Flax/FlaxEngine
3
0
Fork 0
Code Issues Pull Requests Releases Activity
13,785 Commits 15 Branches 23 Tags
master
Commit Graph

446 Commits

Author SHA1 Message Date
mafiesto4 c8912ad100 Add help support to Debug Commands via XML docs parsing 2026-05-13 10:47:21 +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 4e72be1604 Add selected code editor name to UI button for scripts project opening 2026-04-16 15:44:28 +02:00
mafiesto4 b3ceda5a6e Revert 10c8454e8f to use more common paste logic in scene tree 
(duplicate can paste at the same tree level, paste puts new object into the selection by default)
 2026-04-08 22:19:21 +02:00
mafiesto4 5b922e069e Fix importing and using files without extension in Editor content 2026-04-08 20:36:02 +02:00
mafiesto4 4e6fde17ea Add macOS window impl progress 2026-04-04 22:34:39 +02:00
mafiesto4 dccfa76994 Fix DPI issues on macOS in Editor windows 2026-04-04 21:05:39 +02:00
mafiesto4 ebdf7074d3 Fix native window system regression on Windows in Editor due to transparent window as layered 
#4039
 2026-04-03 17:57:13 +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
Tryibion a41f2e9260 Merge branch 'master' into add-content-tree-view 2026-03-27 10:48:08 -05: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 0d133cfbdc Minor fixes to #3870 2026-03-10 22:22:02 +01:00
mafiesto4 337fea0f69 Merge branch 'codeeditor_fixes' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-codeeditor_fixes 2026-03-10 22:09:28 +01:00
mafiesto4 90ffc4e5f9 Merge branch 'script-recycle' of https://github.com/Tryibion/FlaxEngine into Tryibion-script-recycle 2026-03-10 14:13:25 +01:00
mafiesto4 37a39e750f Attempt to fix Linux headless Test run with SDL 2026-03-10 11:25:22 +01:00
Tryibion 83bbb4f6ba Add recycle bin to script deleting. 2026-03-06 19:39:49 -06:00
Tryibion 24a11ac2a8 Add tree view mode for content window. 2026-02-28 12:38:07 -06:00
mafiesto4 7ff4ce18ff Add web platform icons to editor atlas 2026-02-17 13:21:00 +01:00
mafiesto4 c4d20f06ee Move GetDisplayServer to LinuxPlatform (add support for custom platform scripting api) 
#2800
 2026-02-12 09:24:11 +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 f870fc3ae2 Merge remote-tracking branch 'origin/master' into sdl_platform 
# Conflicts:
#	Source/Editor/Viewport/MainEditorGizmoViewport.cs
 2026-02-03 17:39:43 +02:00
mafiesto4 9fc9382e58 Refactor navmesh building to support updating all scenes automatically without specifying one 
#3744
 2026-01-30 13:11:56 +01:00
Tryibion a7016d1186 Fix issue with tabs not collapsing panel 1 if no tabs on panel 1 2026-01-26 21:56:30 -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 e721fbd89f Add editor status message about amount of selected actors 2026-01-13 14:21:32 +01:00
mafiesto4 e21cb9154a Adjust #3677 to evaluate product local path in lazy 2026-01-11 22:11:16 +01:00
mafiesto4 af124ce163 Merge branch 'QuickOpenProductLocalFolder' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-QuickOpenProductLocalFolder 2026-01-11 22:09:43 +01:00
Ari Vuollet 71b222e0b0 Fix Editor project file generation to use custom code editor arguments 2025-12-18 23:52:21 +02:00
Ari Vuollet 5921f60af2 Get code editor name through CodeEditingManager 2025-12-18 23:52:21 +02:00
Ari Vuollet 39269583c3 Fix default code editor not using Visual Studio as fallback editor 2025-12-18 23:52:21 +02:00
Ari Vuollet cba3899c62 Fix invalid code editor when selected editor is not detected 2025-12-18 23:52:21 +02:00
Ari Vuollet 3e91ba3fb2 Merge remote-tracking branch 'origin/master' into sdl_platform 2025-12-15 19:03:05 +02:00
Tryibion 1bf6612002 Fix exception thrown when reloading open windows. 2025-11-25 17:26:57 -06:00
Ari Vuollet 0ac3ab2329 Merge remote-tracking branch 'origin/master' into sdl_platform 2025-11-19 18:30:08 +02:00
mafiesto4 5ec860015d Add minor adjustments 2025-11-06 21:00:16 +01:00
Ari Vuollet 668a4dbb4d Merge remote-tracking branch 'origin/master' into sdl_platform 2025-10-14 01:09:26 +03:00
mafiesto4 18364d2a8b Merge remote-tracking branch 'origin/1.11' 2025-10-12 21:50:19 +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
Saas c4c7ee941f add industry standard shortcut for editor settings 2025-10-03 14:46:43 +02:00
mafiesto4 60c19303f6 Fix duplicating splines with parents 
#3531
 2025-10-02 23:31:03 +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 3fcc9ed01f Merge branch 'feature/create_project' of https://github.com/IceReaper/FlaxEngine into IceReaper-feature/create_project 2025-09-22 22:32:43 +02:00
mafiesto4 9749487e24 Move prefab and game UI size context menu to shared UI Module 
#3571
 2025-09-14 23:59:40 +02:00
mafiesto4 55968a8ddc Merge branch 'prefab-viewport-scaling' of https://github.com/Tryibion/FlaxEngine into Tryibion-prefab-viewport-scaling 2025-09-14 23:11:59 +02:00
Saas 215467ae42 add ribbon menu buttons to quick open product local folder 2025-09-14 18:14:38 +02:00
Ari Vuollet f0dea9d528 Add support for Visual Studio 2026 and v145 MSVC toolset 2025-09-10 20:05:56 +03: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
Ari Vuollet b443b74d18 Merge branch 'master' into sdl_platform 
# Conflicts:
#	Source/Editor/GUI/Docking/DockHintWindow.cs
#	Source/Editor/Options/InterfaceOptions.cs
 2025-09-07 19:02:09 +03:00