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

2015-02-10 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/translator-credits into lp:widelands has been updated. Description changed to: The point of this branch is that translators will be able to add their own name to be displayed in the Authors list. Once we have merged this, I can add the translat

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

2015-02-10 Thread GunChleoc
I have already broken it in the fh1 branch then. I guess I will need to set up the homepage software on my localhost, to come up with some code and test it. -- https://code.launchpad.net/~widelands-dev/widelands/translator-credits/+merge/249085 Your team Widelands Developers is requested to revie

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

2015-02-11 Thread GunChleoc
Review: Approve All tests now run without problems on my machine, so IMO this branch is good to go now :) Since the test that's still failing does so only on your machine and for trunk as well, I expect that there's something about your setup that Widelands doesn't like. -- https://code.launc

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

2015-02-12 Thread GunChleoc
Bug report, so we won't forget: https://bugs.launchpad.net/widelands/+bug/1421107 -- https://code.launchpad.net/~widelands-dev/widelands/seafaring-ai/+merge/242271 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/seafaring-ai. __

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

2015-02-12 Thread GunChleoc
Thanks, Tibor. I will take care of the merging :) -- https://code.launchpad.net/~widelands-dev/widelands/seafaring-ai/+merge/242271 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/seafaring-ai. ___ Mailing list: https

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

2015-02-13 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/synchronize_translations into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/synchronize_translations/+merge/249698 Adapted utils

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

2015-02-13 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/synchronize_translations into lp:widelands has been updated. Description changed to: Adapted utils/merge_and_push_translations.sh for Transifex. ETA: We still need to bzr add new translation files coming from Transifex. For more details, see: h

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

2015-02-13 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/synchronize_translations into lp:widelands has been updated. Description changed to: Adapted utils/merge_and_push_translations.sh for Transifex. We need to bzr add new translation files coming from Transifex - the first added batch will be big,

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

2015-02-14 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/terrain_doc into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/terrain_doc/+merge/249747 I have added some documentation for the

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

2015-02-15 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/remove_concept_graphics into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/remove_concept_graphics/+merge/249770 The concept graphics

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

2015-02-15 Thread GunChleoc
Thanks for the review - next round :) -- https://code.launchpad.net/~widelands-dev/widelands/synchronize_translations/+merge/249698 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/synchronize_translations. ___ Mailing

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

2015-02-15 Thread GunChleoc
OK, I'll abandon this branch then. Looking forward to the new graphics :) -- https://code.launchpad.net/~widelands-dev/widelands/remove_concept_graphics/+merge/249770 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/remove_concept_graphics. _

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

2015-02-15 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/remove_concept_graphics into lp:widelands has been updated. Status: Needs review => Rejected For more details, see: https://code.launchpad.net/~widelands-dev/widelands/remove_concept_graphics/+merge/249770 -- Your team Widelands Developers i

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

2015-02-15 Thread GunChleoc
I also have a question that needs answering before the merge this: Am I correct in assuming that "acid" and "dead" do the exact same thing? If so, will it break compatibility with existing maps if I change all the "acid" ones to "dead"? If we can get rid of the distinction, I could do some addi

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

2015-02-15 Thread GunChleoc
We have both "dead" and "acid" in the init.lua: http://bazaar.launchpad.net/~widelands-dev/widelands/terrain_doc/view/head:/world/terrains/init.lua Will it break maps if I change them all to "dead"? -- https://code.launchpad.net/~widelands-dev/widelands/terrain_doc/+merge/249747 Your team Widela

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

2015-02-16 Thread GunChleoc
I decided to go for "dead", because it fits the current icon and the translations, and also makes more sense for snow. -- https://code.launchpad.net/~widelands-dev/widelands/terrain_doc/+merge/249747 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/terrain_doc.

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

2015-02-16 Thread GunChleoc
LGTM. FYI: As you already noticed, our codecheck rules aren't fully compatible with clang_format yet. This is something that still needs fixing. -- https://code.launchpad.net/~widelands-dev/widelands/observer_building_spaces_codecheck_errors/+merge/249808 Your team Widelands Developers is reques

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

2015-02-16 Thread GunChleoc
Review: Approve Forgot to hit Approve -- https://code.launchpad.net/~widelands-dev/widelands/observer_building_spaces_codecheck_errors/+merge/249808 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/observer_building_spaces_codecheck_errors.

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

2015-02-16 Thread GunChleoc
I can confirm the error. -- https://code.launchpad.net/~franku/widelands-website/handle_big_images/+merge/247235 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to

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

2015-02-16 Thread GunChleoc
I don't know how the trees work exactly, so I'd rather be vague before I add something that isn't true. Maybe somebody who is familiar with the terrain affinty code can add some improvements? -- https://code.launchpad.net/~widelands-dev/widelands/terrain_doc/+merge/249747 Your team Widelands Dev

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

2015-02-16 Thread GunChleoc
Good luck - we will need to find an appropriate place for the documentation once you have gotten your head around this. I have removed the comment about the affinities. Is this branch good to go now? -- https://code.launchpad.net/~widelands-dev/widelands/terrain_doc/+merge/249747 Your team Widel

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

2015-02-17 Thread GunChleoc
@SirVer: Do you want another look at the code? The important changes are in src/logic/world/terrain_description.cc, and world/terrains/init.lua, the rest is just renaming of variables. -- https://code.launchpad.net/~widelands-dev/widelands/terrain_doc/+merge/249747 Your team Widelands Developers

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

2015-02-17 Thread GunChleoc
OK, will merge then. Thanks :) -- https://code.launchpad.net/~widelands-dev/widelands/terrain_doc/+merge/249747 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/terrain_doc. ___ Mailing list: https://launchpad.net/~wid

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

2015-02-18 Thread GunChleoc
I think something like: ScoutingDirection unsign = static_cast(des.unsigned_8()); should work. The compiler will tell you if I'm wrong. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1422452/+merge/250232 Your team Widelands Developers is requested to review the proposed merge of lp

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

2015-02-19 Thread GunChleoc
Review: Approve Using enum classes instead of enums does take some getting used to in these cases. LGTM, thanks for hunting! -- https://code.launchpad.net/~widelands-dev/widelands/bug-1422452/+merge/250232 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-14

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

2015-02-19 Thread GunChleoc
You have an approve and we have a bug for the todo-list, so yes :) -- https://code.launchpad.net/~widelands-dev/widelands/ai-enhancements/+merge/250207 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai-enhancements.

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

2015-02-20 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/authors into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1424072 in widelands: "Automatically add translator credits to authors list" https://bugs.launchpad.net/widelands/+b

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

2015-02-21 Thread GunChleoc
localized_name and native_name are already documented with the first locale on the list in i18n/locales.lua. Maybe I am misusing the po format a bit here, but I think this will be the easiest way to manage the credits list, because it is so long. My long-term plan is to have the language teams'

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

2015-02-21 Thread GunChleoc
P.S: another issue I have been thinking about is when translators might to write their name in non-Latin scripts. We can't switch font sets within the same MultilineTextarea though, so if that happens, we would have to do some tricks with lists. -- https://code.launchpad.net/~widelands-dev/wide

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

2015-02-22 Thread GunChleoc
I just had another idea on how we could handle this: Write a Python script that will turn the information in the po files into a file with a Lua table. This script would then be run when we merge and push translations. This might also make it easier to write the code for the homepage. What do yo

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

2015-02-22 Thread GunChleoc
The problem with the Transifex API is that it will have no way of adding the SoureForge and LaunchPad translators. So, we would be stuck with 2 different lists that we would need to merge. I will look into creating a Python script. I will create it off the PO files for now. -- https://code.lau

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

2015-02-23 Thread GunChleoc
No problem. This is why we're a team - it make for better code ;) -- https://code.launchpad.net/~widelands-dev/widelands/authors/+merge/250513 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/authors into lp:widelands. __

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

2015-02-23 Thread GunChleoc
Yes, we could do that. For GUI images, we would then still need to prefix "data" to the image files, which sort of means that we are redefining the same information all the time all over the code base. This is why I came up with the image catalog for GUI images, but we could also use other means

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

2015-02-24 Thread GunChleoc
Sgrìobh SirVer na leanas 24/02/2015 aig 06:18: >> For GUI images, we would then still need to prefix "data" to the image >> files, which sort of means that we are redefining the same information all >> the time all over the code base. > > Why? They load their graphics through load_image, which u

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

2015-02-24 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/stringfixes into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/stringfixes/+merge/250768 Renamed "unpassable" terrain to &

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

2015-02-25 Thread GunChleoc
Thank Joe Dalton who flagged it up on Transifex :) -- https://code.launchpad.net/~widelands-dev/widelands/stringfixes/+merge/250768 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/stringfixes. ___ Mailing list: https:

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

2015-02-25 Thread GunChleoc
Sub filesystems aren't a solution - sometimes, world or tribe images will be used as GUI strings, e,g, in the Terrain Tool. I will go back to using full paths, based on the "data" directory. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1397500/+merge/243860 Your team Widelands Deve

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

2015-02-27 Thread GunChleoc
Review: Resubmit Next round. ImageCatalog is gone, sound handler is reverted to old design. I have changed the global datadir to "./data", and it is working fine, except for the tests which are broken, because the map loader won't find the maps now. I tried moving the tests to data as well, but

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

2015-03-02 Thread GunChleoc
I have an idea: how about putting all the tasks into a set, making sure that the due time is unique: http://www.cplusplus.com/reference/set/set/ You could then get and erase the task from front(), emplace a new task of the same type (making sure that due time is unique) and work the current tas

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

2015-03-03 Thread GunChleoc
Set elements are pairs of . Just use the duetime as the key and the job type as the value, and your entries will automatically be sorted by duetime. Pop the next job off the front and insert a new check of the same job type into the set with the new duetime and you will have everything you need.

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

2015-03-03 Thread GunChleoc
Shorter code sounds good :) -- https://code.launchpad.net/~widelands-dev/widelands/ai-scheduler/+merge/251327 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/ai-scheduler into lp:widelands. ___ Ma

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

2015-03-04 Thread GunChleoc
I was thinking, if all you need is an equal chance of all jobs types being run, you could list the job types in a const array and walk through it round-robin in a fixed time interval. -- https://code.launchpad.net/~widelands-dev/widelands/ai-scheduler/+merge/251327 Your team Widelands Developers

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

2015-03-05 Thread GunChleoc
Looks like a good solution to me :) I have added a bunch of small nits with the comments function. Diff comments: > === modified file 'src/ai/defaultai.cc' > --- src/ai/defaultai.cc 2015-02-16 20:23:15 + > +++ src/ai/defaultai.cc 2015-03-04 20:14:13 + > @@ -50,12 +50,6 @@ >

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

2015-03-05 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-998544 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #998544 in widelands: "Replay name should contain Widelands version" https://bugs.launchpad.net/widelands/+bug/998544

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

2015-03-05 Thread GunChleoc
game().get_gametime() should return uint32_t. We just haven't gotten around to fixing it. https://bugs.launchpad.net/widelands/+bug/1380058 -- https://code.launchpad.net/~widelands-dev/widelands/ai-scheduler/+merge/251327 Your team Widelands Developers is requested to review the proposed merge o

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

2015-03-05 Thread GunChleoc
Review: Approve Thanks. LGTM :) -- https://code.launchpad.net/~widelands-dev/widelands/ai-scheduler/+merge/251327 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai-scheduler. ___ Mailing list: https://launchpad.net/

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

2015-03-06 Thread GunChleoc
Yes, please do :) -- https://code.launchpad.net/~widelands-dev/widelands/ai-scheduler/+merge/251327 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai-scheduler. ___ Mailing list: https://launchpad.net/~widelands-dev

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

2015-03-11 Thread GunChleoc
Do something like this (I don't remember the exact enum variable names): if (direction == Ship::Direction::kCounterClockwise) { lua_pushstring(L, "ccw") } elseif ... then everything will always be referenced by a name. I have done something similar in lua_map.cc for the BuildingDescription t

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

2015-03-12 Thread GunChleoc
I just had a very quick look and it seems to be OK overall - I will have to look at the code properly. One thing though: it might be better to have strings rather than numbers in Lua for the scouting direction. Operating on the pure numbers will make the code hard to read, and also break the cod

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

2015-03-12 Thread GunChleoc
I forgot that in this direction, it is better to use a switch statement. Something I learned from SirVer - the code will run faster, because it just jumps using the variable as an address instead of making a full comparison. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1380287/+mer

Re: [Widelands-dev] [Merge] lp:~hjd/widelands/tests-poc into lp:~widelands-dev/widelands/debian

2015-03-13 Thread GunChleoc
I just happened across a project that used Jenkins with Lanuchpad. Maybe worth looking into? https://code.launchpad.net/~nik90/ubuntu-clock-app/fix-translation-plural-forms/+merge/252838 -- https://code.launchpad.net/~hjd/widelands/tests-poc/+merge/250533 Your team Widelands Developers is reques

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

2015-03-15 Thread GunChleoc
I have added some diff comments with my anal retentive proofreader hat on. Diff comments: > === modified file 'templates/notification/email_body.txt' > --- templates/notification/email_body.txt 2009-02-20 16:46:21 + > +++ templates/notification/email_body.txt 2015-03-15 20:23:54 +

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

2015-03-16 Thread GunChleoc
I wasn't sure of the context, so "was added to the topic" is fine. I have added a comment to your comment. Diff comments: > === modified file 'templates/notification/email_body.txt' > --- templates/notification/email_body.txt 2009-02-20 16:46:21 + > +++ templates/notification/email_body.

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

2015-03-24 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/string-fixes into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/253922 Some small string fixes in map descriptions

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/ai-military-changes into lp:widelands

2015-03-24 Thread GunChleoc
How about "needs_few_wares" and "needs_gold_and_weapons"? -- https://code.launchpad.net/~widelands-dev/widelands/ai-military-changes/+merge/253881 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai-military-changes. _

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/ai-military-changes into lp:widelands

2015-03-25 Thread GunChleoc
Just imagine that you get hit by a bus tomorrow and that in 10 year's time another developer is trying to understand your code. So yes, just a handful of developers is important, which is why I posted my idea of how they might be named ;) -- https://code.launchpad.net/~widelands-dev/widelands/a

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

2015-03-26 Thread GunChleoc
Yes, they show up for me. Here they are for convenience: 527 + i.blend_mode = BlendMode::UseAlpha; 528 + // RenderQueue::instance().enqueue(i); 529 + GunChleoc (gunchleoc) wrote on 2015-03-25: Why is this commented out? 1412+// TODO(sirver): This is a hack to make sure we are

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

2015-03-26 Thread GunChleoc
Did some more testing - now the roads look funny. I have attached a screenshot to the bug. -- https://code.launchpad.net/~widelands-dev/widelands/render_queue/+merge/250524 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/render_queue. _

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

2015-03-26 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1413226 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1413226 in widelands: "Spaces in attack box disappear" https://bugs.launchpad.net/widelands/+bug/1413226 For mo

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

2015-03-30 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1390793 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #814500 in widelands: "The Edit box in the Editor's "Map Options" should have a "save" and "

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

2015-03-30 Thread GunChleoc
Setting MARGIN to 0 gives me the correct size for small roads, but the rendering is still fuzzy. I also killed the build directory and compiled again from scratch to rule out compiler hiccups. -- https://code.launchpad.net/~widelands-dev/widelands/render_queue/+merge/250524 Your team Widelands

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

2015-04-07 Thread GunChleoc
Review: Approve I refactored the enums, made the status function return strings, and added some tests. Please review my code before merging. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1380287/+merge/252507 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/

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

2015-04-15 Thread GunChleoc
Review: Resubmit I managed to fix the text suite (and use it to track down some bugs I had created :P). So, this is ready for review again. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1291904/+merge/237128 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/w

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

2015-04-16 Thread GunChleoc
I added some more tweaks. I had to upload to a new branch because of permissions: https://code.launchpad.net/~widelands-dev/widelands/empire -- https://code.launchpad.net/~elisabeth/widelands/empire/+merge/254718 Your team Widelands Developers is requested to review the proposed merge of lp:~el

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

2015-04-18 Thread GunChleoc
Review: Approve LGTM :) -- https://code.launchpad.net/~widelands-dev/widelands/clang_36/+merge/256735 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/clang_36. ___ Mailing list: https://launchpad.net/~widelands-dev P

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

2015-04-22 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/empire into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1424950 in widelands: "strange character relationships in the empire campaigns" https://bugs.launchpad.net/widelands/+b

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

2015-04-22 Thread GunChleoc
I guess so. https://code.launchpad.net/~widelands-dev/widelands/empire/+merge/257141 -- https://code.launchpad.net/~elisabeth/widelands/empire/+merge/254718 Your team Widelands Developers is requested to review the proposed merge of lp:~elisabeth/widelands/empire into lp:widelands.

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

2015-04-22 Thread GunChleoc
The proposal to merge lp:~elisabeth/widelands/empire into lp:widelands has been updated. Status: Needs review => Work in progress For more details, see: https://code.launchpad.net/~elisabeth/widelands/empire/+merge/254718 -- Your team Widelands Developers is requested to review the proposed

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

2015-04-24 Thread GunChleoc
Not quite - I still have an open query on the forum regarding these strings: https://wl.widelands.org/forum/topic/1568/?page=6#post-13419 I don't want to have to change them too often and break the translations again. -- https://code.launchpad.net/~widelands-dev/widelands/empire/+merge/257141 Yo

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

2015-04-25 Thread GunChleoc
No problem. Thanks for the review - things can't be proofread too often :) -- https://code.launchpad.net/~widelands-dev/widelands/empire/+merge/257141 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/empire. ___ Mailin

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

2015-04-25 Thread GunChleoc
Can you create a bug report for this, so we can take care of it in a separate branch? I have worked with signals before on the UI and might be able to figure it out, so I would put it on my todo-list. -- https://code.launchpad.net/~widelands-dev/widelands/find_attack_soldiers/+merge/245276 Your

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

2015-04-25 Thread GunChleoc
Why don't you try having a look at the code? I don't understand all the GL stuff SirVer is doing either, but I review it anyway, because there is no-one else to do it. Granted, this branch might be a bit too big to start doing your first code review. 1. The seafaring checkbox is for the filter

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

2015-04-28 Thread GunChleoc
> 1. I understand seafaring checkbox when loading game - but dont understand it > when saving the game. On save this info should be generated automatically and > saved into map. Automatially generating this tag is a good idea :) We should do this in a new branch though, this branch is already

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

2015-04-29 Thread GunChleoc
Thanks for having a look. Glad that you learned something and didn't waste your time :) If nobody else finds it, I will have a look some other time, after forgetting what the code is about. Forgetting might help me to spot it. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1390793/+

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

2015-05-02 Thread GunChleoc
Fixed :) Is this ready now? -- https://code.launchpad.net/~widelands-dev/widelands/bug-998544/+merge/251947 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-998544. ___ Mailing list: https://launchpad.net/~widelan

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

2015-05-02 Thread GunChleoc
You found it :) How about only writing the ships that the player owns as well? We still need the test when loading for older savegames, but not writing it in the first place would be a good idea I think. Around line 137: if (ship->get_economy() == temp_economy) { We could have: if (ship->get

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

2015-05-02 Thread GunChleoc
Review: Approve LGTM :) -- https://code.launchpad.net/~widelands-dev/widelands/bug-978138/+merge/257005 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-978138. ___ Mailing list: https://launchpad.net/~widelands-d

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

2015-05-03 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1451069 into lp:widelands. Commit message: Collectors win condition now counts wares in ports as well. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1451069 in widelands: "Collectors win cond

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

2015-05-03 Thread GunChleoc
This fix is very weird. The check is there to drop the soldier if its level is higher than the maximum level that it can get trained to. Removing this check might mean that soldiers trained to max won't be kicked out. So, my guess is that the real bug lies with setting the max value. I think thi

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

2015-05-03 Thread GunChleoc
I get it now - we need to check for all attributes before we break, not just for one of them. Maybe set an additional boolean "trainable_atrribute_found"? Then at the bottom, if (!this_soldier_is_safe || !trainable_atrribute_found) -> drop soldier. Removing the iterator is great, we want to do

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

2015-05-04 Thread GunChleoc
I was worried that fully trained soldiers would get stuck in the trainingsite now. I have tested and dug around in the code, and there is a separate function "drop_unupgradable_soldiers" that takes care of that. So, please ignore my last suggestion. Instead, we can remove the "if (level > upgra

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

2015-05-04 Thread GunChleoc
Review: Approve Makes sense to me. Go ahead and merge :) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1428396/+merge/256857 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1428396. ___ Mailing list:

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

2015-05-04 Thread GunChleoc
Review: Approve I don't know where I have my brain - of course the continue does do something useful. Go ahead and merge. Thanks for the fix :) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1451078-fix/+merge/258118 Your team Widelands Developers is subscribed to branch lp:~widelan

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

2015-05-06 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1451977 into lp:widelands. Commit message: Collectors win condition now displays descname for wares. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1451977 in widelands: "Collectors message con

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

2015-05-07 Thread GunChleoc
Thanks for the review :) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1451977/+merge/258335 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1451977. ___ Mailing list: https://launchpad.net/~widelands

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/ai-coverity-fix into lp:widelands

2015-05-07 Thread GunChleoc
Review: Approve LGTM, please merge :) A note for the future: while testing with the Nile map, an already found port space was overgrown by trees before it was time for the AI to start building ports. It might be a good idea if the AI has no ports yet, to check for port spaces every time the AI

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

2015-05-07 Thread GunChleoc
I added some small code style tweaks - please have a look to see if you like the changes. While testing with Twin Lagoons, the blue player built 3 Donjons and a Fortress right next to each other to the south of the mountain. This didn't happen before - can you have another look at your code to

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

2015-05-07 Thread GunChleoc
I added a small nit in the diff comments. I also get a lot of compiler warnings about variable names in the graphic libs, e.g. src/graphic/gl/fields_to_draw.h:56:16: warning: declaration of ‘size’ shadows a member of 'this' [-Wshadow] const size_t size = w_ * h_; The problem with the fuzzy

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

2015-05-07 Thread GunChleoc
Kick out my changes then, maybe I made a mistake that's not obvious. BTW I just noticed some <<< TREE ... >>> MERGE-SOURCE in the current diff ;) -- https://code.launchpad.net/~widelands-dev/widelands/militarysites_tweaks/+merge/255132 Your team Widelands Developers is requested to revie

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

2015-05-09 Thread GunChleoc
Review: Approve All fine now - sorry for messing things up. Please go ahead and merge :) I copied the new AI code over to an older version of trunk to test the crashing savegame linked in the bug - it still crashed. So, I have unlinked the bug report from this branch. If you want to still work

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

2015-05-09 Thread GunChleoc
Translator and developer credits now live in JSON files. They get parsed into Lua files by utils/update_authors.py Once this gets the go-ahead, we should hook the new Python script into utils/merge_and_push_translations.sh, so it will be called regularly. I will also need to set up the translat

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

2015-05-09 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1442945 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1442945 in widelands: "Atlanteans ship construction much faster" https://bugs.launchpad.net/widelands/+bug/1442945

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

2015-05-10 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/building_encyclopedia into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/building_encyclopedia/+merge/258719 The Tribal Encyclopedia

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

2015-05-11 Thread GunChleoc
Merging trunk fixed the diff :) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1442945/+merge/258712 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1442945 into lp:widelands. ___

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

2015-05-11 Thread GunChleoc
Thanks for checking :) Now I still need somebody to nitpick my Python code, and then we're good to go. -- https://code.launchpad.net/~widelands-dev/widelands/authors/+merge/250513 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/authors into

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

2015-05-11 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/authors into lp:widelands has been updated. Description changed to: All README files have been converted to Lua. Translator and developer credits now live in JSON files. They get parsed into Lua files by utils/update_authors.py Before we merge

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

2015-05-11 Thread GunChleoc
Remember you have to go back to revision 7446 and copy the current AI code over, because the savegame isn't compatible any more. -- https://code.launchpad.net/~widelands-dev/widelands/militarysites_tweaks/+merge/255132 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/wide

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

2015-05-11 Thread GunChleoc
Game crashes when headquarters is taken over https://bugs.launchpad.net/widelands/+bug/1451147 -- https://code.launchpad.net/~widelands-dev/widelands/militarysites_tweaks/+merge/255132 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/militarysites_tweaks. _

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

2015-05-11 Thread GunChleoc
I also noticed the inconsistency in the layout, but I don't want to redesign the ware help at the moment. I know SirVer has something in mind for when we finally finish the new font renderer, and I don't want to design it twice. I have added some space before sections - does it look good now? I

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

2015-05-12 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1399621 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #849705 in widelands: "Add a column for "stopped" buildings in building statistics" https://bugs.launchpa

<    1   2   3   4   5   6   7   8   9   10   >