← Back to team overview

widelands-dev team mailing list archive

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

 

kaputtnik has proposed merging lp:~franku/widelands/adjust_rolling_of_winterwaves into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1408712 in widelands: "Waves are rolling in different speed /rolling angle is different"
  https://bugs.launchpad.net/widelands/+bug/1408712

For more details, see:
https://code.launchpad.net/~franku/widelands/adjust_rolling_of_winterwaves/+merge/266607

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.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~franku/widelands/adjust_rolling_of_winterwaves into lp:widelands.
=== modified file 'world/terrains/pics/winter/water_00.png'
Binary 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'
Binary 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'
Binary 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'
Binary 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'
Binary 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'
Binary 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'
Binary 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'
Binary 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'
Binary 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'
Binary 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'
Binary 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

Follow ups