← Back to team overview

widelands-dev team mailing list archive

[Merge] lp:~chuckw20/widelands/Bug-829984 into lp:widelands

 

Chuck Wilder has proposed merging lp:~chuckw20/widelands/Bug-829984 into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #829984 in Widelands media development: "Tweak the duck animation"
  https://bugs.launchpad.net/widelands-media/+bug/829984

For more details, see:
https://code.launchpad.net/~chuckw20/widelands/Bug-829984/+merge/246434

Expanded and fine-tuned the duck animation to synchronize with the water animation more closely.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~chuckw20/widelands/Bug-829984 into lp:widelands.
=== modified file 'world/critters/duck/duck_00.png'
Binary files world/critters/duck/duck_00.png	2010-03-17 22:19:10 +0000 and world/critters/duck/duck_00.png	2015-01-14 15:03:41 +0000 differ
=== modified file 'world/critters/duck/duck_01.png'
Binary files world/critters/duck/duck_01.png	2010-03-17 22:19:10 +0000 and world/critters/duck/duck_01.png	2015-01-14 15:03:41 +0000 differ
=== modified file 'world/critters/duck/duck_02.png'
Binary files world/critters/duck/duck_02.png	2010-03-17 22:19:10 +0000 and world/critters/duck/duck_02.png	2015-01-14 15:03:41 +0000 differ
=== modified file 'world/critters/duck/duck_03.png'
Binary files world/critters/duck/duck_03.png	2010-03-17 22:19:10 +0000 and world/critters/duck/duck_03.png	2015-01-14 15:03:41 +0000 differ
=== modified file 'world/critters/duck/duck_04.png'
Binary files world/critters/duck/duck_04.png	2010-03-17 22:19:10 +0000 and world/critters/duck/duck_04.png	2015-01-14 15:03:41 +0000 differ
=== modified file 'world/critters/duck/duck_05.png'
Binary files world/critters/duck/duck_05.png	2010-03-17 22:19:10 +0000 and world/critters/duck/duck_05.png	2015-01-14 15:03:41 +0000 differ
=== added file 'world/critters/duck/duck_06.png'
Binary files world/critters/duck/duck_06.png	1970-01-01 00:00:00 +0000 and world/critters/duck/duck_06.png	2015-01-14 15:03:41 +0000 differ
=== added file 'world/critters/duck/duck_07.png'
Binary files world/critters/duck/duck_07.png	1970-01-01 00:00:00 +0000 and world/critters/duck/duck_07.png	2015-01-14 15:03:41 +0000 differ
=== modified file 'world/critters/duck/init.lua'
--- world/critters/duck/init.lua	2014-04-18 12:57:10 +0000
+++ world/critters/duck/init.lua	2015-01-14 15:03:41 +0000
@@ -8,7 +8,7 @@
          name = "duck",
       },
       hotspot = { 5, 7 },
-      fps = 1,
+      fps = 4,
    },
 }
 add_walking_animations(animations, dirname, "duck_walk", {5, 10})


Follow ups