GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
2fc95bdf57af250add3354bd63cc4390c4ff2d55
FlaxEngine/Source/Editor
History
Wojtek Figat 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
..
Analytics
Add support for building engine without logging
2025-05-28 04:05:12 +02:00
Content
Merge remote-tracking branch 'origin/master' into 1.12
2026-04-01 17:14:21 +02:00
Cooker
Fix stack overflow on mac when cooking game with too small stack size
2026-03-26 10:55:11 +01:00
CustomEditors
Merge remote-tracking branch 'origin/master' into 1.12
2026-04-01 17:14:21 +02:00
Gizmo
Merge remote-tracking branch 'origin/master' into 1.12
2026-04-01 17:14:21 +02:00
GUI
Merge remote-tracking branch 'origin/master' into 1.12
2026-04-01 17:14:21 +02:00
History
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
Managed
Merge remote-tracking branch 'origin/1.11' into sdl_platform_1.11
2025-09-07 19:31:16 +03:00
Modules
Merge remote-tracking branch 'origin/master' into 1.12
2026-04-01 17:14:21 +02:00
Options
Merge remote-tracking branch 'origin/master' into 1.12
2026-04-01 17:14:21 +02:00
Plugins
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
Progress
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
SceneGraph
Fix spawned in Editor actor RigidBody to never be static
2026-03-26 09:21:54 +01:00
Scripting
Merge remote-tracking branch 'origin/master' into 1.12
2026-03-13 08:09:16 +01:00
States
Fix issue with tooltip not updating on scene reload.
2025-06-20 20:12:43 -05:00
Surface
Merge remote-tracking branch 'origin/master' into 1.12
2026-04-01 17:14:21 +02:00
Tools
Merge remote-tracking branch 'origin/master' into 1.12
2026-03-26 23:44:33 +01:00
Undo
Fix pasted ghost prefab objects when paste target is not defined
2026-03-30 10:14:50 +02:00
Utilities
Remove deprecated CommonValue
2026-02-12 18:26:08 +01:00
Viewport
Merge remote-tracking branch 'origin/master' into 1.12
2026-04-01 17:14:21 +02:00
Windows
Merge remote-tracking branch 'origin/master' into 1.12
2026-04-01 17:14:21 +02:00
CustomEditorWindow.cs
Expose hideOnClose and scrollBars in constructor for CustomEditorWindows.
2025-08-22 01:26:34 +03:00
Editor.Build.cs
Merge remote-tracking branch 'origin/master' into 1.12
2026-03-26 23:44:33 +01:00
Editor.cpp
Verify the last project path before using it
2025-12-17 03:45:15 +02:00
Editor.cs
Attempt to fix Linux headless Test run with SDL
2026-03-10 11:25:22 +01:00
Editor.h
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
EditorAssets.cs
replace HW with material instead of sprite
2026-03-03 23:44:24 +01:00
EditorIcons.cs
Add new HSV wheel material, maintain Editor icons atlas for now
2026-03-24 18:58:32 +01:00
IEditable.cs
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
ProjectInfo.cpp
Add memory profiling events to the main areas of the engine
2025-05-22 04:47:01 +02:00
ProjectInfo.cs
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
ProjectInfo.h
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
ViewportDebugDrawData.cs
SImplify editor code for actors debug shapes drawing
2025-07-11 23:00:53 +02:00