widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

GunChleoc has proposed merging lp:~widelands-dev/widelands/barracks_graphics into lp:widelands.

Commit message:
Improved animation and graphics for Barbarian and Empire Barracks

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/barracks_graphics/+merge/364404

Still not having much luck with rendering from Blender, so I assembled these with Gimp.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/barracks_graphics into lp:widelands.

=== added file 'data/tribes/buildings/productionsites/barbarians/barracks/build_00.png'
Binary files data/tribes/buildings/productionsites/barbarians/barracks/build_00.png	1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/barbarians/barracks/build_00.png	2019-03-13 21:30:30 +0000 differ
=== added file 'data/tribes/buildings/productionsites/barbarians/barracks/build_01.png'
Binary files data/tribes/buildings/productionsites/barbarians/barracks/build_01.png	1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/barbarians/barracks/build_01.png	2019-03-13 21:30:30 +0000 differ
=== added file 'data/tribes/buildings/productionsites/barbarians/barracks/build_02.png'
Binary files data/tribes/buildings/productionsites/barbarians/barracks/build_02.png	1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/barbarians/barracks/build_02.png	2019-03-13 21:30:30 +0000 differ
=== added file 'data/tribes/buildings/productionsites/barbarians/barracks/build_03.png'
Binary files data/tribes/buildings/productionsites/barbarians/barracks/build_03.png	1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/barbarians/barracks/build_03.png	2019-03-13 21:30:30 +0000 differ
=== modified file 'data/tribes/buildings/productionsites/barbarians/barracks/idle_00.png'
Binary files data/tribes/buildings/productionsites/barbarians/barracks/idle_00.png	2015-10-15 15:34:16 +0000 and data/tribes/buildings/productionsites/barbarians/barracks/idle_00.png	2019-03-13 21:30:30 +0000 differ
=== added file 'data/tribes/buildings/productionsites/barbarians/barracks/idle_00_pc.png'
Binary files data/tribes/buildings/productionsites/barbarians/barracks/idle_00_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/barbarians/barracks/idle_00_pc.png	2019-03-13 21:30:30 +0000 differ
=== modified file 'data/tribes/buildings/productionsites/barbarians/barracks/init.lua'
--- data/tribes/buildings/productionsites/barbarians/barracks/init.lua	2017-09-03 07:59:51 +0000
+++ data/tribes/buildings/productionsites/barbarians/barracks/init.lua	2019-03-13 21:30:30 +0000
@@ -24,11 +24,15 @@
    animations = {
       idle = { -- TODO(GunChleoc): make animations
          pictures = path.list_files(dirname .. "idle_??.png"),
-         hotspot = { 52, 64 },
+         hotspot = { 50, 38 },
+      },
+      build = { -- TODO(GunChleoc): make animations
+         pictures = path.list_files(dirname .. "build_??.png"),
+         hotspot = { 50, 38 },
       },
       working = { -- TODO(GunChleoc): make animations
-         pictures = path.list_files(dirname .. "idle_??.png"),
-         hotspot = { 52, 64 },
+         pictures = path.list_files(dirname .. "working_??.png"),
+         hotspot = { 50, 38 },
       }
    },
 

=== added file 'data/tribes/buildings/productionsites/barbarians/barracks/working_00.png'
Binary files data/tribes/buildings/productionsites/barbarians/barracks/working_00.png	1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/barbarians/barracks/working_00.png	2019-03-13 21:30:30 +0000 differ
=== added file 'data/tribes/buildings/productionsites/barbarians/barracks/working_00_pc.png'
Binary files data/tribes/buildings/productionsites/barbarians/barracks/working_00_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/barbarians/barracks/working_00_pc.png	2019-03-13 21:30:30 +0000 differ
=== modified file 'data/tribes/buildings/productionsites/empire/barracks/idle_00.png'
Binary files data/tribes/buildings/productionsites/empire/barracks/idle_00.png	2015-10-15 15:34:16 +0000 and data/tribes/buildings/productionsites/empire/barracks/idle_00.png	2019-03-13 21:30:30 +0000 differ
=== modified file 'data/tribes/buildings/productionsites/empire/barracks/init.lua'
--- data/tribes/buildings/productionsites/empire/barracks/init.lua	2017-09-03 07:59:51 +0000
+++ data/tribes/buildings/productionsites/empire/barracks/init.lua	2019-03-13 21:30:30 +0000
@@ -26,11 +26,11 @@
    animations = {
       idle = { -- TODO(GunChleoc): make animations
          pictures = path.list_files(dirname .. "idle_??.png"),
-         hotspot = { 52, 64 },
+         hotspot = { 56, 68 },
       },
       working = { -- TODO(GunChleoc): make animations
          pictures = path.list_files(dirname .. "idle_??.png"),
-         hotspot = { 52, 64 },
+         hotspot = { 56, 68 },
       }
    },