Permalink
Browse files

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

  • Loading branch information...
2 parents 3948a3c + 68abbd3 commit 717cd804b1621dd39014673e92aa4702a9ac0709 @martinfdk martinfdk committed Apr 29, 2012
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
@@ -86,6 +86,10 @@
<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.2" img="water/spring05.png" />
+ <frame duration="0.2" img="water/spring06.png" />
+ <frame duration="0.2" img="water/spring07.png" />
+ <frame duration="0.2" img="water/spring08.png" />
</variation>
</sprite>
<sprite name="bush" margin="5" layer="3">
@@ -175,6 +179,26 @@
<frame duration="0.2" img="plant/floatingPlant01.png" />
</variation>
</sprite>
+ <sprite name="branchLeft" margin="5" layer="7">
+ <variation>
+ <frame duration="0.2" img="plant/branchLeft01.png" />
+ </variation>
+ </sprite>
+ <sprite name="branchRight" margin="5" layer="7">
+ <variation>
+ <frame duration="0.2" img="plant/branchRight01.png" />
+ </variation>
+ </sprite>
+ <sprite name="vineBranchLeft" margin="5" layer="7">
+ <variation>
+ <frame duration="0.2" img="plant/rootBranchLeft01.png" />
+ </variation>
+ </sprite>
+ <sprite name="vineBranchRight" margin="5" layer="7">
+ <variation>
+ <frame duration="0.2" img="plant/rootBranchRight01.png" />
+ </variation>
+ </sprite>
</sprites>
</blockSprites>
<characterSprites>

0 comments on commit 717cd80

Please sign in to comment.