[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 more details,

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

2015-03-26 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/ai-military-changes into lp:widelands has been updated. Status: Needs review = Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/ai-military-changes/+merge/253881 -- Your team Widelands Developers is

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

2015-03-26 Thread SirVer
Some minor nits with my proofreader glasses on. They do not show up in Launchpad. Did you submit your changes/add the comments into the diff? -- https://code.launchpad.net/~widelands-dev/widelands/render_queue/+merge/250524 Your team Widelands Developers is subscribed to branch

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

2015-03-26 Thread SirVer
Review: Approve :) let make an agreement: If there will be another requests to change something I will change also this, can be? Pf. I changed ts_type to trainingsite_type - I took the time, it took me 36 seconds. Should not have taken you much longer than typing this comment. I think

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

2015-03-26 Thread kaputtnik
The merge has no effect on https://wl.widelands.org/admin/wlimages/image/ :-O Pressing F5 doesn't show the changes too... -- https://code.launchpad.net/~franku/widelands-website/changes_to_admin_wlimages/+merge/252996 Your team Widelands Developers is subscribed to branch

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

2015-03-26 Thread SirVer
I might have forgotten to restart the website. Could you try again now? -- https://code.launchpad.net/~franku/widelands-website/changes_to_admin_wlimages/+merge/252996 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___

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

2015-03-26 Thread TiborB
I changed ts_type to trainingsite_type - I took the time, it took me 36 seconds. ts_type is definitely safe string to use sed (or other tool) to replace all occurrences, but to use sed to replace strings 'basic' and 'advanced' - it would be quite different --

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

2015-03-26 Thread kaputtnik
All fine now :-) Thanks -- https://code.launchpad.net/~franku/widelands-website/changes_to_admin_wlimages/+merge/252996 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev

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