Flax/FlaxEngine
3
0
Fork 0
Code Issues Pull Requests Releases Activity
14,606 Commits 16 Branches 23 Tags
a04fa0b8ed95e7c71ea02b3f92adfff44b375e19
Commit Graph
4999 Commits
Author SHA1 Message Date
mafiesto4 b1507cc366 Merge remote-tracking branch 'origin/master' into 1.13 
# Conflicts:
#	Source/Editor/GUI/CurveEditor.Contents.cs
 2026-09-20 23:58:32 +02:00
mafiesto4 ebcf315e87 Add object track type tooltip 2026-09-20 22:50:46 +02:00
mafiesto4 7d1d222d63 Improve component labels for colors #4153 2026-09-20 22:50:34 +02:00
mafiesto4 6a4a1a223c Merge branch 'dev/AnimationTimelinesWindowImprovements' of https://github.com/ifromstone/FlaxEngine into ifromstone-dev/AnimationTimelinesWindowImprovements 2026-09-20 22:24:57 +02:00
mafiesto4 2a0589b4c1 Add context menu option to show asset in Content window quickly 2026-09-19 23:26:35 +02:00
mafiesto4 a39762e4de Fix typos 2026-09-19 23:26:17 +02:00
David Svez b7077e6abb Fix CSG Brush face moving bugs 
#4207
https://github.com/RomanZhu/FlaxEngine/commit/87bd2dc6e42797084f56128691c506c5a7bf3364
 2026-09-19 22:50:32 +02:00
mafiesto4 358e39caa7 Add various improvements to CSG Brushes editing workflow 2026-09-19 22:48:57 +02:00
mafiesto4 2974a0435c Fix selecting CSG Brush face 2026-09-19 22:43:28 +02:00
mafiesto4 451985612b Various tweaks to #4218 2026-09-19 20:05:36 +02:00
mafiesto4 a05c803c51 Merge branch 'msdf-stage2' of https://github.com/fibref/FlaxEngine into fibref-msdf-stage2 2026-09-19 19:49:29 +02:00
mafiesto4 acaaafacbc Use better group name for Debug Log options 2026-09-19 06:20:47 +02:00
mafiesto4 01c9f19904 Refactor #4179 by using RichTextBox for Debug Log title formatting 2026-09-19 06:20:32 +02:00
mafiesto4 f7acaa28a5 Merge branch 'log-color' of https://github.com/CodeForBeauty/FlaxEngine into CodeForBeauty-log-color 2026-09-18 13:18:25 +02:00
mafiesto4 dae5b416ca Minor tweaks #4130 2026-09-18 13:08:16 +02:00
mafiesto4 40ec48c29e Merge branch 'dev/DiscardingUnsavedAssetChanges' of https://github.com/ifromstone/FlaxEngine into ifromstone-dev/DiscardingUnsavedAssetChanges 2026-09-18 13:00:57 +02:00
mafiesto4 151f573040 Add current .NET version to the main window tooltip 2026-09-18 12:55:28 +02:00
mafiesto4 c996b68dcf Merge branch 'control_textinput' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-control_textinput 2026-09-16 12:40:56 +02:00
mafiesto4 d8a7382c8d Merge remote-tracking branch 'origin/master' into 1.13 
# Conflicts:
#	Source/Engine/GraphicsDevice/Vulkan/GPUSwapChainVulkan.cpp
#	Source/Engine/Renderer/Utils/GlobalSignDistanceFieldPass.cpp
#	Source/Engine/Scripting/Internal/InternalCalls.h
#	Source/Engine/Scripting/Internal/ManagedDictionary.cpp
#	Source/Engine/Scripting/Internal/ManagedDictionary.h
#	Source/Engine/Scripting/ScriptingObject.cpp
#	Source/Tools/Flax.Build/Bindings/BindingsGenerator.CSharp.cs
 2026-09-16 12:38:27 +02:00
Roman Zhu 7a6190944c RMB look doesn't pitch up sometimes on weird scaling/dpi combo 
# Conflicts:
#	Source/Editor/Viewport/EditorViewport.cs
 2026-09-16 12:27:38 +02:00
mafiesto4 82ee8713f5 Fix missing mutex lock in Game Cooker thread 
#4170 #4181
 2026-09-15 13:52:36 +02:00
mafiesto4 d04d48490a Rename EditorViewport.HasLoadedAssets to HasContentLoaded and fix it for prefab auto-fit 
Ref #4137
 2026-09-15 13:39:06 +02:00
mafiesto4 4df2f3b4c1 Reduce assertions in dock panel in favor of pain error 2026-09-15 13:13:27 +02:00
mafiesto4 bd5edcc4d2 Fix minor Editor UI issues 2026-09-15 12:55:13 +02:00
mafiesto4 411c94efcc Fix typo 2026-09-14 08:48:22 +02:00
mafiesto4 5a850b1334 Merge branch 'ScrollContentPanelNavBarToCurrentFolder' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-ScrollContentPanelNavBarToCurrentFolder 
# Conflicts:
#	Source/Editor/Windows/ContentWindow.cs
 2026-09-14 08:36:39 +02:00
mafiesto4 e669e9ca65 Fix old api usage for #4185 2026-09-14 08:30:51 +02:00
mafiesto4 09f0477e18 Add auto-expand for items list with a single category in use 2026-09-14 06:59:52 +02:00
mafiesto4 f83d853e5d Fix default value in Editor when it's null for value-type 2026-09-14 06:59:01 +02:00
mafiesto4 0fc3972cea Refactor #2746 to use ScriptingObjectInterfaceReference for C# too instead of attribute 
Use `MarshalAs=ScriptingObject*` for more universal way of marshaling data between C++ and C#
 2026-09-14 06:58:40 +02:00
mafiesto4 a7754f3137 Merge branch 'dev/ObjectInterfaceReferences' of https://github.com/ifromstone/FlaxEngine into ifromstone-dev/ObjectInterfaceReferences 
# Conflicts:
#	Source/Engine/Scripting/Internal/ManagedDictionary.cpp
 2026-09-12 12:40:59 +02:00
mafiesto4 a370aa29e9 Fix interface or abstract property editing of read-only or scripting object types 2026-09-11 12:13:57 +02:00
mafiesto4 efaff8338f Merge branch 'ShowWholeThing' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-ShowWholeThing 
# Conflicts:
#	Source/Editor/Surface/SurfaceUtils.cs
 2026-09-09 08:07:31 +02:00
mafiesto4 c3a1312285 Add RMB and MMB actions to Type Editor control 2026-09-02 23:08:23 +02:00
mafiesto4 313f0e5478 Merge remote-tracking branch 'origin/master' into 1.13 
# Conflicts:
#	Content/Shaders/Editor/Grid.flax
#	Content/Shaders/GBuffer.flax
#	Content/Shaders/GlobalSignDistanceField.flax
#	Content/Shaders/ProbesFilter.flax
#	Content/Shaders/SSR.flax
#	Content/Shaders/VolumetricFog.flax
#	Development/Documentation/mono.md
#	Source/Editor/Modules/ContentDatabaseModule.cs
 2026-08-30 22:23:31 +02:00
Withaust ec1f4a9a4b Fix headless editor & Roslyn analyzer include resolution 2026-08-30 10:48:35 +03:00
mafiesto4 ab7936c9ff Add middle and right mouse button actions to asset/object pickers to clear value or show popup quickly 2026-08-29 23:46:54 +02:00
mafiesto4 d99631ddbf Comply with .net 8 for now 2026-08-29 23:18:08 +02:00
mafiesto4 fb076cc34d Merge branch 'asset_window_reload_fix' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-asset_window_reload_fix 2026-08-29 23:16:35 +02:00
mafiesto4 b7b357014f Comply with .net 8 for now 2026-08-29 23:14:24 +02:00
mafiesto4 f0604434ab Merge branch 'editor_gamewin_fixes' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-editor_gamewin_fixes 2026-08-29 23:10:26 +02:00
mafiesto4 68d85ec817 Merge branch 'content_delete_fix' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-content_delete_fix 2026-08-29 23:05:07 +02:00
mafiesto4 97186f1970 Add **Hardware Occlusion Culling** to models, foliage, particles, terrain and local light shadows 2026-08-28 19:53:10 +02:00
Ari Vuollet 582af19cb2 Fix compilation 2026-08-26 20:11:21 +03:00
mafiesto4 14df537817 Refactor engine shaders folder to have better organization 2026-08-26 12:59:23 +02:00
Ari Vuollet 28d5a6d0de Fix DockWindow.IsDocked to ignore single tab floating window as docked 2026-08-26 00:33:56 +03:00
Ari Vuollet 17df377737 Fix restoring editor game window from maximized state to dock panels 2026-08-25 23:43:53 +03:00
Ari Vuollet d21edc12cb Fix restoring editor game window from maximized state to split panels 2026-08-25 23:43:53 +03:00
Ari Vuollet 101c15c677 Prevent refloating editor game window when window was floating before 2026-08-25 23:43:52 +03:00
Ari Vuollet a56903d3ad Fix client-side decorations in borderless editor game window on launch 2026-08-25 23:43:52 +03:00