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
de7f47c8e2
Detect content changes only when Editor has focus
2026-08-21 13:35:54 +03:00
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
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
e043b18299
Minor fixes and improvements
2026-07-28 22:28:47 +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
mafiesto4
edb3badcb3
Optimize content modifications watching events processing in large projects
2026-04-24 23:47:22 +02:00
mafiesto4
5b922e069e
Fix importing and using files without extension in Editor content
2026-04-08 20:36:02 +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
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
6ff260d052
Merge remote-tracking branch 'origin/master' into sdl_platform
2025-06-16 14:09:29 +03:00
mafiesto4
496856d12e
Add shader header proxy for easy .hlsl files creation within Editor
2025-06-04 00:12:43 +02:00
592215dd30
Support compiling third party library C files as C code
2025-04-19 21:13:50 +03:00
mafiesto4
9c3fd052cd
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
mafiesto4
56b2c96b3b
Fix missing content database load when opening project without code compilation
...
#2469
2025-02-26 20:29:44 +02:00
GoaLitiuM
3382aabefe
Close and restore AssetEditorWindows on scripting reload
2025-02-26 20:29:22 +02:00
GoaLitiuM
4ddc765ee4
Fix ContentDatabase not being loaded at the end of editor initialization
2025-02-26 20:29:21 +02:00
GoaLitiuM
5fd64ead62
Fix custom content and importers blocking scripting reload
2025-02-26 20:29:21 +02:00
Tryibion
36d4417905
Add game plugin template.
2024-12-20 09:29:36 -06:00
Tryibion
0335086df8
Add more scripting templates.
2024-11-22 17:07:10 -06:00
Tryibion
f37804ac49
Check and warn user if asset is being moved from content to source folders snd from source to content folders.
2024-10-30 15:46:16 -05:00
mafiesto4
9daddccbed
Merge remote-tracking branch 'origin/master' into 1.9
...
# Conflicts:
# Source/Editor/Modules/ContentDatabaseModule.cs
# Source/Editor/Surface/SurfaceUtils.cs
# Source/Editor/Windows/Assets/MaterialInstanceWindow.cs
# Source/Engine/Foliage/Foliage.cpp
# Source/Engine/Graphics/Models/MeshBase.h
# Source/Engine/Tools/MaterialGenerator/MaterialGenerator.Textures.cpp
2024-09-12 13:38:20 +02:00
mafiesto4
26ad61c1ce
Merge branch 'module-remove' of https://github.com/Tryibion/FlaxEngine into Tryibion-module-remove
2024-09-11 13:41:30 +02:00
mafiesto4
060dd748a7
Merge branch 'fix-spelling-virtual' of https://github.com/Tryibion/FlaxEngine into Tryibion-fix-spelling-virtual
2024-09-09 07:58:02 +02:00
Tryibion
65fd975b1a
Add generic CSharpProxy. Add Empty C# template.
2024-09-02 12:57:23 -05:00
Tryibion
fd7e04fd8c
Fix spelling and comment description wording for GetAssetVirtualProxy
2024-09-01 14:00:50 -05:00
Tryibion
e4e568ae6a
Code style fix
2024-08-27 15:21:49 -05:00
Tryibion
3bffc927f6
Add cleaning up modules from target files when deleted.
2024-08-27 14:54:21 -05:00
mafiesto4
20456d95e8
Merge remote-tracking branch 'origin/master' into 1.9
2024-08-22 17:33:20 +02:00
Tryibion
e21c884841
Add removing old proxy to add new one.
2024-08-16 13:49:50 -05:00
Tryibion
cc157718cd
Only allow adding unique proxy types to content database Proxy list.
2024-08-16 11:17:25 -05:00
mafiesto4
bc313c8630
Merge remote-tracking branch 'origin/master' into 1.9
2024-08-05 20:00:39 +02:00
Tryibion
074751f91f
Re-add lazy rebuilds
2024-07-25 18:23:26 -05:00
Tryibion
e05eedfc76
Force rebuild on proxy changes if rebuild is true
2024-07-25 17:28:55 -05:00
mafiesto4
0d8c9f6626
Add Video module
2024-05-01 01:25:16 +02:00
mafiesto4
8a45dda98c
Add support for custom file proxies in Editor
2024-05-01 01:05:15 +02:00
mafiesto4
4cd788cedc
Add UI Widget to new asset creation for quick UI setup
2024-03-22 11:59:04 +01:00
mafiesto4
859c420d76
Update year in copyright note
2024-02-26 19:00:48 +01:00
8841a603f6
Virtual proxy
2023-12-29 23:15:03 +01:00
mafiesto4
8d9f4d72f5
Various stability improvements for Editor
2023-10-17 22:42:47 +02:00
mafiesto4
9a636468e0
Fix crash when importing assets in Editor (race-condition from Content Importer thread)
...
#1691 #1679
2023-10-13 15:44:18 +02:00
mafiesto4
abd6881d7b
Fix removing large amount of assets in Editor at once
...
#1484
2023-10-13 15:43:11 +02:00
mafiesto4
e6c45fccb3
Merge remote-tracking branch 'origin/master' into 1.7
...
# Conflicts:
# Source/Engine/Level/Actors/AnimatedModel.cpp
2023-10-05 10:44:03 +02:00
mafiesto4
5fe135e10b
Fix updating Content folder name when renamed in Finder on macOS
2023-10-02 13:11:20 +02:00
mafiesto4
8a9d0271a3
Add ignoring ’.DS_Store’ files in Content on macOS
2023-10-02 13:04:21 +02:00
mafiesto4
a71de7357c
Merge remote-tracking branch 'origin/master' into 1.7
2023-09-19 21:42:53 +02:00
GoaLitiuM
5ab299fed9
Fix assets getting deleted when modified by external applications
2023-09-16 18:11:22 +03:00
mafiesto4
Ari Vuollet
Tryibion
GoaLitiuM