Merge lp:~widelands-dev/widelands/barracks_graphics into lp:widelands

Proposed by GunChleoc
Status: Merged
Merged at revision: 9021
Proposed branch: lp:~widelands-dev/widelands/barracks_graphics
Merge into: lp:widelands
Diff against target: 57 lines (+9/-5)
2 files modified
data/tribes/buildings/productionsites/barbarians/barracks/init.lua (+7/-3)
data/tribes/buildings/productionsites/empire/barracks/init.lua (+2/-2)
To merge this branch: bzr merge lp:~widelands-dev/widelands/barracks_graphics
Reviewer Review Type Date Requested Status
Widelands Developers Pending
Review via email: mp+364404@code.launchpad.net

Commit message

Improved animation and graphics for Barbarian and Empire Barracks

Description of the change

Still not having much luck with rendering from Blender, so I assembled these with Gimp.

To post a comment you must log in.
Revision history for this message
Benedikt Straub (nordfriese) wrote :

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?

Revision history for this message
bunnybot (widelandsofficial) wrote :

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.

Revision history for this message
GunChleoc (gunchleoc) wrote :

The Training Camp which I stole the Barbarian Barracks from does the exact same thing, it's just less obvious. We will need a proper Blender model in the end anyway, so I'd rather not spend too much time on it.

Revision history for this message
GunChleoc (gunchleoc) wrote :

@bunnybot merge

Revision history for this message
bunnybot (widelandsofficial) wrote :

Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways.

Travis build 4600. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/506014328.

Revision history for this message
GunChleoc (gunchleoc) wrote :

The usual inputqueues timeout on test suite with GCC8

@bunnybot merge force

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'data/tribes/buildings/productionsites/barbarians/barracks/build_00.png'
2Binary 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
3=== added file 'data/tribes/buildings/productionsites/barbarians/barracks/build_01.png'
4Binary 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
5=== added file 'data/tribes/buildings/productionsites/barbarians/barracks/build_02.png'
6Binary 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
7=== added file 'data/tribes/buildings/productionsites/barbarians/barracks/build_03.png'
8Binary 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
9=== modified file 'data/tribes/buildings/productionsites/barbarians/barracks/idle_00.png'
10Binary 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
11=== added file 'data/tribes/buildings/productionsites/barbarians/barracks/idle_00_pc.png'
12Binary 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
13=== modified file 'data/tribes/buildings/productionsites/barbarians/barracks/init.lua'
14--- data/tribes/buildings/productionsites/barbarians/barracks/init.lua 2017-09-03 07:59:51 +0000
15+++ data/tribes/buildings/productionsites/barbarians/barracks/init.lua 2019-03-13 21:30:30 +0000
16@@ -24,11 +24,15 @@
17 animations = {
18 idle = { -- TODO(GunChleoc): make animations
19 pictures = path.list_files(dirname .. "idle_??.png"),
20- hotspot = { 52, 64 },
21+ hotspot = { 50, 38 },
22+ },
23+ build = { -- TODO(GunChleoc): make animations
24+ pictures = path.list_files(dirname .. "build_??.png"),
25+ hotspot = { 50, 38 },
26 },
27 working = { -- TODO(GunChleoc): make animations
28- pictures = path.list_files(dirname .. "idle_??.png"),
29- hotspot = { 52, 64 },
30+ pictures = path.list_files(dirname .. "working_??.png"),
31+ hotspot = { 50, 38 },
32 }
33 },
34
35
36=== added file 'data/tribes/buildings/productionsites/barbarians/barracks/working_00.png'
37Binary 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
38=== added file 'data/tribes/buildings/productionsites/barbarians/barracks/working_00_pc.png'
39Binary 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
40=== modified file 'data/tribes/buildings/productionsites/empire/barracks/idle_00.png'
41Binary 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
42=== modified file 'data/tribes/buildings/productionsites/empire/barracks/init.lua'
43--- data/tribes/buildings/productionsites/empire/barracks/init.lua 2017-09-03 07:59:51 +0000
44+++ data/tribes/buildings/productionsites/empire/barracks/init.lua 2019-03-13 21:30:30 +0000
45@@ -26,11 +26,11 @@
46 animations = {
47 idle = { -- TODO(GunChleoc): make animations
48 pictures = path.list_files(dirname .. "idle_??.png"),
49- hotspot = { 52, 64 },
50+ hotspot = { 56, 68 },
51 },
52 working = { -- TODO(GunChleoc): make animations
53 pictures = path.list_files(dirname .. "idle_??.png"),
54- hotspot = { 52, 64 },
55+ hotspot = { 56, 68 },
56 }
57 },
58

Subscribers

People subscribed via source and target branches

to status/vote changes: