Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/editor-resize-map into lp:widelands

2019-04-08 Thread GunChleoc
First round of code review done. Not tested yet. Diff comments: > > === added file 'src/editor/tools/resize_tool.cc' > --- src/editor/tools/resize_tool.cc 1970-01-01 00:00:00 + > +++ src/editor/tools/resize_tool.cc 2019-04-07 17:11:51 + > @@ -0,0 +1,99 @@ > +/* > + * Copyright (C) 20

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

2019-04-08 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/territorial_game_over into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/territorial_game_over/+merge/365636 -- Your team Widelands Developers is subs

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1764318-barbarian-lore into lp:widelands

2019-04-08 Thread GunChleoc
I have pushed some code fixes. I'll have to review the texts themselves later. Constructionsites and Dismanlesites are not tribe-specific, so I have removed "Barbarian" from the lore author. For the Atlantean fishbreeder: return pgettext("atlanteans_building", [[‘‘Only after the last deer ha

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug1823471-empire3-4-victory into lp:widelands

2019-04-08 Thread bunnybot
Continuous integration builds have changed state: Travis build 4686. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/516959535. Appveyor build 4472. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug1823471

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/editor-resize-map into lp:widelands

2019-04-08 Thread Benedikt Straub
Thanks for the review, implemented your suggestions Diff comments: > > === modified file 'src/editor/ui_menus/tool_menu.cc' > --- src/editor/ui_menus/tool_menu.cc 2019-02-23 11:00:49 + > +++ src/editor/ui_menus/tool_menu.cc 2019-04-07 17:11:51 + > @@ -82,7 +84,10 @@ >

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

2019-04-08 Thread Benedikt Straub
Can´t reply this in the bug report for some reason…: Let W and E be the end flags of the waterway that has a ferry. – Destroy both waterways. – Build a waterway from W to a new flag F on the tiny island south of the warehouse. It´ll get the ferry that used to service the waterway from W to E. – B

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

2019-04-08 Thread bunnybot
Continuous integration builds have changed state: Travis build 4687. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/516995509. Appveyor build 4473. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_territoria

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/cleanup-statistics-plotter into lp:widelands

2019-04-08 Thread bunnybot
Continuous integration builds have changed state: Travis build 4688. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/517020546. Appveyor build 4474. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_cleanup_st

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1764318-barbarian-lore into lp:widelands

2019-04-08 Thread bunnybot
Continuous integration builds have changed state: Travis build 4693. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/517159425. Appveyor build 4479. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_17643

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/editor-resize-map into lp:widelands

2019-04-08 Thread bunnybot
Continuous integration builds have changed state: Travis build 4695. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/517211510. Appveyor build 4481. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_editor_res

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

2019-04-08 Thread bunnybot
Continuous integration builds have changed state: Travis build 4696. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/517213969. Appveyor build 4482. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-4482

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/editor-resize-map into lp:widelands

2019-04-08 Thread GunChleoc
Review: Approve Changes LGTM :) Not tested yet. -- https://code.launchpad.net/~widelands-dev/widelands/editor-resize-map/+merge/365638 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/editor-resize-map. ___ Mailing l

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

2019-04-08 Thread noreply
The proposal to merge lp:~widelands-dev/widelands-website/mv_main_files into lp:widelands-website has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands-website/mv_main_files/+merge/365634 -- Your team Widelands Developers

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

2019-04-08 Thread kaputtnik
This is merged and deployed. Now we can definitely work on porting to python3 :) I had to change the init-file to let gunicorn find the moved file wlwebsite_wsgi.py -- https://code.launchpad.net/~widelands-dev/widelands-website/mv_main_files/+merge/365634 Your team Widelands Developers is subscr