Flax/FlaxEngine
3
0
Fork 0
Code Issues Pull Requests Releases Activity
14,469 Commits 16 Branches 23 Tags
280da1702b8a2a18c33c2d3a50eab224249bc792
Commit Graph
601 Commits
Author SHA1 Message Date
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
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
Ari Vuollet 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
Ari Vuollet 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
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 ae4ae7a638 7ee2e66881
 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
Phantom ec0877004c Merge branch 'master' into Improve-HighlightedPopUpColor 2026-01-12 22:56:49 +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
Ari Vuollet 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
Ari Vuollet 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
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
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
Ari Vuollet 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
Saas 79351f0c4d Hide array editor "Size" text when array title overlaps it 2025-10-15 21:09:24 +02:00
Ari Vuollet 668a4dbb4d Merge remote-tracking branch 'origin/master' into sdl_platform 2025-10-14 01:09:26 +03:00
Saas 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
Ari Vuollet 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
Ari Vuollet 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