Wojtek Figat
eab7794e3b
Merge remote-tracking branch 'origin/master' into 1.12
...
# Conflicts:
# Source/Engine/Content/Storage/FlaxStorage.cpp
# global.json
2026-03-26 23:44:33 +01:00
Wojtek Figat
2c742bee41
Fix typo from #3914
2026-03-25 17:22:38 +01:00
Wojtek Figat
0f332e331d
Merge branch 'RadialMenuImprovements' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-RadialMenuImprovements
2026-03-25 17:21:20 +01:00
Wojtek Figat
f3c957481c
Merge remote-tracking branch 'origin/master' into 1.12
...
# Conflicts:
# Source/Editor/GUI/Dialogs/ColorPickerDialog.cs
# Source/Editor/GUI/Dialogs/ColorSelector.cs
2026-03-24 23:41:58 +01:00
Phantom
14d6273a2f
fix #2 on Dropdown
2026-03-14 15:29:31 +01:00
Phantom
f876068086
Fix Text Color Highlighted
2026-03-13 20:09:57 +01:00
Wojtek Figat
45a8d82a83
Merge remote-tracking branch 'origin/master' into 1.12
...
# Conflicts:
# Content/Shaders/GI/DDGI.flax
# Content/Shaders/GUI.flax
# Flax.flaxproj
# Source/Editor/Windows/AboutDialog.cs
# Source/Engine/Serialization/Stream.cpp
# Source/Shaders/GUICommon.hlsl
2026-03-13 08:09:16 +01:00
Phantom
895758d27d
Merge branch 'master' into Improve-HighlightedPopUpColor
2026-03-12 17:34:46 +01:00
Wojtek Figat
8b4f8de988
Fix Control.LocalLocation to use parent control GetDesireClientArea rather than Bounds
...
#3889
2026-03-12 15:27:31 +01:00
Phantom
6b1490dac4
Merge branch 'master' into Improve-HighlightedPopUpColor
2026-03-12 12:26:26 +01:00
Wojtek Figat
30d7588d9c
Fix UI panel controls missing in Editor
2026-03-12 08:53:30 +01:00
Chandler Cox
c3aecc1a11
Add allowable characters enum to text box
2026-03-10 19:47:09 -05:00
Phantom
6629ead842
Merge branch 'master' into Improve-HighlightedPopUpColor
2026-03-11 01:22:58 +01:00
Wojtek Figat
5509bc4989
Add option to render Canvas into GPUTexture
...
#3601
2026-03-10 16:29:39 +01:00
Wojtek Figat
3cfa110a48
Merge remote-tracking branch 'origin/master' into 1.12
...
# Conflicts:
# Source/Editor/Options/InterfaceOptions.cs
# Source/Engine/Audio/OpenAL/AudioBackendOAL.cpp
# Source/Engine/Graphics/Graphics.cpp
# Source/Engine/GraphicsDevice/Vulkan/CmdBufferVulkan.cpp
# Source/Engine/GraphicsDevice/Vulkan/CmdBufferVulkan.h
# Source/Engine/GraphicsDevice/Vulkan/Config.h
# Source/Engine/GraphicsDevice/Vulkan/GPUDeviceVulkan.cpp
# Source/Engine/GraphicsDevice/Vulkan/GPUDeviceVulkan.h
# Source/Engine/GraphicsDevice/Vulkan/QueueVulkan.cpp
2026-03-10 15:08:43 +01:00
Phantom
f4c1e81f64
Merge branch 'master' into Improve-HighlightedPopUpColor
2026-03-09 18:56:30 +01:00
Chandler Cox
4d4571ee55
Allow -1 for Max textbox length
...
Allow -1 to be "no" length or max length. add bottom limit of -1.
2026-03-06 20:02:24 -06:00
Phantom
dfdcd47ad7
Merge branch 'master' into Improve-HighlightedPopUpColor
2026-03-04 22:33:45 +01:00
Saas
db46050b16
tweak caret blink speed
2026-03-01 11:01:55 +01:00
Wojtek Figat
273b110db4
Code style formatting and minor tweaks
...
#2800
2026-02-11 17:15:15 +01:00
Wojtek Figat
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
Wojtek Figat
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
Phantom
83c15c05bb
Merge branch 'master' into Improve-HighlightedPopUpColor
2026-02-03 23:06:53 +01: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
Saas
b27e556363
expose material instance
2026-02-02 21:35:40 +01:00
Saas
b0a0c5b66c
change selectedSegment to int
2026-02-02 12:52:54 +01:00
Saas
f1d5c0257f
improve radial menu control
...
- Add AllowChangeSelectionWhenOutside to allow changing the selection from the outside the menu
- Expose UpdateAngle() to get *some* kind of controller support
- Expose `SelectedSegment`
- Improve various doc comments
2026-02-02 12:50:24 +01:00
Phantom
ae46520edf
Merge branch 'master' into Improve-HighlightedPopUpColor
2026-02-02 10:31:24 +01:00
Chandler Cox
e1ffdee57a
If UI is culling children, dont return children outside of client area for raycast.
2026-01-30 15:51:53 -06:00
Wojtek Figat
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
Wojtek Figat
c9d16e16cc
Fix Rich Text Box vertical alignment of the inlined images and whole contents
...
#3502 ae4ae7a6387ee2e66881
2026-01-29 10:55:10 +01:00
Chandler Cox
004e02af73
Fix double scaling in canvas scalar.
2026-01-26 20:46:49 -06:00
Wojtek Figat
610c76578b
Merge remote-tracking branch 'origin/master' into 1.12
...
# Conflicts:
# Flax.flaxproj
2026-01-13 14:29:44 +01:00
Wojtek Figat
b4b13d8dd4
Fix crash when showing cube or volume texture in GPUTextureBrush
2026-01-13 10:36:26 +01:00
Phantom
ec0877004c
Merge branch 'master' into Improve-HighlightedPopUpColor
2026-01-12 22:56:49 +01:00
Wojtek Figat
840835fad2
Merge branch 'ArrayEditorHideSize' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-ArrayEditorHideSize
2026-01-12 21:34:52 +01:00
Wojtek Figat
32cae3aacd
Merge branch 'UiClippingFixes' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-UiClippingFixes
2026-01-12 21:33:03 +01:00
Wojtek Figat
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
Phantom
0094216ff8
Renaming Luminance name to Brightness
2025-12-15 14:29:57 +01:00
Phantom
7f2f73afd8
Added Luminance property and updated authors
...
-Added public Luminance property in Color.cs to calculate colour brightness.
-Refactored Dropdown.cs to use Luminance instead of manual calculation.
-Updated author list in AboutDialog.cs by adding ‘Michael Salvini’.
2025-12-15 00:48:42 +01:00
Phantom
bb2e22ecf2
Improved readability of highlighted text in drop-down menus
...
TextColorHighlighted is now automatically lightened if too dark, by calculating brightness and interpolating towards white. This ensures better readability of selected items in drop-down menus.
2025-12-14 13:14:45 +01:00
Phantom
ed50ce9c90
Change Dropdown's EditorOrder from 2023 to 2024
2025-12-07 18:48:16 +01:00
Phantom
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
Phantom
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
Wojtek Figat
1f592ba1a1
Fix game viewport scaling when using custom aspect or resolution to simulate actual logic
...
#3699
2025-10-30 23:36:51 +01:00
Saas
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
Wojtek Figat
0913e6f738
Fix error when focus changes during focus change xd
2025-10-30 10:39:46 +01:00
