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

2015-02-23 19:18:26 -08:00
parent a4cecf66ee 587db43045
commit 80fe9e6b62
13 changed files with 55 additions and 33 deletions
--- a/desktop/resources/inside-antique/background.png
+++ b/desktop/resources/inside-antique/background.png
--- a/desktop/resources/inside-antique/background.psd
+++ b/desktop/resources/inside-antique/background.psd
--- a/desktop/resources/inside-antique/beard.png
+++ b/desktop/resources/inside-antique/beard.png
--- a/desktop/resources/inside-antique/clock.pxa/0.pxi
+++ b/desktop/resources/inside-antique/clock.pxa/0.pxi
--- a/desktop/resources/inside-antique/clock.pxa/1.pxi
+++ b/desktop/resources/inside-antique/clock.pxa/1.pxi
--- a/desktop/resources/inside-antique/clock.pxa/2.pxi
+++ b/desktop/resources/inside-antique/clock.pxa/2.pxi
--- a/desktop/resources/inside-antique/clock.pxa/CelData.plist
+++ b/desktop/resources/inside-antique/clock.pxa/CelData.plist
@@ -0,0 +1,18 @@
+<?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>
+</array>
+</plist>
--- a/desktop/resources/inside-antique/collision.png
+++ b/desktop/resources/inside-antique/collision.png
--- a/desktop/resources/outsidehouse/background.psd
+++ b/desktop/resources/outsidehouse/background.psd