Merge lp:~chuckw20/widelands/corn_graphics into lp:widelands

Proposed by Chuck Wilder
Status: Merged
Merged at revision: 5507
Proposed branch: lp:~chuckw20/widelands/corn_graphics
Merge into: lp:widelands
Diff against target: 23 lines (+2/-2)
2 files modified
tribes/atlanteans/corn/conf (+1/-1)
tribes/atlanteans/spidercloth/conf (+1/-1)
To merge this branch: bzr merge lp:~chuckw20/widelands/corn_graphics
Reviewer Review Type Date Requested Status
Nasenbaer Approve
Review via email: mp+34637@code.launchpad.net

Description of the change

Here are new graphics for the atlantean corn ware that are more similar than their predecessors.

To post a comment you must log in.
Revision history for this message
Nasenbaer (nasenbaer) wrote :

looks good to me :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tribes/atlanteans/corn/conf'
2--- tribes/atlanteans/corn/conf 2010-08-01 14:35:38 +0000
3+++ tribes/atlanteans/corn/conf 2010-09-05 17:44:45 +0000
4@@ -5,4 +5,4 @@
5 # Simply corn
6 [idle]
7 pics=idle.png
8-hotspot=10 13
9+hotspot=6 11
10
11=== modified file 'tribes/atlanteans/corn/idle.png'
12Binary files tribes/atlanteans/corn/idle.png 2010-08-01 14:35:38 +0000 and tribes/atlanteans/corn/idle.png 2010-09-05 17:44:45 +0000 differ
13=== modified file 'tribes/atlanteans/corn/menu.png'
14Binary files tribes/atlanteans/corn/menu.png 2009-11-11 18:15:19 +0000 and tribes/atlanteans/corn/menu.png 2010-09-05 17:44:45 +0000 differ
15=== modified file 'tribes/atlanteans/spidercloth/conf'
16--- tribes/atlanteans/spidercloth/conf 2010-05-10 00:41:44 +0000
17+++ tribes/atlanteans/spidercloth/conf 2010-09-05 17:44:45 +0000
18@@ -5,4 +5,4 @@
19 [idle]
20 pics=idle.png
21 hotspot=6 9
22-playercolor=true
23+

Subscribers

People subscribed via source and target branches

to status/vote changes: