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

Proposed by kaputtnik
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
kaputtnik (community) Needs Resubmitting
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.
Revision history for this message
kaputtnik (franku) wrote :

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

Revision history for this message
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.

Revision history for this message
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: Needs Resubmitting
Revision history for this message
GunChleoc (gunchleoc) wrote :

Yes, much better! :)

@bunnybot merge

review: Approve
Revision history for this message
kaputtnik (franku) wrote :

Thanks, for testing :)

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'data/tribes/immovables/cornfield/harvested/idle_00.png'
0Binary 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 differ0Binary 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
=== added file 'data/tribes/immovables/cornfield/harvested/idle_01.png'
1Binary 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 differ1Binary 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
=== added file 'data/tribes/immovables/cornfield/harvested/idle_02.png'
2Binary 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 differ2Binary 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
=== added file 'data/tribes/immovables/cornfield/harvested/idle_03.png'
3Binary 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 differ3Binary 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
=== added file 'data/tribes/immovables/cornfield/harvested/idle_04.png'
4Binary 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 differ4Binary 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
=== modified file 'data/tribes/immovables/cornfield/harvested/init.lua'
--- data/tribes/immovables/cornfield/harvested/init.lua 2019-05-28 19:13:37 +0000
+++ data/tribes/immovables/cornfield/harvested/init.lua 2019-08-13 16:48:09 +0000
@@ -18,7 +18,7 @@
18 animations = {18 animations = {
19 idle = {19 idle = {
20 pictures = path.list_files(dirname .. "idle_??.png"),20 pictures = path.list_files(dirname .. "idle_??.png"),
21 hotspot = { 31, 30 },21 hotspot = { 34, 22 },
22 },22 },
23 }23 }
24}24}
2525
=== modified file 'data/tribes/immovables/cornfield/harvested/menu.png'
26Binary 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 differ26Binary 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
=== 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 differ27Binary 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
=== added file 'data/tribes/immovables/cornfield/medium/idle_01.png'
28Binary 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 differ28Binary 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
=== added file 'data/tribes/immovables/cornfield/medium/idle_02.png'
29Binary 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 differ29Binary 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
=== added file 'data/tribes/immovables/cornfield/medium/idle_03.png'
30Binary 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 differ30Binary 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
=== added file 'data/tribes/immovables/cornfield/medium/idle_04.png'
31Binary 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 differ31Binary 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
=== modified file 'data/tribes/immovables/cornfield/medium/init.lua'
--- data/tribes/immovables/cornfield/medium/init.lua 2019-05-28 19:13:37 +0000
+++ data/tribes/immovables/cornfield/medium/init.lua 2019-08-13 16:48:09 +0000
@@ -19,7 +19,7 @@
19 animations = {19 animations = {
20 idle = {20 idle = {
21 pictures = path.list_files(dirname .. "idle_??.png"),21 pictures = path.list_files(dirname .. "idle_??.png"),
22 hotspot = { 31, 35 },22 hotspot = { 34, 34 },
23 },23 },
24 }24 }
25}25}
2626
=== modified file 'data/tribes/immovables/cornfield/medium/menu.png'
27Binary 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 differ27Binary 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
=== modified file 'data/tribes/immovables/cornfield/ripe/idle_00.png'
28Binary 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 differ28Binary 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
=== added file 'data/tribes/immovables/cornfield/ripe/idle_01.png'
29Binary 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 differ29Binary 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
=== added file 'data/tribes/immovables/cornfield/ripe/idle_02.png'
30Binary 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 differ30Binary 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
=== added file 'data/tribes/immovables/cornfield/ripe/idle_03.png'
31Binary 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 differ31Binary 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
=== added file 'data/tribes/immovables/cornfield/ripe/idle_04.png'
32Binary 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 differ32Binary 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
=== modified file 'data/tribes/immovables/cornfield/ripe/init.lua'
--- data/tribes/immovables/cornfield/ripe/init.lua 2019-05-28 19:13:37 +0000
+++ data/tribes/immovables/cornfield/ripe/init.lua 2019-08-13 16:48:09 +0000
@@ -22,7 +22,7 @@
22 animations = {22 animations = {
23 idle = {23 idle = {
24 pictures = path.list_files(dirname .. "idle_??.png"),24 pictures = path.list_files(dirname .. "idle_??.png"),
25 hotspot = { 31, 41 },25 hotspot = { 34, 39 },
26 },26 },
27 }27 }
28}28}
2929
=== modified file 'data/tribes/immovables/cornfield/ripe/menu.png'
30Binary 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 differ30Binary 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
=== modified file 'data/tribes/immovables/cornfield/small/idle_00.png'
31Binary 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 differ31Binary 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
=== added file 'data/tribes/immovables/cornfield/small/idle_01.png'
32Binary 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 differ32Binary 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
=== added file 'data/tribes/immovables/cornfield/small/idle_02.png'
33Binary 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 differ33Binary 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
=== added file 'data/tribes/immovables/cornfield/small/idle_03.png'
34Binary 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 differ34Binary 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
=== added file 'data/tribes/immovables/cornfield/small/idle_04.png'
35Binary 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 differ35Binary 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
=== modified file 'data/tribes/immovables/cornfield/small/init.lua'
--- data/tribes/immovables/cornfield/small/init.lua 2019-05-28 19:13:37 +0000
+++ data/tribes/immovables/cornfield/small/init.lua 2019-08-13 16:48:09 +0000
@@ -19,7 +19,7 @@
19 animations = {19 animations = {
20 idle = {20 idle = {
21 pictures = path.list_files(dirname .. "idle_??.png"),21 pictures = path.list_files(dirname .. "idle_??.png"),
22 hotspot = { 35, 34 },22 hotspot = { 34, 24 },
23 },23 },
24 }24 }
25}25}
2626
=== modified file 'data/tribes/immovables/cornfield/small/menu.png'
27Binary 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 differ27Binary 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
=== modified file 'data/tribes/immovables/cornfield/tiny/idle_00.png'
28Binary 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 differ28Binary 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
=== added file 'data/tribes/immovables/cornfield/tiny/idle_01.png'
29Binary 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 differ29Binary 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
=== added file 'data/tribes/immovables/cornfield/tiny/idle_02.png'
30Binary 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 differ30Binary 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
=== added file 'data/tribes/immovables/cornfield/tiny/idle_03.png'
31Binary 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 differ31Binary 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
=== added file 'data/tribes/immovables/cornfield/tiny/idle_04.png'
32Binary 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 differ32Binary 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
=== modified file 'data/tribes/immovables/cornfield/tiny/init.lua'
--- data/tribes/immovables/cornfield/tiny/init.lua 2019-05-28 19:13:37 +0000
+++ data/tribes/immovables/cornfield/tiny/init.lua 2019-08-13 16:48:09 +0000
@@ -19,7 +19,7 @@
19 animations = {19 animations = {
20 idle = {20 idle = {
21 pictures = path.list_files(dirname .. "idle_??.png"),21 pictures = path.list_files(dirname .. "idle_??.png"),
22 hotspot = { 35, 34 },22 hotspot = { 34, 22 },
23 },23 },
24 }24 }
25}25}
2626
=== modified file 'data/tribes/immovables/cornfield/tiny/menu.png'
27Binary 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 differ27Binary 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

Subscribers

People subscribed via source and target branches

to status/vote changes: