Merge lp:~matt-xv/damn-monkey/new-sprites into lp:damn-monkey

[Matthis FRENAY]

[lp:~matt-xv/damn-monkey/new-sprites]

27. By Matthis FRENAY on 2011-06-03

Functional Jumpman sprites added.

28. By Matthis FRENAY on 2011-06-03

Life icon added.

=== modified file 'pixmaps/jumpman.png' (properties changed: -x to +x)
 Binary files pixmaps/jumpman.png	2011-05-06 12:49:01 +0000 and pixmaps/jumpman.png	2011-06-03 16:56:27 +0000 differ
=== modified file 'pixmaps/jumpman.sprite'
--- pixmaps/jumpman.sprite	2011-05-13 13:13:53 +0000
+++ pixmaps/jumpman.sprite	2011-06-03 16:56:27 +0000
@@ -7,6 +7,6 @@
 jump-left   ; 54 ; 32 ; 29 ; 31 ;         1 ;        0 ;
 ladder      ; 24 ; 64 ; 23 ; 31 ;         1 ;        0 ;
 walk-ladder ;  0 ; 64 ; 23 ; 31 ;         2 ;      120 ;
-dead        ;  0 ; 96 ; 32 ; 32 ;         4 ;      100 ;
+dead        ;  0 ; 96 ; 34 ; 34 ;         4 ;      100 ;
 
 
 
=== added file 'pixmaps/lady.png'
 Binary files pixmaps/lady.png	1970-01-01 00:00:00 +0000 and pixmaps/lady.png	2011-06-03 16:56:27 +0000 differ
=== added file 'pixmaps/lady.sprite'
--- pixmaps/lady.sprite	1970-01-01 00:00:00 +0000
+++ pixmaps/lady.sprite	2011-06-03 16:56:27 +0000
@@ -0,0 +1,4 @@
+#Movement ; x ; y ; w ; h ; numb. items ; delay ms ;
+ask-help ; 0 ; 42 ; 54 ; 36 ; 1 ; 100 ;
+custom ; 0 ; 0 ; 40 ; 42 ; 2 ; 1000 ;
+
 
=== added file 'pixmaps/life.png'
 Binary files pixmaps/life.png	1970-01-01 00:00:00 +0000 and pixmaps/life.png	2011-06-03 16:56:27 +0000 differ
=== renamed file 'pixmaps/life.png' => 'pixmaps/life.png.moved'