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

[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
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-website/fix-installation into lp:widelands-website

[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/widelands-website/fix-installation into lp:widelands-website.

___
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-website/fix-installation into lp:widelands-website

[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/286797
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands-website/fix-installation into lp:widelands-website.

___
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-website/fix-installation into lp:widelands-website

[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/widelands-website/fix-installation into lp:widelands-website.

___
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-website/fix-installation into lp:widelands-website

[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 Github.
-- 
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/widelands-website/fix-installation into lp:widelands-website.

___
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/statistics_gui into lp:widelands

[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://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-1546095-backslash-edit into lp:widelands

[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.

___
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-website/fix-installation into lp:widelands-website

[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 partially fix the installation.

I can't run the setup, because some of the imported modules don't match the 
Django version in the requirements file. Since my ssl login is also broken and 
I can't have a peek at the actual website, I couldn't find out which Django 
version I actually need.
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands-website/fix-installation into lp:widelands-website.
=== modified file 'README.txt'
--- README.txt	2015-09-20 12:24:47 +
+++ README.txt	2016-02-22 13:15:59 +
@@ -11,7 +11,7 @@
 Example:
 On Ubuntu, installing all required tools and dependencies in two commands::
 
-   $ sudo apt-get install python-dev python-virtualenv python-pip mercurial bzr subversion git-core sqlite3
+   $ sudo apt-get install python-dev python-virtualenv python-pip mercurial bzr subversion git-core sqlite3 libmysqlclient-dev
$ sudo apt-get build-dep python-numpy
 
 Setting up the local environment
@@ -23,7 +23,7 @@
 
 This will make sure that your virtual environment is not tainted with python
 packages from your global site packages. Very important!
-Now, we create and activate our environment:: 
+Now, we create and activate our environment::
 
$ virtualenv --no-site-packages wlwebsite
$ cd wlwebsite
@@ -42,12 +42,12 @@
 Installation of the third party libraries should be easy, given you have
 development tools installed and in your path. The two difficult packages are
 PIL and numpy; you can also try to migrate them over from your global site dir
-or add your global site dir to your PYTHONPATH. 
+or add your global site dir to your PYTHONPATH.
 Installation via pip should work like this::
 
$ pip install -r pip_requirements.txt
 
-This will take a while. If no errors are shown we should be fine. 
+This will take a while. If no errors are shown we should be fine.
 
 Setting up the website
 --
@@ -62,14 +62,14 @@
 
$ ln -s local_urls.py.sample local_urls.py
$ ln -s local_settings.py.sample local_settings.py
-   
+
 There has to be some corrections to get into the admin pages:
 
 Either copy the folders "media" and "templates"
 
from: ~/wlwebsite/django/contrib/admin
to:   ~/wlwebsite/lib/python2.7/site-packages/django/contrib/admin/
-   
+
 or create symlinks:
 
$ ln -s ~/wlwebsite/django/contrib/admin/templates/ ~/wlwebsite/lib/python2.7/site-packages/django/contrib/admin/templates
@@ -93,7 +93,7 @@
$ ./manage.py runserver
 
 Open your browser to http://localhost:8000. You should see something that
-resembles the widelands homepage quite closely. All content is missing though. 
+resembles the widelands homepage quite closely. All content is missing though.
 
 Some important settings
 ^^^
@@ -114,7 +114,7 @@
$ ./manage.py runserver 169.254.1.0:8000
 
 See also http://docs.djangoproject.com/en/dev/ref/django-admin/#runserver-port-or-address-port
-for further details. 
+for further details.
 
 Setting up the online help / encyclopedia
 ^

=== modified file 'pip_requirements.txt'
--- pip_requirements.txt	2015-07-04 07:35:29 +
+++ pip_requirements.txt	2016-02-22 13:15:59 +
@@ -8,7 +8,7 @@
 -e hg+https://django-tracking.googlecode.com/hg/#egg=tracking
 Markdown==2.6.2
 BeautifulSoup==3.2
--e hg+http://bitbucket.org/ubernostrum/django-registration/@1086c6a#egg=registration
+-e git://github.com/ubernostrum/django-registration/#egg=registration
 -e svn+http://django-tagging.googlecode.com/svn/trunk/#egg=tagging
 -e git://github.com/dcramer/django-ratings.git#egg=djangoratings
 django-threadedcomments==0.5.2

___
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-1546095-backslash-edit into lp:widelands

[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 Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1546095-backslash-edit.

___
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-1525706-artifacts into lp:widelands

[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-artifacts/+merge/285566
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1525706-artifacts.

___
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-1509172-map-saving-paths into lp:widelands

[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
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1509172-map-saving-paths.

___
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/beautiful_correct_lines into lp:widelands

[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 remote host
bzr: ERROR: Connection closed: Unexpected end of message. Please check 
connectivity and permissions, and report a bug if problems persist. 
Using saved parent location: 
bzr+ssh://bazaar.launchpad.net/~widelands-dev/widelands/beautiful_correct_lines/

-- 
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.

___
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/network-memory into lp:widelands

[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_memory-582.
-- 
https://code.launchpad.net/~widelands-dev/widelands/network-memory/+merge/286162
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/network-memory 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-1546810-undo-redo into lp:widelands

[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 subscribed to branch 
lp:~widelands-dev/widelands/bug-1546810-undo-redo.

___
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-1546153-suggested-teams into lp:widelands

[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 remote host
bzr: ERROR: Connection closed: Unexpected end of message. Please check 
connectivity and permissions, and report a bug if problems persist. 
Using saved parent location: 
bzr+ssh://bazaar.launchpad.net/~widelands-dev/widelands/bug-1546153-suggested-teams/

-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1546153-suggested-teams/+merge/286345
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1546153-suggested-teams.

___
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-1542705 into lp:widelands

[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 message. Please check 
connectivity and permissions, and report a bug if problems persist. 
Using saved parent location: 
bzr+ssh://bazaar.launchpad.net/~widelands-dev/widelands/bug-1542705/

-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1542705/+merge/286187
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1542705 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/find_portdock_reworked into lp:widelands

[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 message. Please check 
connectivity and permissions, and report a bug if problems persist. 
Using saved parent location: 
bzr+ssh://bazaar.launchpad.net/~widelands-dev/widelands/find_portdock_reworked/

-- 
https://code.launchpad.net/~widelands-dev/widelands/find_portdock_reworked/+merge/286408
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/find_portdock_reworked 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/string-fixes into lp:widelands

[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-580.
-- 
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/286547
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/string-fixes 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/listselect into lp:widelands

[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-572.
-- 
https://code.launchpad.net/~widelands-dev/widelands/listselect/+merge/286033
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/listselect.

___
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] [recipe build #1080683] of ~widelands-dev widelands-daily in xenial: Dependency wait

[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
 * Upload Log: 
 * Builder: https://launchpad.net/builders/lgw01-37

-- 
https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+recipebuild/1080683
Your team Widelands Developers is the requester of the build.

___
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-1525706-artifacts into lp:widelands

[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 message. Please check 
connectivity and permissions, and report a bug if problems persist. 
Using saved parent location: 
bzr+ssh://bazaar.launchpad.net/~widelands-dev/widelands/bug-1525706-artifacts/

-- 
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: 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/listselect into lp:widelands

[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 message. Please check 
connectivity and permissions, and report a bug if problems persist. 
Using saved parent location: 
bzr+ssh://bazaar.launchpad.net/~widelands-dev/widelands/listselect/

-- 
https://code.launchpad.net/~widelands-dev/widelands/listselect/+merge/286033
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/listselect.

___
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/network-memory into lp:widelands

[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:

> 
> === modified file 'src/ui_fsmenu/internet_lobby.cc'
> --- src/ui_fsmenu/internet_lobby.cc   2016-02-07 16:31:06 +
> +++ src/ui_fsmenu/internet_lobby.cc   2016-02-19 20:11:01 +
> @@ -176,16 +176,18 @@
>   InternetGaming::ref().handle_metaserver_communication();
>   }
>  
> - if (InternetGaming::ref().update_for_clients())
> + if (InternetGaming::ref().update_for_clients()) {
>   fill_client_list(InternetGaming::ref().clients());
> + }
>  

This is a bad pattern for multithreaded Programms:
if (someLengthyExpression->getSomeThingThatMayBeNull()) {
   // Return value may have changed in some other thread
   someLengthyExpression->getSomeThingThatMayBeNull()->doSomething();
}
Better:
SomeThingThatMayBeNull mayBe = 
someLengthyExpression->getSomeThingThatMayBeNull();
if (mayBe) {
   mayBe->doSomething();
}

C++ may take over new Operators from languangs like swift: 
someLengthyExpression?->getSomeThingThatMayBeNull()?->doSomething()
> https://developer.apple.com/library/ios/documentation/Swift/Conceptual/Swift_Programming_Language/OptionalChaining.html#//apple_ref/doc/uid/TP40014097-CH21-ID245

BUT, for Widelands this OK :-)

> - if (InternetGaming::ref().update_for_games())
> + if (InternetGaming::ref().update_for_games()) {
>   fill_games_list(InternetGaming::ref().games());
> + }
>  }
>  
>  void FullscreenMenuInternetLobby::clicked_ok()
>  {
> - if (joingame.enabled()) {
> + if (joingame_.enabled()) {
>   server_doubleclicked();
>   } else {
>   clicked_hostgame();


-- 
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-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-1546095-backslash-edit into lp:widelands

[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_backslash_edit-600.
-- 
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.

___
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-1542705 into lp:widelands

[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-571.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1542705/+merge/286187
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1542705 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/network-memory into lp:widelands

[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 failed: (state_ == OFFLINE), function login, file 
/Users/klaus/develop/widelands-repo/network-memory/src/network/internet_gaming.cc,
 line 139.

The "Solution" in Java is returning an immutable vector.
No idea how to do this in C++ perhpas some const& const, whatever...




-- 
https://code.launchpad.net/~widelands-dev/widelands/network-memory/+merge/286162
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/network-memory 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/beautiful_correct_lines into lp:widelands

[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.

___
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-1546810-undo-redo into lp:widelands

[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.

___
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-1525706-artifacts into lp:widelands

[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 safely get the size of a std::unique_ptr.
>> 
>> Why is it an array and not a vector anyway?
> -- 
> 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: 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

-- 
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: 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/soldier_refactoring into lp:widelands

[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_refactoring-605.
-- 
https://code.launchpad.net/~widelands-dev/widelands/soldier_refactoring/+merge/286753
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/soldier_refactoring 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/find_portdock_reworked into lp:widelands

[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_portdock_reworked-574.
-- 
https://code.launchpad.net/~widelands-dev/widelands/find_portdock_reworked/+merge/286408
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/find_portdock_reworked 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-1546810-undo-redo into lp:widelands

[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 doesn't work when placing 
terrains in one move"
  https://bugs.launchpad.net/widelands/+bug/1546810

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1546810-undo-redo/+merge/286733

Fixed undo/redo bug when drawing terrains in the editor.
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1546810-undo-redo into lp:widelands.
=== modified file 'src/editor/tools/editor_draw_tool.h'
--- src/editor/tools/editor_draw_tool.h	2016-01-28 05:24:34 +
+++ src/editor/tools/editor_draw_tool.h	2016-02-20 10:41:42 +
@@ -43,7 +43,7 @@
 	EditorActionArgs format_args_impl(EditorInteractive & parent) override;
 
 	char const * get_sel_impl() const override {
-		return "images/ui_basic/fsel.png";
+		return "EDITOR_DRAW_TOOL";
 	}
 
 	void add_action(EditorToolAction ac, EditorActionArgs & args);

___
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/beautiful_correct_lines into lp:widelands

[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 remote host
bzr: ERROR: Connection closed: Unexpected end of message. Please check 
connectivity and permissions, and report a bug if problems persist. 
Using saved parent location: 
bzr+ssh://bazaar.launchpad.net/~widelands-dev/widelands/beautiful_correct_lines/

-- 
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.

___
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/string-fixes into lp:widelands

[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 
lp:~widelands-dev/widelands/string-fixes.

___
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/balancing_tribes into lp:widelands

[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 review the proposed merge of 
lp:~widelands-dev/widelands/balancing_tribes 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/fix_campaign_loading into lp:widelands

[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.

___
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-1546095-backslash-edit into lp:widelands

[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 remote host
bzr: ERROR: Connection closed: Unexpected end of message. Please check 
connectivity and permissions, and report a bug if problems persist. 
Using saved parent location: 
bzr+ssh://bazaar.launchpad.net/~widelands-dev/widelands/bug-1546095-backslash-edit/

-- 
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.

___
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-1509172-map-saving-paths into lp:widelands

[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 you can't save again "abc" without restarting the editor (or save once 
under another name).

So the editor itself does put also a lock on the save file after the first save.

Why does creating a MapSaver object with new not work on linux?
-- 
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-1509172-map-saving-paths.

___
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-1525706-artifacts into lp:widelands

[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:~widelands-dev/widelands/bug-1525706-artifacts.

___
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/listselect into lp:widelands

[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-572.
-- 
https://code.launchpad.net/~widelands-dev/widelands/listselect/+merge/286033
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/listselect.

___
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-1395278-logic1 into lp:widelands

[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,40 +1024,40 @@
>   // Read general statistics
>   uint32_t entries = fr.unsigned_16();
>   const PlayerNumber nr_players = map().get_nrplayers();
> - m_general_stats.resize(nr_players);
> + general_stats_.resize(nr_players);
>  
>   iterate_players_existing_novar(p, nr_players, *this) {
> - m_general_stats[p - 1].land_size   .resize(entries);
> - m_general_stats[p - 1].nr_workers  .resize(entries);
> - m_general_stats[p - 1].nr_buildings.resize(entries);
> - m_general_stats[p - 1].nr_wares.resize(entries);
> - m_general_stats[p - 1].productivity.resize(entries);
> - m_general_stats[p - 1].nr_casualties   .resize(entries);
> - m_general_stats[p - 1].nr_kills.resize(entries);
> - m_general_stats[p - 1].nr_msites_lost.resize(entries);
> - m_general_stats[p - 1].nr_msites_defeated.resize(entries);
> - m_general_stats[p - 1].nr_civil_blds_lost.resize(entries);
> - m_general_stats[p - 1].nr_civil_blds_defeated.resize(entries);
> - m_general_stats[p - 1].miltary_strength.resize(entries);
> - m_general_stats[p - 1].custom_statistic.resize(entries);
> + general_stats_[p - 1].land_size   .resize(entries);
> + general_stats_[p - 1].nr_workers  .resize(entries);
> + general_stats_[p - 1].nr_buildings.resize(entries);
> + general_stats_[p - 1].nr_wares.resize(entries);
> + general_stats_[p - 1].productivity.resize(entries);
> + general_stats_[p - 1].nr_casualties   .resize(entries);
> + general_stats_[p - 1].nr_kills.resize(entries);
> + general_stats_[p - 1].nr_msites_lost.resize(entries);
> + general_stats_[p - 1].nr_msites_defeated.resize(entries);
> + general_stats_[p - 1].nr_civil_blds_lost.resize(entries);
> + general_stats_[p - 1].nr_civil_blds_defeated.resize(entries);
> + general_stats_[p - 1].miltary_strength.resize(entries);
> + general_stats_[p - 1].custom_statistic.resize(entries);

We should try to kill such invariants, even if the compiler may find this ...

>   }
>  
>   iterate_players_existing_novar(p, nr_players, *this)
> - for (uint32_t j = 0; j < m_general_stats[p - 
> 1].land_size.size(); ++j)
> + for (uint32_t j = 0; j < general_stats_[p - 
> 1].land_size.size(); ++j)
>   {
> - m_general_stats[p - 1].land_size   [j] = 
> fr.unsigned_32();
> - m_general_stats[p - 1].nr_workers  [j] = 
> fr.unsigned_32();
> - m_general_stats[p - 1].nr_buildings[j] = 
> fr.unsigned_32();
> - m_general_stats[p - 1].nr_wares[j] = 
> fr.unsigned_32();
> - m_general_stats[p - 1].productivity[j] = 
> fr.unsigned_32();
> - m_general_stats[p - 1].nr_casualties   [j] = 
> fr.unsigned_32();
> - m_general_stats[p - 1].nr_kills[j] = 
> fr.unsigned_32();
> - m_general_stats[p - 1].nr_msites_lost[j] = 
> fr.unsigned_32();
> - m_general_stats[p - 1].nr_msites_defeated[j] = 
> fr.unsigned_32();
> - m_general_stats[p - 1].nr_civil_blds_lost[j] = 
> fr.unsigned_32();
> - m_general_stats[p - 1].nr_civil_blds_defeated[j] = 
> fr.unsigned_32();
> - m_general_stats[p - 1].miltary_strength[j] = 
> fr.unsigned_32();
> - m_general_stats[p - 1].custom_statistic[j] = 
> fr.unsigned_32();
> + general_stats_[p - 1].land_size   [j] = 
> fr.unsigned_32();
> + general_stats_[p - 1].nr_workers  [j] = 
> fr.unsigned_32();
> + general_stats_[p - 1].nr_buildings[j] = 
> fr.unsigned_32();
> + general_stats_[p - 1].nr_wares[j] = 
> fr.unsigned_32();
> + general_stats_[p - 1].productivity[j] = 
> fr.unsigned_32();
> + general_stats_[p - 1].nr_casualties   [j] = 
> fr.unsigned_32();
> + general_stats_[p - 1].nr_kills[j] = 
> fr.unsigned_32();
> + general_stats_[p - 1].nr_msites_lost[j] = 
> fr.unsigned_32();
> + general_stats_[p - 1].nr_msites_defeated[j] = 
> fr.unsigned_32();
> + general_stats_[p - 1].nr_civil_blds_lost[j] = 
> fr.unsigned_32();
> 

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

[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.

___
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-1542705 into lp:widelands

[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-594.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1542705/+merge/286187
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1542705 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/soldier_refactoring into lp:widelands

[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 remote host
bzr: ERROR: Connection closed: Unexpected end of message. Please check 
connectivity and permissions, and report a bug if problems persist. 
Using saved parent location: 
bzr+ssh://bazaar.launchpad.net/~widelands-dev/widelands/soldier_refactoring/

-- 
https://code.launchpad.net/~widelands-dev/widelands/soldier_refactoring/+merge/286753
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/soldier_refactoring 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-1542705 into lp:widelands

[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 remote host
bzr: ERROR: Connection closed: Unexpected end of message. Please check 
connectivity and permissions, and report a bug if problems persist. 
Using saved parent location: 
bzr+ssh://bazaar.launchpad.net/~widelands-dev/widelands/bug-1542705/

-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1542705/+merge/286187
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1542705 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/string-fixes into lp:widelands

[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
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp

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

[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
 * Upload Log: 
 * Builder: https://launchpad.net/builders/lgw01-57

-- 
https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+recipebuild/1081991
Your team Widelands Developers is the requester of the build.

___
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/codecheck-braces into lp:widelands

[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/~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/network-memory into lp:widelands

[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-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-1509172-map-saving-paths into lp:widelands

[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-1509172-map-saving-paths.

___
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] [recipe build #1081336] of ~widelands-dev widelands-daily in xenial: Dependency wait

[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
 * Upload Log: 
 * Builder: https://launchpad.net/builders/lgw01-39

-- 
https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+recipebuild/1081336
Your team Widelands Developers is the requester of the build.

___
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/ai_small_tweaks into lp:widelands

[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 branch 
lp:~widelands-dev/widelands/ai_small_tweaks.

___
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/fix_campaign_loading into lp:widelands

[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-dev/widelands/fix_campaign_loading/+merge/285709
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/fix_campaign_loading.

___
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/ai_small_tweaks into lp:widelands

[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-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/network-memory into lp:widelands

[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 branch 
lp:~widelands-dev/widelands/network-memory.

___
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-1509172-map-saving-paths into lp:widelands

[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/~widelands-dev/widelands/bug-1509172-map-saving-paths/+merge/286067
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1509172-map-saving-paths.

___
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-1546095-backslash-edit into lp:widelands

[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.

___
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-1395278-logic1 into lp:widelands

[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/+merge/286178
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1395278-logic1.

___
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-1509172-map-saving-paths into lp:widelands

[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_map_saving_paths-604.
-- 
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-1509172-map-saving-paths.

___
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/ai_small_tweaks into lp:widelands

[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 remote host
bzr: ERROR: Connection closed: Unexpected end of message. Please check 
connectivity and permissions, and report a bug if problems persist. 
Using saved parent location: 
bzr+ssh://bazaar.launchpad.net/~widelands-dev/widelands/ai_small_tweaks/

-- 
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-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-1509172-map-saving-paths into lp:widelands

[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 remote host
bzr: ERROR: Connection closed: Unexpected end of message. Please check 
connectivity and permissions, and report a bug if problems persist. 
Using saved parent location: 
bzr+ssh://bazaar.launchpad.net/~widelands-dev/widelands/bug-1509172-map-saving-paths/

-- 
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-1509172-map-saving-paths.

___
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/ai_small_tweaks into lp:widelands

[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_tweaks-579.
-- 
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-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-1546095-backslash-edit into lp:widelands

[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 remote host
bzr: ERROR: Connection closed: Unexpected end of message. Please check 
connectivity and permissions, and report a bug if problems persist. 
Using saved parent location: 
bzr+ssh://bazaar.launchpad.net/~widelands-dev/widelands/bug-1546095-backslash-edit/

-- 
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.

___
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-1525706-artifacts into lp:widelands

[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 remote host
bzr: ERROR: Connection closed: Unexpected end of message. Please check 
connectivity and permissions, and report a bug if problems persist. 
Using saved parent location: 
bzr+ssh://bazaar.launchpad.net/~widelands-dev/widelands/bug-1525706-artifacts/

-- 
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: 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-1525706-artifacts into lp:widelands

[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_artifacts-581.
-- 
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: 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/listselect into lp:widelands

[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 remote host
bzr: ERROR: Connection closed: Unexpected end of message. Please check 
connectivity and permissions, and report a bug if problems persist. 
Using saved parent location: 
bzr+ssh://bazaar.launchpad.net/~widelands-dev/widelands/listselect/

-- 
https://code.launchpad.net/~widelands-dev/widelands/listselect/+merge/286033
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/listselect.

___
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-1546153-suggested-teams into lp:widelands

[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 remote host
bzr: ERROR: Connection closed: Unexpected end of message. Please check 
connectivity and permissions, and report a bug if problems persist. 
Using saved parent location: 
bzr+ssh://bazaar.launchpad.net/~widelands-dev/widelands/bug-1546153-suggested-teams/

-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1546153-suggested-teams/+merge/286345
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1546153-suggested-teams.

___
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-1542705 into lp:widelands

[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-594.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1542705/+merge/286187
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1542705 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/listselect into lp:widelands

[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 remote host
bzr: ERROR: Connection closed: Unexpected end of message. Please check 
connectivity and permissions, and report a bug if problems persist. 
Using saved parent location: 
bzr+ssh://bazaar.launchpad.net/~widelands-dev/widelands/listselect/

-- 
https://code.launchpad.net/~widelands-dev/widelands/listselect/+merge/286033
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/listselect.

___
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/beautiful_correct_lines into lp:widelands

[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_correct_lines-447.
-- 
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.

___
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-1542705 into lp:widelands

[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 remote host
bzr: ERROR: Connection closed: Unexpected end of message. Please check 
connectivity and permissions, and report a bug if problems persist. 
Using saved parent location: 
bzr+ssh://bazaar.launchpad.net/~widelands-dev/widelands/bug-1542705/

-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1542705/+merge/286187
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1542705 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/ai_small_tweaks into lp:widelands

[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 remote host
bzr: ERROR: Connection closed: Unexpected end of message. Please check 
connectivity and permissions, and report a bug if problems persist. 
Using saved parent location: 
bzr+ssh://bazaar.launchpad.net/~widelands-dev/widelands/ai_small_tweaks/

-- 
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-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-1525706-artifacts into lp:widelands

[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 remote host
bzr: ERROR: Connection closed: Unexpected end of message. Please check 
connectivity and permissions, and report a bug if problems persist. 
Using saved parent location: 
bzr+ssh://bazaar.launchpad.net/~widelands-dev/widelands/bug-1525706-artifacts/

-- 
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: 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-1546153-suggested-teams into lp:widelands

[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_suggested_teams-570.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1546153-suggested-teams/+merge/286345
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1546153-suggested-teams.

___
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/ai_small_tweaks into lp:widelands

[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:~widelands-dev/widelands/ai_small_tweaks.

___
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/ai_small_tweaks into lp:widelands

[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/logic/widelands_geometry.h
Text conflict in src/ai/ai_help_structs.h
Text conflict in src/ai/defaultai.cc
2 conflicts encountered.

-- 
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-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-1395278-logic1 into lp:widelands

[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 subscribed to branch 
lp:~widelands-dev/widelands/bug-1395278-logic1.

___
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-1509172-map-saving-paths into lp:widelands

[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-map-saving-paths/+merge/286067
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1509172-map-saving-paths.

___
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/soldier_refactoring into lp:widelands

[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 in SolderDescr private.
- Renamed all instances of "hp" and "hitpoints" to "health" for consistency.
- TrainingAttribute is now an enum class with consistent saveloading datatype.


Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/soldier_refactoring/+merge/286753

The Lua code for the soldier descriptions was still a holdover from the old 
conf file format. I have now created some nicer data structures and done some 
code refactoring (see commit message).

I'd like this in Build 19, because it will be a pain for modders otherwise.
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/soldier_refactoring into lp:widelands.
=== modified file 'data/campaigns/tutorial02_warfare.wmf/scripting/texts.lua'
--- data/campaigns/tutorial02_warfare.wmf/scripting/texts.lua	2016-01-28 05:24:34 +
+++ data/campaigns/tutorial02_warfare.wmf/scripting/texts.lua	2016-02-21 19:03:44 +
@@ -31,7 +31,7 @@
   p(_[[Take a look at the soldiers that are on their way to our military buildings. They look different from normal workers: they have a health bar over their head that displays their remaining health, and they have four symbols, which symbolize the individual soldier’s current levels in the four different categories: health, attack, defense and evade.]]) ..
   p(_[[If a Barbarian soldier is fully trained, he has level 3 health, level 5 attack, level 0 defense and level 2 evade. This is one fearsome warrior then! The individual abilities have the following meaning:]])
) ..
-   rt("image=tribes/workers/barbarians/soldier/hp_level0.png", h2(_"Health:"))..
+   rt("image=tribes/workers/barbarians/soldier/health_level0.png", h2(_"Health:"))..
rt(p(_[[The total life of a soldier. A Barbarian soldier starts with 130 health, and he will gain 28 health with each health level.]])) ..
rt("image=tribes/workers/barbarians/soldier/attack_level0.png", h2(_"Attack:")) ..
rt(p(_[[The amount of damage a soldier will inflict on the enemy when an attack is successful. A Barbarian soldier with attack level 0 inflicts ~14 points of health damage when he succeeds in hitting an enemy. For each attack level, he gains 7 damage points.]])) ..

=== modified file 'data/tribes/buildings/trainingsites/atlanteans/labyrinth/init.lua'
--- data/tribes/buildings/trainingsites/atlanteans/labyrinth/init.lua	2016-02-17 15:29:52 +
+++ data/tribes/buildings/trainingsites/atlanteans/labyrinth/init.lua	2016-02-21 19:03:44 +
@@ -69,7 +69,7 @@
  "shield_advanced"
   }
},
-   ["soldier hp"] = {
+   ["soldier health"] = {
   min_level = 0,
   max_level = 0,
   food = {
@@ -119,15 +119,15 @@
 "train=soldier defense 1 2"
  }
   },
-  upgrade_soldier_hp_0 = {
+  upgrade_soldier_health_0 = {
  -- TRANSLATORS: Completed/Skipped/Did not start upgrading ... because ...
  descname = _"upgrading soldier health from level 0 to level 1",
  actions = {
-"check_soldier=soldier hp 0", -- Fails when aren't any soldier of level 0 hp
+"check_soldier=soldier health 0", -- Fails when aren't any soldier of level 0 health
 "sleep=3",
-"check_soldier=soldier hp 0", -- Because the soldier can be expelled by the player
+"check_soldier=soldier health 0", -- Because the soldier can be expelled by the player
 "consume=smoked_fish,smoked_meat:2 tabard_golden",
-"train=soldier hp 0 1"
+"train=soldier health 0 1"
  }
   },
   upgrade_soldier_evade_0 = {

=== modified file 'data/tribes/buildings/trainingsites/barbarians/trainingcamp/init.lua'
--- data/tribes/buildings/trainingsites/barbarians/trainingcamp/init.lua	2016-01-02 21:39:43 +
+++ data/tribes/buildings/trainingsites/barbarians/trainingcamp/init.lua	2016-02-21 19:03:44 +
@@ -82,7 +82,7 @@
  "ax_warriors"
   }
},
-   ["soldier hp"] = {
+   ["soldier health"] = {
   min_level = 0,
   max_level = 2,
   food = {
@@ -160,37 +160,37 @@
 "train=soldier attack 4 5"
  }
   },
-  upgrade_soldier_hp_0 = {
+  upgrade_soldier_health_0 = {
  -- TRANSLATORS: Completed/Skipped/Did not start upgrading ... because ...
  descname = _"upgrading soldier health from level 0 to level 1",
  actions = {
-"check_soldier=soldier hp 0",
+"check_soldier=soldier health 0",
 "sleep=3",
-"check_soldier=soldier hp 0",
+"check_soldier=soldier health 0",

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

[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.

___
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-1525706-artifacts into lp:widelands

[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: 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/codecheck-braces into lp:widelands

[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/~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:~miroslavr256/widelands/bug-1524841 into lp:widelands

[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 details, see:
https://code.launchpad.net/~miroslavr256/widelands/bug-1524841/+merge/286735

This should hopefully fix bug #1524841. Needs testing from someone who can 
reproduce the bug.
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~miroslavr256/widelands/bug-1524841 into lp:widelands.
=== modified file 'utils/buildcat.py'
--- utils/buildcat.py	2016-02-03 09:22:53 +
+++ utils/buildcat.py	2016-02-20 15:58:07 +
@@ -306,18 +306,25 @@
 and write out the given potfile
 """
 # call xgettext and supply source filenames via stdin
-gettext_input = subprocess.Popen("xgettext %s --files-from=- --output=%s" % \
-(XGETTEXTOPTS, potfile), shell=True, stdin=subprocess.PIPE, universal_newlines=True).stdin
+xgettext = subprocess.Popen("xgettext %s --files-from=- --output=%s" % \
+(XGETTEXTOPTS, potfile), shell=True, stdin=subprocess.PIPE, universal_newlines=True)
 try:
 for one_pattern in srcfiles:
 # 'normpath' is necessary for windows ('/' vs. '\')
 # 'glob' handles filename wildcards
 for one_file in glob(os.path.normpath(one_pattern)):
-gettext_input.write(one_file + "\n")
-return gettext_input.close()
+xgettext.stdin.write(one_file + "\n")
+xgettext.stdin.close()
 except IOError as err_msg:
 sys.stderr.write("Failed to call xgettext: %s\n" % err_msg)
-return -1
+return False
+
+xgettext_status = xgettext.wait()
+if (xgettext_status != 0):
+sys.stderr.write("xgettext exited with errorcode %i\n" % xgettext_status)
+return False
+
+return True
 
 
 ##
@@ -368,8 +375,7 @@
 potfile = os.path.basename(pot) + '.pot'
 if pot.startswith('widelands'):
 # This catalogs can be built with xgettext
-do_compile_src(potfile , srcfiles )
-succ = True
+succ = do_compile_src(potfile , srcfiles )
 else:
 succ = do_compile(potfile, srcfiles)
 

___
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/codecheck-braces into lp:widelands

[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 branch 
lp:~widelands-dev/widelands/codecheck-braces.

___
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/find_portdock_reworked into lp:widelands

[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 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/fix_campaign_loading into lp:widelands

[noreply]

The proposal to merge lp:~widelands-dev/widelands/fix_campaign_loading into 
lp:widelands has been updated.

Status: Needs review => Merged

For more details, see:
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.

___
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-1546095-backslash-edit into lp:widelands

[SirVer]

I guess the \ disappear because we do escaping in the unicode rendered and \ is 
interpreted as invalid and eaten. 
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1546095-backslash-edit/+merge/286189
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1546095-backslash-edit 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/string-fixes into lp:widelands

[SirVer]

Review: Approve

lgtm. 
-- 
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
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp