Commit Graph

200 Commits

Author SHA1 Message Date
Wojtek Figat
8d9f4d72f5 Various stability improvements for Editor 2023-10-17 22:42:47 +02:00
Wojtek Figat
db52be5936 Fix crash when item is already in a view
#1679
2023-10-13 11:31:43 +02:00
Wojtek Figat
fdd6b171bb Stability fixes 2023-10-12 23:12:53 +02:00
Wojtek Figat
fa57440a2f Fix typo 2023-10-09 14:48:19 +02:00
Wojtek Figat
09f2be907e Merge remote-tracking branch 'origin/master' into 1.7
# Conflicts:
#	Flax.flaxproj
2023-10-09 12:40:47 +02:00
Wojtek Figat
64d4076615 Minor tweaks 2023-10-09 12:06:55 +02:00
Wojtek Figat
38664e9d43 More improvements to 13853d5fb5 2023-10-08 16:34:41 +02:00
Wojtek Figat
13853d5fb5 Fix model asset previews to wait for materials to be loaded 2023-10-08 16:01:34 +02:00
Wojtek Figat
e29d3d02a2 Refactor audio clip import settings to use auto-generated bindings via AudioTool 2023-10-06 14:08:48 +02:00
Wojtek Figat
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
Wojtek Figat
1838c7bba7 Minor cleanup 2023-10-04 23:21:40 +02:00
Wojtek Figat
4e83a0a757 Fix potential exception in drag and drop handling 2023-10-03 22:20:44 +02:00
Wojtek Figat
dd66ee3521 Add using text Show in Finder on macOS in Editor 2023-10-02 13:26:26 +02:00
Wojtek Figat
5fe135e10b Fix updating Content folder name when renamed in Finder on macOS 2023-10-02 13:11:20 +02:00
Wojtek Figat
fb488cbaf7 Merge remote-tracking branch 'origin/master' into 1.7 2023-09-11 22:43:46 +02:00
Wojtek Figat
985d6cc811 Add UTF8 format for created plugin files and format code
#1335
2023-09-11 22:32:37 +02:00
Wojtek Figat
16fed8927c Refactor #1266 (code quality and simplicity) 2023-09-11 20:02:53 +02:00
Wojtek Figat
2ddb44afa8 Merge branch 'ContentBrowserImprovement' of https://github.com/NoriteSC/FlaxEngineFork into NoriteSC-ContentBrowserImprovement
# Conflicts:
#	Source/Editor/Windows/ContentWindow.cs
2023-09-11 15:39:48 +02:00
Chandler Cox
67909e33c8 Add difference for folders. 2023-09-01 16:37:14 -05:00
Chandler Cox
53861c4795 Improve content item in tile view. Decrease margin between list view items. 2023-09-01 14:28:26 -05:00
Wojtek Figat
18b47257fd Add **Behavior Tree** asset type and editing 2023-08-16 13:26:33 +02:00
Wojtek Figat
8dc98174cf Minor tweaks 2023-08-01 14:14:27 +02:00
NoriteSC
0b89164328 Merge branch 'FlaxEngine:master' into ContentBrowserImprovement 2023-07-28 15:56:40 +02:00
NoriteSC
131060efa7 bug fix 2023-07-28 12:48:43 +02:00
NoriteSC
6a65ccd5ef rev1 2023-07-24 22:10:12 +02:00
Chandler Cox
83427ba1d4 Add batch creating prefabs from mutiple selected actors in the scene tree. 2023-07-20 23:02:26 -05:00
Wojtek Figat
843abca8ca Fix error when opening shader asset if it's not visible in Content window 2023-07-14 10:59:04 +02:00
Wojtek Figat
23a6a8b69f Merge branch 'fix_content_browser' of https://github.com/RuanLucasGD/FlaxEngine into RuanLucasGD-fix_content_browser 2023-06-27 23:20:11 +02:00
Wojtek Figat
53587ad162 Fix error when unloading Visual Script item in Editor 2023-06-15 09:51:49 +02:00
Wojtek Figat
8f7da81621 Merge remote-tracking branch 'origin/master' into 1.6
# Conflicts:
#	Flax.flaxproj
#	Source/Editor/Content/Items/AssetItem.cs
2023-06-13 15:41:07 +02:00
Wojtek Figat
13b1c16213 Add asset reload option via context menu in Editor 2023-06-13 14:58:14 +02:00
Ruan Lucas
164670cceb change content folder detection mode on "CanRename" 2023-06-12 20:04:32 -04:00
Wojtek Figat
979168e82c Refactor various Editor APIs to use auto-generated bindings instead of manual code 2023-06-12 14:34:07 +02:00
Wojtek Figat
7140c4a2d8 Merge remote-tracking branch 'origin/master' into 1.6 2023-06-11 21:38:20 +02:00
Ruan Lucas
8f76fe4049 don't let rename source/content folders 2023-06-09 22:14:33 -04:00
Wojtek Figat
a6430692d2 Fix crash safe handling of internal errors and exceptions when drawing asset thumbnails
#1138
2023-06-09 18:22:40 +02:00
Wojtek Figat
81ae687238 Merge remote-tracking branch 'origin/master' into 1.6 2023-05-28 16:34:38 +02:00
Wojtek Figat
583a5d9223 Minor fixes to content window navigation 2023-05-28 13:17:43 +02:00
Chandler Cox
c9d48d00e7 Change default script name to MyScript and make the name invalid if it is called Script. 2023-05-27 11:15:54 -05:00
Wojtek Figat
694980160b Merge remote-tracking branch 'origin/master' into 1.6
# Conflicts:
#	Source/Editor/CustomEditors/CustomEditorsUtil.cs
#	Source/Engine/Networking/NetworkReplicator.cpp
#	Source/Engine/Scripting/ManagedCLR/MUtils.cpp
#	Source/Tools/Flax.Build/Bindings/BindingsGenerator.Cpp.cs
2023-05-24 23:28:38 +02:00
Wojtek Figat
47f9bc2017 Fix regression in Content Item tooltip #1085 2023-05-24 09:47:27 +02:00
Menotdan
627b1cee10 Resolve issues that came through when attempting to merge previously. 2023-05-10 17:49:45 -04:00
Menotdan
5bc76de7d6 Merge branch 'master' into scale-icon-change 2023-05-10 17:16:44 -04:00
Wojtek Figat
fe4e8f3dd2 Merge remote-tracking branch 'origin/master' into 1.6 2023-05-10 12:13:45 +02:00
Wojtek Figat
0c2c643ea8 Follow up #1085 with expendable type description for content items 2023-05-10 10:29:59 +02:00
Menotdan
296ac0b940 Revert "Use shorter, relative path for displaying Asset Tooltips."
This reverts commit 4c906f4040.

undo changes from master branch which I don't want for this seperate change.
2023-05-07 23:04:11 -04:00
Menotdan
f3d7ad0aa9 Add better tooltips to all files and folders. 2023-05-07 14:03:27 -04:00
Menotdan
cffc3f7f5d Better formatting for type names. 2023-05-07 13:44:15 -04:00
Menotdan
4c906f4040 Use shorter, relative path for displaying Asset Tooltips. 2023-05-07 13:11:53 -04:00
Wojtek Figat
22239bc2d1 Merge remote-tracking branch 'origin/master' into 1.6 2023-05-05 11:41:32 +02:00