Damn Monkey

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

  1. new-sprites
  2. Merge into trunk
Proposed by Matthis FRENAY
Status: Merged
Approved by: Fabien LOISON
Approved revision: 28
Merged at revision: 27
Proposed branch: lp:~matt-xv/damn-monkey/new-sprites
Merge into: lp:damn-monkey
Diff against target: 28 lines (+5/-1) (has conflicts)
2 files modified
pixmaps/jumpman.sprite (+1/-1)
pixmaps/lady.sprite (+4/-0)
Conflict adding file pixmaps/life.png.  Moved existing file to pixmaps/life.png.moved.
To merge this branch: bzr merge lp:~matt-xv/damn-monkey/new-sprites
Reviewer Review Type Date Requested Status
Fabien LOISON Pending
Review via email: mp+63132@code.launchpad.net
To post a comment you must log in.
lp:~matt-xv/damn-monkey/new-sprites updated
27. By Matthis FRENAY

Functional Jumpman sprites added.

28. By Matthis FRENAY

Life icon added.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'pixmaps/jumpman.png' (properties changed: -x to +x)
2Binary files pixmaps/jumpman.png 2011-05-06 12:49:01 +0000 and pixmaps/jumpman.png 2011-06-03 16:56:27 +0000 differ
3=== modified file 'pixmaps/jumpman.sprite'
4--- pixmaps/jumpman.sprite 2011-05-13 13:13:53 +0000
5+++ pixmaps/jumpman.sprite 2011-06-03 16:56:27 +0000
6@@ -7,6 +7,6 @@
7 jump-left ; 54 ; 32 ; 29 ; 31 ; 1 ; 0 ;
8 ladder ; 24 ; 64 ; 23 ; 31 ; 1 ; 0 ;
9 walk-ladder ; 0 ; 64 ; 23 ; 31 ; 2 ; 120 ;
10-dead ; 0 ; 96 ; 32 ; 32 ; 4 ; 100 ;
11+dead ; 0 ; 96 ; 34 ; 34 ; 4 ; 100 ;
12
13
14
15=== added file 'pixmaps/lady.png'
16Binary files pixmaps/lady.png 1970-01-01 00:00:00 +0000 and pixmaps/lady.png 2011-06-03 16:56:27 +0000 differ
17=== added file 'pixmaps/lady.sprite'
18--- pixmaps/lady.sprite 1970-01-01 00:00:00 +0000
19+++ pixmaps/lady.sprite 2011-06-03 16:56:27 +0000
20@@ -0,0 +1,4 @@
21+#Movement ; x ; y ; w ; h ; numb. items ; delay ms ;
22+ask-help ; 0 ; 42 ; 54 ; 36 ; 1 ; 100 ;
23+custom ; 0 ; 0 ; 40 ; 42 ; 2 ; 1000 ;
24+
25
26=== added file 'pixmaps/life.png'
27Binary files pixmaps/life.png 1970-01-01 00:00:00 +0000 and pixmaps/life.png 2011-06-03 16:56:27 +0000 differ
28=== renamed file 'pixmaps/life.png' => 'pixmaps/life.png.moved'

Subscribers

People subscribed via source and target branches

to all changes: