diff --git a/desktop/gametodos.txt b/desktop/gametodos.txt index da50925d..04380aa9 100644 --- a/desktop/gametodos.txt +++ b/desktop/gametodos.txt @@ -12,6 +12,7 @@ IOS + pngcrush breaks colors + renable pickup sound once it's been replaced + update-override slow on IOS ++ branching logic in shader = not a good time AUDIO + Walking diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index ab6632a6..c76ccaec 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -1114,7 +1114,7 @@ void main() (set! (. camera zoom) (:zoom (:cam entities))) (set! (.. camera position x) (:x (:cam entities) 160.0)) (set! (.. camera position y) (:y (:cam entities) 120.0))) - (let [entities (utils/update-override screen entities)] + (let [entities entities #_(utils/update-override screen entities)] (when (= (get-in entities [:fade :opacity]) diff --git a/ios/build.sh b/ios/build.sh index 8a1b9df3..9beeacc1 100755 --- a/ios/build.sh +++ b/ios/build.sh @@ -1,2 +1,2 @@ #!/bin/bash -rm -rf advent.core.IOSLauncher && lein do compile, fruit ipa64 +rm -rf advent.core.IOSLauncher && lein do compile, fruit ipa diff --git a/ios/project.clj b/ios/project.clj index fdeb91c6..c3ae0b84 100644 --- a/ios/project.clj +++ b/ios/project.clj @@ -13,7 +13,7 @@ [play-clj "0.4.5-BRYCE"]] :source-paths ["src/clojure" "../desktop/src-common"] :java-source-paths ["src/java"] - :plugins [[lein-fruit "0.2.3"]] + :plugins [[lein-fruit "0.2.4-SNAPSHOT"]] :javac-options ["-target" "1.7" "-source" "1.7" "-Xlint:-options"] :ios {:robovm-opts ["-forcelinkclasses" "advent.**:clojure.**:com.badlogic.**:play_clj.**" "-libs" "libs/libObjectAL.a:libs/libgdx.a:libs/libgdx-box2d.a:libs/libgdx-bullet.a"