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

2019-03-02 Thread Toni Förster
Review: Approve I like it. -- https://code.launchpad.net/~widelands-dev/widelands/frisian_music/+merge/350429 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/frisian_music. ___ Mailing list: https://launchpad.net/~wi

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1818073-worker into lp:widelands

2019-03-02 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bug-1818073-worker into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1818073-worker/+merge/363851 -- Your team Widelands Developers is subscribed

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

2019-03-02 Thread Benedikt Straub
Code looks good to me, some diff comments with smaller suggestions. Will test this more thoroughly the next days… Diff comments: > === modified file 'data/scripting/mapobjects.lua' > --- data/scripting/mapobjects.lua 2017-02-08 18:48:32 + > +++ data/scripting/mapobjects.lua 2019-03-0

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1818227-replay-desync into lp:widelands

2019-03-02 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bug-1818227-replay-desync into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1818227-replay-desync/+merge/363871 -- Your team Widelands Developers

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1818227-replay-desync into lp:widelands

2019-03-02 Thread bunnybot
Continuous integration builds have changed state: Travis build 4555. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/500750597. Appveyor build 4342. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_181822

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

2019-03-02 Thread Benedikt Straub
Ah, okay. I´m afraid several of the blend files for older models are messed up. I guess the creators somehow post-processed the renders without documenting how to, or these aren´t even the actual model files but some experiments that overwrote the originals… I uploaded mipmaps for all bushes to

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

2019-03-02 Thread kaputtnik
Ah, ok will look into it. -- https://code.launchpad.net/~widelands-dev/widelands-website/pybb_cleanup/+merge/363742 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands-website/pybb_cleanup into lp:widelands-website.

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

2019-03-02 Thread GunChleoc
Icons sind jetzt OK. Vorschau ist das hier: https://launchpadlibrarian.net/413400282/vorschau.png -- https://code.launchpad.net/~widelands-dev/widelands-website/pybb_cleanup/+merge/363742 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands-webs

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1818073-worker into lp:widelands

2019-03-02 Thread Toni Förster
Well, then we let it be as it is. :-) @bunnybot merge force -- https://code.launchpad.net/~widelands-dev/widelands/bug-1818073-worker/+merge/363851 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1818073-worker.

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1818073-worker into lp:widelands

2019-03-02 Thread GunChleoc
Arithmetic comparisons are very fast - I don't know if we would gain any performance here really. We also get an additional comparison if amount <= 2, so theoretically we only gain 1 comparison on average here while making the code harder to read. -- https://code.launchpad.net/~widelands-dev/wi

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1818227-replay-desync into lp:widelands

2019-03-02 Thread GunChleoc
Works for me - let's have it! @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1818227-replay-desync/+merge/363871 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1818227-replay-desync.

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1818073-worker into lp:widelands

2019-03-02 Thread Toni Förster
Since bunnybot refused to merge, I had another Idea, currently we enter the if-clause for every amount > 0. But we only want it to enter when: 0 < amount <= 6: if (amount > 0 && amount <= 6) { if (amount <= 2) { totalchance += 6; } else if (amount <= 4) {

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1818227-replay-desync into lp:widelands

2019-03-02 Thread Toni Förster
Review: Approve tested If you do not plan any further changes, I would approve it like this. We should open a bug targeted for build-21 and try to move the calculations to init screen again, to avoid the black screen entirely. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1818227-r

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1818227-replay-desync into lp:widelands

2019-03-02 Thread Toni Förster
@GunChleoc I readded the "Initializing Game..." message. So we have a black screen but the user gets some feedback. I think this is a good compromise. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1818227-replay-desync/+merge/363871 Your team Widelands Developers is subscribed to br

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

2019-03-02 Thread GunChleoc
For the Barbarian units without mipmaps, that is on purpose to test the new convenience function for animations that don't have mipmaps yet. > The warehouse and shipyard look very different when zooming in than on normal > scale, but I assume that that´s an error in the settings with which they

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

2019-03-02 Thread GunChleoc
I have not had time to listen to the newest version yet. -- https://code.launchpad.net/~widelands-dev/widelands/frisian_music/+merge/350429 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/frisian_music into lp:widelands. ___

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1818073-worker into lp:widelands

2019-03-02 Thread bunnybot
Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways. Travis build 4553. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/500508131. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1818073-worker/+merge/363851 Your team W

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1818227-replay-desync into lp:widelands

2019-03-02 Thread GunChleoc
I have removed the extra init function, this way the fields get added after the replay is saveloaded. This means we now get a black screen for big maps. I can't get any log messages on the screen there, but I have improved the console logging a bit. -- https://code.launchpad.net/~widelands-dev/

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1818073-worker into lp:widelands

2019-03-02 Thread GunChleoc
Review: Approve Thanks for fixing @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1818073-worker/+merge/363851 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1818073-worker. ___ Maili