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

2017-03-05 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bug-1670065_emp01_clear_building_site into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1670065_emp01_clear_building_site/+merge/319000 -- Your

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

2017-03-05 Thread bunnybot
Continuous integration builds have changed state: Travis build 2046. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/207911463. Appveyor build 1881. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_167006

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

2017-03-05 Thread noreply
The proposal to merge lp:~widelands-dev/widelands-website/get_rid_of_wikiwords into lp:widelands-website has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands-website/get_rid_of_wikiwords/+merge/318283 -- Your team Widela

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1670065_emp01_clear_building_site into lp:widelands

2017-03-05 Thread kaputtnik
Thanks :-) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1670065_emp01_clear_building_site/+merge/319000 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1670065_emp01_clear_building_site. ___ Mailing

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

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

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

2017-03-05 Thread GunChleoc
Thanks! @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/align_cleanup_textarea/+merge/318322 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/align_cleanup_textarea. ___ Mailing list: https://la

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1664052-expedition-shipwindow-crash into lp:widelands

2017-03-05 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/bug-1664052-expedition-shipwindow-crash into lp:widelands has been updated. Commit Message changed to: Do not delete/recreate buttons in the ship window. This fixes a segfault with the button signals. This also makes NoteShipWindow::Action::kRe

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1664052-expedition-shipwindow-crash into lp:widelands

2017-03-05 Thread GunChleoc
Prettification is done. I also rearranged the buttons on the bottom - the shipwindow was the only window where the goto-button is on the left. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1664052-expedition-shipwindow-crash/+merge/318986 Your team Widelands Developers is requested

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

2017-03-05 Thread Notabilis
Review: Approve The diff looks good to me and I haven't noticed anything strange in-game. -- https://code.launchpad.net/~widelands-dev/widelands/align_cleanup_textarea/+merge/318322 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/align_cleanup_textarea. __

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1664052-expedition-shipwindow-crash into lp:widelands

2017-03-05 Thread GunChleoc
I like the mockup - should be doable :) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1664052-expedition-shipwindow-crash/+merge/318986 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1664052-expedition-shipwindow-crash into

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1670065_emp01_clear_building_site into lp:widelands

2017-03-05 Thread GunChleoc
Review: Approve LGTM :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1670065_emp01_clear_building_site/+merge/319000 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1670065_emp01_clear_building_site. _

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

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

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

2017-03-05 Thread bunnybot
Continuous integration builds have changed state: Travis build 2042. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/207878664. Appveyor build 1877. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_silkweaver

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

2017-03-05 Thread kaputtnik
The proposal to merge lp:~widelands-dev/widelands/bug-1670065_emp01_clear_building_site into lp:widelands has been updated. Commit Message changed to: Clear building space for first buildings in empire campaign 1 For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-16

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

2017-03-05 Thread Klaus Halfmann
Review: Approve Actually played this until I heared the song :-) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/silkweaver_song/+merge/318999 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/silkweaver_song. ___

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1670065_emp01_clear_building_site into lp:widelands

2017-03-05 Thread kaputtnik
Thats better :-) Made a function remove_trees() and additionally call it for the fields of the barrack. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1670065_emp01_clear_building_site/+merge/319000 Your team Widelands Developers is requested to review the proposed merge of lp:~wide

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1664052-expedition-shipwindow-crash into lp:widelands

2017-03-05 Thread kaputtnik
Ah, ok i see... i meant formerly the black area fits the whole inner window, whereas now there is some space on the left and right between window border and black area. It looks like the black area is in the air somehow. I have no time (and maybe no experience) for creating such an image i ment

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1664052-expedition-shipwindow-crash into lp:widelands

2017-03-05 Thread bunnybot
Continuous integration builds have changed state: Travis build 2040. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/207850688. Appveyor build 1875. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_16640

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1670065_emp01_clear_building_site into lp:widelands

2017-03-05 Thread GunChleoc
I think this is an excellent idea :) How about adding this for the blockhouse as well? If you check for if (f.immovable:has_attribute("tree")) then you can't accidentally tear down any buildings or flags. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1670065_emp01_clear_buildi

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

2017-03-05 Thread kaputtnik
kaputtnik has proposed merging lp:~widelands-dev/widelands/bug-1670065_emp01_clear_building_site into lp:widelands. Commit message: Clear building space for Lumberjack in empire campaign 1 Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1670065 in widelands: "rand

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

2017-03-05 Thread Klaus Halfmann
Klaus Halfmann has proposed merging lp:~widelands-dev/widelands/silkweaver_song into lp:widelands. Requested reviews: GunChleoc (gunchleoc) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/silkweaver_song/+merge/318999 Adde the Silweaver Song as ingame music. -- You

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

2017-03-05 Thread GunChleoc
Review: Approve I have added you to the credits. Merge if you're happy. -- https://code.launchpad.net/~widelands-dev/widelands/silkweaver_song/+merge/318999 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/silkweaver_song. __

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1664052-expedition-shipwindow-crash into lp:widelands

2017-03-05 Thread GunChleoc
1. I added some padding around the navigation buttons, if this is what you mean. A background image would be possible, but someone needs to make one first - that's beyond my skills. Let me know if you want to try - I will code a branch then so you can drop in the image and see it in-game. 2. Th