Merge branch 'master' of https://bitbucket.org/brycecovertoperations/advent

2014-11-06 17:17:52 -08:00
parent 23ca0f576e 4474f92343
commit 4b3851e32b
56 changed files with 643 additions and 160 deletions
--- a/desktop/resources/behindhouse/background.png
+++ b/desktop/resources/behindhouse/background.png
--- a/desktop/resources/behindhouse/house-cover.png
+++ b/desktop/resources/behindhouse/house-cover.png
--- a/desktop/resources/behindhouse/house.png
+++ b/desktop/resources/behindhouse/house.png
--- a/desktop/resources/behindhouse/stick.png
+++ b/desktop/resources/behindhouse/stick.png
--- a/desktop/resources/cursor.png
+++ b/desktop/resources/cursor.png
--- a/desktop/resources/ego/cat-toy.png
+++ b/desktop/resources/ego/cat-toy.png
--- a/desktop/resources/ego/cat-toy.pxa/0.pxi
+++ b/desktop/resources/ego/cat-toy.pxa/0.pxi
--- a/desktop/resources/ego/cat-toy.pxa/1.pxi
+++ b/desktop/resources/ego/cat-toy.pxa/1.pxi
--- a/desktop/resources/ego/cat-toy.pxa/2.pxi
+++ b/desktop/resources/ego/cat-toy.pxa/2.pxi
--- a/desktop/resources/ego/cat-toy.pxa/3.pxi
+++ b/desktop/resources/ego/cat-toy.pxa/3.pxi
--- a/desktop/resources/ego/cat-toy.pxa/4.pxi
+++ b/desktop/resources/ego/cat-toy.pxa/4.pxi
--- a/desktop/resources/ego/cat-toy.pxa/CelData.plist
+++ b/desktop/resources/ego/cat-toy.pxa/CelData.plist
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<array>
+	<dict>
+		<key>duration</key>
+		<real>1</real>
+	</dict>
+	<dict>
+		<key>duration</key>
+		<real>1</real>
+	</dict>
+	<dict>
+		<key>duration</key>
+		<real>1</real>
+	</dict>
+	<dict>
+		<key>duration</key>
+		<real>1</real>
+	</dict>
+	<dict>
+		<key>duration</key>
+		<real>1</real>
+	</dict>
+</array>
+</plist>
--- a/desktop/resources/ego/reach.png
+++ b/desktop/resources/ego/reach.png
--- a/desktop/resources/ego/reach.pxa/0.pxi
+++ b/desktop/resources/ego/reach.pxa/0.pxi
--- a/desktop/resources/ego/reach.pxa/1.pxi
+++ b/desktop/resources/ego/reach.pxa/1.pxi
--- a/desktop/resources/ego/reach.pxa/2.pxi
+++ b/desktop/resources/ego/reach.pxa/2.pxi
--- a/desktop/resources/ego/reach.pxa/3.pxi
+++ b/desktop/resources/ego/reach.pxa/3.pxi
--- a/desktop/resources/ego/reach.pxa/CelData.plist
+++ b/desktop/resources/ego/reach.pxa/CelData.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<array>
+	<dict>
+		<key>duration</key>
+		<real>1</real>
+	</dict>
+	<dict>
+		<key>duration</key>
+		<real>1</real>
+	</dict>
+	<dict>
+		<key>duration</key>
+		<real>1</real>
+	</dict>
+	<dict>
+		<key>duration</key>
+		<real>1</real>
+	</dict>
+</array>
+</plist>
--- a/desktop/resources/ego/squat.png
+++ b/desktop/resources/ego/squat.png
--- a/desktop/resources/ego/squat.pxa/0.pxi
+++ b/desktop/resources/ego/squat.pxa/0.pxi
--- a/desktop/resources/ego/squat.pxa/1.pxi
+++ b/desktop/resources/ego/squat.pxa/1.pxi
--- a/desktop/resources/ego/squat.pxa/2.pxi
+++ b/desktop/resources/ego/squat.pxa/2.pxi
--- a/desktop/resources/ego/squat.pxa/3.pxi
+++ b/desktop/resources/ego/squat.pxa/3.pxi
--- a/desktop/resources/ego/squat.pxa/CelData.plist
+++ b/desktop/resources/ego/squat.pxa/CelData.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<array>
+	<dict>
+		<key>duration</key>
+		<real>1</real>
+	</dict>
+	<dict>
+		<key>duration</key>
+		<real>1</real>
+	</dict>
+	<dict>
+		<key>duration</key>
+		<real>1</real>
+	</dict>
+	<dict>
+		<key>duration</key>
+		<real>1</real>
+	</dict>
+</array>
+</plist>
--- a/desktop/resources/inside-castle/background.png
+++ b/desktop/resources/inside-castle/background.png
--- a/desktop/resources/inside-castle/game-player-talk.png
+++ b/desktop/resources/inside-castle/game-player-talk.png
--- a/desktop/resources/inside-castle/game-player-talk.pxa/0.pxi
+++ b/desktop/resources/inside-castle/game-player-talk.pxa/0.pxi
--- a/desktop/resources/inside-castle/game-player-talk.pxa/1.pxi
+++ b/desktop/resources/inside-castle/game-player-talk.pxa/1.pxi
--- a/desktop/resources/inside-castle/game-player-talk.pxa/2.pxi
+++ b/desktop/resources/inside-castle/game-player-talk.pxa/2.pxi
--- a/desktop/resources/inside-castle/game-player-talk.pxa/3.pxi
+++ b/desktop/resources/inside-castle/game-player-talk.pxa/3.pxi
--- a/desktop/resources/inside-castle/game-player-talk.pxa/CelData.plist
+++ b/desktop/resources/inside-castle/game-player-talk.pxa/CelData.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<array>
+	<dict>
+		<key>duration</key>
+		<real>1</real>
+	</dict>
+	<dict>
+		<key>duration</key>
+		<real>1</real>
+	</dict>
+	<dict>
+		<key>duration</key>
+		<real>1</real>
+	</dict>
+	<dict>
+		<key>duration</key>
+		<real>1</real>
+	</dict>
+</array>
+</plist>
--- a/desktop/resources/inside-castle/gameplayer.png
+++ b/desktop/resources/inside-castle/gameplayer.png
--- a/desktop/resources/inside-castle/gameplayer.pxi
+++ b/desktop/resources/inside-castle/gameplayer.pxi
--- a/desktop/resources/inside-castle/player.pxi
+++ b/desktop/resources/inside-castle/player.pxi
--- a/desktop/resources/inside-fangald.mp3
+++ b/desktop/resources/inside-fangald.mp3
--- a/desktop/resources/inside-fangald.ogg
+++ b/desktop/resources/inside-fangald.ogg
--- a/desktop/resources/megaboss.mp3
+++ b/desktop/resources/megaboss.mp3
--- a/desktop/resources/outside-castle/steer.png
+++ b/desktop/resources/outside-castle/steer.png
--- a/desktop/resources/outside-castle/steer.pxi
+++ b/desktop/resources/outside-castle/steer.pxi
--- a/desktop/resources/town-music-1.ogg
+++ b/desktop/resources/town-music-1.ogg
--- a/desktop/resources/town-music-2.mp3
+++ b/desktop/resources/town-music-2.mp3
--- a/desktop/resources/town-music-2.ogg
+++ b/desktop/resources/town-music-2.ogg
--- a/desktop/resources/town-music.ogg
+++ b/desktop/resources/town-music.ogg