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

2014-07-21 Thread SirVer
That's a lot of code. I need to make a chunk of time to review this. My branch is about removing the legacy richtext renderer and using the new one everywhere (i.e. especially in scenario texts). -- https://code.launchpad.net/~widelands-dev/widelands/fh1/+merge/177228 Your team Widelands Develo

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

2014-07-21 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/string_fix_headquarters into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/string_fix_headquarters/+merge/227543 -- https://code.launchpad.net/~widela

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

2014-07-21 Thread SirVer
Review: Approve -- https://code.launchpad.net/~widelands-dev/widelands/string_fix_headquarters/+merge/227543 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string_fix_headquarters. ___ Mailing list: https://launchp

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

2014-07-21 Thread SirVer
Review: Needs Fixing I changed a couple of nits: - I moved the documentation of your new methods to the header (documentation in .cc files makes less sense. I know that we did that in the past, but for the future, documentation goes into the header). - Added a disallow_copy_and_assign() to Pr

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

2014-07-21 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bug-1322741 into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1322741/+merge/227626 -- https://code.launchpad.net/~widelands-dev/widelands/bug-13

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

2014-07-21 Thread SirVer
Review: Approve -- https://code.launchpad.net/~widelands-dev/widelands/bug-1322741/+merge/227626 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1322741. ___ Mailing list: https://launchpad.net/~widelands-dev Po

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

2014-07-21 Thread cghislai
Concerning the widgets, there are 2 minor issues left : Consecutive line breaks and RTL auto-wrapping. Other than that, all use new font renderer and (multiline) editboxes work great. Sirver, I will try to check the changes in your branch. -- https://code.launchpad.net/~widelands-dev/widelands/fh

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

2014-07-21 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1322741 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1322741 in widelands: "text issue: fps statistics overlaps with xz coordinates" https://bugs.launchpad.net/widelands/+bug/132

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

2014-07-21 Thread SirVer
Review: Approve Looks good to me. I went ahead and merged. I'll probably tweak a bit while deploying... Thanks for taking care of that Shevonar! -- https://code.launchpad.net/~widelands-dev/widelands-website/map-upload/+merge/227458 Your team Widelands Developers is subscribed to branch lp:wid

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

2014-07-21 Thread noreply
The proposal to merge lp:~widelands-dev/widelands-website/map-upload into lp:widelands-website has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands-website/map-upload/+merge/227458 -- https://code.launchpad.net/~wideland

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

2014-07-21 Thread Shevonar
I don't really know how to deal with the map file being saved twice without putting a lot of effort into it. I think it is not worth to investigate further. From my side this is ready for review and merge. -- https://code.launchpad.net/~widelands-dev/widelands-website/map-upload/+merge/227458 Yo

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

2014-07-21 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/string_fix_headquarters into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/string_fix_headquarters/+merge/227543 Small string fix -- h

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

2014-07-21 Thread cghislai
This is what i get after merging trunk. I made a test ui you can launch with ./widelands --testui There are still some layout issues I need to fix. -- https://code.launchpad.net/~widelands-dev/widelands/fh1/+merge/177228 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/wi

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

2014-07-21 Thread GunChleoc
Thanks for the info. I am looking forward to Ninja :D -- https://code.launchpad.net/~widelands-dev/widelands/bug-1341081/+merge/227107 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1341081. ___ Mailing list: ht

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

2014-07-21 Thread Shevonar
When Widelands is installed from the daily PPA the executables are also added to PATH so it is not necessary to provide the exact directory. This means it works without changes. -- https://code.launchpad.net/~widelands-dev/widelands-website/map-upload/+merge/227458 Your team Widelands Developers

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

2014-07-21 Thread GunChleoc
OK, all done and ready for merging :) The delay parameters might need some more tweaking, we'll just have to see how it behaves in a real game. Buildings with message delay are hunters, lumberjacks and wells. -- https://code.launchpad.net/~widelands-dev/widelands/bug-999262_part2/+merge/227348

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

2014-07-21 Thread Shevonar
> Any idea why this is not showing a diff? I got this mail form launchpad: > Launchpad encountered an internal error during the following operation: > generating the diff for a merge proposal. It was logged with id > OOPS-3da48092fc23f6e12528857791597bea. Sorry for the inconvenience. Does not

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

2014-07-21 Thread cghislai
Yep Ill push my code as soons as I have this last bug gone with the editbox. On Mon, Jul 21, 2014 at 6:53 AM, SirVer wrote: > Cool. I am working on getting rid of the old font renderer too in > https://code.launchpad.net/~widelands-dev/widelands/text_area_richtext . > Maybe we can join forces.