widelands

Merge lp:~franku/widelands/adjust_rolling_of_winterwaves into lp:widelands

  1. adjust_rolling_of_winterwaves
  2. Merge into trunk
Proposed by kaputtnik
Status: Merged
Merged at revision: 7499
Proposed branch: lp:~franku/widelands/adjust_rolling_of_winterwaves
Merge into: lp:widelands
Diff against target: 22 lines (+0/-0)
0 files modified
To merge this branch: bzr merge lp:~franku/widelands/adjust_rolling_of_winterwaves
Reviewer Review Type Date Requested Status
GunChleoc Approve
Review via email: mp+266607@code.launchpad.net

Description of the change

This branch contains only changed files for the waves in winterland so that the angle of rolling waves are equal to the other water terrains.

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

This is definitely an improvement, so I'm merging this.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'world/terrains/pics/winter/water_00.png'
0Binary files world/terrains/pics/winter/water_00.png 2014-03-29 15:17:42 +0000 and world/terrains/pics/winter/water_00.png 2015-07-31 18:05:30 +0000 differ0Binary files world/terrains/pics/winter/water_00.png 2014-03-29 15:17:42 +0000 and world/terrains/pics/winter/water_00.png 2015-07-31 18:05:30 +0000 differ
=== modified file 'world/terrains/pics/winter/water_01.png'
1Binary files world/terrains/pics/winter/water_01.png 2014-03-29 15:17:42 +0000 and world/terrains/pics/winter/water_01.png 2015-07-31 18:05:30 +0000 differ1Binary files world/terrains/pics/winter/water_01.png 2014-03-29 15:17:42 +0000 and world/terrains/pics/winter/water_01.png 2015-07-31 18:05:30 +0000 differ
=== modified file 'world/terrains/pics/winter/water_02.png'
2Binary files world/terrains/pics/winter/water_02.png 2014-03-29 15:17:42 +0000 and world/terrains/pics/winter/water_02.png 2015-07-31 18:05:30 +0000 differ2Binary files world/terrains/pics/winter/water_02.png 2014-03-29 15:17:42 +0000 and world/terrains/pics/winter/water_02.png 2015-07-31 18:05:30 +0000 differ
=== modified file 'world/terrains/pics/winter/water_03.png'
3Binary files world/terrains/pics/winter/water_03.png 2014-03-29 15:17:42 +0000 and world/terrains/pics/winter/water_03.png 2015-07-31 18:05:30 +0000 differ3Binary files world/terrains/pics/winter/water_03.png 2014-03-29 15:17:42 +0000 and world/terrains/pics/winter/water_03.png 2015-07-31 18:05:30 +0000 differ
=== modified file 'world/terrains/pics/winter/water_04.png'
4Binary files world/terrains/pics/winter/water_04.png 2014-03-29 15:17:42 +0000 and world/terrains/pics/winter/water_04.png 2015-07-31 18:05:30 +0000 differ4Binary files world/terrains/pics/winter/water_04.png 2014-03-29 15:17:42 +0000 and world/terrains/pics/winter/water_04.png 2015-07-31 18:05:30 +0000 differ
=== modified file 'world/terrains/pics/winter/water_05.png'
5Binary files world/terrains/pics/winter/water_05.png 2014-03-29 15:17:42 +0000 and world/terrains/pics/winter/water_05.png 2015-07-31 18:05:30 +0000 differ5Binary files world/terrains/pics/winter/water_05.png 2014-03-29 15:17:42 +0000 and world/terrains/pics/winter/water_05.png 2015-07-31 18:05:30 +0000 differ
=== modified file 'world/terrains/pics/winter/water_06.png'
6Binary files world/terrains/pics/winter/water_06.png 2014-03-29 15:17:42 +0000 and world/terrains/pics/winter/water_06.png 2015-07-31 18:05:30 +0000 differ6Binary files world/terrains/pics/winter/water_06.png 2014-03-29 15:17:42 +0000 and world/terrains/pics/winter/water_06.png 2015-07-31 18:05:30 +0000 differ
=== modified file 'world/terrains/pics/winter/water_07.png'
7Binary files world/terrains/pics/winter/water_07.png 2014-03-29 15:17:42 +0000 and world/terrains/pics/winter/water_07.png 2015-07-31 18:05:30 +0000 differ7Binary files world/terrains/pics/winter/water_07.png 2014-03-29 15:17:42 +0000 and world/terrains/pics/winter/water_07.png 2015-07-31 18:05:30 +0000 differ
=== modified file 'world/terrains/pics/winter/water_08.png'
8Binary files world/terrains/pics/winter/water_08.png 2014-03-29 15:17:42 +0000 and world/terrains/pics/winter/water_08.png 2015-07-31 18:05:30 +0000 differ8Binary files world/terrains/pics/winter/water_08.png 2014-03-29 15:17:42 +0000 and world/terrains/pics/winter/water_08.png 2015-07-31 18:05:30 +0000 differ
=== modified file 'world/terrains/pics/winter/water_09.png'
9Binary files world/terrains/pics/winter/water_09.png 2014-03-29 15:17:42 +0000 and world/terrains/pics/winter/water_09.png 2015-07-31 18:05:30 +0000 differ9Binary files world/terrains/pics/winter/water_09.png 2014-03-29 15:17:42 +0000 and world/terrains/pics/winter/water_09.png 2015-07-31 18:05:30 +0000 differ
=== modified file 'world/terrains/pics/winter/water_10.png'
10Binary files world/terrains/pics/winter/water_10.png 2014-03-29 15:17:42 +0000 and world/terrains/pics/winter/water_10.png 2015-07-31 18:05:30 +0000 differ10Binary files world/terrains/pics/winter/water_10.png 2014-03-29 15:17:42 +0000 and world/terrains/pics/winter/water_10.png 2015-07-31 18:05:30 +0000 differ

Subscribers

People subscribed via source and target branches

to status/vote changes: