Merge branch 'master' of github.com:Kajakklubben/48pixels

Kajakklubben · Apr 29, 2012 · e39e36b · e39e36b
2 parents f0fb704 + cd03209
commit e39e36b
Show file tree

Hide file tree

Showing 15 changed files with 8 additions and 4 deletions.
diff --git a/art/spring.psd b/art/spring.psd
diff --git a/assets/character/char_climb02.png b/assets/character/char_climb02.png
diff --git a/assets/character/char_climb03.png b/assets/character/char_climb03.png
diff --git a/assets/character/char_climb04.png b/assets/character/char_climb04.png
diff --git a/assets/character/char_swim01.png b/assets/character/char_swim01.png
diff --git a/assets/character/char_swim02.png b/assets/character/char_swim02.png
diff --git a/assets/character/char_swim03.png b/assets/character/char_swim03.png
diff --git a/assets/water/spring02.png b/assets/water/spring02.png
diff --git a/assets/water/spring03.png b/assets/water/spring03.png
diff --git a/assets/water/spring04.png b/assets/water/spring04.png
diff --git a/assets/water/spring05.png b/assets/water/spring05.png
diff --git a/assets/water/spring06.png b/assets/water/spring06.png
diff --git a/assets/water/spring07.png b/assets/water/spring07.png
diff --git a/assets/water/spring08.png b/assets/water/spring08.png
diff --git a/settings/settings.xml b/settings/settings.xml
@@ -82,10 +82,14 @@
             </sprite>
             <sprite name="spring" margin="5" layer="6">
                 <variation>
-                    <frame duration="0.2" img="water/spring01.png" />
-                    <frame duration="0.2" img="water/spring02.png" />
-                    <frame duration="0.2" img="water/spring03.png" />
-                    <frame duration="0.2" img="water/spring04.png" />
+                    <frame duration="0.1" img="water/spring01.png" />
+                    <frame duration="0.1" img="water/spring02.png" />
+                    <frame duration="0.1" img="water/spring03.png" />
+                    <frame duration="0.1" img="water/spring04.png" />
+					<frame duration="0.1" img="water/spring05.png" />
+					<frame duration="0.1" img="water/spring06.png" />
+					<frame duration="0.1" img="water/spring07.png" />
+					<frame duration="0.1" img="water/spring08.png" />
                 </variation>
             </sprite>
             <sprite name="bush" margin="5" layer="3">