Flax/FlaxEngine
3
0
Fork 0
Code Issues Pull Requests Releases Activity
14,654 Commits 16 Branches 23 Tags
85b6e62fe368c46bc3a03fd2683e5f1eb953bf6c
Commit Graph
1298 Commits
Author SHA1 Message Date
mafiesto4 0380997bcd Merge remote-tracking branch 'origin/master' into 1.13 
# Conflicts:
#	.github/actions/vulkan/action.yml
#	Source/Editor/GUI/PlatformSelector.cs
#	Source/Editor/Windows/GameCookerWindow.cs
 2026-10-01 23:17:07 +02:00
mafiesto4 6c5321d225 Add deprecation attributes to old UWP platform 2026-09-30 22:03:48 +02:00
mafiesto4 f78a70e1cd Fix Game Cooker wait on code compile/load end before cooking starts 
#4277
 2026-09-30 21:56:54 +02:00
mafiesto4 07046a94c1 Revert "Merge branch 'GoaLitiuM-asset_window_reload_fix'" 
Caused regression on various windows being misplaces after hot-reload  (eg. BT editor).

This reverts commit 470a2220ee, reversing
changes made to 4d6fe760c1.

# Conflicts:
#	Source/Editor/GUI/Docking/FloatWindowDockPanel.cs
 2026-09-23 22:36:23 +02:00
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 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
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 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 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
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 bd5edcc4d2 Fix minor Editor UI issues 2026-09-15 12:55:13 +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 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 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 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
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
Ari Vuollet 0f47b6d9a2 Add Start/EndTextInput for control to toggle character input events 2026-08-18 21:56:35 +03:00
Ari Vuollet 373ce6b212 Keep asset windows alive during scripts reload 
Recreated asset editor windows are now reattached to the native window
after scripts reload to keep the current state and Z-order of the
windows untouched on platforms where window state can't be changed
without user interaction (Wayland).
 2026-08-18 01:10:14 +03:00
Ari Vuollet 923fc58cd1 Trigger UI double-click actions with left mouse button only 2026-08-18 01:08:41 +03:00
Ari Vuollet 0125e4603d Fix engine CommandLine argument value usage 2026-08-17 14:06:11 +03:00
fibref c41c5ad561 add MSDFSize slider limit 2026-08-15 18:15:44 +08:00
fibref cf05034d7a fix Font and FontAsset cache not completely refreshed when options change 2026-08-14 21:02:03 +08: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 05ebbe7448 Add new temporal upsampling option (TAAU) when using location DuringAntiAliasing 
Refactor `RenderingUpscaleLocation` enum item names.
 2026-08-13 11:26:27 +02:00
mafiesto4 782e7415a7 Add auto-select of newly copied/moved content items 2026-08-13 06:01:55 +02:00
fibref 74327aa8cd add MSDFsize to FontAsset 2026-08-08 16:12:37 +08: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 4b5e32df74 Merge branch 'add-editor-return-after-play' of https://github.com/Duroxxigar/FlaxEngine into Duroxxigar-add-editor-return-after-play 2026-08-08 05:36:36 +02:00
Ari Vuollet 8d0fb85dd5 Fix content browser stealing focus from popup asset windows 2026-08-08 00:10:26 +03:00
Jake Young 6489b7d7b7 Add a new option when entering play mode to always restore to the editor window after exiting play mode. Also made it the default option on new projects. 2026-08-07 16:21:12 -04:00
mafiesto4 eb69dafb7c Add Loaded event to Asset in scripting 
Refactor `Asset` events naming to match engine scheme
 2026-07-28 22:32:36 +02:00
mafiesto4 3aed901834 Simplify code around assets editing and selecting in Editor 2026-07-22 11:53:22 +02:00
mafiesto4 2723f91905 Fix errors on Editor shutdown 2026-07-22 09:26:54 +02:00
mafiesto4 d7cfd144ef Fix errors on Editor shutdown 2026-07-21 23:39:01 +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 f9990f2712 Merge branch 'auto-rename-new-param' of https://github.com/TyGrze/FlaxEngine into TyGrze-auto-rename-new-param 2026-07-13 17:58:47 +02:00
mafiesto4 4aff336f32 Merge branch 'properties-search' of https://github.com/Tryibion/FlaxEngine into Tryibion-properties-search 2026-07-13 17:51:11 +02:00