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

2016-02-22 Thread bunnybot
Continuous integration builds have changed state: Travis build 763. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/110920193. Appveyor build 609. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_statistics_g

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

2016-02-22 Thread kaputtnik
Review: Approve Cool :-) -- https://code.launchpad.net/~widelands-dev/widelands-website/fix-installation/+merge/286797 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev P

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

2016-02-22 Thread GunChleoc
I found a version of django-registration that works. I now finally have this running on my localhost :) -- https://code.launchpad.net/~widelands-dev/widelands-website/fix-installation/+merge/286797 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/wide

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

2016-02-22 Thread kaputtnik
I just took a look what version of django registration is installed here: django-registration 0.8 So you may test https://github.com/ubernostrum/django-registration/releases/tag/0.8 in pip_requirements.txt -- https://code.launchpad.net/~widelands-dev/widelands-website/fix-installation/+merge/2

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

2016-02-22 Thread GunChleoc
This is actually the wrong version of django-registration, I will have to track down an older version. -- https://code.launchpad.net/~widelands-dev/widelands-website/fix-installation/+merge/286797 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widel

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

2016-02-22 Thread GunChleoc
I had been wondering if pip-requirements was still current, since I had to fix some stuff, and the configuration later on isn't working. I'll post more about that in a new bug maybe. libmysqlclient-dev is needed for MySQL-python. The other package that I changed has moved its repository to Gith

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

2016-02-22 Thread kaputtnik
Review: Approve testing Works :-) -- https://code.launchpad.net/~widelands-dev/widelands/statistics_gui/+merge/286787 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/statistics_gui. ___ Mailing list: https://launchpa

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

2016-02-22 Thread kaputtnik
The website is now running under Django 1.3.7 You can see this in pip_requirements.txt The Django devs have removed all documentation prior to Django version 1.7 from her website. And i believe that Django 1.3.7 isn't available at all anymore. At least from Pypi... See also: https://www.django

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1546095-backslash-edit into lp:widelands

2016-02-22 Thread GunChleoc
I'd rather not wait for the backslash bug, because I don't know how to fix that one. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1546095-backslash-edit/+merge/286189 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1546095-backslash-edit. ___

[Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/fix-installation into lp:widelands-website

2016-02-22 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands-website/fix-installation into lp:widelands-website. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands-website/fix-installation/+merge/286797 This will pa

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1546095-backslash-edit into lp:widelands

2016-02-22 Thread kaputtnik
The one slash thing is solved :-) As you mentioned this is better than a crash. But i would still wait with merging this until the backspace bug is fixed. Just do it like you want. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1546095-backslash-edit/+merge/286189 Your team Widelands

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1525706-artifacts into lp:widelands

2016-02-22 Thread GunChleoc
Changing this to a vector is complicated, so I'd like to get this branch in and leave that as a problem for another day. > Sorry, cannot keep up with email > > I think this can be a vector and that would probably be better. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1525706-

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1509172-map-saving-paths into lp:widelands

2016-02-22 Thread GunChleoc
Review: Approve Now I get it - it's because of file locks. Everything works on Ubuntu now, so I am in favour of merging. Let's solve the problem with not being able to save twice in a new branch. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1509172-map-saving-paths/+merge/286067 Y

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1509172-map-saving-paths into lp:widelands

2016-02-22 Thread GunChleoc
I'll test your changes :) > Why does creating a MapSaver object with new not work on linux? Why do we need this to be a pointer anyway? It only adds an extra line of code. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1509172-map-saving-paths/+merge/286067 Your team Widelands Develo

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

2016-02-22 Thread bunnybot
Bunnybot encountered an error while working on this merge proposal: Running 'bzr pull --overwrite' failed. Output: ssh_exchange_identification: Connection closed by remote host ConnectionReset reading response for 'BzrDir.open_2.1', retrying ssh_exchange_identification: Connection closed by remot

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

2016-02-22 Thread bunnybot
Continuous integration builds have changed state: Travis build 736. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/110471430. Appveyor build 582. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_network_memo

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1546810-undo-redo into lp:widelands

2016-02-22 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bug-1546810-undo-redo into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1546810-undo-redo/+merge/286733 -- Your team Widelands Developers is subs

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1546153-suggested-teams into lp:widelands

2016-02-22 Thread bunnybot
Bunnybot encountered an error while working on this merge proposal: Running 'bzr pull --overwrite' failed. Output: ssh_exchange_identification: Connection closed by remote host ConnectionReset reading response for 'BzrDir.open_2.1', retrying ssh_exchange_identification: Connection closed by remot

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

2016-02-22 Thread bunnybot
Bunnybot encountered an error while working on this merge proposal: Running 'bzr pull --overwrite' failed. Output: Permission denied (publickey). ConnectionReset reading response for 'BzrDir.open_2.1', retrying Permission denied (publickey). bzr: ERROR: Connection closed: Unexpected end of messag

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

2016-02-22 Thread bunnybot
Bunnybot encountered an error while working on this merge proposal: Running 'bzr pull --overwrite' failed. Output: Permission denied (publickey). ConnectionReset reading response for 'BzrDir.open_2.1', retrying Permission denied (publickey). bzr: ERROR: Connection closed: Unexpected end of messag

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

2016-02-22 Thread GunChleoc
Review: Approve I was unable to improve on this, so let's merge it as it is. It's is a great improvement on what we had before in any case :) I have removed the now unused LineDrawMode. Unless SirVer wants to do something else with the code yet, this can go in. -- https://code.launchpad.net/~w

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

2016-02-22 Thread bunnybot
Continuous integration builds have changed state: Travis build 733. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/110196319. Appveyor build 580. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_string_fixes

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

2016-02-22 Thread bunnybot
Continuous integration builds have changed state: Travis build 725. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/109937395. Appveyor build 572. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_listselect-5

[Widelands-dev] [recipe build #1080683] of ~widelands-dev widelands-daily in xenial: Dependency wait

2016-02-22 Thread noreply
* State: Dependency wait * Recipe: widelands-dev/widelands-daily * Archive: ~widelands-dev/ubuntu/widelands-daily * Distroseries: xenial * Duration: 4 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+recipebuild/1080683/+files/buildlog.txt.gz * Uplo

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1525706-artifacts into lp:widelands

2016-02-22 Thread bunnybot
Bunnybot encountered an error while working on this merge proposal: Running 'bzr pull --overwrite' failed. Output: Permission denied (publickey). ConnectionReset reading response for 'BzrDir.open_2.1', retrying Permission denied (publickey). bzr: ERROR: Connection closed: Unexpected end of messag

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

2016-02-22 Thread bunnybot
Bunnybot encountered an error while working on this merge proposal: Running 'bzr pull --overwrite' failed. Output: Permission denied (publickey). ConnectionReset reading response for 'BzrDir.open_2.1', retrying Permission denied (publickey). bzr: ERROR: Connection closed: Unexpected end of messag

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

2016-02-22 Thread Klaus Halfmann
Review: Approve compile / test Compiles, did some test with Gun, which foound bug #1542821 but this is the same in trunk. Maybe some lists will stay in some other state now, but as of the networking error there is no consistent state anyway. OTOH we get rid of some memory leaks. Diff comments

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1546095-backslash-edit into lp:widelands

2016-02-22 Thread bunnybot
Continuous integration builds have changed state: Travis build 754. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/110746351. Appveyor build 600. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1546095_

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

2016-02-22 Thread bunnybot
Continuous integration builds have changed state: Travis build 724. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/109905228. Appveyor build 571. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1542705-

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

2016-02-22 Thread Klaus Halfmann
Pulling the network cable and then trying to go along the internet game gave me: InternetGaming: reached a timeout for an awaited answer of the metaserver! InternetGaming: Connecting to the metaserver. Warning: Verbindungsproblem Widelands konnte sich nicht zum Metaserver verbinden. Assertion fai

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1525706-artifacts into lp:widelands

2016-02-22 Thread bunnybot
Continuous integration builds have changed state: Travis build 734. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/110444117. Appveyor build 581. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1525706_

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

2016-02-22 Thread SirVer
This needs some cleanup. I'll look into that soonish. -- https://code.launchpad.net/~widelands-dev/widelands/beautiful_correct_lines/+merge/284517 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/beautiful_correct_lines.

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1546810-undo-redo into lp:widelands

2016-02-22 Thread GunChleoc
Me neither, which is why I caused this bug in the first place *lol -- https://code.launchpad.net/~widelands-dev/widelands/bug-1546810-undo-redo/+merge/286733 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1546810-undo-redo.

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1525706-artifacts into lp:widelands

2016-02-22 Thread SirVer
Sorry, cannot keep up with email I think this can be a vector and that would probably be better. > Am 16.02.2016 um 09:48 schrieb GunChleoc : > > I still need help with this before we can go ahead: > >> I tried and failed to just iterate over the fields - seems like there is no >> way to s

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

2016-02-22 Thread bunnybot
Bunnybot encountered an error while working on this merge proposal: Running 'bzr pull --overwrite' failed. Output: Permission denied (publickey). ConnectionReset reading response for 'BzrDir.open_2.1', retrying Permission denied (publickey). bzr: ERROR: Connection closed: Unexpected end of messag

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

2016-02-22 Thread bunnybot
Continuous integration builds have changed state: Travis build 759. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/110812226. Appveyor build 605. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_soldier_refa

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

2016-02-22 Thread bunnybot
Continuous integration builds have changed state: Travis build 727. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/109980041. Appveyor build 574. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_find_portdoc

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1546810-undo-redo into lp:widelands

2016-02-22 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1546810-undo-redo into lp:widelands. Commit message: Fixed undo/redo bug when drawing terrains in the editor. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1546810 in widelands: "Editor: undo/redo doe

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

2016-02-22 Thread bunnybot
Bunnybot encountered an error while working on this merge proposal: Running 'bzr pull --overwrite' failed. Output: ssh_exchange_identification: Connection closed by remote host ConnectionReset reading response for 'BzrDir.open_2.1', retrying ssh_exchange_identification: Connection closed by remot

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

2016-02-22 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/string-fixes into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/286547 -- Your team Widelands Developers is subscribed to branch

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

2016-02-22 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/find_portdock_reworked into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/find_portdock_reworked/+merge/286408 -- Your team Widelands Developers is su

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

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

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

2016-02-22 Thread GunChleoc
Review: Approve Tested and LGTM :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/fix_campaign_loading/+merge/285709 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix_campaign_loading. ___

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1546095-backslash-edit into lp:widelands

2016-02-22 Thread bunnybot
Bunnybot encountered an error while working on this merge proposal: Running 'bzr pull --overwrite' failed. Output: ssh_exchange_identification: Connection closed by remote host ConnectionReset reading response for 'BzrDir.open_2.1', retrying ssh_exchange_identification: Connection closed by remot

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1509172-map-saving-paths into lp:widelands

2016-02-22 Thread Tino
I would really like to avoid using different code pathes for windows and linux. The current version does work for directory saves on windows. But if fails on the second save for a zip save: If you start the editor and save the map "abc" and "abc" already exists it gets overwritten correctly. But

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1525706-artifacts into lp:widelands

2016-02-22 Thread GunChleoc
I have found a safe upper limit for iterating over the fields now, so I'll be pushing something new as soon as I have compiled & tested it. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1525706-artifacts/+merge/285566 Your team Widelands Developers is subscribed to branch lp:~widela

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

2016-02-22 Thread bunnybot
Continuous integration builds have changed state: Travis build 725. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/109937395. Appveyor build 572. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_listselect-5

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

2016-02-22 Thread bunnybot
Continuous integration builds have changed state: Travis build 732. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/110188250. Appveyor build 579. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ai_small_twe

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1395278-logic1 into lp:widelands

2016-02-22 Thread Klaus Halfmann
Review: Approve compile / code read See only harmless renamings here, will play some games now, but this will take some time Diff comments: > > === modified file 'src/logic/game.cc' > --- src/logic/game.cc 2016-02-07 07:16:24 + > +++ src/logic/game.cc 2016-02-16 14:25:27 + > @@ -1024,4

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

2016-02-22 Thread GunChleoc
This has been approved on the forum. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/balancing_tribes/+merge/286346 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/balancing_tribes into lp:widelands.

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

2016-02-22 Thread bunnybot
Continuous integration builds have changed state: Travis build 748. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/110599393. Appveyor build 594. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1542705-

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

2016-02-22 Thread bunnybot
Bunnybot encountered an error while working on this merge proposal: Running 'bzr pull --overwrite' failed. Output: ssh_exchange_identification: Connection closed by remote host ConnectionReset reading response for 'BzrDir.open_2.1', retrying ssh_exchange_identification: Connection closed by remot

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

2016-02-22 Thread bunnybot
Bunnybot encountered an error while working on this merge proposal: Running 'bzr pull --overwrite' failed. Output: ssh_exchange_identification: Connection closed by remote host ConnectionReset reading response for 'BzrDir.open_2.1', retrying ssh_exchange_identification: Connection closed by remot

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1546810-undo-redo into lp:widelands

2016-02-22 Thread bunnybot
Continuous integration builds have changed state: Travis build 739. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/110576262. Appveyor build 585. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1546810_

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

2016-02-22 Thread GunChleoc
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/286547 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ Mailing list: https://launchpad.net/~widelands-dev Po

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

2016-02-22 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/balancing_tribes into lp:widelands has been updated. Commit Message changed to: Balancing: Added gold to building cost for Atlantean training sites. Made Barbarian attack stronger. For more details, see: https://code.launchpad.net/~widelands-de

[Widelands-dev] [recipe build #1081991] of ~widelands-dev widelands-daily in xenial: Dependency wait

2016-02-22 Thread noreply
* State: Dependency wait * Recipe: widelands-dev/widelands-daily * Archive: ~widelands-dev/ubuntu/widelands-daily * Distroseries: xenial * Duration: 4 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+recipebuild/1081991/+files/buildlog.txt.gz * Uplo

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

2016-02-22 Thread GunChleoc
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/codecheck-braces/+merge/286466 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/codecheck-braces. ___ Mailing list: https://launchpad.net/~wideland

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

2016-02-22 Thread GunChleoc
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/network-memory/+merge/286162 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/network-memory. ___ Mailing list: https://launchpad.net/~widelands-de

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1509172-map-saving-paths into lp:widelands

2016-02-22 Thread GunChleoc
Review: Needs Fixing This now works in Windows for the Zip Filesystem, but not for the normal file system. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1509172-map-saving-paths/+merge/286067 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-150

[Widelands-dev] [recipe build #1081336] of ~widelands-dev widelands-daily in xenial: Dependency wait

2016-02-22 Thread noreply
* State: Dependency wait * Recipe: widelands-dev/widelands-daily * Archive: ~widelands-dev/ubuntu/widelands-daily * Distroseries: xenial * Duration: 3 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+recipebuild/1081336/+files/buildlog.txt.gz * Uplo

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

2016-02-22 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/ai_small_tweaks into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/ai_small_tweaks/+merge/286407 -- Your team Widelands Developers is subscribed to br

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

2016-02-22 Thread SirVer
Review: Approve As mentioned in chat, the reason the pics still loaded was just because we saved the game directly after starting it. That felt broken, so I removed the extra_data packet. branch lgtm now. If you are happy with my changes please merge. -- https://code.launchpad.net/~widelands-d

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1546810-undo-redo into lp:widelands

2016-02-22 Thread SirVer
Review: Approve no idea what that string change does, frankly... -- https://code.launchpad.net/~widelands-dev/widelands/bug-1546810-undo-redo/+merge/286733 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1546810-undo-redo. _

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

2016-02-22 Thread GunChleoc
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/ai_small_tweaks/+merge/286407 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_small_tweaks. ___ Mailing list: https://launchpad.net/~widelands-

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

2016-02-22 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/network-memory into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/network-memory/+merge/286162 -- Your team Widelands Developers is subscribed to bran

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1509172-map-saving-paths into lp:widelands

2016-02-22 Thread Tino
Review: Resubmit Ok, it does work again on windows. But i've really no clue what i've done with the last commit. No the file lock on the tmp save is gone and it can be renamed correctly. If this does not break anything on linux i would remove the NOCOMs and merge. -- https://code.launchpad.net/

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1546095-backslash-edit into lp:widelands

2016-02-22 Thread GunChleoc
Review: Resubmit Thanks for the hint - found it! :) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1546095-backslash-edit/+merge/286189 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1546095-backslash-edit.

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1395278-logic1 into lp:widelands

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

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1395278-logic1 into lp:widelands

2016-02-22 Thread GunChleoc
Thanks for the review :) Tree growth has nothing to do with this branch - the Last Bastion is already being redesigned to fit the new tree growth parameters https://wl.widelands.org/forum/topic/1917/ @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1395278-logic1/+mer

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1509172-map-saving-paths into lp:widelands

2016-02-22 Thread bunnybot
Continuous integration builds have changed state: Travis build 758. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/110807105. Appveyor build 604. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1509172_

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

2016-02-22 Thread bunnybot
Bunnybot encountered an error while working on this merge proposal: Running 'bzr pull --overwrite' failed. Output: ssh_exchange_identification: Connection closed by remote host ConnectionReset reading response for 'BzrDir.open_2.1', retrying ssh_exchange_identification: Connection closed by remot

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1509172-map-saving-paths into lp:widelands

2016-02-22 Thread bunnybot
Bunnybot encountered an error while working on this merge proposal: Running 'bzr pull --overwrite' failed. Output: ssh_exchange_identification: Connection closed by remote host ConnectionReset reading response for 'BzrDir.open_2.1', retrying ssh_exchange_identification: Connection closed by remot

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

2016-02-22 Thread bunnybot
Continuous integration builds have changed state: Travis build 732. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/110188250. Appveyor build 579. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ai_small_twe

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1546095-backslash-edit into lp:widelands

2016-02-22 Thread bunnybot
Bunnybot encountered an error while working on this merge proposal: Running 'bzr pull --overwrite' failed. Output: ssh_exchange_identification: Connection closed by remote host ConnectionReset reading response for 'BzrDir.open_2.1', retrying ssh_exchange_identification: Connection closed by remot

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1525706-artifacts into lp:widelands

2016-02-22 Thread bunnybot
Bunnybot encountered an error while working on this merge proposal: Running 'bzr pull --overwrite' failed. Output: ssh_exchange_identification: Connection closed by remote host ConnectionReset reading response for 'BzrDir.open_2.1', retrying ssh_exchange_identification: Connection closed by remot

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1525706-artifacts into lp:widelands

2016-02-22 Thread bunnybot
Continuous integration builds have changed state: Travis build 734. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/110444117. Appveyor build 581. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1525706_

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

2016-02-22 Thread bunnybot
Bunnybot encountered an error while working on this merge proposal: Running 'bzr pull --overwrite' failed. Output: ssh_exchange_identification: Connection closed by remote host ConnectionReset reading response for 'BzrDir.open_2.1', retrying ssh_exchange_identification: Connection closed by remot

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1546153-suggested-teams into lp:widelands

2016-02-22 Thread bunnybot
Bunnybot encountered an error while working on this merge proposal: Running 'bzr pull --overwrite' failed. Output: ssh_exchange_identification: Connection closed by remote host ConnectionReset reading response for 'BzrDir.open_2.1', retrying ssh_exchange_identification: Connection closed by remot

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1509172-map-saving-paths into lp:widelands

2016-02-22 Thread bunnybot
Bunnybot encountered an error while working on this merge proposal: Running 'bzr pull --overwrite' failed. Output: ssh_exchange_identification: Connection closed by remote host ConnectionReset reading response for 'BzrDir.open_2.1', retrying ssh_exchange_identification: Connection closed by remot

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

2016-02-22 Thread bunnybot
Continuous integration builds have changed state: Travis build 748. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/110599393. Appveyor build 594. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1542705-

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

2016-02-22 Thread bunnybot
Bunnybot encountered an error while working on this merge proposal: Running 'bzr pull --overwrite' failed. Output: ssh_exchange_identification: Connection closed by remote host ConnectionReset reading response for 'BzrDir.open_2.1', retrying ssh_exchange_identification: Connection closed by remot

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

2016-02-22 Thread bunnybot
Continuous integration builds have changed state: Travis build 735. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/110460429. Appveyor build 447. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_beautiful_co

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

2016-02-22 Thread bunnybot
Bunnybot encountered an error while working on this merge proposal: Running 'bzr pull --overwrite' failed. Output: ssh_exchange_identification: Connection closed by remote host ConnectionReset reading response for 'BzrDir.open_2.1', retrying ssh_exchange_identification: Connection closed by remot

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

2016-02-22 Thread bunnybot
Bunnybot encountered an error while working on this merge proposal: Running 'bzr pull --overwrite' failed. Output: ssh_exchange_identification: Connection closed by remote host ConnectionReset reading response for 'BzrDir.open_2.1', retrying ssh_exchange_identification: Connection closed by remot

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1525706-artifacts into lp:widelands

2016-02-22 Thread bunnybot
Bunnybot encountered an error while working on this merge proposal: Running 'bzr pull --overwrite' failed. Output: ssh_exchange_identification: Connection closed by remote host ConnectionReset reading response for 'BzrDir.open_2.1', retrying ssh_exchange_identification: Connection closed by remot

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1546153-suggested-teams into lp:widelands

2016-02-22 Thread bunnybot
Continuous integration builds have changed state: Travis build 723. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/109900878. Appveyor build 570. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1546153_

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

2016-02-22 Thread TiborB
OK, it seems it works as before, I checked a code a bit, and I trust you that you had not changed the functionality of my code.. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/ai_small_tweaks/+merge/286407 Your team Widelands Developers is subscribed to branch lp:~widela

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

2016-02-22 Thread bunnybot
Bunnybot encountered an error while working on this merge proposal: Running 'bzr merge ../_widelands_dev_widelands_ai_small_tweaks' failed. Output: M src/ai/ai_help_structs.cc M src/ai/ai_help_structs.h M src/ai/defaultai.cc M src/ai/defaultai.h M src/logic/widelands_geometry.cc M src

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1395278-logic1 into lp:widelands

2016-02-22 Thread Klaus Halfmann
Review: Approve I playes some Atlanters in "the last" bastion without any Hickups, execpt that the trees so not grow that good in comparioson to r18? Lets merge this... -- https://code.launchpad.net/~widelands-dev/widelands/bug-1395278-logic1/+merge/286178 Your team Widelands Developers is subsc

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1509172-map-saving-paths into lp:widelands

2016-02-22 Thread GunChleoc
Review: Approve That broke it for Linus, but I have added an #ifndef that should fix it for everybody. I have tested with the zip option on and off. COuld you please test for Windows again to make sure that it's still working? -- https://code.launchpad.net/~widelands-dev/widelands/bug-1509172-m

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

2016-02-22 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/soldier_refactoring into lp:widelands. Commit message: Some refactoring for the Soldier code: - Refactored the battle attributes in SoldierDescr (health, attack, defense, evade) into a nice Lua table and struct. - Made member variables i

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1546810-undo-redo into lp:widelands

2016-02-22 Thread kaputtnik
Review: Approve testing Works perfect again :-) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1546810-undo-redo/+merge/286733 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1546810-undo-redo. ___ Ma

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1546810-undo-redo into lp:widelands

2016-02-22 Thread GunChleoc
Thanks for testing! The code change is trivial, so I'm gonna merge. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1546810-undo-redo/+merge/286733 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1546810-undo-redo. __

[Widelands-dev] [Merge] lp:~miroslavr256/widelands/bug-1524841 into lp:widelands

2016-02-22 Thread Miroslav Remák
The proposal to merge lp:~miroslavr256/widelands/bug-1524841 into lp:widelands has been updated. Description changed to: This should hopefully fix bug #1524841. Needs testing from someone who can reproduce the bug (I am unable to do that on my system). For more details, see: https://code.launc

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1525706-artifacts into lp:widelands

2016-02-22 Thread kaputtnik
Review: Approve testing Works :-) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1525706-artifacts/+merge/285566 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1525706-artifacts. ___ Mailing list: ht

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

2016-02-22 Thread SirVer
Review: Approve lgtm. -- https://code.launchpad.net/~widelands-dev/widelands/codecheck-braces/+merge/286466 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/codecheck-braces. ___ Mailing list: https://launchpad.net/~w

[Widelands-dev] [Merge] lp:~miroslavr256/widelands/bug-1524841 into lp:widelands

2016-02-22 Thread Miroslav Remák
Miroslav Remák has proposed merging lp:~miroslavr256/widelands/bug-1524841 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1524841 in widelands: "Translation updates are incomplete" https://bugs.launchpad.net/widelands/+bug/1524841 For more det

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

2016-02-22 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/codecheck-braces into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/codecheck-braces/+merge/286466 -- Your team Widelands Developers is subscribed to

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

2016-02-22 Thread GunChleoc
Review: Approve LGTM :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/find_portdock_reworked/+merge/286408 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/find_portdock_reworked. ___ Mailing

  1   2   >