widelands

Merge lp:~widelands-dev/widelands/new-wheatfield-graphics-by-fraang into lp:widelands

  1. new-wheatfield-graphics-by-fraang
  2. Merge into trunk
Proposed by GunChleoc
Status: Merged
Merged at revision: 8925
Proposed branch: lp:~widelands-dev/widelands/new-wheatfield-graphics-by-fraang
Merge into: lp:widelands
Diff against target: 114 lines (+5/-5)
5 files modified
data/tribes/immovables/field_harvested/init.lua (+1/-1)
data/tribes/immovables/field_medium/init.lua (+1/-1)
data/tribes/immovables/field_ripe/init.lua (+1/-1)
data/tribes/immovables/field_small/init.lua (+1/-1)
data/tribes/immovables/field_tiny/init.lua (+1/-1)
To merge this branch: bzr merge lp:~widelands-dev/widelands/new-wheatfield-graphics-by-fraang
Reviewer Review Type Date Requested Status
Widelands Developers Pending
Review via email: mp+358893@code.launchpad.net

Commit message

New wheatfield graphics by fraang

To post a comment you must log in.
Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 4234. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/455846563.
Appveyor build 4030. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_new_wheatfield_graphics_by_fraang-4030.

Revision history for this message
GunChleoc (gunchleoc) wrote :

@bunnybot merge

Preview Diff

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

Subscribers

People subscribed via source and target branches

to status/vote changes: