widelands

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

  1. build_animation
  2. Merge into trunk
Proposed by kaputtnik
Status: Merged
Merged at revision: 7673
Proposed branch: lp:~widelands-dev/widelands/build_animation
Merge into: lp:widelands
Diff against target: 82 lines (+0/-7)
7 files modified
tribes/buildings/trainingsites/barbarians/battlearena/init.lua (+0/-1)
tribes/buildings/trainingsites/barbarians/trainingcamp/init.lua (+0/-1)
tribes/buildings/trainingsites/empire/arena/init.lua (+0/-1)
tribes/buildings/warehouses/atlanteans/port/init.lua (+0/-1)
tribes/buildings/warehouses/barbarians/port/init.lua (+0/-1)
tribes/buildings/warehouses/barbarians/warehouse/init.lua (+0/-1)
tribes/buildings/warehouses/empire/port/init.lua (+0/-1)
To merge this branch: bzr merge lp:~widelands-dev/widelands/build_animation
Reviewer Review Type Date Requested Status
GunChleoc Approve
Review via email: mp+281287@code.launchpad.net

Description of the change

Corrected some init.lua files to fix build animations during gameplay.

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

Code LGTM, will test.

Revision history for this message
GunChleoc (gunchleoc) wrote :

Tested :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tribes/buildings/trainingsites/barbarians/battlearena/init.lua'
2--- tribes/buildings/trainingsites/barbarians/battlearena/init.lua 2015-12-12 20:47:04 +0000
3+++ tribes/buildings/trainingsites/barbarians/battlearena/init.lua 2015-12-23 15:49:43 +0000
4@@ -35,7 +35,6 @@
5 template = "build_??",
6 directory = dirname,
7 hotspot = { 110, 72 },
8- fps = 1
9 },
10 unoccupied = {
11 template = "unoccupied_??",
12
13=== modified file 'tribes/buildings/trainingsites/barbarians/trainingcamp/init.lua'
14--- tribes/buildings/trainingsites/barbarians/trainingcamp/init.lua 2015-12-12 20:47:04 +0000
15+++ tribes/buildings/trainingsites/barbarians/trainingcamp/init.lua 2015-12-23 15:49:43 +0000
16@@ -34,7 +34,6 @@
17 template = "build_??",
18 directory = dirname,
19 hotspot = { 110, 77 },
20- fps = 1
21 },
22 unoccupied = {
23 template = "unoccupied_??",
24
25=== modified file 'tribes/buildings/trainingsites/empire/arena/init.lua'
26--- tribes/buildings/trainingsites/empire/arena/init.lua 2015-12-12 20:47:04 +0000
27+++ tribes/buildings/trainingsites/empire/arena/init.lua 2015-12-23 15:49:43 +0000
28@@ -35,7 +35,6 @@
29 template = "build_??",
30 directory = dirname,
31 hotspot = { 82, 83 },
32- fps = 1
33 }
34 },
35
36
37=== modified file 'tribes/buildings/warehouses/atlanteans/port/init.lua'
38--- tribes/buildings/warehouses/atlanteans/port/init.lua 2015-11-05 12:53:49 +0000
39+++ tribes/buildings/warehouses/atlanteans/port/init.lua 2015-12-23 15:49:43 +0000
40@@ -37,7 +37,6 @@
41 template = "build_??",
42 directory = dirname,
43 hotspot = { 74, 70 },
44- fps = 1
45 }
46 },
47
48
49=== modified file 'tribes/buildings/warehouses/barbarians/port/init.lua'
50--- tribes/buildings/warehouses/barbarians/port/init.lua 2015-11-05 12:53:49 +0000
51+++ tribes/buildings/warehouses/barbarians/port/init.lua 2015-12-23 15:49:43 +0000
52@@ -39,7 +39,6 @@
53 template = "build_??",
54 directory = dirname,
55 hotspot = { 67, 80 },
56- fps = 1
57 }
58 },
59
60
61=== modified file 'tribes/buildings/warehouses/barbarians/warehouse/init.lua'
62--- tribes/buildings/warehouses/barbarians/warehouse/init.lua 2015-11-05 12:53:49 +0000
63+++ tribes/buildings/warehouses/barbarians/warehouse/init.lua 2015-12-23 15:49:43 +0000
64@@ -33,7 +33,6 @@
65 template = "build_??",
66 directory = dirname,
67 hotspot = { 60, 78 },
68- fps = 1
69 }
70 },
71
72
73=== modified file 'tribes/buildings/warehouses/empire/port/init.lua'
74--- tribes/buildings/warehouses/empire/port/init.lua 2015-11-05 12:53:49 +0000
75+++ tribes/buildings/warehouses/empire/port/init.lua 2015-12-23 15:49:43 +0000
76@@ -38,7 +38,6 @@
77 template = "build_??",
78 directory = dirname,
79 hotspot = { 74, 96 },
80- fps = 1
81 }
82 },
83

Subscribers

People subscribed via source and target branches

to status/vote changes: