Merge remote-tracking branch 'upStream/master' into AtomicFileReference

Script/AtomicEditor/ui/frames/menus/ProjectFrameMenu.ts

@@ -131,9 +131,20 @@ export = ProjectFrameMenus;
 // initialization
 var StringID = strings.StringID;
 
+//Change the words "Reveal in Finder" based on platform
+var showInFs = "Reveal in File Manager";
+
+if (Atomic.platform == "Windows") {
+    showInFs = "Reveal in Explorer";
+}
+else if (Atomic.platform == "MacOSX") {
+    showInFs = "Reveal in Finder";
+}
+
+
 var assetGeneralContextItems = {
     "Rename": ["rename_asset", undefined, ""],
-    "Reveal in Finder": ["reveal_folder", undefined, ""],
+    [showInFs]: ["reveal_folder", undefined, ""], 
     "-1": null,
     "Delete": ["delete_asset", undefined, ""]
 };
@@ -145,7 +156,7 @@ var assetFolderContextItems = {
     "Create Material": ["create_material", undefined, "ComponentBitmap"],
     "Create Scene": ["create_scene", undefined, "ComponentBitmap"],
     "-1": null,
-    "Reveal in Finder": ["reveal_folder", undefined, ""],
+    [showInFs]: ["reveal_folder", undefined, ""],
     "-2": null,
     "Delete": ["delete_asset", undefined, "FolderDeleteBitmap"]
 };

Source/ThirdParty/TurboBadger/tb_widgets.cpp

@@ -630,6 +630,9 @@ bool TBWidget::MoveFocus(bool forward)
     if (!root)
         root = origin->GetParentRoot();
 
+    if (root == origin)
+        return false;
+
     TBWidget *current = origin;
     while (current)
     {

Source/ToolCore/Build/BuildWindows.cpp

@@ -155,8 +155,13 @@ void BuildWindows::Build(const String& buildPath)
     if (!BuildCreateDirectory(buildPath_ + "/Settings"))
         return;
 
-    if (!BuildCopyFile(GetSettingsDirectory() + "/Engine.json", buildPath_ + "/Settings/Engine.json"))
-        return;
+    String engineJSON(GetSettingsDirectory() + "/Engine.json");
+
+    if (fileSystem->FileExists(engineJSON))
+    {
+        if (!BuildCopyFile(engineJSON, buildPath_ + "/Settings/Engine.json"))
+            return;
+    }
 
     if (!BuildCopyFile(playerBinary, buildPath_ + "/AtomicPlayer.exe"))
         return;