diff --git a/desktop/gametodos.txt b/desktop/gametodos.txt index 731d8966..87582b60 100644 --- a/desktop/gametodos.txt +++ b/desktop/gametodos.txt @@ -2,19 +2,17 @@ ART + Update all collisions PROGRAMMING -+ fight with blergh at end isn't great + Save slots? + try to have dialogue for every wrong interaction + preload all sounds + behind house left direction not great -+ grenouille chala leftovers IOS + all mp3s -+ particle effects slowdown? + pngcrush breaks colors + renable pickup sound once it's been replaced + check out 64 bit? ++ update-override slow on IOS AUDIO + Walking diff --git a/desktop/resources/particles/dream-magic b/desktop/resources/particles/dream-magic index 3f4b7d1e..f42a1ced 100644 --- a/desktop/resources/particles/dream-magic +++ b/desktop/resources/particles/dream-magic @@ -6,7 +6,7 @@ lowMin: 1000.0 lowMax: 1000.0 - Count - min: 0 -max: 800 +max: 200 - Emission - lowMin: 0.0 lowMax: 0.0 diff --git a/desktop/resources/particles/lightning.png b/desktop/resources/particles/lightning.png index 83ed2548..eef89c03 100644 Binary files a/desktop/resources/particles/lightning.png and b/desktop/resources/particles/lightning.png differ diff --git a/desktop/resources/robovm.ini b/desktop/resources/robovm.ini index 85f2571f..ad648ee3 100644 --- a/desktop/resources/robovm.ini +++ b/desktop/resources/robovm.ini @@ -1,2 +1,2 @@ -ms=256M -mx=1024M +ms128M +mx512M diff --git a/desktop/src-common/advent/screens/rooms/outside_house.clj b/desktop/src-common/advent/screens/rooms/outside_house.clj index 6624e1e4..34b3b254 100644 --- a/desktop/src-common/advent/screens/rooms/outside_house.clj +++ b/desktop/src-common/advent/screens/rooms/outside_house.clj @@ -171,7 +171,9 @@ (particle-effect! (get-in @entities [:room :entities :magic-frog-particle]) :reset) (particle-effect! (get-in @entities [:room :entities :magic-frog-particle]) :start) (Thread/sleep 1500) - (actions/transition-background entities :outside-house [257 90] :face :left)) + (actions/transition-background entities :outside-house [257 90] :face :left) + (dotimes [_ 160] + (particle-effect! (get-in @entities [:rooms :inside-house :entities :magic-frog-particle]) :update 0.2))) (defn do-prophecy [entities] {:run #(do (actions/respond entities % diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index 66ba9d0a..e5efd4ae 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]) @@ -1262,8 +1262,8 @@ void main() (fn [{:keys [^FitViewport viewport] :as screen} [entities]] (.apply viewport) (let [entities (utils/apply-tweens screen entities (:tweens entities))] - #_(label! (:fps entities) :set-text (str (game :fps))) - (render! screen [ (:inventory entities) (:close entities)]) + (label! (:fps entities) :set-text (str (game :fps))) + (render! screen [ (:fps entities) (:inventory entities) (:close entities)]) entities)) :on-resize diff --git a/ios/build.sh b/ios/build.sh index 9beeacc1..8a1b9df3 100755 --- a/ios/build.sh +++ b/ios/build.sh @@ -1,2 +1,2 @@ #!/bin/bash -rm -rf advent.core.IOSLauncher && lein do compile, fruit ipa +rm -rf advent.core.IOSLauncher && lein do compile, fruit ipa64 diff --git a/ios/project.clj b/ios/project.clj index f022d51a..fdeb91c6 100644 --- a/ios/project.clj +++ b/ios/project.clj @@ -7,6 +7,9 @@ [org.clojure/data.priority-map "0.0.5"] [org.clojure/core.async "0.1.346.0-17112a-alpha"] [org.clojure/clojure "1.6.0"] + [org.robovm/robovm-cocoatouch "1.7.0"] + [org.robovm/robovm-objc "1.7.0"] + [org.robovm/robovm-rt "1.7.0"] [play-clj "0.4.5-BRYCE"]] :source-paths ["src/clojure" "../desktop/src-common"] :java-source-paths ["src/java"] @@ -15,7 +18,8 @@ :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" "-frameworks" "UIKit:OpenGLES:QuartzCore:CoreGraphics:OpenAL:AudioToolbox:AVFoundation" - "-resources" "../desktop/resources/**"] + "-resources" "../desktop/resources/**" + ] :robovm-path "/Users/brycecovert/dev/robovm/robovm-1.7.0/" :versionn 1.1} :aot :all