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

2014-10-11 Thread GunChleoc
Review: Resubmit OOps, I meant to resubmit -- https://code.launchpad.net/~widelands-dev/widelands/bug-1378801/+merge/237599 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1378801. ___ Mailing list: https://launc

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

2014-10-11 Thread GunChleoc
Review: Needs Fixing All fixed now. BTW the compilation failed because the DISALLOW_COPY_AND_ASSIGN had the wrong object - SirVer doesn't have time to wait for the compiler when doing code reviews, so I always compile again when addressing his comments. -- https://code.launchpad.net/~widelands

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

2014-10-11 Thread wl-zocker
Currently, I am still improving the tutorials. When there is an end in sight, I will take care of this branch. Is this branch ready? The sooner it is merged, the more time I have to solve conflicts. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1298301/+merge/236966 Your team Widela

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

2014-10-11 Thread GunChleoc
That depends on the conflict and how well you know the code you're working on. If you haven't defined these functions yet, you could copy over the code from this branch. Let me know if you need help. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1298301/+merge/236966 Your team Wide

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

2014-10-11 Thread TiborB
Compilation fails here: [ 59%] Building CXX object src/editor/CMakeFiles/editor.dir/ui_menus/editor_main_menu.cc.o In file included from /var/widelands/BZR/bug-1378801/src/ui_basic/panel.h:32:0, from /var/widelands/BZR/bug-1378801/src/ui_basic/button.h:28, from

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

2014-10-11 Thread TiborB
I dont dare to review the code, but at least I can confirm it works :) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1371062/+merge/238048 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1371062 into lp:widelands. _

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

2014-10-11 Thread wl-zocker
Now I am. Parts of this I had planned anyway: An extra message_box function, the splitting into several files and string re-formatting. I have never had to solve conflicts. How hard is that? -- https://code.launchpad.net/~widelands-dev/widelands/bug-1298301/+merge/236966 Your team Widelands Devel

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

2014-10-11 Thread SirVer
This will likely conflict with wl-zockers changes. Is he aware of this branch? -- https://code.launchpad.net/~widelands-dev/widelands/bug-1298301/+merge/236966 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1298301 into lp:widelands. _

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

2014-10-11 Thread SirVer
Review: Needs Fixing Added a bunch of comments in the review. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1378801/+merge/237599 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1378801. ___ Mailing

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

2014-10-11 Thread SirVer
Review: Needs Fixing I went over the code and in general it lgtm. I just do not understand some (most?) of the compatibility cruft that you left in there. For example, buildings and ships should only ever be in savegames, never in maps. Could you elaborate on the individual cases, maybe we can

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

2014-10-11 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/boost_format into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/boost_format/+merge/229366 -- https://code.launchpad.net/~widelands-dev/widelands/boos

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

2014-10-11 Thread SirVer
Review: Approve Looks good. I went ahead and merged this. -- https://code.launchpad.net/~widelands-dev/widelands/boost_format/+merge/229366 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/boost_format. ___ Mailing li

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

2014-10-11 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bug-566729 into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-566729/+merge/229302 -- https://code.launchpad.net/~widelands-dev/widelands/bug-5667

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

2014-10-11 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/tibor-ai5 into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/tibor-ai5/+merge/228762 -- https://code.launchpad.net/~widelands-dev/widelands/tibor-ai5/

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

2014-10-11 Thread SirVer
Review: Approve Great. I merge this now. -- https://code.launchpad.net/~widelands-dev/widelands/tibor-ai5/+merge/228762 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/tibor-ai5. ___ Mailing list: https://launchpad.n

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

2014-10-11 Thread SirVer
Review: Approve I added a bunch of small comments in the last revision (grep for NOCOM). Looks good to me in general, feel free to merge after you've addressed these. -- https://code.launchpad.net/~widelands-dev/widelands/bug-566729/+merge/229302 Your team Widelands Developers is subscribed to b

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

2014-10-11 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1371062 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1371062 in widelands: "Add confirmation dialog to exit game" https://bugs.launchpad.net/widelands/+bug/1371062 For more detai