Merge lp:~widelands-dev/widelands/atlanteans_cornfield into lp:widelands
- atlanteans_cornfield
- Merge into trunk
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 |
Related bugs: |
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:/
I have created the menu.png from idle_00.png by resizing.
kaputtnik (franku) wrote : | # |
bunnybot (widelandsofficial) wrote : | # |
Continuous integration builds have changed state:
Travis build 5318. State: passed. Details: https:/
Appveyor build 5090. State: success. Details: https:/
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.
GunChleoc (gunchleoc) wrote : | # |
Yes, much better! :)
@bunnybot merge
kaputtnik (franku) wrote : | # |
Thanks, for testing :)
Updated the media branch with the blend file and fraangs license.
Preview Diff
1 | === modified file 'data/tribes/immovables/cornfield/harvested/idle_00.png' | |||
2 | 0 | Binary 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 | 0 | Binary 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' | |||
4 | 1 | Binary 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 | 1 | Binary 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' | |||
6 | 2 | Binary 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 | 2 | Binary 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' | |||
8 | 3 | Binary 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 | 3 | Binary 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' | |||
10 | 4 | Binary 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 | 4 | Binary 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 | 18 | animations = { | 18 | animations = { |
16 | 19 | idle = { | 19 | idle = { |
17 | 20 | pictures = path.list_files(dirname .. "idle_??.png"), | 20 | pictures = path.list_files(dirname .. "idle_??.png"), |
19 | 21 | hotspot = { 31, 30 }, | 21 | hotspot = { 34, 22 }, |
20 | 22 | }, | 22 | }, |
21 | 23 | } | 23 | } |
22 | 24 | } | 24 | } |
23 | 25 | 25 | ||
24 | === modified file 'data/tribes/immovables/cornfield/harvested/menu.png' | |||
25 | 26 | Binary 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 | Binary 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' | |||
27 | 27 | Binary 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 | 27 | Binary 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' | |||
29 | 28 | Binary 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 | 28 | Binary 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' | |||
31 | 29 | Binary 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 | 29 | Binary 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' | |||
33 | 30 | Binary 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 | 30 | Binary 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' | |||
35 | 31 | Binary 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 | 31 | Binary 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 | 19 | animations = { | 19 | animations = { |
41 | 20 | idle = { | 20 | idle = { |
42 | 21 | pictures = path.list_files(dirname .. "idle_??.png"), | 21 | pictures = path.list_files(dirname .. "idle_??.png"), |
44 | 22 | hotspot = { 31, 35 }, | 22 | hotspot = { 34, 34 }, |
45 | 23 | }, | 23 | }, |
46 | 24 | } | 24 | } |
47 | 25 | } | 25 | } |
48 | 26 | 26 | ||
49 | === modified file 'data/tribes/immovables/cornfield/medium/menu.png' | |||
50 | 27 | Binary 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 | 27 | Binary 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' | |||
52 | 28 | Binary 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 | 28 | Binary 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' | |||
54 | 29 | Binary 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 | 29 | Binary 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' | |||
56 | 30 | Binary 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 | 30 | Binary 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' | |||
58 | 31 | Binary 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 | 31 | Binary 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' | |||
60 | 32 | Binary 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 | 32 | Binary 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 | 22 | animations = { | 22 | animations = { |
66 | 23 | idle = { | 23 | idle = { |
67 | 24 | pictures = path.list_files(dirname .. "idle_??.png"), | 24 | pictures = path.list_files(dirname .. "idle_??.png"), |
69 | 25 | hotspot = { 31, 41 }, | 25 | hotspot = { 34, 39 }, |
70 | 26 | }, | 26 | }, |
71 | 27 | } | 27 | } |
72 | 28 | } | 28 | } |
73 | 29 | 29 | ||
74 | === modified file 'data/tribes/immovables/cornfield/ripe/menu.png' | |||
75 | 30 | Binary 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 | 30 | Binary 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' | |||
77 | 31 | Binary 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 | 31 | Binary 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' | |||
79 | 32 | Binary 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 | 32 | Binary 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' | |||
81 | 33 | Binary 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 | 33 | Binary 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' | |||
83 | 34 | Binary 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 | 34 | Binary 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' | |||
85 | 35 | Binary 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 | 35 | Binary 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 | 19 | animations = { | 19 | animations = { |
91 | 20 | idle = { | 20 | idle = { |
92 | 21 | pictures = path.list_files(dirname .. "idle_??.png"), | 21 | pictures = path.list_files(dirname .. "idle_??.png"), |
94 | 22 | hotspot = { 35, 34 }, | 22 | hotspot = { 34, 24 }, |
95 | 23 | }, | 23 | }, |
96 | 24 | } | 24 | } |
97 | 25 | } | 25 | } |
98 | 26 | 26 | ||
99 | === modified file 'data/tribes/immovables/cornfield/small/menu.png' | |||
100 | 27 | Binary 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 | 27 | Binary 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' | |||
102 | 28 | Binary 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 | 28 | Binary 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' | |||
104 | 29 | Binary 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 | 29 | Binary 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' | |||
106 | 30 | Binary 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 | 30 | Binary 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' | |||
108 | 31 | Binary 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 | 31 | Binary 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' | |||
110 | 32 | Binary 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 | 32 | Binary 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 | 19 | animations = { | 19 | animations = { |
116 | 20 | idle = { | 20 | idle = { |
117 | 21 | pictures = path.list_files(dirname .. "idle_??.png"), | 21 | pictures = path.list_files(dirname .. "idle_??.png"), |
119 | 22 | hotspot = { 35, 34 }, | 22 | hotspot = { 34, 22 }, |
120 | 23 | }, | 23 | }, |
121 | 24 | } | 24 | } |
122 | 25 | } | 25 | } |
123 | 26 | 26 | ||
124 | === modified file 'data/tribes/immovables/cornfield/tiny/menu.png' | |||
125 | 27 | Binary 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 | 27 | Binary 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 |
Just a reminder for me: Don't forget to update the media repo in case this get merged.