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

2014-11-10 13:33:58 -08:00
parent 0f714c5b5e 8e0fd913a2
commit fa79d63ec9
28 changed files with 300 additions and 35 deletions
--- a/desktop/resources/cursor.png
+++ b/desktop/resources/cursor.png
--- a/desktop/resources/ego/fire.png
+++ b/desktop/resources/ego/fire.png
--- a/desktop/resources/ego/fire.pxa/0.pxi
+++ b/desktop/resources/ego/fire.pxa/0.pxi
--- a/desktop/resources/ego/fire.pxa/1.pxi
+++ b/desktop/resources/ego/fire.pxa/1.pxi
--- a/desktop/resources/ego/fire.pxa/10.pxi
+++ b/desktop/resources/ego/fire.pxa/10.pxi
--- a/desktop/resources/ego/fire.pxa/11.pxi
+++ b/desktop/resources/ego/fire.pxa/11.pxi
--- a/desktop/resources/ego/fire.pxa/2.pxi
+++ b/desktop/resources/ego/fire.pxa/2.pxi
--- a/desktop/resources/ego/fire.pxa/3.pxi
+++ b/desktop/resources/ego/fire.pxa/3.pxi
--- a/desktop/resources/ego/fire.pxa/4.pxi
+++ b/desktop/resources/ego/fire.pxa/4.pxi
--- a/desktop/resources/ego/fire.pxa/5.pxi
+++ b/desktop/resources/ego/fire.pxa/5.pxi
--- a/desktop/resources/ego/fire.pxa/6.pxi
+++ b/desktop/resources/ego/fire.pxa/6.pxi
--- a/desktop/resources/ego/fire.pxa/7.pxi
+++ b/desktop/resources/ego/fire.pxa/7.pxi
--- a/desktop/resources/ego/fire.pxa/8.pxi
+++ b/desktop/resources/ego/fire.pxa/8.pxi
--- a/desktop/resources/ego/fire.pxa/9.pxi
+++ b/desktop/resources/ego/fire.pxa/9.pxi
--- a/desktop/resources/ego/fire.pxa/CelData.plist
+++ b/desktop/resources/ego/fire.pxa/CelData.plist
@@ -0,0 +1,54 @@
+<?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>
+	<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>
+	<dict>
+		<key>duration</key>
+		<real>1</real>
+	</dict>
+	<dict>
+		<key>duration</key>
+		<real>1</real>
+	</dict>
+</array>
+</plist>
--- a/desktop/resources/inside-antique/background.png
+++ b/desktop/resources/inside-antique/background.png
--- a/desktop/resources/inside-antique/bowl.png
+++ b/desktop/resources/inside-antique/bowl.png
--- a/desktop/resources/inside-antique/portrait.png
+++ b/desktop/resources/inside-antique/portrait.png
--- a/desktop/resources/inside-antique/shopkeep-talk.png
+++ b/desktop/resources/inside-antique/shopkeep-talk.png
--- a/desktop/resources/inside-antique/shopkeep.png
+++ b/desktop/resources/inside-antique/shopkeep.png
--- a/desktop/resources/inside-house/safe-lock.png
+++ b/desktop/resources/inside-house/safe-lock.png