[Widelands-dev] [Merge] lp:~widelands-dev/widelands/barracks_graphics into lp:widelands

2019-03-13 Thread GunChleoc
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 + and data/tribes/buildings/productionsites/barbarians/barracks/build_00.png	2019-03-13 21:30:30 + 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 + and data/tribes/buildings/productionsites/barbarians/barracks/build_01.png	2019-03-13 21:30:30 + 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 + and data/tribes/buildings/productionsites/barbarians/barracks/build_02.png	2019-03-13 21:30:30 + 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 + and data/tribes/buildings/productionsites/barbarians/barracks/build_03.png	2019-03-13 21:30:30 + 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 + and data/tribes/buildings/productionsites/barbarians/barracks/idle_00.png	2019-03-13 21:30:30 + 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 + and data/tribes/buildings/productionsites/barbarians/barracks/idle_00_pc.png	2019-03-13 21:30:30 + 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 +
+++ data/tribes/buildings/productionsites/barbarians/barracks/init.lua	2019-03-13 21:30:30 +
@@ -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 + and data/tribes/buildings/productionsites/barbarians/barracks/working_00.png	2019-03-13 21:30:30 + 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 + and data/tribes/buildings/productionsites/barbarians/barracks/working_00_pc.png	2019-03-13 21:30:30 + 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 + and data/tribes/buildings/productionsites/empire/barracks/idle_00.png	2019-03-13 21:30:30 + 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 +
+++ data/tribes/buildings/productionsites/empire/barracks/init.lua	2019-03-13 21:30:30 +
@@ -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 },
   }
},
 


Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/barracks_graphics into lp:widelands

2019-03-13 Thread Benedikt Straub
Much better for empire :)
It´s a good improvement for barbarians as well, but the partial transparency of 
the ground looks really strange, esp. when the second frame is completed. Could 
you make the ground fully opaque perhaps?
-- 
https://code.launchpad.net/~widelands-dev/widelands/barracks_graphics/+merge/364404
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/barracks_graphics into lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


[Widelands-dev] [Merge] lp:~nordfriese/widelands/workareas into lp:widelands

2019-03-13 Thread bunnybot
Continuous integration builds have changed state:

Travis build 4599. State: passed. Details: 
https://travis-ci.org/widelands/widelands/builds/505929624.
Appveyor build 4387. State: failed. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_nordfriese_widelands_workareas-4387.
-- 
https://code.launchpad.net/~nordfriese/widelands/workareas/+merge/364266
Your team Widelands Developers is requested to review the proposed merge of 
lp:~nordfriese/widelands/workareas into lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


[Widelands-dev] [Merge] lp:~widelands-dev/widelands/barracks_graphics into lp:widelands

2019-03-13 Thread bunnybot
Continuous integration builds have changed state:

Travis build 4600. State: errored. Details: 
https://travis-ci.org/widelands/widelands/builds/506014328.
Appveyor build 4388. State: success. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_barracks_graphics-4388.
-- 
https://code.launchpad.net/~widelands-dev/widelands/barracks_graphics/+merge/364404
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/barracks_graphics into lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp