[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1542821-internet-exceptions into lp:widelands

2016-04-23 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1542821-internet-exceptions into lp:widelands. Commit message: Server and client will now log out when they crash. Requested reviews: Klaus Halfmann (klaus-halfmann) Related bugs: Bug #1542821 in widelands: "Inconsistency

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1573545-dismantlesite-crash into lp:widelands

2016-04-23 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1573545-dismantlesite-crash into lp:widelands. Commit message: Protect against division by 0 when drawing dismantlesite. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1573545 in widelands

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

2016-04-23 Thread GunChleoc
Review: Approve LGTM :) -- https://code.launchpad.net/~widelands-dev/widelands/update_eris/+merge/292700 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/update_eris. ___ Mailing list: https://launchpad.net/~widelands

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

2016-04-23 Thread GunChleoc
Review: Approve LGTM -- https://code.launchpad.net/~widelands-dev/widelands/format_security/+merge/292699 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/format_security. ___ Mailing list: https://launchpad.net/~wide

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1542821-internet-exceptions into lp:widelands

2016-04-23 Thread GunChleoc
The internet code is complicated, and I have never analysed the complete workflow. I just searched for "catch" and found the spot. The idea with the version came from IRC ;) +Thanks for the review! @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1542821-internet-exce

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

2016-04-23 Thread GunChleoc
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/format_security/+merge/292699 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/format_security. ___ Mailing list: https://launchpad.net/~widelands-

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

2016-04-23 Thread GunChleoc
LGTM :) Let's wait for Travis and then merge. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1571308-editbox_crash/+merge/292591 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1571308-editbox_crash.

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1535732-font-textures into lp:widelands

2016-04-23 Thread GunChleoc
No, you're not wasting my time, I just didn't want you to waste yours. The video clearly shows that we have some garbage pointers here. I think I have fixed it now - will know more when the build is ready. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1535732-font-textures/+merge/2

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1573968-new-map-crash into lp:widelands

2016-04-23 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1573968-new-map-crash into lp:widelands. Commit message: Select info tool before creating new maps. This fixes a crash with the player tool. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1573968 in

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

2016-04-23 Thread GunChleoc
I am getting a bit burned out trying to fix this thing, so I need a pair of fresh eyes. I have circumvented the remaining bugs by some hacking - what I need to know now is which hacks we can live with and which hacks need to be fixed. I think getting rid of the old font renderer is worth a few

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

2016-04-23 Thread GunChleoc
Now I understand what you're getting at, you have a valid point about the sort order. Thanks for explaining :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug_1571009_work_area_radius/+merge/292066 Your team Widelands Developers is subscribed to branch lp:~widelands-d

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

2016-04-23 Thread GunChleoc
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/update_eris/+merge/292700 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/update_eris. ___ Mailing list: https://launchpad.net/~widelands-dev Post

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1228811-observer-minimap into lp:widelands

2016-04-23 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1228811-observer-minimap into lp:widelands. Commit message: Write minimap file for observers. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug

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

2016-04-24 Thread GunChleoc
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1571308-editbox_crash/+merge/292591 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1571308-editbox_crash. ___ Mailing list: https://launc

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1228811-observer-minimap into lp:widelands

2016-04-24 Thread GunChleoc
This raises the question: Do we want to try having more overlays here? -- https://code.launchpad.net/~widelands-dev/widelands/bug-1228811-observer-minimap/+merge/292716 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1228811-observer-minimap. __

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

2016-04-24 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/fh1_multiline_textarea into lp:widelands has been updated. Description changed to: I am now looking for an evaluation of the NOCOM comments only - which ones can be turned into TODO comments, and which ones absolutely need fixing for Build 19?

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1535732-font-textures into lp:widelands

2016-04-24 Thread GunChleoc
Review: Resubmit This is fixed for me now, could you please test as well? -- https://code.launchpad.net/~widelands-dev/widelands/bug-1535732-font-textures/+merge/292354 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1535732-font-textures.

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1573968-new-map-crash into lp:widelands

2016-04-24 Thread GunChleoc
Oops, should be fixed now. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1573968-new-map-crash/+merge/292712 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1573968-new-map-crash. ___ Mailing list: ht

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

2016-04-24 Thread GunChleoc
Review: Approve LGTM :) -- https://code.launchpad.net/~widelands-dev/widelands/ai_target_quantity/+merge/292714 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_target_quantity. ___ Mailing list: https://launchpad.

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

2016-04-24 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/vintner into lp:widelands. Commit message: Created model for the Empire's Vintner. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1418525 in widelands: "Create a Vintner for the Imperial Winer

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1535732-font-textures into lp:widelands

2016-04-24 Thread GunChleoc
I have already removed the extra log output, so we need to create a new build first. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1535732-font-textures/+merge/292354 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1535732-font-textures. _

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1535732-font-textures into lp:widelands

2016-04-24 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/bug-1535732-font-textures into lp:widelands has been updated. Commit Message changed to: Fixed garbage pointer in font renderer's texture cache retrieval. For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1535732-fon

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1535732-font-textures into lp:widelands

2016-04-24 Thread GunChleoc
I can't reproduce the problems that you are still having :( Let's merge this now and try a separate fix for the remaining bug. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1535732-font-textures/+merge/292354 Your team Widelands Developers is subscribed to branch lp

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

2016-04-24 Thread GunChleoc
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/ai_target_quantity/+merge/292714 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_target_quantity. ___ Mailing list: https://launchpad.net/~wide

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1535732-fun-with-pointers into lp:widelands

2016-04-24 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1535732-fun-with-pointers into lp:widelands. Requested reviews: kaputtnik (franku) Related bugs: Bug #1535732 in widelands: "Texts not displayed correctly with the new font renderer" https://bugs.launchpad.net/wide

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

2016-04-24 Thread GunChleoc
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/vintner/+merge/292722 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/vintner. ___ Mailing list: https://launchpad.net/~widelands-dev Post to

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1573968-new-map-crash into lp:widelands

2016-04-25 Thread GunChleoc
> Are there no initial data for the editor to which it can be reset before a map > is loaded or a new map is going to be created? It looks always that there is > some data from the previous map when creating a new map or loading a map... There is already a TODO comment in the codebase for that. I

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1228811-observer-minimap into lp:widelands

2016-04-25 Thread GunChleoc
Yep, more flags is better. The change is trivial, so I'm gonna merge @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1228811-observer-minimap/+merge/292716 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1228811-observer-minimap.

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1536377-texture-atlas-size into lp:widelands

2016-04-27 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1536377-texture-atlas-size into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1536377 in widelands: "The texture atlas must use at least 2048 as size (1024 was given)&quo

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1531312-harvested-fields into lp:widelands

2016-04-27 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1531312-harvested-fields into lp:widelands. Commit message: Fixed decay of harvested fields. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1531312 in widelands: "foresters arent planting o

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1536377-texture-atlas-size into lp:widelands

2016-04-28 Thread GunChleoc
That didn't work, back to the drawing board. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1536377-texture-atlas-size/+merge/293067 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1536377-texture-atlas-size into lp:widelands

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1536377-texture-atlas-size into lp:widelands

2016-04-28 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/bug-1536377-texture-atlas-size into lp:widelands has been updated. Status: Needs review => Work in progress For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1536377-texture-atlas-size/+merge/293067 -- Your team

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1531312-harvested-fields into lp:widelands

2016-04-29 Thread GunChleoc
Thannks! bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1531312-harvested-fields/+merge/293161 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1531312-harvested-fields. ___ Mailing list

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1531312-harvested-fields into lp:widelands

2016-04-29 Thread GunChleoc
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1531312-harvested-fields/+merge/293161 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1531312-harvested-fields. ___ Mailing list: https:/

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1535732-fun-with-pointers into lp:widelands

2016-04-29 Thread GunChleoc
I thought it might fix a curious Windows bug, but it doesn't really. I'm not sure what is better code style here; we might just abandin this branch. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1535732-fun-with-pointers/+merge/292735 Your team Widelands Developers is subscribed to b

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1536377-texture-atlas-size into lp:widelands

2016-04-30 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/bug-1536377-texture-atlas-size into lp:widelands has been updated. Description changed to: Next try - relax the size requirement. For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1536377-texture-atlas-size/+merge/2

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1536377-texture-atlas-size into lp:widelands

2016-04-30 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1536377-texture-atlas-size into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1536377 in widelands: "The texture atlas must use at least 2048 as size (1024 was given)&quo

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

2016-05-01 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/gcc531 into lp:widelands. Commit message: Fixed some compiler warnings with gcc 5.3.1. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/gcc531/+merge

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1576280-help-textdomains into lp:widelands

2016-05-01 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1576280-help-textdomains into lp:widelands. Commit message: Fixed fetching of help translations. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1576280 in widelands: "Missing localization in

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

2016-05-02 Thread GunChleoc
Replied to the comments. Diff comments: > === modified file 'src/logic/queue_cmd_factory.cc' > --- src/logic/queue_cmd_factory.cc2016-01-18 05:12:51 + > +++ src/logic/queue_cmd_factory.cc2016-05-01 10:05:57 + > @@ -112,7 +112,7 @@ > case QueueCommandTypes::kReplaySyncRead: >

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1535732-fun-with-pointers into lp:widelands

2016-05-02 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/bug-1535732-fun-with-pointers into lp:widelands has been updated. Status: Needs review => Rejected For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1535732-fun-with-pointers/+merge/292735 -- Your team Widelands

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

2016-05-02 Thread GunChleoc
Review: Approve LGTM :) Let's wait for a Windows build before merging, so we can test. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1572879-broken_bidi/+merge/293491 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1572879-broken_bidi. __

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

2016-05-02 Thread GunChleoc
That's what my gcc --version says. -- https://code.launchpad.net/~widelands-dev/widelands/gcc531/+merge/293478 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/gcc531. ___ Mailing list: https://launchpad.net/~widelands

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

2016-05-02 Thread GunChleoc
Might be Ubuntu-sepecific numbering. -- https://code.launchpad.net/~widelands-dev/widelands/gcc531/+merge/293478 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/gcc531. ___ Mailing list: https://launchpad.net/~widelan

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

2016-05-02 Thread GunChleoc
Woohoo :D -- https://code.launchpad.net/~widelands-dev/widelands/bug-1572879-broken_bidi/+merge/293491 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1572879-broken_bidi. ___ Mailing list: https://launchpad.net/~

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1302593-result-screen into lp:widelands

2016-05-02 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1302593-result-screen into lp:widelands. Commit message: Persist PlayerEndStatus. This fixes missing result screen after saveloading. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1302593 in

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1576280-help-textdomains into lp:widelands

2016-05-02 Thread GunChleoc
Thanks! @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1576280-help-textdomains/+merge/293479 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1576280-help-textdomains. ___ Mailing list

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

2016-05-02 Thread GunChleoc
I didn't check the datatype ;) Diff comments: > > === modified file 'src/map_io/map_players_view_packet.cc' > --- src/map_io/map_players_view_packet.cc 2016-02-16 10:27:23 + > +++ src/map_io/map_players_view_packet.cc 2016-05-01 10:05:57 + > @@ -991,12 +991,12 @@ >

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/barbarians2-starting-objective into lp:widelands

2016-05-02 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/barbarians2-starting-objective into lp:widelands. Commit message: Barbarian Campaign 2: Added an objective to the first message. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1276247 in widelands

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

2016-05-03 Thread GunChleoc
All clear :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/gcc531/+merge/293478 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/gcc531. ___ Mailing list: https://launchpad.net/~widelands-dev

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1573968-new-map-crash into lp:widelands

2016-05-03 Thread GunChleoc
I like that much better, thank you! @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1573968-new-map-crash/+merge/292712 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1573968-new-map-crash. __

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/barbarians2-starting-objective into lp:widelands

2016-05-06 Thread GunChleoc
Thanks! @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/barbarians2-starting-objective/+merge/293546 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/barbarians2-starting-objective. ___ Mailing

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/revise-map-descr into lp:widelands

2016-05-06 Thread GunChleoc
Thanks! @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/revise-map-descr/+merge/292031 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/revise-map-descr. ___ Mailing list: https://launchpad.net/

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-601398-map-location-markers into lp:widelands

2016-05-06 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-601398-map-location-markers into lp:widelands. Commit message: Persist map location markers ((Ctrl)+0-9). Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #601398 in widelands: "map location marker

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-601398-map-location-markers into lp:widelands

2016-05-07 Thread GunChleoc
Thanks! @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-601398-map-location-markers/+merge/293983 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-601398-map-location-markers. ___ Mailin

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1302593-result-screen into lp:widelands

2016-05-08 Thread GunChleoc
Te way I tested was to hack https://bazaar.launchpad.net/~widelands-dev/widelands/trunk/view/head:/data/tribes/scripting/starting_conditions/empire/headquarters.lua to give them only a few soldiers so I could easily win, then create a map with 3 starting positions close to each other, and then o

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1548932-editor-save-zip-2 into lp:widelands

2016-05-08 Thread GunChleoc
Sorry, I'm down with a nasty cold, so I haven't done any testing yet. Have you tested that the contents of the "scripts" directory don't get wiped? Fixing that bug was the reason for the original change that caused this bug. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1548932-edit

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

2016-05-09 Thread GunChleoc
Not tested but code LGTM -- https://code.launchpad.net/~widelands-dev/widelands/bug-1579500-broken_territorial_time/+merge/294074 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1579500-broken_territorial_time into lp:widelands. __

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

2016-05-09 Thread GunChleoc
I need more information - enough for what? -- https://code.launchpad.net/~widelands-dev/widelands/ai_coverity/+merge/294132 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/ai_coverity into lp:widelands. _

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

2016-05-10 Thread GunChleoc
Review: Approve @Tibor: To answer your question, a delete deletes the object a pointer is pointing to, so yes, it would have gotten rid of the variable. The solution you implemented is much better though. Not compiled or tested, but code LGTM :) -- https://code.launchpad.net/~widelands-dev/wid

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1302593-result-screen into lp:widelands

2016-05-10 Thread GunChleoc
I have added a question in the diff comments. Diff comments: > > === modified file 'src/logic/playersmanager.cc' > --- src/logic/playersmanager.cc 2016-02-16 10:27:23 + > +++ src/logic/playersmanager.cc 2016-05-02 11:22:37 + > @@ -120,5 +120,21 @@ > } > } > > +void P

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

2016-05-10 Thread GunChleoc
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1579500-broken_territorial_time/+merge/294074 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1579500-broken_territorial_time. ___ Mailing

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1302593-result-screen into lp:widelands

2016-05-10 Thread GunChleoc
Ah, so the line is not redundant then. I'll implement the other changes that you suggested :) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1302593-result-screen/+merge/293521 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1302593-result-scree

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

2016-05-10 Thread GunChleoc
Compiled and tested. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/ai_coverity/+merge/294132 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_coverity. ___ Mailing list: https://launchpad.n

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1548932-editor-save-zip-2 into lp:widelands

2016-05-10 Thread GunChleoc
In case this helps, we also have a saving bug on Mac that is related: https://bugs.launchpad.net/widelands/+bug/1568540 -- https://code.launchpad.net/~widelands-dev/widelands/bug-1548932-editor-save-zip-2/+merge/294067 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/wide

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1302593-result-screen into lp:widelands

2016-05-10 Thread GunChleoc
Review: Resubmit Now I get it - I forgot to use a reference instead of a copy. Should be all fixed now :) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1302593-result-screen/+merge/293521 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1302593

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1302593-result-screen into lp:widelands

2016-05-11 Thread GunChleoc
Duh! Thanks for having my back. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1302593-result-screen/+merge/293521 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1302593-result-screen. ___ Mailing lis

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1535065-random-map-id into lp:widelands

2016-05-11 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1535065-random-map-id into lp:widelands. Commit message: Fixed Island Mode on/off for random map generation. Added log output. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1535065 in widelands

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1302593-result-screen into lp:widelands

2016-05-11 Thread GunChleoc
Thanks again! @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1302593-result-screen/+merge/293521 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1302593-result-screen. ___ Mailing list

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1535065-random-map-id into lp:widelands

2016-05-11 Thread GunChleoc
Nits are good, they make the code better :) Let's wait for Travis before merging, we have a codecheck error. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1535065-random-map-id/+merge/294379 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-15350

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1535065-random-map-id into lp:widelands

2016-05-12 Thread GunChleoc
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1535065-random-map-id/+merge/294379 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1535065-random-map-id. ___ Mailing list: https://launc

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1548932-editor-save-zip-2 into lp:widelands

2016-05-12 Thread GunChleoc
Everything's fine on my Ubuntu. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1548932-editor-save-zip-2/+merge/294067 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1548932-editor-save-zip-2. ___ Mai

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1536377-texture-atlas-size into lp:widelands

2016-05-12 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/bug-1536377-texture-atlas-size into lp:widelands has been updated. Status: Needs review => Work in progress For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1536377-texture-atlas-size/+merge/293067 -- Your team

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/mapgen-ui-updates into lp:widelands

2016-05-12 Thread GunChleoc
LGTM :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/mapgen-ui-updates/+merge/294520 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/mapgen-ui-updates into lp:widelands. ___

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1581647-compiler-warnings into lp:widelands

2016-05-13 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1581647-compiler-warnings into lp:widelands. Commit message: Fixed some compiler warnings. Requested reviews: kaputtnik (franku) Related bugs: Bug #1581647 in widelands: "Compiler warning: Unreachable code was reached&quo

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

2016-05-14 Thread GunChleoc
Review: Resubmit The output path is now defined on the command line when calling the executable. If the new changes are OK, this can go in now. -- https://code.launchpad.net/~widelands-dev/widelands/map_object_info/+merge/287409 Your team Widelands Developers is subscribed to branch lp:~widelan

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

2016-05-14 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/map_object_info into lp:widelands. Commit message: Created a new executable that will generate JSON files for updating the encyclopedia on the website. Requested reviews: GunChleoc (gunchleoc) kaputtnik (franku): testing Related

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

2016-05-14 Thread GunChleoc
The C++ code has been updated now to specify the output dir on the command line. I can't get the website code to run after my recent system upgrade though, so I don't know how to finish up this branch :( -- https://code.launchpad.net/~widelands-dev/widelands-website/encyclopedia/+merge/287410 Yo

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

2016-05-14 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/fix_tut1_destroy_quarries into lp:widelands. Commit message: Trigger destroy_quarries_message in Tutorial 1 with 1 message. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1418154-collectors-teams into lp:widelands

2016-05-14 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1418154-collectors-teams into lp:widelands. Commit message: Collectors now reports team scores as well as player scores. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1418154 in widelands

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1581647-compiler-warnings into lp:widelands

2016-05-14 Thread GunChleoc
Thanks! @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1581647-compiler-warnings/+merge/294698 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1581647-compiler-warnings. ___ Mailing li

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

2016-05-14 Thread GunChleoc
Thanks! @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/fix_tut1_destroy_quarries/+merge/294699 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix_tut1_destroy_quarries. ___ Mailing list: http

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

2016-05-14 Thread GunChleoc
Excellent :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/fix_tut1_destroy_quarries_2/+merge/294713 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fix_tut1_destroy_quarries_2 into lp:widelands. __

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

2016-05-15 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/appdata into lp:widelands. Commit message: Added added widelands.appdata.xml for debian desktops. Made this file and widelands.desktop localizable. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1271595

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

2016-05-15 Thread GunChleoc
LGTM :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1566441_Saving_game/+merge/294720 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1566441_Saving_game into lp:widelands. ___

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1548932-editor-save-zip-2 into lp:widelands

2016-05-15 Thread GunChleoc
I just tested on Windows 7. I saved and loaded repeatedly, alternating between zip and no zip. I did not encounter any problems. > I get an empty scripting subdir: > 1.) Copy one tutorial scenario into ~/.widelands/maps > 2.) Rename it test1234 > 3.) Open it with the editor > 4.) Save it again a

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1548932-editor-save-zip-2 into lp:widelands

2016-05-15 Thread GunChleoc
Testing on my Windows 10 is also OK. I used Island Hopping for testing. I think this branch is a significant improvement in any case, shall we merge it? -- https://code.launchpad.net/~widelands-dev/widelands/bug-1548932-editor-save-zip-2/+merge/294067 Your team Widelands Developers is subscribed

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

2016-05-15 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1560454-mapdir into lp:widelands. Commit message: UI improvements for saving maps: - Maps are now saved in a "My Maps" subdirectory to prevent overwriting of official maps - Show full save path to user - After crea

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

2016-05-15 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/bug-1560454-mapdir into lp:widelands has been updated. Commit Message changed to: UI improvements for saving maps: - Maps are now saved in a "My Maps" subdirectory to prevent overwriting of official maps - Show full save path to user - After cre

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

2016-05-15 Thread GunChleoc
> > - Show full save path to user > This shows the wrong path. Here it is shown: /home/kaputtnik/widelands- > repo/bug-1560454-mapdir/maps/My_Maps > Instead the map is saved in: /home/kaputtnik/.widelands/maps/My_Maps I'll look into this. > > - After creating a new directory, enter it > Good ide

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

2016-05-15 Thread GunChleoc
> How about a CMake option for compiling website-related tools? Tried and failed and decided not to spent more time on it at the moment. -- https://code.launchpad.net/~widelands-dev/widelands/map_object_info/+merge/287409 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/w

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1418154-collectors-teams into lp:widelands

2016-05-16 Thread GunChleoc
Yes, gold is counted. https://bazaar.launchpad.net/~widelands-dev/widelands/bug-1418154-collectors-teams/view/head:/data/scripting/win_conditions/collectors.lua#L48 > A small nit: After the "you have lost message" I get a last status message, > thats OK. > > But it claims "The Game will end in .

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1548932-editor-save-zip-2 into lp:widelands

2016-05-16 Thread GunChleoc
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1548932-editor-save-zip-2/+merge/294067 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1548932-editor-save-zip-2. ___ Mailing list: https

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1418154-collectors-teams into lp:widelands

2016-05-16 Thread GunChleoc
The missing gold was a bug in the formatting code. Good catch! :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1418154-collectors-teams/+merge/294702 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1418154-collectors-teams. __

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

2016-05-17 Thread GunChleoc
Displaying the absolute path is less than trivial, because the LayeredFilesystem will iterate internally over all file systems until it finds a match. So, I decided to display the relative directory instead, both in the load and save screens. > If i create a new directory the map name editbox

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

2016-05-17 Thread GunChleoc
Review: Resubmit Thanks for the review and CMake tips - this should now be ready. The corresponding branch for the website can't read the command-line parameter for the output path yet. This is not a problem for this branch though, because the encyclopedia is only updated manually. So, it can't

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

2016-05-17 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/string-fixes into lp:widelands. Commit message: Small fixes for various string issues reported on Transifex. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1421942 in widelands: "Unified term for &

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

2016-05-17 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/bug-1560454-mapdir into lp:widelands has been updated. Commit Message changed to: UI improvements for saving maps: - Maps are now saved in a "My Maps" subdirectory to prevent overwriting of official maps - Show full save path to user - After cre

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

2016-05-17 Thread GunChleoc
Oops, I fixed the commit message. I don't get the problem with the fullscreen toggling while the text input is focused. You're right, it's without the Ctrl key. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1560454-mapdir/+merge/294725 Your team Widelands Developers is subscribed to

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

2016-05-17 Thread GunChleoc
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/294939 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ Mailing list: https://launchpad.net/~widelands-dev Po

<    10   11   12   13   14   15   16   17   18   19   >