Flax/FlaxEngine
3
0
Fork 0
Code Issues Pull Requests Releases Activity
14,397 Commits 16 Branches 23 Tags
aaa4f770e293d42ef1fd0517cbef0811aabd2d62
Commit Graph
799 Commits
Author SHA1 Message Date
Ari Vuollet 923fc58cd1 Trigger UI double-click actions with left mouse button only 2026-08-18 01:08:41 +03:00
mafiesto4 1f9f2b6a39 Merge remote-tracking branch 'origin/master' into 1.13 
# Conflicts:
#	Content/Shaders/GI/DDGI.flax
 2026-08-13 11:46:40 +02:00
mafiesto4 5b648b1824 Fixes 2026-08-08 06:50:32 +02:00
mafiesto4 59227bbc8b Merge remote-tracking branch 'origin/master' into 1.13 
# Conflicts:
#	Source/Engine/Graphics/Materials/DeformableMaterialShader.h
#	Source/Engine/Platform/Windows/WindowsWindow.cpp
#	Source/Engine/Platform/Windows/WindowsWindow.h
 2026-08-08 06:40:11 +02:00
mafiesto4 b8d403f32d Minor changes after backporting changes 2026-08-08 06:31:00 +02:00
David Svez 53df912261 Add layers settings shortcut to actor layer dropdown 2026-08-08 06:19:34 +02:00
David Svez 042c3b7220 Skip indexed properties in generic editor 2026-08-08 06:18:46 +02:00
mafiesto4 49cb39e1f1 Merge remote-tracking branch 'origin/master' into 1.13 
# Conflicts:
#	Source/Engine/GraphicsDevice/Vulkan/GPUSwapChainVulkan.cpp
 2026-08-05 08:12:00 +02:00
Daniel Macura d1b475e690 Fix terrain resolution in editor. 2026-08-03 19:49:39 +02:00
mafiesto4 ee266b2710 Merge remote-tracking branch 'origin/master' into 1.13 2026-07-28 22:27:52 +02:00
mafiesto4 4d589314c8 Fix object creation feature to use a proper type in Editor 
7e48786ffc
 2026-07-24 18:40:43 +02:00
mafiesto4 4ba22b4fa8 Merge remote-tracking branch 'origin/master' into 1.13 2026-07-24 18:36:04 +02:00
mafiesto4 3aed901834 Simplify code around assets editing and selecting in Editor 2026-07-22 11:53:22 +02:00
mafiesto4 55a756532b Add cross button to unset abstract class or interface object value 2026-07-22 11:30:49 +02:00
mafiesto4 d92f2a0437 Add IsScriptingObject utility to ScriptType 2026-07-22 11:29:07 +02:00
mafiesto4 7e48786ffc Add type picker when creating abstract class or interface 2026-07-22 11:18:32 +02:00
mafiesto4 d0ab5c961e Merge remote-tracking branch 'origin/master' into 1.13 
# Conflicts:
#	Flax.flaxproj
 2026-07-21 17:18:33 +02:00
mafiesto4 c3e9edc42f Fix editing array of CultureInfo values 2026-07-17 15:49:27 +02:00
mafiesto4 f3af10ca9e Fix missing doc comment 2026-07-13 18:11:35 +02:00
Tryibion 6ba406953b Add initial properties search to properties wndow and prefab properties panel. 2026-07-03 15:54:03 -05:00
mafiesto4 3ccc167707 Fix error on drag&drop in Editor 2026-06-17 10:30:07 +02:00
mafiesto4 080de40eac Add debug preview to selected resource in GPU Memory tab 2026-06-10 15:13:59 +02:00
mafiesto4 e450658834 Remove deprecated mono runtime backend 
Old `mono` backend was not maintained for since 1.7 (July 2023)
`dotnet` backend still can run `mono` on AOT platforms but with the latest .NET features.
 2026-06-03 16:35:06 +02:00
mafiesto4 d9c787a661 Merge remote-tracking branch 'origin/master' into 1.13 
# Conflicts:
#	Source/Editor/SceneGraph/GUI/ActorTreeNode.cs
#	Source/Engine/Graphics/Graphics.h
#	Source/Engine/Renderer/ShadowsPass.cpp
 2026-05-13 16:03:53 +02:00
mafiesto4 2c8da4ea04 Merge branch 'xmldoc_optimizations' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-xmldoc_optimizations 2026-05-12 22:32:28 +02:00
mafiesto4 627f3a2dec Show full timespan in editor incl. seconds 2026-05-06 17:31:27 +02:00
mafiesto4 2f05a0987e Add ShowInPlayMode to HideInEditor attribute for properties/fields that should display in editor only during play mode 2026-05-06 16:54:34 +02:00
mafiesto4 6335bcdc93 Add in-built editors for DateTime and TimeSpan 2026-05-06 16:42:38 +02:00
mafiesto4 956b0d85b1 Fix collection editor of scene object references to use compact inline layout 2026-04-09 17:13:36 +02:00
mafiesto4 2fc95bdf57 Merge remote-tracking branch 'origin/master' into 1.12 
# Conflicts:
#	Content/Editor/MaterialTemplates/Deformable.shader
#	Flax.flaxproj
#	Source/Engine/Content/Content.h
#	Source/Engine/Serialization/JsonTools.cpp
 2026-04-01 17:14:21 +02:00
mafiesto4 095f7277e2 Minor fixes 2026-03-28 15:13:52 +01:00
mafiesto4 76378156f7 Fix crash when applying prefab changes 
#3755
 2026-03-28 00:31:46 +01:00
mafiesto4 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
mafiesto4 9d0e4e9768 Fix potential stack overflow inside CustomEditor.RebuildLayout 
#3720
 2026-03-25 18:51:12 +01:00
mafiesto4 e10d784e83 Add custom HTML shell template to Web export 2026-03-16 22:09:21 +01:00
mafiesto4 f42a9a760a Adjust new Z Axis color in Transform 2026-03-13 23:27:21 +01:00
mafiesto4 1fc5316d12 Adjust new Z Axis color in Transform 2026-03-13 23:21:30 +01:00
mafiesto4 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
mafiesto4 6736f2f77a Merge branch 'NewActorAndUiTransformEditorSkin' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-NewActorAndUiTransformEditorSkin 2026-03-12 11:07:48 +01:00
mafiesto4 2000a95fa7 Merge branch 'SplineEditorImprovements' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-SplineEditorImprovements 2026-03-10 22:58:02 +01:00
mafiesto4 0ade65036e Merge branch 'DoubleClickSplitterToReset' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-DoubleClickSplitterToReset 2026-03-10 22:29:07 +01:00
mafiesto4 8cdb6d77ab Merge branch 'req-actor-inherited-type' of https://github.com/Tryibion/FlaxEngine into Tryibion-req-actor-inherited-type 2026-03-10 20:01:37 +01:00
mafiesto4 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
mafiesto4 c376f220ca Minor adjustments to #3846 2026-03-08 22:46:53 +01:00
mafiesto4 5ce0a1535f Merge branch 'ObsoleteInScriptsEditor' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-ObsoleteInScriptsEditor 
# Conflicts:
#	Source/Editor/CustomEditors/Dedicated/ScriptsEditor.cs
 2026-03-08 22:40:35 +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
mafiesto4 f3111e855d Fix showing C++ structures inlined in collection editor when they have a single property/field 2026-02-03 19:48:57 +01:00