mafiesto4
273b110db4
Code style formatting and minor tweaks
...
#2800
2026-02-11 17:15:15 +01:00
mafiesto4
ee22b9dc25
Merge branch 'sdl_platform' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-sdl_platform
...
# Conflicts:
# Source/Editor/GUI/Dialogs/ColorPickerDialog.cs
# Source/Editor/Modules/UIModule.cs
2026-02-11 14:08:57 +01:00
mafiesto4
f045b5b6b6
Merge remote-tracking branch 'origin/master' into 1.12
...
# Conflicts:
# Content/Editor/Camera/M_Camera.flax
# Content/Editor/CubeTexturePreviewMaterial.flax
# Content/Editor/DebugMaterials/DDGIDebugProbes.flax
# Content/Editor/DebugMaterials/SingleColor/Decal.flax
# Content/Editor/DebugMaterials/SingleColor/Particle.flax
# Content/Editor/DebugMaterials/SingleColor/Surface.flax
# Content/Editor/DebugMaterials/SingleColor/SurfaceAdditive.flax
# Content/Editor/DebugMaterials/SingleColor/Terrain.flax
# Content/Editor/DefaultFontMaterial.flax
# Content/Editor/Gizmo/FoliageBrushMaterial.flax
# Content/Editor/Gizmo/Material.flax
# Content/Editor/Gizmo/MaterialWire.flax
# Content/Editor/Gizmo/SelectionOutlineMaterial.flax
# Content/Editor/Gizmo/VertexColorsPreviewMaterial.flax
# Content/Editor/Highlight Material.flax
# Content/Editor/Icons/IconsMaterial.flax
# Content/Editor/IesProfilePreviewMaterial.flax
# Content/Editor/MaterialTemplates/Features/ForwardShading.hlsl
# Content/Editor/Particles/Particle Material Color.flax
# Content/Editor/Particles/Smoke Material.flax
# Content/Editor/SpriteMaterial.flax
# Content/Editor/Terrain/Circle Brush Material.flax
# Content/Editor/Terrain/Highlight Terrain Material.flax
# Content/Editor/TexturePreviewMaterial.flax
# Content/Editor/Wires Debug Material.flax
# Content/Engine/DefaultDeformableMaterial.flax
# Content/Engine/DefaultMaterial.flax
# Content/Engine/DefaultRadialMenu.flax
# Content/Engine/DefaultTerrainMaterial.flax
# Content/Engine/SingleColorMaterial.flax
# Content/Engine/SkyboxMaterial.flax
# Flax.flaxproj
# Source/Engine/Graphics/Materials/MaterialShader.h
# Source/Engine/Graphics/Materials/MaterialShaderFeatures.cpp
# Source/Engine/Renderer/RenderList.h
# Source/Shaders/Reflections.shader
# Source/Shaders/ReflectionsCommon.hlsl
# Source/Tools/Flax.Build/Bindings/BindingsGenerator.Cpp.cs
2026-02-11 00:20:38 +01:00
0084bc051c
Merge branch 'master' into sdl_platform
2026-02-10 23:05:19 +02:00
f870fc3ae2
Merge remote-tracking branch 'origin/master' into sdl_platform
...
# Conflicts:
# Source/Editor/Viewport/MainEditorGizmoViewport.cs
2026-02-03 17:39:43 +02:00
Tryibion
e1ffdee57a
If UI is culling children, dont return children outside of client area for raycast.
2026-01-30 15:51:53 -06:00
mafiesto4
8ed6a92022
Merge branch 'fix-scaling-issue' of https://github.com/Tryibion/FlaxEngine into Tryibion-fix-scaling-issue
2026-01-29 10:58:03 +01:00
mafiesto4
c9d16e16cc
Fix Rich Text Box vertical alignment of the inlined images and whole contents
...
#3502 ae4ae7a6387ee2e66881
2026-01-29 10:55:10 +01:00
Tryibion
004e02af73
Fix double scaling in canvas scalar.
2026-01-26 20:46:49 -06:00
mafiesto4
610c76578b
Merge remote-tracking branch 'origin/master' into 1.12
...
# Conflicts:
# Flax.flaxproj
2026-01-13 14:29:44 +01:00
mafiesto4
b4b13d8dd4
Fix crash when showing cube or volume texture in GPUTextureBrush
2026-01-13 10:36:26 +01:00
mafiesto4
840835fad2
Merge branch 'ArrayEditorHideSize' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-ArrayEditorHideSize
2026-01-12 21:34:52 +01:00
mafiesto4
32cae3aacd
Merge branch 'UiClippingFixes' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-UiClippingFixes
2026-01-12 21:33:03 +01:00
mafiesto4
450b998a29
Merge branch 'master' into 1.12
2026-01-07 23:15:13 +01:00
3e91ba3fb2
Merge remote-tracking branch 'origin/master' into sdl_platform
2025-12-15 19:03:05 +02:00
ed50ce9c90
Change Dropdown's EditorOrder from 2023 to 2024
2025-12-07 18:48:16 +01:00
a7e77f6e21
Update CreatePopupItem method
...
-Modify the `TextColour` property to use a dynamic value based on `TextColour` multiplied by `0.9f` instead of a fixed value (`Colour.White * 0.9f`).
-Modify the `TextColourHighlighted` property to use the dynamic value of `TextColourHighlighted` instead of a fixed value (`Colour.White`).
2025-12-07 18:23:38 +01:00
56278b17ee
Add Text Color Highlighted on Dropdown
2025-12-07 16:53:43 +01:00
466f9a4797
Merge remote-tracking branch 'origin/master' into sdl_platform
2025-11-11 21:40:06 +02:00
mafiesto4
1f592ba1a1
Fix game viewport scaling when using custom aspect or resolution to simulate actual logic
...
#3699
2025-10-30 23:36:51 +01:00
35d6e5fd21
fix still being able to open/ close script editor with no fields
...
Introduces "CanOpenClose" to DropPanel.
If false, will ignore the user clicking on the header (or the arrow) to open or collapse the panel
2025-10-30 20:02:15 +01:00
mafiesto4
0913e6f738
Fix error when focus changes during focus change xd
2025-10-30 10:39:46 +01:00
mafiesto4
a2d91d989d
Add Focused event to control
2025-10-21 15:54:20 +02:00
f99a244b8e
Merge remote-tracking branch 'origin/master' into sdl_platform
...
# Conflicts:
# Source/Editor/Windows/GameWindow.cs
2025-10-18 02:19:30 +03:00
mafiesto4
dab44f5ceb
Minor fixes
2025-10-16 10:20:51 +02:00
79351f0c4d
Hide array editor "Size" text when array title overlaps it
2025-10-15 21:09:24 +02:00
668a4dbb4d
Merge remote-tracking branch 'origin/master' into sdl_platform
2025-10-14 01:09:26 +03:00
48100cf9fc
fix group element text clipping
...
fixes group element header text clipping outside of the header and into the settings icon (if there is one).
Also some extra code to handle script editor, as that displays some extra icons in the header.
2025-10-13 11:16:07 +02:00
mafiesto4
823ed247d2
Merge remote-tracking branch 'origin/master' into 1.11
...
# Conflicts:
# Source/Engine/Level/Actors/Sky.cpp
2025-10-03 22:37:32 +02:00
mafiesto4
4c640b915f
Fix CheckBox to display check state when created in game without editor icon atlas
...
#3705
2025-10-03 11:25:25 +02:00
mafiesto4
87e2c4c4d5
Merge remote-tracking branch 'origin/master' into 1.11
...
# Conflicts:
# Content/Editor/DebugMaterials/DDGIDebugProbes.flax
# Source/Editor/Windows/OutputLogWindow.cs
# Source/Engine/Level/Actor.cpp
2025-09-24 18:18:27 +02:00
mafiesto4
ae4ae7a638
Fix rich textbox vertical alignment
...
#3502
2025-09-15 15:17:18 +02:00
mafiesto4
a471861e92
Fix editing UI Brush in prefabs
...
#3501
2025-09-12 23:15:13 +02:00
mafiesto4
8921cf5156
Add label/button text to string convertion for better debugging
2025-09-09 10:42:10 +02:00
1d8f221f1b
Merge remote-tracking branch 'origin/1.11' into sdl_platform_1.11
...
# Conflicts:
# Source/Engine/Platform/Windows/WindowsPlatform.cpp
# Source/Tools/Flax.Build/Build/ProjectTarget.cs
# Source/Tools/Flax.Build/Configuration.cs
2025-09-07 19:31:16 +03:00
mafiesto4
826009c1b4
Merge remote-tracking branch 'origin/master' into 1.11
...
# Conflicts:
# Content/Editor/DebugMaterials/DDGIDebugProbes.flax
# Source/Engine/Scripting/Scripting.cpp
2025-08-25 23:48:08 +02:00
fc341a86e7
Merge remote-tracking branch 'origin/master' into sdl_platform
2025-08-24 09:44:28 +03:00
Tryibion
38b4ace1a8
Use material base as ctor parameter.
2025-08-15 07:01:48 -05:00
Tryibion
cf503cf921
Add material instance ctor for MaterialBrush
2025-08-12 21:03:35 -05:00
mafiesto4
f87e2c2229
Merge branch '1.11' of https://gitlab.flaxengine.com/flax/flaxengine into 1.11
2025-07-19 11:14:58 +02:00
mafiesto4
18035a8604
Fix incorrect image buffer usage in Render Output Control
2025-07-19 11:14:54 +02:00
mafiesto4
9646dd3fc2
Fix AutoFocus on ContainerControl to be false by default
2025-07-15 12:33:33 +02:00
mafiesto4
185151b025
Minor fixes
2025-06-27 18:52:25 +02:00
1586bb0702
Merge remote-tracking branch 'origin/master' into sdl_platform
2025-06-26 15:31:59 +03:00
mafiesto4
d1c43ec1fe
Merge remote-tracking branch 'origin/master' into 1.11
2025-06-25 10:48:11 +02:00
mafiesto4
5a05038a9b
Add new UIBrush that uses UIBrushAsset json resource with a brush data
2025-06-24 13:08:25 +02:00
mafiesto4
d7df403e5e
Optimize ContainerControl.DisposeChildren
2025-06-20 09:05:41 +02:00
6ff260d052
Merge remote-tracking branch 'origin/master' into sdl_platform
2025-06-16 14:09:29 +03:00
mafiesto4
ba75fd5882
Fix crash regression when textbox watermak is null
2025-06-05 12:47:45 +02:00
8df3999f85
Merge remote-tracking branch 'origin/master' into sdl_platform
2025-06-04 19:30:30 +03:00
mafiesto4
Ari Vuollet
Tryibion