merged.

2017-08-10 19:55:06 -07:00
parent a7c7de5f27 0db00c633d
commit 2c4031f093
1305 changed files with 14202 additions and 4888 deletions
--- a/desktop/.gitignore
+++ b/desktop/.gitignore
@@ -8,3 +8,4 @@ screenshot*
 /content-builder/output/
 ticks_tales.log
 saves
+tmp
--- a/desktop/.lein-repl-history
+++ b/desktop/.lein-repl-history
@@ -0,0 +1 @@
+
--- a/desktop/asset-work/castle-gate/throw-walkie_0.png
+++ b/desktop/asset-work/castle-gate/throw-walkie_0.png
--- a/desktop/asset-work/castle-gate/throw-walkie_1.png
+++ b/desktop/asset-work/castle-gate/throw-walkie_1.png
--- a/desktop/asset-work/castle-gate/throw-walkie_2.png
+++ b/desktop/asset-work/castle-gate/throw-walkie_2.png
--- a/desktop/asset-work/castle-gate/throw-walkie_3.png
+++ b/desktop/asset-work/castle-gate/throw-walkie_3.png
--- a/desktop/asset-work/castle-gate/throw-walkie_4.png
+++ b/desktop/asset-work/castle-gate/throw-walkie_4.png
--- a/desktop/asset-work/castle-gate/throw-walkie_5.png
+++ b/desktop/asset-work/castle-gate/throw-walkie_5.png
--- a/desktop/asset-work/castle-gate/throw-walkie_6.png
+++ b/desktop/asset-work/castle-gate/throw-walkie_6.png
--- a/desktop/asset-work/castle-gate/throw-walkie_7.png
+++ b/desktop/asset-work/castle-gate/throw-walkie_7.png
--- a/desktop/asset-work/castle-gate/throw-walkie_8.png
+++ b/desktop/asset-work/castle-gate/throw-walkie_8.png
--- a/desktop/asset-work/cat-tree/eye_0.png
+++ b/desktop/asset-work/cat-tree/eye_0.png
--- a/desktop/asset-work/cat-tree/eye_1.png
+++ b/desktop/asset-work/cat-tree/eye_1.png
--- a/desktop/asset-work/cat-tree/eye_10.png
+++ b/desktop/asset-work/cat-tree/eye_10.png
--- a/desktop/asset-work/cat-tree/eye_11.png
+++ b/desktop/asset-work/cat-tree/eye_11.png
--- a/desktop/asset-work/cat-tree/eye_12.png
+++ b/desktop/asset-work/cat-tree/eye_12.png
--- a/desktop/asset-work/cat-tree/eye_2.png
+++ b/desktop/asset-work/cat-tree/eye_2.png
--- a/desktop/asset-work/cat-tree/eye_3.png
+++ b/desktop/asset-work/cat-tree/eye_3.png
--- a/desktop/asset-work/cat-tree/eye_4.png
+++ b/desktop/asset-work/cat-tree/eye_4.png
--- a/desktop/asset-work/cat-tree/eye_5.png
+++ b/desktop/asset-work/cat-tree/eye_5.png
--- a/desktop/asset-work/cat-tree/eye_6.png
+++ b/desktop/asset-work/cat-tree/eye_6.png
--- a/desktop/asset-work/cat-tree/eye_7.png
+++ b/desktop/asset-work/cat-tree/eye_7.png
--- a/desktop/asset-work/cat-tree/eye_8.png
+++ b/desktop/asset-work/cat-tree/eye_8.png
--- a/desktop/asset-work/cat-tree/eye-10.png
+++ b/desktop/asset-work/cat-tree/eye-10.png
--- a/desktop/asset-work/cat-tree/grandma-cry_0.png
+++ b/desktop/asset-work/cat-tree/grandma-cry_0.png
--- a/desktop/asset-work/cat-tree/grandma-cry_1.png
+++ b/desktop/asset-work/cat-tree/grandma-cry_1.png
--- a/desktop/asset-work/cat-tree/grandma-cry_10.png
+++ b/desktop/asset-work/cat-tree/grandma-cry_10.png
--- a/desktop/asset-work/cat-tree/grandma-cry_11.png
+++ b/desktop/asset-work/cat-tree/grandma-cry_11.png
--- a/desktop/asset-work/cat-tree/grandma-cry_12.png
+++ b/desktop/asset-work/cat-tree/grandma-cry_12.png
--- a/desktop/asset-work/cat-tree/grandma-cry_13.png
+++ b/desktop/asset-work/cat-tree/grandma-cry_13.png
--- a/desktop/asset-work/cat-tree/grandma-cry_14.png
+++ b/desktop/asset-work/cat-tree/grandma-cry_14.png
--- a/desktop/asset-work/cat-tree/grandma-cry_15.png
+++ b/desktop/asset-work/cat-tree/grandma-cry_15.png
--- a/desktop/asset-work/cat-tree/grandma-cry_16.png
+++ b/desktop/asset-work/cat-tree/grandma-cry_16.png
--- a/desktop/asset-work/cat-tree/grandma-cry_17.png
+++ b/desktop/asset-work/cat-tree/grandma-cry_17.png
--- a/desktop/asset-work/cat-tree/grandma-cry_18.png
+++ b/desktop/asset-work/cat-tree/grandma-cry_18.png
--- a/desktop/asset-work/cat-tree/grandma-cry_19.png
+++ b/desktop/asset-work/cat-tree/grandma-cry_19.png
--- a/desktop/asset-work/cat-tree/grandma-cry_2.png
+++ b/desktop/asset-work/cat-tree/grandma-cry_2.png
--- a/desktop/asset-work/cat-tree/grandma-cry_3.png
+++ b/desktop/asset-work/cat-tree/grandma-cry_3.png
--- a/desktop/asset-work/cat-tree/grandma-cry_4.png
+++ b/desktop/asset-work/cat-tree/grandma-cry_4.png
--- a/desktop/asset-work/cat-tree/grandma-cry_5.png
+++ b/desktop/asset-work/cat-tree/grandma-cry_5.png
--- a/desktop/asset-work/cat-tree/grandma-cry_6.png
+++ b/desktop/asset-work/cat-tree/grandma-cry_6.png
--- a/desktop/asset-work/cat-tree/grandma-cry_7.png
+++ b/desktop/asset-work/cat-tree/grandma-cry_7.png
--- a/desktop/asset-work/cat-tree/grandma-cry_8.png
+++ b/desktop/asset-work/cat-tree/grandma-cry_8.png
--- a/desktop/asset-work/cat-tree/grandma-cry-10.png
+++ b/desktop/asset-work/cat-tree/grandma-cry-10.png
--- a/desktop/asset-work/inside-cafeteria/hands-fight-6.png
+++ b/desktop/asset-work/inside-cafeteria/hands-fight-6.png
--- a/desktop/asset-work/dbh.png
+++ b/desktop/asset-work/dbh.png
--- a/desktop/asset-work/dbhlogo.png
+++ b/desktop/asset-work/dbhlogo.png
--- a/desktop/asset-work/dream/cliff.png
+++ b/desktop/asset-work/dream/cliff.png
--- a/desktop/asset-work/dream/clouds1.png
+++ b/desktop/asset-work/dream/clouds1.png
--- a/desktop/asset-work/dream/far.png
+++ b/desktop/asset-work/dream/far.png
--- a/desktop/asset-work/dream/sky.png
+++ b/desktop/asset-work/dream/sky.png
--- a/desktop/asset-work/ending-castle/cat-stand.png
+++ b/desktop/asset-work/ending-castle/cat-stand.png
--- a/desktop/asset-work/ending-castle/frankie-fall_0.png
+++ b/desktop/asset-work/ending-castle/frankie-fall_0.png
--- a/desktop/asset-work/ending-castle/frankie-fall_1.png
+++ b/desktop/asset-work/ending-castle/frankie-fall_1.png
--- a/desktop/asset-work/ending-castle/frankie-fall_10.png
+++ b/desktop/asset-work/ending-castle/frankie-fall_10.png
--- a/desktop/asset-work/ending-castle/frankie-fall_11.png
+++ b/desktop/asset-work/ending-castle/frankie-fall_11.png
--- a/desktop/asset-work/ending-castle/frankie-fall_2.png
+++ b/desktop/asset-work/ending-castle/frankie-fall_2.png
--- a/desktop/asset-work/ending-castle/frankie-fall_3.png
+++ b/desktop/asset-work/ending-castle/frankie-fall_3.png
--- a/desktop/asset-work/ending-castle/frankie-fall_4.png
+++ b/desktop/asset-work/ending-castle/frankie-fall_4.png
--- a/desktop/asset-work/ending-castle/frankie-fall_5.png
+++ b/desktop/asset-work/ending-castle/frankie-fall_5.png
--- a/desktop/asset-work/ending-castle/frankie-fall_6.png
+++ b/desktop/asset-work/ending-castle/frankie-fall_6.png
--- a/desktop/asset-work/ending-castle/frankie-fall_7.png
+++ b/desktop/asset-work/ending-castle/frankie-fall_7.png
--- a/desktop/asset-work/ending-castle/frankie-fall_8.png
+++ b/desktop/asset-work/ending-castle/frankie-fall_8.png
--- a/desktop/asset-work/ending-castle/frankie-fall-10.png
+++ b/desktop/asset-work/ending-castle/frankie-fall-10.png
--- a/desktop/asset-work/ending-castle/georgia/kick.ogg
+++ b/desktop/asset-work/ending-castle/georgia/kick.ogg
--- a/desktop/asset-work/ending-castle/georgia/kick.pxa/0.pxi
+++ b/desktop/asset-work/ending-castle/georgia/kick.pxa/0.pxi
--- a/desktop/asset-work/ending-castle/georgia/kick.pxa/1.pxi
+++ b/desktop/asset-work/ending-castle/georgia/kick.pxa/1.pxi
--- a/desktop/asset-work/ending-castle/georgia/kick.pxa/10.pxi
+++ b/desktop/asset-work/ending-castle/georgia/kick.pxa/10.pxi
--- a/desktop/asset-work/ending-castle/georgia/kick.pxa/11.pxi
+++ b/desktop/asset-work/ending-castle/georgia/kick.pxa/11.pxi
--- a/desktop/asset-work/ending-castle/georgia/kick.pxa/12.pxi
+++ b/desktop/asset-work/ending-castle/georgia/kick.pxa/12.pxi
--- a/desktop/asset-work/ending-castle/georgia/kick.pxa/13.pxi
+++ b/desktop/asset-work/ending-castle/georgia/kick.pxa/13.pxi
--- a/desktop/asset-work/ending-castle/georgia/kick.pxa/14.pxi
+++ b/desktop/asset-work/ending-castle/georgia/kick.pxa/14.pxi
--- a/desktop/asset-work/ending-castle/georgia/kick.pxa/15.pxi
+++ b/desktop/asset-work/ending-castle/georgia/kick.pxa/15.pxi
--- a/desktop/asset-work/ending-castle/georgia/kick.pxa/16.pxi
+++ b/desktop/asset-work/ending-castle/georgia/kick.pxa/16.pxi
--- a/desktop/asset-work/ending-castle/georgia/kick.pxa/17.pxi
+++ b/desktop/asset-work/ending-castle/georgia/kick.pxa/17.pxi
--- a/desktop/asset-work/ending-castle/georgia/kick.pxa/18.pxi
+++ b/desktop/asset-work/ending-castle/georgia/kick.pxa/18.pxi
--- a/desktop/asset-work/ending-castle/georgia/kick.pxa/19.pxi
+++ b/desktop/asset-work/ending-castle/georgia/kick.pxa/19.pxi
--- a/desktop/asset-work/ending-castle/georgia/kick.pxa/2.pxi
+++ b/desktop/asset-work/ending-castle/georgia/kick.pxa/2.pxi
--- a/desktop/asset-work/ending-castle/georgia/kick.pxa/3.pxi
+++ b/desktop/asset-work/ending-castle/georgia/kick.pxa/3.pxi
--- a/desktop/asset-work/ending-castle/georgia/kick.pxa/4.pxi
+++ b/desktop/asset-work/ending-castle/georgia/kick.pxa/4.pxi
--- a/desktop/asset-work/ending-castle/georgia/kick.pxa/5.pxi
+++ b/desktop/asset-work/ending-castle/georgia/kick.pxa/5.pxi
--- a/desktop/asset-work/ending-castle/georgia/kick.pxa/6.pxi
+++ b/desktop/asset-work/ending-castle/georgia/kick.pxa/6.pxi
--- a/desktop/asset-work/ending-castle/georgia/kick.pxa/7.pxi
+++ b/desktop/asset-work/ending-castle/georgia/kick.pxa/7.pxi
--- a/desktop/asset-work/ending-castle/georgia/kick.pxa/8.pxi
+++ b/desktop/asset-work/ending-castle/georgia/kick.pxa/8.pxi
--- a/desktop/asset-work/ending-castle/georgia/kick.pxa/9.pxi
+++ b/desktop/asset-work/ending-castle/georgia/kick.pxa/9.pxi
--- a/desktop/asset-work/ending-castle/georgia/kick.pxa/CelData.plist
+++ b/desktop/asset-work/ending-castle/georgia/kick.pxa/CelData.plist
--- a/desktop/asset-work/ending-castle/georgia/kick.wav
+++ b/desktop/asset-work/ending-castle/georgia/kick.wav
--- a/desktop/asset-work/ending-castle/georgia/kick_0.png
+++ b/desktop/asset-work/ending-castle/georgia/kick_0.png
--- a/desktop/asset-work/ending-castle/georgia/kick_1.png
+++ b/desktop/asset-work/ending-castle/georgia/kick_1.png
--- a/desktop/asset-work/ending-castle/georgia/kick_10.png
+++ b/desktop/asset-work/ending-castle/georgia/kick_10.png
--- a/desktop/asset-work/ending-castle/georgia/kick_11.png
+++ b/desktop/asset-work/ending-castle/georgia/kick_11.png
--- a/desktop/asset-work/ending-castle/georgia/kick_12.png
+++ b/desktop/asset-work/ending-castle/georgia/kick_12.png
--- a/desktop/asset-work/ending-castle/georgia/kick_13.png
+++ b/desktop/asset-work/ending-castle/georgia/kick_13.png
--- a/desktop/asset-work/ending-castle/georgia/kick_14.png
+++ b/desktop/asset-work/ending-castle/georgia/kick_14.png
--- a/desktop/asset-work/ending-castle/georgia/kick_15.png
+++ b/desktop/asset-work/ending-castle/georgia/kick_15.png
--- a/desktop/asset-work/ending-castle/georgia/kick_16.png
+++ b/desktop/asset-work/ending-castle/georgia/kick_16.png
--- a/desktop/asset-work/ending-castle/georgia/kick_17.png
+++ b/desktop/asset-work/ending-castle/georgia/kick_17.png
--- a/desktop/asset-work/ending-castle/georgia/kick_18.png
+++ b/desktop/asset-work/ending-castle/georgia/kick_18.png
--- a/desktop/asset-work/ending-castle/georgia/kick_19.png
+++ b/desktop/asset-work/ending-castle/georgia/kick_19.png
--- a/desktop/asset-work/ending-castle/georgia/kick_2.png
+++ b/desktop/asset-work/ending-castle/georgia/kick_2.png
--- a/Show More
+++ b/Show More