widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1659133-animation-scaling into lp:widelands.

Commit message:
Removed scaled animations for Barbarian shipyard and warehouse

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1659133 in widelands: "Working animation of barbarians shipyard is sharper and bigger"
  https://bugs.launchpad.net/widelands/+bug/1659133

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1659133-animation-scaling/+merge/346914

The scaling feature will be replaced by mipmaps in Build 21, so we can get rid of these test cases in trunk now
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1659133-animation-scaling into lp:widelands.

=== modified file 'data/tribes/buildings/productionsites/barbarians/shipyard/idle_00.png'
Binary files data/tribes/buildings/productionsites/barbarians/shipyard/idle_00.png	2016-11-02 09:21:54 +0000 and data/tribes/buildings/productionsites/barbarians/shipyard/idle_00.png	2018-05-27 06:52:17 +0000 differ
=== modified file 'data/tribes/buildings/productionsites/barbarians/shipyard/idle_00_pc.png'
Binary files data/tribes/buildings/productionsites/barbarians/shipyard/idle_00_pc.png	2016-11-02 09:21:54 +0000 and data/tribes/buildings/productionsites/barbarians/shipyard/idle_00_pc.png	2018-05-27 06:52:17 +0000 differ
=== modified file 'data/tribes/buildings/productionsites/barbarians/shipyard/init.lua'
--- data/tribes/buildings/productionsites/barbarians/shipyard/init.lua	2017-09-03 07:59:51 +0000
+++ data/tribes/buildings/productionsites/barbarians/shipyard/init.lua	2018-05-27 06:52:17 +0000
@@ -7,7 +7,6 @@
    descname = pgettext("barbarians_building", "Shipyard"),
    helptext_script = dirname .. "helptexts.lua",
    icon = dirname .. "menu.png",
-   representative_image = dirname .. "representative_image.png",
    size = "medium",
    needs_seafaring = true,
 
@@ -27,7 +26,6 @@
       idle = {
          pictures = path.list_files(dirname .. "idle_??.png"),
          hotspot = { 62, 48 },
-         scale = 3.26
       },
       build = {
          pictures = path.list_files(dirname .. "build_??.png"),

=== removed file 'data/tribes/buildings/productionsites/barbarians/shipyard/representative_image.png'
Binary files data/tribes/buildings/productionsites/barbarians/shipyard/representative_image.png	2016-11-03 08:07:28 +0000 and data/tribes/buildings/productionsites/barbarians/shipyard/representative_image.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/tribes/buildings/productionsites/barbarians/shipyard/representative_image_pc.png'
Binary files data/tribes/buildings/productionsites/barbarians/shipyard/representative_image_pc.png	2017-02-19 18:07:20 +0000 and data/tribes/buildings/productionsites/barbarians/shipyard/representative_image_pc.png	1970-01-01 00:00:00 +0000 differ
=== modified file 'data/tribes/buildings/warehouses/barbarians/warehouse/idle_00.png'
Binary files data/tribes/buildings/warehouses/barbarians/warehouse/idle_00.png	2016-11-02 09:21:54 +0000 and data/tribes/buildings/warehouses/barbarians/warehouse/idle_00.png	2018-05-27 06:52:17 +0000 differ
=== modified file 'data/tribes/buildings/warehouses/barbarians/warehouse/idle_00_pc.png'
Binary files data/tribes/buildings/warehouses/barbarians/warehouse/idle_00_pc.png	2016-11-02 09:21:54 +0000 and data/tribes/buildings/warehouses/barbarians/warehouse/idle_00_pc.png	2018-05-27 06:52:17 +0000 differ
=== modified file 'data/tribes/buildings/warehouses/barbarians/warehouse/init.lua'
--- data/tribes/buildings/warehouses/barbarians/warehouse/init.lua	2016-11-03 08:07:28 +0000
+++ data/tribes/buildings/warehouses/barbarians/warehouse/init.lua	2018-05-27 06:52:17 +0000
@@ -7,7 +7,6 @@
    descname = pgettext("barbarians_building", "Warehouse"),
    helptext_script = dirname .. "helptexts.lua",
    icon = dirname .. "menu.png",
-   representative_image = dirname .. "representative_image.png",
    size = "medium",
 
    buildcost = {
@@ -27,8 +26,7 @@
    animations = {
       idle = {
          pictures = path.list_files(dirname .. "idle_??.png"),
-         hotspot = { 60, 78 },
-         scale = 3.62
+         hotspot = { 60, 78 }
       },
       build = {
          pictures = path.list_files(dirname .. "build_??.png"),

=== removed file 'data/tribes/buildings/warehouses/barbarians/warehouse/representative_image.png'
Binary files data/tribes/buildings/warehouses/barbarians/warehouse/representative_image.png	2016-11-03 08:07:28 +0000 and data/tribes/buildings/warehouses/barbarians/warehouse/representative_image.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/tribes/buildings/warehouses/barbarians/warehouse/representative_image_pc.png'
Binary files data/tribes/buildings/warehouses/barbarians/warehouse/representative_image_pc.png	2017-02-19 18:07:20 +0000 and data/tribes/buildings/warehouses/barbarians/warehouse/representative_image_pc.png	1970-01-01 00:00:00 +0000 differ