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

2015-03-19 16:08:13 -07:00
parent a71d229bb1 a3024fd128
commit 2d946c6653
23 changed files with 71 additions and 28 deletions
--- a/desktop/resources/ego/squat.png
+++ b/desktop/resources/ego/squat.png
--- a/desktop/resources/ego/squat.pxa/3.pxi
+++ b/desktop/resources/ego/squat.pxa/3.pxi
--- a/desktop/resources/ego/squat.pxa/5.pxi
+++ b/desktop/resources/ego/squat.pxa/5.pxi
--- a/desktop/resources/ego/squat.pxa/6.pxi
+++ b/desktop/resources/ego/squat.pxa/6.pxi
--- a/desktop/resources/ego/squat.pxa/CelData.plist
+++ b/desktop/resources/ego/squat.pxa/CelData.plist
@@ -22,5 +22,13 @@
 		<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-house/close-safe.16.wav
+++ b/desktop/resources/inside-house/close-safe.16.wav
--- a/desktop/resources/inside-house/close-safe.ogg
+++ b/desktop/resources/inside-house/close-safe.ogg
--- a/desktop/resources/inside-house/close-safe.wav
+++ b/desktop/resources/inside-house/close-safe.wav
--- a/desktop/resources/inside-house/open-safe.16.wav
+++ b/desktop/resources/inside-house/open-safe.16.wav
--- a/desktop/resources/inside-house/open-safe.ogg
+++ b/desktop/resources/inside-house/open-safe.ogg
--- a/desktop/resources/inside-house/open-safe.wav
+++ b/desktop/resources/inside-house/open-safe.wav
--- a/desktop/resources/outsidehouse/milk.24.wav
+++ b/desktop/resources/outsidehouse/milk.24.wav
--- a/desktop/resources/outsidehouse/milk.ogg
+++ b/desktop/resources/outsidehouse/milk.ogg
--- a/desktop/resources/outsidehouse/milk.wav
+++ b/desktop/resources/outsidehouse/milk.wav