Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/rework-resource-indicators into lp:widelands

2018-09-02 Thread Benedikt Straub
OK, refactored the building help so it now queries the highest resi for the given resource from the given TribeDescr and uses its representative_image. The barbarian scenario also uses representative_image for each resi now instead of fixed image paths. There was no need to define an icon, as re

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/frisian-buildings into lp:widelands

2018-09-02 Thread Benedikt Straub
Another try. If this one isn´t good enough, then I´ll redesign the hq completely, similar to the photo. -- https://code.launchpad.net/~widelands-dev/widelands/frisian-buildings/+merge/354156 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/f

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/frisian-buildings into lp:widelands

2018-09-02 Thread GunChleoc
Yes, that works :D @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/frisian-buildings/+merge/354156 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/frisian-buildings into lp:widelands.

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/frisian-buildings into lp:widelands

2018-09-02 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/frisian-buildings into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/frisian-buildings/+merge/354156 -- Your team Widelands Developers is requested to

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/rework-resource-indicators into lp:widelands

2018-09-02 Thread GunChleoc
Code looks good to me - I have removed the iterators and pushed a commit. - Barbarian indicators are good. - Empire: I still have a bit of difficulty seeing the difference between no resources and stones. Maybe give them a bevel or something? Or give the marble a bit of color. The Arena's color

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/mines-worldsavior into lp:widelands

2018-09-02 Thread Toni Förster
I already had a look at some of the changes made here. From my side it looks okay so far. Any particular I have to look at? -- https://code.launchpad.net/~widelands-dev/widelands/mines-worldsavior/+merge/350716 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/mi

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor_fix into lp:widelands

2018-09-02 Thread hessenfarmer
hessenfarmer has proposed merging lp:~widelands-dev/widelands/appveyor_fix into lp:widelands. Commit message: I need an appveyor build to further debug this Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/appve

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/empire04_bug_fix_enhance into lp:widelands

2018-09-02 Thread MP
seems good to go to me as well. -- https://code.launchpad.net/~widelands-dev/widelands/empire04_bug_fix_enhance/+merge/353742 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/empire04_bug_fix_enhance into lp:widelands. __

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor_fix into lp:widelands

2018-09-02 Thread bunnybot
Continuous integration builds have changed state: Travis build 3881. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/423709137. Appveyor build 3679. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_appveyor_fi

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor_glbinding into lp:widelands

2018-09-02 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/appveyor_glbinding into lp:widelands. Commit message: Another attempt at fixing AppVeyor Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1789835 in widelands: "Appveyor glbinding incompatible with WL code"