← Back to team overview

widelands-dev team mailing list archive

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

 

kaputtnik has proposed merging lp:~widelands-dev/widelands/build_animation into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1527368 in widelands: "Some buildings have lost build animations; Add check for lua tables"
  https://bugs.launchpad.net/widelands/+bug/1527368

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/build_animation/+merge/281287

Corrected some init.lua files to fix build animations during gameplay.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/build_animation into lp:widelands.
=== modified file 'tribes/buildings/trainingsites/barbarians/battlearena/init.lua'
--- tribes/buildings/trainingsites/barbarians/battlearena/init.lua	2015-12-12 20:47:04 +0000
+++ tribes/buildings/trainingsites/barbarians/battlearena/init.lua	2015-12-23 13:06:35 +0000
@@ -35,7 +35,6 @@
          template = "build_??",
          directory = dirname,
          hotspot = { 110, 72 },
-         fps = 1
       },
       unoccupied = {
          template = "unoccupied_??",

=== modified file 'tribes/buildings/trainingsites/barbarians/trainingcamp/init.lua'
--- tribes/buildings/trainingsites/barbarians/trainingcamp/init.lua	2015-12-12 20:47:04 +0000
+++ tribes/buildings/trainingsites/barbarians/trainingcamp/init.lua	2015-12-23 13:06:35 +0000
@@ -34,7 +34,6 @@
          template = "build_??",
          directory = dirname,
          hotspot = { 110, 77 },
-         fps = 1
       },
       unoccupied = {
          template = "unoccupied_??",

=== modified file 'tribes/buildings/trainingsites/empire/arena/init.lua'
--- tribes/buildings/trainingsites/empire/arena/init.lua	2015-12-12 20:47:04 +0000
+++ tribes/buildings/trainingsites/empire/arena/init.lua	2015-12-23 13:06:35 +0000
@@ -35,7 +35,6 @@
          template = "build_??",
          directory = dirname,
          hotspot = { 82, 83 },
-         fps = 1
       }
    },
 

=== modified file 'tribes/buildings/warehouses/atlanteans/port/init.lua'
--- tribes/buildings/warehouses/atlanteans/port/init.lua	2015-11-05 12:53:49 +0000
+++ tribes/buildings/warehouses/atlanteans/port/init.lua	2015-12-23 13:06:35 +0000
@@ -37,7 +37,6 @@
          template = "build_??",
          directory = dirname,
          hotspot = { 74, 70 },
-         fps = 1
       }
    },
 

=== modified file 'tribes/buildings/warehouses/barbarians/port/init.lua'
--- tribes/buildings/warehouses/barbarians/port/init.lua	2015-11-05 12:53:49 +0000
+++ tribes/buildings/warehouses/barbarians/port/init.lua	2015-12-23 13:06:35 +0000
@@ -39,7 +39,6 @@
          template = "build_??",
          directory = dirname,
          hotspot = { 67, 80 },
-         fps = 1
       }
    },
 

=== modified file 'tribes/buildings/warehouses/barbarians/warehouse/init.lua'
--- tribes/buildings/warehouses/barbarians/warehouse/init.lua	2015-11-05 12:53:49 +0000
+++ tribes/buildings/warehouses/barbarians/warehouse/init.lua	2015-12-23 13:06:35 +0000
@@ -33,7 +33,6 @@
          template = "build_??",
          directory = dirname,
          hotspot = { 60, 78 },
-         fps = 1
       }
    },
 

=== modified file 'tribes/buildings/warehouses/empire/port/init.lua'
--- tribes/buildings/warehouses/empire/port/init.lua	2015-11-05 12:53:49 +0000
+++ tribes/buildings/warehouses/empire/port/init.lua	2015-12-23 13:06:35 +0000
@@ -38,7 +38,6 @@
          template = "build_??",
          directory = dirname,
          hotspot = { 74, 96 },
-         fps = 1
       }
    },
 


Follow ups