diff --git a/desktop/resources/intro.wav b/desktop/resources/intro.wav new file mode 100644 index 00000000..91790100 Binary files /dev/null and b/desktop/resources/intro.wav differ diff --git a/desktop/src-common/advent/screens/title.clj b/desktop/src-common/advent/screens/title.clj index 343abfeb..e6bb67e6 100644 --- a/desktop/src-common/advent/screens/title.clj +++ b/desktop/src-common/advent/screens/title.clj @@ -96,7 +96,7 @@ fullscreen (center fullscreen) quit (assoc (label "End quest" (style :label font (color 1.0 0.3 0.3 1.0))) :x 0 :y (- 280 (* 32 6)) :height 32 :origin-x 0 :origin-y 0) quit (center quit) - music (utils/make-music "intro.ogg") + music (utils/make-music "intro.wav") ui-skin (skin "ui/ui.json") balloon (utils/make-anim "title/balloon.png" [15 30] 0.45 (range 4)) ] diff --git a/ios/.gitignore b/ios/.gitignore new file mode 100644 index 00000000..71520153 --- /dev/null +++ b/ios/.gitignore @@ -0,0 +1,2 @@ +target +checkouts diff --git a/ios/Info.plist.xml b/ios/Info.plist.xml index fd3d53ff..473b57e2 100644 --- a/ios/Info.plist.xml +++ b/ios/Info.plist.xml @@ -5,15 +5,15 @@ CFBundleDevelopmentRegion en CFBundleDisplayName - advent + Tick's Tales CFBundleExecutable - advent + tickstales CFBundleIdentifier - advent.core + com.brycecovertoperations.tickstales CFBundleInfoDictionaryVersion 6.0 CFBundleName - advent + tickstales CFBundlePackageType APPL CFBundleShortVersionString diff --git a/ios/libs/libObjectAL.a b/ios/libs/libObjectAL.a index 95969cb7..64a843e4 100644 Binary files a/ios/libs/libObjectAL.a and b/ios/libs/libObjectAL.a differ diff --git a/ios/libs/libgdx-box2d.a b/ios/libs/libgdx-box2d.a index a8bcffca..d32d6657 100644 Binary files a/ios/libs/libgdx-box2d.a and b/ios/libs/libgdx-box2d.a differ diff --git a/ios/libs/libgdx-bullet.a b/ios/libs/libgdx-bullet.a index bb80ec0e..9ff9bcdc 100644 Binary files a/ios/libs/libgdx-bullet.a and b/ios/libs/libgdx-bullet.a differ diff --git a/ios/libs/libgdx.a b/ios/libs/libgdx.a index cf8eadaa..371d37bb 100644 Binary files a/ios/libs/libgdx.a and b/ios/libs/libgdx.a differ diff --git a/ios/project.clj b/ios/project.clj index 3ef92c86..f31b2cd8 100644 --- a/ios/project.clj +++ b/ios/project.clj @@ -1,17 +1,21 @@ (defproject advent "0.0.1-SNAPSHOT" :description "FIXME: write description" - :dependencies [[com.badlogicgames.gdx/gdx "1.3.0"] - [com.badlogicgames.gdx/gdx-backend-robovm "1.3.0"] - [com.badlogicgames.gdx/gdx-box2d "1.3.0"] - [com.badlogicgames.gdx/gdx-bullet "1.3.0"] + :dependencies [[com.badlogicgames.gdx/gdx "1.5.3"] + [com.badlogicgames.gdx/gdx-backend-robovm "1.5.3"] + [com.badlogicgames.gdx/gdx-box2d "1.5.3"] + [com.badlogicgames.gdx/gdx-bullet "1.5.3"] + [org.clojure/data.priority-map "0.0.5"] + [org.clojure/core.async "0.1.346.0-17112a-alpha"] [org.clojure/clojure "1.6.0"] - [play-clj "0.3.9"]] + [play-clj "0.4.5-BRYCE"]] :source-paths ["src/clojure" "../desktop/src-common"] :java-source-paths ["src/java"] + :plugins [[lein-fruit "0.2.3"]] :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" "-frameworks" "UIKit:OpenGLES:QuartzCore:CoreGraphics:OpenAL:AudioToolbox:AVFoundation" - "-resources" "../desktop/resources/**"]} + "-resources" "../desktop/resources/**"] + :robovm-path "/Users/brycecovert/dev/robovm/robovm-1.4.0"} :aot :all :main advent.core.IOSLauncher)