Josh Engebretson 9 年之前
父節點
當前提交
e781ea1baf

+ 3 - 0
Build/CMake/Modules/AtomicMac.cmake

@@ -8,6 +8,9 @@ include(AtomicDesktop)
 # only have 32 bit mono installed, fix this
 # only have 32 bit mono installed, fix this
 # set (CMAKE_OSX_ARCHITECTURES i386)
 # set (CMAKE_OSX_ARCHITECTURES i386)
 
 
+# for CEF3
+set(PROJECT_ARCH "x86_64")
+
 set(CMAKE_OSX_ARCHITECTURES "x86_64")
 set(CMAKE_OSX_ARCHITECTURES "x86_64")
 set(CMAKE_OSX_DEPLOYMENT_TARGET  "10.9")
 set(CMAKE_OSX_DEPLOYMENT_TARGET  "10.9")
 
 

+ 5 - 2
Resources/EditorData/AtomicEditor/editor/ui/newbuildwindow.tb.txt

@@ -8,5 +8,8 @@ TBLayout: axis: y
         TBCheckBox: id: newbuild_check
         TBCheckBox: id: newbuild_check
         TBTextField: text: "Don't show me again until a new build is installed"
         TBTextField: text: "Don't show me again until a new build is installed"
             font: size: 16
             font: size: 16
-    TBButton: text: Current Funding Information, id: ok
-        lp: min-width: 128, min-height: 48
+    TBLayout:
+        TBButton: text: Current Funding Information, id: cfi
+            lp: min-width: 128, min-height: 48
+        TBButton: text: Ok, id: ok
+            lp: min-width: 128, min-height: 48

+ 3 - 0
Script/AtomicEditor/ui/frames/WelcomeFrame.ts

@@ -213,6 +213,9 @@ class WelcomeFrame extends ScriptWidget {
             }
             }
 
 
             if (id == "recentList") {
             if (id == "recentList") {
+                if (!this.recentList.getSelectedItemID()) {
+                    return;
+                }
                 var path: string = this.recent[this.recentList.getSelectedItemID()];
                 var path: string = this.recent[this.recentList.getSelectedItemID()];
                 this.sendEvent(EditorEvents.LoadProject, { path: path });
                 this.sendEvent(EditorEvents.LoadProject, { path: path });
             }
             }

+ 1 - 1
Script/AtomicEditor/ui/frames/menus/MainFrameMenu.ts

@@ -313,7 +313,7 @@ class MainFrameMenu extends Atomic.ScriptObject {
             }
             }
 
 
         } else {
         } else {
-            console.log("Menu: " + target.id + " clicked");
+            // console.log("Menu: " + target.id + " clicked");
         }
         }
 
 
     }
     }

+ 5 - 2
Script/AtomicEditor/ui/modal/license/NewBuildWindow.ts

@@ -54,6 +54,11 @@ class NewBuildWindow extends ModalWindow {
 
 
             var id = ev.target.id;
             var id = ev.target.id;
 
 
+            if (id == "cfi") {
+
+                Atomic.fileSystem.systemOpen("http://www.atomicgameengine.com/funding/")
+            }
+
             if (id == "ok") {
             if (id == "ok") {
 
 
                 this.hide();
                 this.hide();
@@ -64,8 +69,6 @@ class NewBuildWindow extends ModalWindow {
                     Preferences.getInstance().write();
                     Preferences.getInstance().write();
 
 
                 }
                 }
-
-                Atomic.fileSystem.systemOpen("http://www.atomicgameengine.com/funding/")
                 return true;
                 return true;
             }
             }
         }
         }