diff --git a/desktop/build-osx.json b/desktop/build-osx.json new file mode 100644 index 00000000..48e752aa --- /dev/null +++ b/desktop/build-osx.json @@ -0,0 +1,12 @@ +{ + "platform": "mac", + "jdk": "/Users/brycecovert/Downloads/jre1.7.0_80.jre/Contents/Home/Archive.zip", + "executable": "TicksTales", + "appjar": "target/advent-0.0.1-SNAPSHOT-standalone.jar", + "mainclass": "advent/core/desktop_launcher", + "resources": [ + "resources" + ], + "minimizejre": "soft", + "outdir": "TicksTales.app" +} diff --git a/desktop/packr.jar b/desktop/packr.jar new file mode 100644 index 00000000..312d19a0 Binary files /dev/null and b/desktop/packr.jar differ diff --git a/desktop/project.clj b/desktop/project.clj index da953456..0fb99ca0 100644 --- a/desktop/project.clj +++ b/desktop/project.clj @@ -18,7 +18,8 @@ [org.clojure/data.priority-map "0.0.5"] [org.clojure/core.async "0.1.338.0-5c5012-alpha"]] :source-paths ["src" "src-common"] - :javac-options ["-target" "1.6" "-source" "1.6" "-Xlint:-options"] + :javac-options ["-target" "1.7" "-source" "1.7" "-Xlint:-options"] :omit-source true :aot [advent.core.desktop-launcher] :main advent.core.desktop-launcher) + diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index 257f37f3..c5bd167d 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -757,7 +757,7 @@ void main() :tweens {:fade-in (tween/tween :fade-in screen [:fade :opacity] 1.0 0.0 1.0 :ease tween/ease-in-cubic :finish #(if (not (get-in % [:state :seen-intro?])) (do ((actions/get-script % (rooms.dream/do-intro %)) entities) - (assoc-in % [:actions :script-running?] true)) + %) %)) :fade-in-music (tween/tween :fade-in-music screen [:volume :value] 0.0 1.0 1.0 :ease tween/ease-in-cubic)} :started? {:value true diff --git a/desktop/src/advent/core/desktop_launcher.clj b/desktop/src/advent/core/desktop_launcher.clj index 0d4fc037..7d442800 100644 --- a/desktop/src/advent/core/desktop_launcher.clj +++ b/desktop/src/advent/core/desktop_launcher.clj @@ -19,7 +19,7 @@ (defn -main [& [port]] - (when port (start-nrepl-expr (Integer/parseInt port))) + #_(when port (start-nrepl-expr (Integer/parseInt port))) (let [cfg (LwjglApplicationConfiguration.)] (if false (do