widelands

Merge lp:~widelands-dev/widelands/bug-1659133-animation-scaling into lp:widelands

  1. bug-1659133-animation-scaling
  2. Merge into trunk
Proposed by GunChleoc
Status: Merged
Merged at revision: 8726
Proposed branch: lp:~widelands-dev/widelands/bug-1659133-animation-scaling
Merge into: lp:widelands
Diff against target: 58 lines (+1/-5)
2 files modified
data/tribes/buildings/productionsites/barbarians/shipyard/init.lua (+0/-2)
data/tribes/buildings/warehouses/barbarians/warehouse/init.lua (+1/-3)
To merge this branch: bzr merge lp:~widelands-dev/widelands/bug-1659133-animation-scaling
Reviewer Review Type Date Requested Status
Klaus Halfmann review, compile, tesplay, regression tests Approve
Review via email: mp+346914@code.launchpad.net

Commit message

Removed scaled animations for Barbarian shipyard and warehouse

Description of the change

The scaling feature will be replaced by mipmaps in Build 21, so we can get rid of these test cases in trunk now

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

Continuous integration builds have changed state:

Travis build 3556. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/384303114.
Appveyor build 3360. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1659133_animation_scaling-3360.

Revision history for this message
Klaus Halfmann (klaus-halfmann) wrote :

Whatever you did it will do what you intend but:
The original bug is about Shipyards?
We do this for R20 as cleanup but its a preparation for R1, correct?
Is there some doc what and how we want to do in R21?
Will there more changes along this line?

https://en.wikipedia.org/wiki/Mipmap.

I will play som barbarians now, but dont expect any differences.

Revision history for this message
Klaus Halfmann (klaus-halfmann) wrote :

Played as Barabarian once, did not notice any differences.
Ran 41 tests in 1081.805s.

@bunnybot merge

review: Approve (review, compile, tesplay, regression tests)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/tribes/buildings/productionsites/barbarians/shipyard/idle_00.png'
2Binary 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
3=== modified file 'data/tribes/buildings/productionsites/barbarians/shipyard/idle_00_pc.png'
4Binary 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
5=== modified file 'data/tribes/buildings/productionsites/barbarians/shipyard/init.lua'
6--- data/tribes/buildings/productionsites/barbarians/shipyard/init.lua 2017-09-03 07:59:51 +0000
7+++ data/tribes/buildings/productionsites/barbarians/shipyard/init.lua 2018-05-27 06:52:17 +0000
8@@ -7,7 +7,6 @@
9 descname = pgettext("barbarians_building", "Shipyard"),
10 helptext_script = dirname .. "helptexts.lua",
11 icon = dirname .. "menu.png",
12- representative_image = dirname .. "representative_image.png",
13 size = "medium",
14 needs_seafaring = true,
15
16@@ -27,7 +26,6 @@
17 idle = {
18 pictures = path.list_files(dirname .. "idle_??.png"),
19 hotspot = { 62, 48 },
20- scale = 3.26
21 },
22 build = {
23 pictures = path.list_files(dirname .. "build_??.png"),
24
25=== removed file 'data/tribes/buildings/productionsites/barbarians/shipyard/representative_image.png'
26Binary 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
27=== removed file 'data/tribes/buildings/productionsites/barbarians/shipyard/representative_image_pc.png'
28Binary 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
29=== modified file 'data/tribes/buildings/warehouses/barbarians/warehouse/idle_00.png'
30Binary 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
31=== modified file 'data/tribes/buildings/warehouses/barbarians/warehouse/idle_00_pc.png'
32Binary 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
33=== modified file 'data/tribes/buildings/warehouses/barbarians/warehouse/init.lua'
34--- data/tribes/buildings/warehouses/barbarians/warehouse/init.lua 2016-11-03 08:07:28 +0000
35+++ data/tribes/buildings/warehouses/barbarians/warehouse/init.lua 2018-05-27 06:52:17 +0000
36@@ -7,7 +7,6 @@
37 descname = pgettext("barbarians_building", "Warehouse"),
38 helptext_script = dirname .. "helptexts.lua",
39 icon = dirname .. "menu.png",
40- representative_image = dirname .. "representative_image.png",
41 size = "medium",
42
43 buildcost = {
44@@ -27,8 +26,7 @@
45 animations = {
46 idle = {
47 pictures = path.list_files(dirname .. "idle_??.png"),
48- hotspot = { 60, 78 },
49- scale = 3.62
50+ hotspot = { 60, 78 }
51 },
52 build = {
53 pictures = path.list_files(dirname .. "build_??.png"),
54
55=== removed file 'data/tribes/buildings/warehouses/barbarians/warehouse/representative_image.png'
56Binary 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
57=== removed file 'data/tribes/buildings/warehouses/barbarians/warehouse/representative_image_pc.png'
58Binary 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

Subscribers

People subscribed via source and target branches

to status/vote changes: