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

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

Browse Source 
# Conflicts:
#	Source/Engine/Networking/NetworkReplicator.cpp
This commit is contained in:
Wojtek Figat
2024-11-22 16:31:18 +01:00
parent 914d82a087 d4b663cd1a
commit 9d70fd82d6
33 changed files with 495 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Editor/Modules/SourceCodeEditing/CodeDocsModule.cs
View File

@@ -293,7 +293,7 @@ namespace FlaxEditor.Modules.SourceCodeEditing
var assemblyPath = Utils.GetAssemblyLocation(assembly);
var assemblyName = assembly.GetName().Name;
var xmlFilePath = Path.ChangeExtension(assemblyPath, ".xml");
if (!File.Exists(assemblyPath))
if (!File.Exists(assemblyPath) && !string.IsNullOrEmpty(assemblyPath))
{
var uri = new UriBuilder(assemblyPath);
var path = Uri.UnescapeDataString(uri.Path);

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

@@ -540,6 +540,7 @@ namespace FlaxEditor.Modules
cm.AddSeparator();
cm.AddButton("Open project...", OpenProject);
cm.AddButton("Reload project", ReloadProject);
cm.AddButton("Open project folder", () => FileSystem.ShowFileExplorer(Editor.Instance.GameProject.ProjectFolderPath));
cm.AddSeparator();
cm.AddButton("Exit", "Alt+F4", () => Editor.Windows.MainWindow.Close(ClosingReason.User));