GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into 1.7

Browse Source 
# Conflicts:
#	Source/Engine/Level/Actors/AnimatedModel.cpp
This commit is contained in:
Wojtek Figat
2023-10-05 10:44:03 +02:00
parent dd21020297 86d1d29820
commit e6c45fccb3
83 changed files with 1809 additions and 519 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Editor/Modules/ContentDatabaseModule.cs
View File

@@ -919,6 +919,11 @@ namespace FlaxEditor.Modules
// Check if node already has that element (skip during init when we want to walk project dir very fast)
if (_isDuringFastSetup || !parent.Folder.ContainsChild(path))
{
#if PLATFORM_MAC
if (path.EndsWith(".DS_Store", StringComparison.Ordinal))
continue;
#endif
// Create file item
ContentItem item;
if (path.EndsWith(".cs"))
@@ -960,6 +965,11 @@ namespace FlaxEditor.Modules
// Check if node already has that element (skip during init when we want to walk project dir very fast)
if (_isDuringFastSetup || !parent.Folder.ContainsChild(path))
{
#if PLATFORM_MAC
if (path.EndsWith(".DS_Store", StringComparison.Ordinal))
continue;
#endif
// Create file item
ContentItem item = null;
if (FlaxEngine.Content.GetAssetInfo(path, out var assetInfo))
@@ -1186,6 +1196,7 @@ namespace FlaxEditor.Modules
{
case WatcherChangeTypes.Created:
case WatcherChangeTypes.Deleted:
case WatcherChangeTypes.Renamed:
{
lock (_dirtyNodes)
{

7
Source/Editor/Modules/UIModule.cs
View File

@@ -553,6 +553,13 @@ namespace FlaxEditor.Modules
cm.AddSeparator();
_menuEditSelectAll = cm.AddButton("Select all", inputOptions.SelectAll, Editor.SceneEditing.SelectAllScenes);
_menuEditFind = cm.AddButton("Find", inputOptions.Search, Editor.Windows.SceneWin.Search);
cm.AddSeparator();
cm.AddButton("Game Settings", () =>
{
var item = Editor.ContentDatabase.Find(GameSettings.GameSettingsAssetPath);
if(item != null)
Editor.ContentEditing.Open(item);
});
// Scene
MenuScene = MainMenu.AddButton("Scene");