widelands

Merge lp://qastaging/~widelands-dev/widelands/immovables_icon_wrong_path_menu into lp://qastaging/widelands

  1. immovables_icon_wrong_path_menu
  2. Merge into trunk
Proposed by Toni Förster
Status: Merged
Merged at revision: 9144
Proposed branch: lp://qastaging/~widelands-dev/widelands/immovables_icon_wrong_path_menu
Merge into: lp://qastaging/widelands
Diff against target: 884 lines (+71/-2)
46 files modified
data/tribes/immovables/ashes/init.lua (+2/-0)
data/tribes/immovables/barleyfield/harvested/init.lua (+1/-0)
data/tribes/immovables/barleyfield/medium/init.lua (+1/-0)
data/tribes/immovables/barleyfield/ripe/init.lua (+1/-0)
data/tribes/immovables/barleyfield/small/init.lua (+1/-0)
data/tribes/immovables/barleyfield/tiny/init.lua (+1/-0)
data/tribes/immovables/berry_bushes/blueberry/init.lua (+4/-0)
data/tribes/immovables/berry_bushes/currant_black/init.lua (+4/-0)
data/tribes/immovables/berry_bushes/currant_red/init.lua (+4/-0)
data/tribes/immovables/berry_bushes/desert_hackberry/init.lua (+4/-0)
data/tribes/immovables/berry_bushes/juniper/init.lua (+4/-0)
data/tribes/immovables/berry_bushes/raspberry/init.lua (+4/-0)
data/tribes/immovables/berry_bushes/sea_buckthorn/init.lua (+4/-0)
data/tribes/immovables/berry_bushes/strawberry/init.lua (+4/-0)
data/tribes/immovables/blackrootfield/harvested/init.lua (+1/-0)
data/tribes/immovables/blackrootfield/medium/init.lua (+1/-0)
data/tribes/immovables/blackrootfield/ripe/init.lua (+1/-0)
data/tribes/immovables/blackrootfield/small/init.lua (+1/-0)
data/tribes/immovables/blackrootfield/tiny/init.lua (+1/-0)
data/tribes/immovables/cornfield/harvested/init.lua (+1/-0)
data/tribes/immovables/cornfield/medium/init.lua (+1/-0)
data/tribes/immovables/cornfield/ripe/init.lua (+1/-0)
data/tribes/immovables/cornfield/small/init.lua (+1/-0)
data/tribes/immovables/cornfield/tiny/init.lua (+1/-0)
data/tribes/immovables/destroyed_building/init.lua (+1/-0)
data/tribes/immovables/grapevine/medium/init.lua (+1/-0)
data/tribes/immovables/grapevine/ripe/init.lua (+1/-0)
data/tribes/immovables/grapevine/small/init.lua (+1/-0)
data/tribes/immovables/grapevine/tiny/init.lua (+1/-0)
data/tribes/immovables/pond/dry/init.lua (+1/-0)
data/tribes/immovables/pond/growing/init.lua (+1/-0)
data/tribes/immovables/pond/mature/init.lua (+1/-0)
data/tribes/immovables/reedfield/medium/init.lua (+1/-0)
data/tribes/immovables/reedfield/ripe/init.lua (+1/-0)
data/tribes/immovables/reedfield/small/init.lua (+1/-0)
data/tribes/immovables/reedfield/tiny/init.lua (+1/-0)
data/tribes/immovables/shipconstruction_atlanteans/init.lua (+1/-0)
data/tribes/immovables/shipconstruction_barbarians/init.lua (+1/-0)
data/tribes/immovables/shipconstruction_empire/init.lua (+1/-0)
data/tribes/immovables/shipconstruction_frisians/init.lua (+1/-0)
data/tribes/immovables/wheatfield/harvested/init.lua (+1/-0)
data/tribes/immovables/wheatfield/medium/init.lua (+1/-0)
data/tribes/immovables/wheatfield/ripe/init.lua (+1/-0)
data/tribes/immovables/wheatfield/small/init.lua (+1/-0)
data/tribes/immovables/wheatfield/tiny/init.lua (+1/-1)
data/tribes/scripting/help/init.lua (+1/-1)
To merge this branch: bzr merge lp://qastaging/~widelands-dev/widelands/immovables_icon_wrong_path_menu
Reviewer Review Type Date Requested Status
Widelands Developers Pending
Review via email: mp+368011@code.qastaging.launchpad.net

Commit message

Fixes wrong path for encyclopedia immovables icon.

Added missing menu icons for immovables.

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

Continuous integration builds have changed state:

Travis build 5078. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/538444034.
Appveyor build 4858. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_immovables_icon_wrong_path_menu-4858.

Revision history for this message
GunChleoc (gunchleoc) wrote :

How did you encode the PNGs? I am getting warnings:

libpng warning: iCCP: CRC error

I don't get this problem when I export PNGs with GIMP, maybe try that?

Revision history for this message
Toni Förster (stonerl) wrote :

I used GIMP, already. Where do you get these warnings?

Revision history for this message
GunChleoc (gunchleoc) wrote :

When I open the encyclopedia. utils/optimize_pngs.py will also crash with these files.

Revision history for this message
Toni Förster (stonerl) wrote :

should be fixed

Revision history for this message
GunChleoc (gunchleoc) wrote :

The errors are gone :)

I think the Atlantean Ship Under Construction is hard to see, maybe lighten it up a bit?

Also, the Frisian berry bushes are still missing icons.

Note that I have run the optimizer, so you will have to pull this branch before working on it.

Revision history for this message
Toni Förster (stonerl) wrote :

Changed the icon for the ship and added menu.png for all bushes. The bushes don't appear in the encyclopedia because nordfriese needs to entangle the lua files first. Currently, all information including terrain affinity are in one file.

Revision history for this message
Toni Förster (stonerl) wrote :

untangle :D

Revision history for this message
GunChleoc (gunchleoc) wrote :

The lua files are fine as they are, I have added the missing icon paths. No untangling needed ;)

Some of the Frisian icons are hard to read though, because the lines are pretty thin. Maybe more contrast would help here too? The ship under construction is also very small, maybe cut off the mast so you can make the body of the ship bigger?

Revision history for this message
Toni Förster (stonerl) wrote :

Will look into this. :)

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 5085. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/538821683.
Appveyor build 4865. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_immovables_icon_wrong_path_menu-4865.

Revision history for this message
Toni Förster (stonerl) wrote :

Changed the icon for the frisian's ship.

Regarding the bushes, which one in particular do you want to see changed?

Revision history for this message
GunChleoc (gunchleoc) wrote :

Almost invisible icons are:

Barleyfield (Tiny)
Blueberry bush
Desert Hackberry
Raspberry Bush (Small + Tiny)
Strawberries (Tiny)

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 5126. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/540237101.
Appveyor build 4908. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_immovables_icon_wrong_path_menu-4908.

Revision history for this message
GunChleoc (gunchleoc) wrote :

I need this for another branch that I'm working on, so let's have this now and improve the icons later.

@bunnybot merge

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes: