From 84201b346b9360b6c9e3c9b1a101a0218ff34f7d Mon Sep 17 00:00:00 2001 From: Chandler Cox Date: Sat, 5 Oct 2024 23:11:38 -0500 Subject: [PATCH 1/4] Add opening file proxy for windows. --- Source/Editor/Content/Proxy/FileProxy.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Source/Editor/Content/Proxy/FileProxy.cs b/Source/Editor/Content/Proxy/FileProxy.cs index 4e12ab588..d162e5f35 100644 --- a/Source/Editor/Content/Proxy/FileProxy.cs +++ b/Source/Editor/Content/Proxy/FileProxy.cs @@ -32,6 +32,14 @@ namespace FlaxEditor.Content /// public override EditorWindow Open(Editor editor, ContentItem item) { +#if PLATFORM_WINDOWS + CreateProcessSettings settings = new CreateProcessSettings + { + ShellExecute = true, + FileName = item.Path + }; + Platform.CreateProcess(ref settings); +#endif return null; } From 13acf3c14377458ceed0657d21a42e294407765c Mon Sep 17 00:00:00 2001 From: Chandler Cox Date: Sat, 5 Oct 2024 23:44:26 -0500 Subject: [PATCH 2/4] Quick fix for #2963 --- Source/Editor/GUI/Docking/FloatWindowDockPanel.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Source/Editor/GUI/Docking/FloatWindowDockPanel.cs b/Source/Editor/GUI/Docking/FloatWindowDockPanel.cs index 302508f5c..a1dc73068 100644 --- a/Source/Editor/GUI/Docking/FloatWindowDockPanel.cs +++ b/Source/Editor/GUI/Docking/FloatWindowDockPanel.cs @@ -139,6 +139,8 @@ namespace FlaxEditor.GUI.Docking /// protected override void OnLastTabRemoved() { + if (ChildPanelsCount > 0) + return; // Close window _window?.Close(); } From 283f26b95cc116e4b79f9c20bc24495a58c6d311 Mon Sep 17 00:00:00 2001 From: Chandler Cox Date: Sun, 6 Oct 2024 14:54:44 -0500 Subject: [PATCH 3/4] Fix video audio not looping. --- Source/Engine/Video/MF/VideoBackendMF.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/Engine/Video/MF/VideoBackendMF.cpp b/Source/Engine/Video/MF/VideoBackendMF.cpp index 727a94158..d396d7672 100644 --- a/Source/Engine/Video/MF/VideoBackendMF.cpp +++ b/Source/Engine/Video/MF/VideoBackendMF.cpp @@ -397,6 +397,7 @@ namespace MF // Loop playerMF.Time.Ticks %= player.Duration.Ticks; playerMF.Seek = 1; + player.PlayAudio(); } else { From 198dddd2ce53b1c877db3f345fe15a8d01a3863e Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Mon, 7 Oct 2024 10:01:51 +0200 Subject: [PATCH 4/4] Fix large worlds build --- Source/Editor/ProjectInfo.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Source/Editor/ProjectInfo.cpp b/Source/Editor/ProjectInfo.cpp index 7fef490fe..2fe8e2b1e 100644 --- a/Source/Editor/ProjectInfo.cpp +++ b/Source/Editor/ProjectInfo.cpp @@ -60,14 +60,13 @@ Vector3 GetVector3FromXml(const xml_node& parent, const PUGIXML_CHAR* name, cons if (x && y && z) { XmlCharAsChar xs(x), ys(y), zs(z); - Vector3 v; + Float3 v; if (!StringUtils::Parse(xs.Str, &v.X) && !StringUtils::Parse(ys.Str, &v.Y) && !StringUtils::Parse(zs.Str, &v.Z)) { - return v; + return (Vector3)v; } } } - return defaultValue; }