[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1669230-lastbastion-finetune/+merge/337083 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune into lp:widelands
Codecheck failure is already in trunk, so it needs to be fixed there @bunnybot merge force -- https://code.launchpad.net/~widelands-dev/widelands/bug-1669230-lastbastion-finetune/+merge/337083 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune into lp:widelands
Yep, Travis still has some catching up to do, because Bunnybot had indeed gotten confused due to problems with Launchpad. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1669230-lastbastion-finetune/+merge/337083 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune into lp:widelands
Oh, I forgot that you did a merge. We might be waiting for travis and appveyor. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1669230-lastbastion-finetune/+merge/337083 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune into lp:widelands
When may I conclude that bunnybot has, once again, decided not to merge. What is the problem this time? -- https://code.launchpad.net/~widelands-dev/widelands/bug-1669230-lastbastion-finetune/+merge/337083 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune into lp:widelands has been updated. Commit Message changed to: Minor fixes to Last Bastion map. See LP bug 1669230 for details. For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1669230-lastbastion-finetune/+merge/337083 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune into lp:widelands
I think this is ok. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1669230-lastbastion-finetune/+merge/337083 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune into lp:widelands
I have left a comment in the bug - I think we need one more small building plot. If you want to rename the map directory, please use bzr mv. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1669230-lastbastion-finetune/+merge/337083 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune into lp:widelands
Review: Approve Yes, code is OK now. Somebody should still test to make sure that the issue is resolved. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1669230-lastbastion-finetune/+merge/337083 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune into lp:widelands
@GunChleoc: Thanks for spotting, is this okay now? -- https://code.launchpad.net/~widelands-dev/widelands/bug-1669230-lastbastion-finetune/+merge/337083 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune into lp:widelands
You lost the localization markup in the elemental packet. This happens because our profile class doesn't support saving that when you update a map. Having desyncs is fine, we do not guarantee multiplayer compatibility between versions. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1669230-lastbastion-finetune/+merge/337083 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune into lp:widelands
Since this is a change of the map it should be clear that this is a new version, imho. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1669230-lastbastion-finetune/+merge/337083 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune into lp:widelands
Continuous integration builds have changed state: Travis build 3128. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/336637447. Appveyor build 2935. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1669230_lastbastion_finetune-2935. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1669230-lastbastion-finetune/+merge/337083 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune into lp:widelands
Teppo Mäenpää has proposed merging lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1669230 in widelands: "Map Last Bastion: enemy fortifications on the other side of water make game impassible in some situations" https://bugs.launchpad.net/widelands/+bug/1669230 For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1669230-lastbastion-finetune/+merge/337083 The red player now has a way to expand around a tower at 10/57. It is not very convenient, but at least the blue can no longer (easily) block the red for good. Also moved the yellow slot at 26/0 south. Now the players should no longer be able to block each other. -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune into lp:widelands. === modified file 'data/maps/Last_Bastion_v2.wmf/binary/heights' Binary files data/maps/Last_Bastion_v2.wmf/binary/heights 2016-03-21 19:29:24 + and data/maps/Last_Bastion_v2.wmf/binary/heights 2018-02-02 15:36:09 + differ === modified file 'data/maps/Last_Bastion_v2.wmf/binary/terrain' Binary files data/maps/Last_Bastion_v2.wmf/binary/terrain 2016-03-21 19:29:24 + and data/maps/Last_Bastion_v2.wmf/binary/terrain 2018-02-02 15:36:09 + differ ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune into lp:widelands has been updated. Description changed to: Last bastion map modified: The red player now has a way to expand around a tower at 10/57. It is not very convenient, but at least the blue can no longer (easily) block the red for good. Also moved the yellow slot at 26/0 south. Now the players should no longer be able to block each other. For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1669230-lastbastion-finetune/+merge/337083 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune into lp:widelands
I tried to keep the changes small. However, if this is ever merged, and people play network with pre-merge and post-merge versions, there are desyncs. That could be avoided by renaming the map (like v2 -> v3). I do not think a rename is needed. Using different bzr versions can act like this. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1669230-lastbastion-finetune/+merge/337083 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp