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

Proposed by kaputtnik on 2019-08-12
Status: Merged
Merged at revision: 9181
Proposed branch: lp:~widelands-dev/widelands/atlanteans_cornfield
Merge into: lp:widelands
Diff against target: 125 lines (+5/-5)
5 files modified
data/tribes/immovables/cornfield/harvested/init.lua (+1/-1)
data/tribes/immovables/cornfield/medium/init.lua (+1/-1)
data/tribes/immovables/cornfield/ripe/init.lua (+1/-1)
data/tribes/immovables/cornfield/small/init.lua (+1/-1)
data/tribes/immovables/cornfield/tiny/init.lua (+1/-1)
To merge this branch: bzr merge lp:~widelands-dev/widelands/atlanteans_cornfield
Reviewer Review Type Date Requested Status
GunChleoc Approve on 2019-08-13
kaputtnik (community) Resubmit on 2019-08-13
Review via email: mp+371209@code.launchpad.net

Commit message

New cornfield images for atlanteans by fraang

Description of the change

See: https://www.widelands.org/forum/topic/4406/

I have created the menu.png from idle_00.png by resizing.

To post a comment you must log in.
kaputtnik (franku) wrote :

Just a reminder for me: Don't forget to update the media repo in case this get merged.

bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 5318. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/570927934.
Appveyor build 5090. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_atlanteans_cornfield-5090.

9178. By kaputtnik on 2019-08-13

fixed hotspots

kaputtnik (franku) wrote :

Sorry didn't applied the init.lua files sent by fraang, because they have changed in the meantime.

The values are now taken from fraang, but i edited the main init.lua files from trunk. Looks good now imho.

fraang had also changed the animate program for cornfield_ripe and applied a value of 45000. The result was that some ripe filed vanished without harvesting. So i leave the value from trunk and it seems to be correct.

review: Resubmit
GunChleoc (gunchleoc) wrote :

Yes, much better! :)

@bunnybot merge

review: Approve
kaputtnik (franku) wrote :

Thanks, for testing :)

Updated the media branch with the blend file and fraangs license.

9179. By kaputtnik on 2019-08-13

merged trunk

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/tribes/immovables/cornfield/harvested/idle_00.png'
2Binary files data/tribes/immovables/cornfield/harvested/idle_00.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/cornfield/harvested/idle_00.png 2019-08-13 16:48:09 +0000 differ
3=== added file 'data/tribes/immovables/cornfield/harvested/idle_01.png'
4Binary files data/tribes/immovables/cornfield/harvested/idle_01.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/cornfield/harvested/idle_01.png 2019-08-13 16:48:09 +0000 differ
5=== added file 'data/tribes/immovables/cornfield/harvested/idle_02.png'
6Binary files data/tribes/immovables/cornfield/harvested/idle_02.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/cornfield/harvested/idle_02.png 2019-08-13 16:48:09 +0000 differ
7=== added file 'data/tribes/immovables/cornfield/harvested/idle_03.png'
8Binary files data/tribes/immovables/cornfield/harvested/idle_03.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/cornfield/harvested/idle_03.png 2019-08-13 16:48:09 +0000 differ
9=== added file 'data/tribes/immovables/cornfield/harvested/idle_04.png'
10Binary files data/tribes/immovables/cornfield/harvested/idle_04.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/cornfield/harvested/idle_04.png 2019-08-13 16:48:09 +0000 differ
11=== modified file 'data/tribes/immovables/cornfield/harvested/init.lua'
12--- data/tribes/immovables/cornfield/harvested/init.lua 2019-05-28 19:13:37 +0000
13+++ data/tribes/immovables/cornfield/harvested/init.lua 2019-08-13 16:48:09 +0000
14@@ -18,7 +18,7 @@
15 animations = {
16 idle = {
17 pictures = path.list_files(dirname .. "idle_??.png"),
18- hotspot = { 31, 30 },
19+ hotspot = { 34, 22 },
20 },
21 }
22 }
23
24=== modified file 'data/tribes/immovables/cornfield/harvested/menu.png'
25Binary files data/tribes/immovables/cornfield/harvested/menu.png 2019-05-29 09:02:33 +0000 and data/tribes/immovables/cornfield/harvested/menu.png 2019-08-13 16:48:09 +0000 differ
26=== modified file 'data/tribes/immovables/cornfield/medium/idle_00.png'
27Binary files data/tribes/immovables/cornfield/medium/idle_00.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/cornfield/medium/idle_00.png 2019-08-13 16:48:09 +0000 differ
28=== added file 'data/tribes/immovables/cornfield/medium/idle_01.png'
29Binary files data/tribes/immovables/cornfield/medium/idle_01.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/cornfield/medium/idle_01.png 2019-08-13 16:48:09 +0000 differ
30=== added file 'data/tribes/immovables/cornfield/medium/idle_02.png'
31Binary files data/tribes/immovables/cornfield/medium/idle_02.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/cornfield/medium/idle_02.png 2019-08-13 16:48:09 +0000 differ
32=== added file 'data/tribes/immovables/cornfield/medium/idle_03.png'
33Binary files data/tribes/immovables/cornfield/medium/idle_03.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/cornfield/medium/idle_03.png 2019-08-13 16:48:09 +0000 differ
34=== added file 'data/tribes/immovables/cornfield/medium/idle_04.png'
35Binary files data/tribes/immovables/cornfield/medium/idle_04.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/cornfield/medium/idle_04.png 2019-08-13 16:48:09 +0000 differ
36=== modified file 'data/tribes/immovables/cornfield/medium/init.lua'
37--- data/tribes/immovables/cornfield/medium/init.lua 2019-05-28 19:13:37 +0000
38+++ data/tribes/immovables/cornfield/medium/init.lua 2019-08-13 16:48:09 +0000
39@@ -19,7 +19,7 @@
40 animations = {
41 idle = {
42 pictures = path.list_files(dirname .. "idle_??.png"),
43- hotspot = { 31, 35 },
44+ hotspot = { 34, 34 },
45 },
46 }
47 }
48
49=== modified file 'data/tribes/immovables/cornfield/medium/menu.png'
50Binary files data/tribes/immovables/cornfield/medium/menu.png 2019-05-29 09:02:33 +0000 and data/tribes/immovables/cornfield/medium/menu.png 2019-08-13 16:48:09 +0000 differ
51=== modified file 'data/tribes/immovables/cornfield/ripe/idle_00.png'
52Binary files data/tribes/immovables/cornfield/ripe/idle_00.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/cornfield/ripe/idle_00.png 2019-08-13 16:48:09 +0000 differ
53=== added file 'data/tribes/immovables/cornfield/ripe/idle_01.png'
54Binary files data/tribes/immovables/cornfield/ripe/idle_01.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/cornfield/ripe/idle_01.png 2019-08-13 16:48:09 +0000 differ
55=== added file 'data/tribes/immovables/cornfield/ripe/idle_02.png'
56Binary files data/tribes/immovables/cornfield/ripe/idle_02.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/cornfield/ripe/idle_02.png 2019-08-13 16:48:09 +0000 differ
57=== added file 'data/tribes/immovables/cornfield/ripe/idle_03.png'
58Binary files data/tribes/immovables/cornfield/ripe/idle_03.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/cornfield/ripe/idle_03.png 2019-08-13 16:48:09 +0000 differ
59=== added file 'data/tribes/immovables/cornfield/ripe/idle_04.png'
60Binary files data/tribes/immovables/cornfield/ripe/idle_04.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/cornfield/ripe/idle_04.png 2019-08-13 16:48:09 +0000 differ
61=== modified file 'data/tribes/immovables/cornfield/ripe/init.lua'
62--- data/tribes/immovables/cornfield/ripe/init.lua 2019-05-28 19:13:37 +0000
63+++ data/tribes/immovables/cornfield/ripe/init.lua 2019-08-13 16:48:09 +0000
64@@ -22,7 +22,7 @@
65 animations = {
66 idle = {
67 pictures = path.list_files(dirname .. "idle_??.png"),
68- hotspot = { 31, 41 },
69+ hotspot = { 34, 39 },
70 },
71 }
72 }
73
74=== modified file 'data/tribes/immovables/cornfield/ripe/menu.png'
75Binary files data/tribes/immovables/cornfield/ripe/menu.png 2019-05-29 09:02:33 +0000 and data/tribes/immovables/cornfield/ripe/menu.png 2019-08-13 16:48:09 +0000 differ
76=== modified file 'data/tribes/immovables/cornfield/small/idle_00.png'
77Binary files data/tribes/immovables/cornfield/small/idle_00.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/cornfield/small/idle_00.png 2019-08-13 16:48:09 +0000 differ
78=== added file 'data/tribes/immovables/cornfield/small/idle_01.png'
79Binary files data/tribes/immovables/cornfield/small/idle_01.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/cornfield/small/idle_01.png 2019-08-13 16:48:09 +0000 differ
80=== added file 'data/tribes/immovables/cornfield/small/idle_02.png'
81Binary files data/tribes/immovables/cornfield/small/idle_02.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/cornfield/small/idle_02.png 2019-08-13 16:48:09 +0000 differ
82=== added file 'data/tribes/immovables/cornfield/small/idle_03.png'
83Binary files data/tribes/immovables/cornfield/small/idle_03.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/cornfield/small/idle_03.png 2019-08-13 16:48:09 +0000 differ
84=== added file 'data/tribes/immovables/cornfield/small/idle_04.png'
85Binary files data/tribes/immovables/cornfield/small/idle_04.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/cornfield/small/idle_04.png 2019-08-13 16:48:09 +0000 differ
86=== modified file 'data/tribes/immovables/cornfield/small/init.lua'
87--- data/tribes/immovables/cornfield/small/init.lua 2019-05-28 19:13:37 +0000
88+++ data/tribes/immovables/cornfield/small/init.lua 2019-08-13 16:48:09 +0000
89@@ -19,7 +19,7 @@
90 animations = {
91 idle = {
92 pictures = path.list_files(dirname .. "idle_??.png"),
93- hotspot = { 35, 34 },
94+ hotspot = { 34, 24 },
95 },
96 }
97 }
98
99=== modified file 'data/tribes/immovables/cornfield/small/menu.png'
100Binary files data/tribes/immovables/cornfield/small/menu.png 2019-05-29 09:02:33 +0000 and data/tribes/immovables/cornfield/small/menu.png 2019-08-13 16:48:09 +0000 differ
101=== modified file 'data/tribes/immovables/cornfield/tiny/idle_00.png'
102Binary files data/tribes/immovables/cornfield/tiny/idle_00.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/cornfield/tiny/idle_00.png 2019-08-13 16:48:09 +0000 differ
103=== added file 'data/tribes/immovables/cornfield/tiny/idle_01.png'
104Binary files data/tribes/immovables/cornfield/tiny/idle_01.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/cornfield/tiny/idle_01.png 2019-08-13 16:48:09 +0000 differ
105=== added file 'data/tribes/immovables/cornfield/tiny/idle_02.png'
106Binary files data/tribes/immovables/cornfield/tiny/idle_02.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/cornfield/tiny/idle_02.png 2019-08-13 16:48:09 +0000 differ
107=== added file 'data/tribes/immovables/cornfield/tiny/idle_03.png'
108Binary files data/tribes/immovables/cornfield/tiny/idle_03.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/cornfield/tiny/idle_03.png 2019-08-13 16:48:09 +0000 differ
109=== added file 'data/tribes/immovables/cornfield/tiny/idle_04.png'
110Binary files data/tribes/immovables/cornfield/tiny/idle_04.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/cornfield/tiny/idle_04.png 2019-08-13 16:48:09 +0000 differ
111=== modified file 'data/tribes/immovables/cornfield/tiny/init.lua'
112--- data/tribes/immovables/cornfield/tiny/init.lua 2019-05-28 19:13:37 +0000
113+++ data/tribes/immovables/cornfield/tiny/init.lua 2019-08-13 16:48:09 +0000
114@@ -19,7 +19,7 @@
115 animations = {
116 idle = {
117 pictures = path.list_files(dirname .. "idle_??.png"),
118- hotspot = { 35, 34 },
119+ hotspot = { 34, 22 },
120 },
121 }
122 }
123
124=== modified file 'data/tribes/immovables/cornfield/tiny/menu.png'
125Binary files data/tribes/immovables/cornfield/tiny/menu.png 2019-05-29 09:02:33 +0000 and data/tribes/immovables/cornfield/tiny/menu.png 2019-08-13 16:48:09 +0000 differ