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
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
de7f47c8e2
Detect content changes only when Editor has focus
2026-08-21 13:35:54 +03:00
Ari Vuollet
b1607e864d
Generate project files automatically when Editor has focus
2026-08-21 13:33:52 +03:00
Ari Vuollet
b6f12be917
Fix scripts/content files getting deleted after file modifications
...
Some editors like Visual Studio saves the modified file to a temporary
file, deletes the original file and renames the temporary file back to
original filename, which rarely causes the editor to detect it as a
file deletion action by user.
2026-08-21 13:33:52 +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
e25349a54d
Fix errors breaking workspace events during content database rebuild
...
Fixes one case where restorable asset windows does not get restored after
recompiling scripts.
2026-08-17 14:11:35 +03: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
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
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
mafiesto4
0fc7bb723c
Remove not needed newline
2026-08-04 20:06:22 +02:00
mafiesto4
dc60dc43e5
Merge branch 'dev/CLionIDESupport' of https://github.com/ifromstone/FlaxEngine into ifromstone-dev/CLionIDESupport
2026-08-04 19:21:47 +02:00
mafiesto4
ef7aefd7b8
Refactor window tooltip to use string builder
...
#4135
2026-08-04 19:19:34 +02:00
mafiesto4
ba0756a30c
Merge branch 'NoPathInWindowTitle' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-NoPathInWindowTitle
2026-08-04 19:10:04 +02:00
mafiesto4
e043b18299
Minor fixes and improvements
2026-07-28 22:28:47 +02:00
mafiesto4
3aed901834
Simplify code around assets editing and selecting in Editor
2026-07-22 11:53:22 +02:00
mafiesto4
1915aa3c06
Merge remote-tracking branch 'origin/master' into 1.13
...
# Conflicts:
# Content/Shaders/DepthOfField.flax
# Source/Engine/Content/Asset.cpp
2026-06-30 10:06:55 +02:00
mafiesto4
5cd6c98ff3
Fix auto-selecting newly imported or created assets in Editor
2026-06-30 08:48:24 +02:00
Alewinn
1a47871212
Moving NodesCache desync after hotreload fix at the right place
2026-06-16 10:29:33 +02:00
mafiesto4
85d3673f15
Fix using Tools menu without Game Settings asset
2026-06-10 19:22:42 +02:00
Andrei Gagua
eaf06e9523
Add CLion CMake facade project generation
...
Add CLion as a supported editor workflow for native C++ development.
The new -clion generation option writes a CMake facade project under
Cache/Projects/CMake/<ProjectName>, exposing a CLion-friendly code model,
build presets, and launcher targets while keeping Flax.Build as the source
of truth for native builds.
2026-06-09 15:16:35 +03:00
Saas
d103ccdbc3
show large world only if needed
2026-06-06 18:58:07 +02:00
Saas
0b160c2e61
remove :
2026-06-03 16:54:03 +02:00
Saas
04fc938119
add project path and large world to window icon tooltip
2026-06-03 16:48:07 +02:00
Saas
fcae4846f1
remove project path from window title
2026-06-03 16:47:49 +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
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
edb3badcb3
Optimize content modifications watching events processing in large projects
2026-04-24 23:47:22 +02:00
mafiesto4
dc9a8a2f84
Fix editor shutdown error when script compilation fails
2026-04-24 11:21:02 +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