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

2017-12-11 Thread kaputtnik
Review: Approve testing Played through the entire scenario and it looks great to me :-) Used current trunk with the option datadir. -- https://code.launchpad.net/~widelands-dev/widelands/Mission4/+merge/334279 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/Mi

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

2017-12-12 Thread kaputtnik
What about a title which is not that revealing? Surprise at Fremil Finally at Home, but... Back to Fremil again, with an economic surprise -- https://code.launchpad.net/~widelands-dev/widelands/Mission4/+merge/334279 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/wide

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1731652-worker-plant-attribute into lp:widelands

2017-12-12 Thread kaputtnik
Review: Approve documentation Documentation is fine -- https://code.launchpad.net/~widelands-dev/widelands/bug-1731652-worker-plant-attribute/+merge/333934 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1731652-worker-plant-attribute.

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

2017-12-13 Thread kaputtnik
kaputtnik has proposed merging lp:~widelands-dev/widelands/bug_1736095_improve_text_for_resources_height into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1736095 in widelands: "Editor: Improve texts for resources tool&quo

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

2017-12-14 Thread kaputtnik
I found another "Set Value" in the "Random height" tool and changed it. > What do you think? You're asking the wrong person here, i am struggling already with german spelling rules :-D But having a general rule is good. I tried to run through all menus with those rules in mind, at least in the

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

2017-12-14 Thread kaputtnik
Geany has also a windows version: https://www.geany.org/Download/Releases It might be a big download because the GTK toolkit is shipped with it. Regarding the chaos-road-solved check: When playing it was clear to me that some roads are really a mess, but finding the last road wich ends only at a

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

2017-12-16 Thread kaputtnik
This is the fourth campaign of Empire. You should have completed the previous campaigns before you can access it through the menu. Alternatively start it with the option --scenario -- https://code.launchpad.net/~widelands-dev/widelands/Mission4/+merge/334279 Your team Widelands Developers is sub

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

2017-12-16 Thread kaputtnik
Review: Needs Fixing The text "... This will replace already set resources." is obviously wrong. At least with trunk holding down CTRL and place resources does not remove already set resources. -- https://code.launchpad.net/~widelands-dev/widelands/bug_1736095_improve_text_for_resources_height/

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

2017-12-16 Thread kaputtnik
Please only one rule for tooltips. >> The text "... This will replace already set resources." is obviously wrong. >> At least with trunk holding down CTRL and place resources does not remove >> already set resources. > I just tested it and this is exactly what it does - I placed a lot of coal,

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

2017-12-16 Thread kaputtnik
Don't know what happens for you. For me all is working fine... > I tried: ./widelands --scenario=data/campaigns/emp04.wmf I think you must use the complete path here, e.g.: ./widelands --scenario=/home/USERNAME/PATH/TO/MISSION4/data/campaigns/emp04.wmf -- https://code.launchpad.net/~widelands

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

2017-12-16 Thread kaputtnik
I do not compile with ASAN anymore, so i maybe miss some errors... -- https://code.launchpad.net/~widelands-dev/widelands/Mission4/+merge/334279 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/Mission4. ___ Mailing

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

2017-12-16 Thread kaputtnik
kaputtnik has proposed merging lp:~widelands-dev/widelands/bug-1727987_fix_not_yet_implemented into lp:widelands. Commit message: Fix map dummy.wmf to prevent a crash when Not Yet Implemented is clicked in the campaigns Requested reviews: Widelands Developers (widelands-dev) Related bugs

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

2017-12-17 Thread kaputtnik
The proposal to merge lp:~widelands-dev/widelands/bug-1727987_fix_not_yet_implemented into lp:widelands has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1727987_fix_not_yet_implemented/+merge/335285 -- Your

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

2017-12-17 Thread kaputtnik
kaputtnik has proposed merging lp:~widelands-dev/widelands/bug-1727987_fix_dummy_map into lp:widelands. Commit message: Fix broken map dummy.wmf aka Not yet implemented Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1727987 in widelands: "Placeholder campaig

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

2017-12-17 Thread kaputtnik
Thanks :-) I think the author hasn't to be localized? And if, we may should call him "Widelands Team" or so. If something changes in the load/savemap algorythm which needs new package numbers this map will fail to load again. The possibility to load this map is not good at all. It should be co

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

2017-12-17 Thread kaputtnik
So the new bug is what the bug description of this merge proposal depends on ;) Is there anything left what i can do in this merge proposal then? Feel free to give me some stupid work :-) -- https://code.launchpad.net/~widelands-dev/widelands/bug_1736095_improve_text_for_resources_height/+merge/

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

2017-12-17 Thread kaputtnik
Ok, done. Also this work is maybe superfluous, i write the magic words ;) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1727987_fix_dummy_map/+merge/335293 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-17

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

2017-12-17 Thread kaputtnik
The Page "About Widelands -> Readme" is broken in this branch. What about the other Shortcuts, like CTRL[1-4] and the Zoom? Scrolling the left side of the tabs "Terrains" and "Trees" is still very slow. I thought this will be fixed when moving to the new font renderer? > 1) In my opinion there

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

2017-12-18 Thread kaputtnik
kaputtnik has proposed merging lp:~widelands-dev/widelands/bug-1738641_set_resource into lp:widelands. Commit message: Remove comparison of amounts when using SetResource Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1738641 in widelands: "Resources c

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

2017-12-19 Thread kaputtnik
Nice, thanks :-) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1738641_set_resource/+merge/335343 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1738641_set_resource. ___ Mailing list: https://launch

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

2017-12-19 Thread kaputtnik
The 'About Widelands' screen take 3 seconds to load here (debug build, german). That is very annoying. All other things lgtm. Tested also the Multiplayer help. -- https://code.launchpad.net/~widelands-dev/widelands/fh1-editorhelp/+merge/335283 Your team Widelands Developers is subscribed to bra

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

2017-12-19 Thread kaputtnik
I guessed the issue i found also in current trunk will be fixed when converting to the new font renderer, but when opening the first tutorial with this branch i get the same messages in terminal for each message box: Story Message Box: falling back to OLD font renderer: [..] Syntax error at 1:20

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

2017-12-19 Thread kaputtnik
Looks good :-) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/reveal_hide_animations/+merge/327062 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1687100-reveal_fields. ___ Mailing list:

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

2017-12-19 Thread kaputtnik
I didn't get the terminal messages when playing the first empire campaign "The Strand of Malacmore" :-) -- https://code.launchpad.net/~widelands-dev/widelands/fh1-editorhelp/+merge/335283 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fh1-editorhelp.

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

2017-12-19 Thread kaputtnik
The text in the first message does not use the available width below the image. The text appears all on the right side. In trunk the text uses the whole width of the message box below the image if the text block is taller than the height of the image. All other looks good, imho. Sorry for post

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fix-bug-1735980-related-problems into lp:widelands

2017-12-19 Thread kaputtnik
Review: Approve testing Very nice :-) I have tested this and it looks good :-) Please set a commit message for this branch, click on "Set commit message" above. Doing so we could use SirVer's bunnybot for merging. -- https://code.launchpad.net/~widelands-dev/widelands/fix-bug-1735980-related-p

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

2017-12-20 Thread kaputtnik
Now it takes about 2 seconds to open the about screen. This is ok imho. On the translators tab the header of RTL Languages are messed up: The localized string characters in those languages are not in one row with the string included in parentheses. -- https://code.launchpad.net/~widelands-dev/w

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

2017-12-20 Thread kaputtnik
Some nitpicking in the comments Diff comments: > > === removed file 'data/scripting/editor/format_editor.lua' > --- data/scripting/editor/format_editor.lua 2016-09-01 15:43:01 + > +++ data/scripting/editor/format_editor.lua 1970-01-01 00:00:00 + > @@ -1,31 +0,0 @@ > --- RST > --- for

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fix-bug-1735980-related-problems into lp:widelands

2017-12-22 Thread kaputtnik
Lets wait for a code review... unfortunately i am not that familiar with c++ so i couldn't do that. -- https://code.launchpad.net/~widelands-dev/widelands/fix-bug-1735980-related-problems/+merge/335403 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix-bug-173

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

2017-12-22 Thread kaputtnik
> Should I create a new branch like last time? Yes, please. -- https://code.launchpad.net/~trimardio/widelands-website/scheduling_module/+merge/331477 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https

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

2017-12-23 Thread kaputtnik
You have to write a management command for this. See: https://docs.djangoproject.com/en/1.8/howto/custom-management-commands/ We use such of those commands in a cron job on the server which automatically run every day. Eg. for updating the search index or the encyclopedia. -- https://code.launc

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

2017-12-23 Thread kaputtnik
I did a small test without a deeper look into the code and found some things which needs fixing: On http://localhost:8000/scheduling/scheduling/ : - There is a small area showing the wooden background below the footer. I remember having the same when implementing the datepicker for the search,

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

2017-12-27 Thread kaputtnik
> Sorry I disappeared for a bit, I was trying to finish up too many things at > once and needed a break. I know this feeling from somewhere ;) > 2. Only parse the Lua scripts when each tab is loaded. I came to same idea, but don't know if it could be done. Should be tested, imho. -- https://co

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fix-bug-1735980-related-problems into lp:widelands

2017-12-31 Thread kaputtnik
next try: @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/fix-bug-1735980-related-problems/+merge/335403 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix-bug-1735980-related-problems. ___ M

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fix-bug-1735980-related-problems into lp:widelands

2017-12-31 Thread kaputtnik
I think it's save to use force @bunnybot merge force -- https://code.launchpad.net/~widelands-dev/widelands/fix-bug-1735980-related-problems/+merge/335403 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix-bug-1735980-related-problems. __

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

2018-01-02 Thread kaputtnik
Review: Needs Fixing I found a bug in this code which needs fixing. -- https://code.launchpad.net/~widelands-dev/widelands-website/better_notification_mail/+merge/335028 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ M

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

2018-01-03 Thread kaputtnik
Launchpad has sometimes trouble to manage branches. "This branch is empty" is shown when looking in https://code.launchpad.net/widelands I had this also... i did then submit a new branch and waited until the "This branch is empty" string disappears and then made the merge proposal. -- https://

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

2018-01-04 Thread kaputtnik
Review: Resubmit I had forgotten to update the packages of the virtual environment the last time. Did this now. The content of email send by django-messages are defined by django-messages itself, so the old templates (templates/notification/messages_*.txt) are obsolete and i have removed them i

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

2018-01-04 Thread kaputtnik
Review: Needs Fixing Looks like there was a merge conflict wich is not solved in scenario/richtext.lua. See line number 350 in the div below. The scenario does not even load: Trying to run: map:scripting/init.lua: Fatal exception: lua: [/home/kaputtnik/Quellcode/widelands-repo/fh1-scenario

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

2018-01-04 Thread kaputtnik
Found two things: 1. In 'Workers' and 'Buildings' are some headers called 'Experience levels' and the text of the next line saying 'Miner to Master (19EP)' is right aligned. All other texts are left aligned, so this should also be left aligned. Found for 'Miners' and '*mines' of empire 2. In '

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

2018-01-05 Thread kaputtnik
Review: Needs Fixing No, see diff comment. Diff comments: > > === modified file 'data/scripting/richtext.lua' > --- data/scripting/richtext.lua 2017-12-27 14:25:35 + > +++ data/scripting/richtext.lua 2018-01-05 12:13:24 + > @@ -305,8 +305,8 @@ > --:arg text: the text of

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

2018-01-06 Thread kaputtnik
The text of the first message does not yet slip below the image which i have tried to explain in https://code.launchpad.net/~widelands-dev/widelands/fh1-scenario-groundwork-emp1/+merge/335294/comments/878675. I thought that has been fixed? -- https://code.launchpad.net/~widelands-dev/widelands/

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

2018-01-07 Thread kaputtnik
I just do not know why the additional multidatespicker library has to be used. An idea for the page where other users available times are displayed: Currently there is a bar shown which is not very intuitive to understand, although the tooltips say the time. Maybe we can exchange the bar with so

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

2018-01-07 Thread kaputtnik
> For selecting multiple dates at the same time. You cannot do it directly with > jquery ui. If you have an idea on how to do without im all ears :) This looks very simple to me: http://jsfiddle.net/gydL0epa/ Derived from: https://stackoverflow.com/questions/1452066/jquery-ui-datepicker-multiple

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

2018-01-07 Thread kaputtnik
It's not a show stopper, and everything else looks good, so get this in now :-) @bunnybot merge force -- https://code.launchpad.net/~widelands-dev/widelands/fh1-scenario-groundwork-emp1/+merge/335294 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fh1-scenario

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

2018-01-07 Thread kaputtnik
Oh a misunderstanding. I meant the clock not for setting the availabilities, but for showing other users availabilities set. Over there it could be much smaller, imho. Some numbers could be omitted also. The clock looks good otherwise :-) -- https://code.launchpad.net/~trimardio/widelands-websi

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

2018-01-08 Thread kaputtnik
I agree, your examples looks a bit chaotic :-D I believe many people do not have that many times available. Maybe give the cake slices a border? Or/and using another background for not available hours? Let's wait for GunChleoc, she has good ideas for such things :-) Can you update your branch s

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1731652-worker-plant-attribute into lp:widelands

2018-01-10 Thread kaputtnik
Review: Needs Fixing > There were merge conflicts, so the in-editor tree/terrain help needs > retesting. Get this when trying to open the editor help: Unexpected error during the game Syntax error at 1:106: expected an allowed attribute, got 'line-spacing'. String continues with: '=3 font-size=

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1731652-worker-plant-attribute into lp:widelands

2018-01-11 Thread kaputtnik
Review: Approve The tree_help showed a failure (no output on console) saying 'picture_li' is wrong in scenario/help.lua. I replaced it with 'li_image' and then all looks good imho. Is there somwhere a list of the tags used by the new font renderer? I try to use it in my new scenario so i get f

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

2018-01-14 Thread kaputtnik
I've made a failure recently by updating django-messages to a wrong version. https://wl.widelands.org/forum/topic/4196/ I fixed it in trunk and also in this branch, which means we need to keep the templates in templates/notification/messages_*/full_text -- https://code.launchpad.net/~wideland

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

2018-01-15 Thread kaputtnik
I like the one with less numbers better. Just switch the AM and PM to the top of the clocks? I'll try to review the code this week. Please merge trunk and push again, to get the latest change in. Sorry for replying so late... -- https://code.launchpad.net/~trimardio/widelands-website/module_sc

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

2018-01-16 Thread kaputtnik
Review: Approve testing LGTM :-) Anything against merging this? -- https://code.launchpad.net/~widelands-dev/widelands/fh1-tutorial2/+merge/336055 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fh1-tutorial2. ___ M

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

2018-01-16 Thread kaputtnik
Review: Approve testing LGTM What i miss is a hint pressing CTRL while connecting two flags. Could addressed later or in a different tutorial. Anything against merging this? -- https://code.launchpad.net/~widelands-dev/widelands/fh1-tutorial1/+merge/336054 Your team Widelands Developers is sub

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1731652-worker-plant-attribute into lp:widelands

2018-01-17 Thread kaputtnik
Tried to fix the commit message... merged trunk, next try: @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1731652-worker-plant-attribute/+merge/333934 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1731652-worker-plant-attribute

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1731652-worker-plant-attribute into lp:widelands

2018-01-17 Thread kaputtnik
The proposal to merge lp:~widelands-dev/widelands/bug-1731652-worker-plant-attribute into lp:widelands has been updated. Commit Message changed to: Removed "tribe:" parameter from workers' "plant" program - The worker program "plant" no longer takes "tribe:" as a parameter; immovables are now

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

2018-01-18 Thread kaputtnik
Review: Approve testing Tested with the fh1-tutorial2 branch and all LGTM :-) -- https://code.launchpad.net/~widelands-dev/widelands/fh1-tutorial4/+merge/336171 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fh1-tutorial4. ___

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

2018-01-18 Thread kaputtnik
Oops, didn't test the objectives and there was one issue. In the 'Open the Ware Stastics window' part was a useless paragraphdivider(). I removed it and all looks good now. -- https://code.launchpad.net/~widelands-dev/widelands/fh1-tutorial4/+merge/336171 Your team Widelands Developers is subsc

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

2018-01-18 Thread kaputtnik
I have tested in english. The language shouldn't matter, as long the language has no special cases, imho. -- https://code.launchpad.net/~widelands-dev/widelands/fh1-tutorial4/+merge/336171 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fh1-tutorial4.

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

2018-01-18 Thread kaputtnik
Thanks :-) Looks better now. I did a first round of proofreading and added some comments, mainly nits. I am not sure if we should show the 'Scheduling' in the main menu, which has already many entrys. Since both links in that view needs logging in, i think showing 'Scheduling' should also be o

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

2018-01-18 Thread kaputtnik
Another round of proofreading. Sorry for being so nitpicking... Comments in the code. Diff comments: > > === added file 'media/css/scheduling.css' > --- media/css/scheduling.css 1970-01-01 00:00:00 + > +++ media/css/scheduling.css 2018-01-17 19:07:26 + > @@ -0,0 +1,230 @@ > +/* Main *

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

2018-01-19 Thread kaputtnik
now forcing @bunnybot merge force -- https://code.launchpad.net/~widelands-dev/widelands/fh1-tutorial1/+merge/336054 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fh1-tutorial1. ___ Mailing list: https://launchpad.

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

2018-01-19 Thread kaputtnik
now forcing @bunnybot merge force -- https://code.launchpad.net/~widelands-dev/widelands/fh1-tutorial2/+merge/336055 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fh1-tutorial2. ___ Mailing list: https://launchpad.

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

2018-01-20 Thread kaputtnik
Klaus, did you finished your test? -- https://code.launchpad.net/~widelands-dev/widelands/fh1-tutorial4/+merge/336171 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fh1-tutorial4. ___ Mailing list: https://launchpad.

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

2018-01-20 Thread kaputtnik
> In trunk I found, that the help for bulding sites is some HTML only. This is another task, imho Thanks for testing :-) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/fh1-tutorial4/+merge/336171 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/w

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

2018-01-21 Thread kaputtnik
kaputtnik has proposed merging lp:~widelands-dev/widelands/show_barbarian_not_yet_implemented into lp:widelands. Commit message: Show Not yet implemented after completing the barbarians campaign Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1744548 in widelands

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1574379-forester-wit into lp:widelands

2018-01-21 Thread kaputtnik
> Side note: WuiPlotArea::register_plot_data leaks memory according to > valgrind, is this known? That should be fixed with http://bazaar.launchpad.net/~widelands-dev/widelands/trunk/revision/8557 Can you merge trunk and test again? -- https://code.launchpad.net/~widelands-dev/widelands/bug-15

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1574379-forester-wit into lp:widelands

2018-01-21 Thread kaputtnik
Thanks :-) Travis has some problems fetching the packages. There is nothing we can do against this, afaik. You should add the commit message, bunnybot uses it when merging into trunk. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1574379-forester-wit/+merge/336068 Your team Widelan

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1731652-worker-plant-attribute into lp:widelands

2018-01-22 Thread kaputtnik
next try @bunnybot merge force -- https://code.launchpad.net/~widelands-dev/widelands/bug-1731652-worker-plant-attribute/+merge/333934 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1731652-worker-plant-attribute.

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

2018-01-26 Thread kaputtnik
Thanks :-) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/show_barbarian_not_yet_implemented/+merge/336399 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/show_barbarian_not_yet_implemented. _

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

2018-01-26 Thread kaputtnik
Review: Approve Beside two small nits looks good to me :-) Not tested. Diff comments: > > === modified file 'data/campaigns/emp03.wmf/scripting/texts.lua' > --- data/campaigns/emp03.wmf/scripting/texts.lua 2017-06-25 07:08:38 > + > +++ data/campaigns/emp03.wmf/scripting/texts.lua

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

2018-01-26 Thread kaputtnik
The second comment about the post_spaces is superfluous, just messed up line inserts and remove with code. Sorry ... -- https://code.launchpad.net/~widelands-dev/widelands/bugfix-empire-campaign/+merge/336074 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bugf

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

2018-01-29 Thread kaputtnik
kaputtnik has proposed merging lp:~widelands-dev/widelands/fix_encyclopedia into lp:widelands. Commit message: Fix a crash when trying to open the tribal encyclopedia Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1746035 in widelands: "Open Tribal encyclo

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

2018-02-01 Thread kaputtnik
> Gun: you know that the Building help is all garbelde HTML, do you? Yes thats a known bug 1744583 I look into it... -- https://code.launchpad.net/~widelands-dev/widelands/fh1-barbarians2/+merge/336707 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fh1-barbari

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

2018-02-02 Thread kaputtnik
kaputtnik has proposed merging lp:~widelands-dev/widelands/bug-1744583_fix_global_helptexts into lp:widelands. Commit message: fix rt rendering of the building help Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1744583 in widelands: "Building help looks

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

2018-02-03 Thread kaputtnik
Review: Needs Fixing Some parts aren't fine. E.g. the email subject when replying to a pm. -- https://code.launchpad.net/~widelands-dev/widelands-website/better_notification_mail/+merge/335028 Your team Widelands Developers is subscribed to branch lp:widelands-website. __

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

2018-02-04 Thread kaputtnik
Thanks :-) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1744583_fix_global_helptexts/+merge/337051 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1744583_fix_global_helptexts. ___ Mailing list: http

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

2018-02-04 Thread kaputtnik
Review: Resubmit alpha site is running with database django_18 now, so only the 8 registered people in this database may get emails and not the people from the old alpha database. -- https://code.launchpad.net/~widelands-dev/widelands-website/better_notification_mail/+merge/335028 Your team Wid

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

2018-02-04 Thread kaputtnik
travis has problems fetching packages... @bunnybot merge force -- https://code.launchpad.net/~widelands-dev/widelands/bug-1744583_fix_global_helptexts/+merge/337051 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1744583_fix_global_helptexts. _

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

2018-02-04 Thread kaputtnik
Ooops, sorry for spamming you with emails. I just forgot that ./manage.py emit_notices must be called by hand on the alpha site and wrote post after post, wondering that no emails get send :-S -- https://code.launchpad.net/~widelands-dev/widelands-website/better_notification_mail/+merge/335028

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

2018-02-05 Thread kaputtnik
Thanks for keeping on it :-) How about moving the link to schedule into the loginbox? Replacing "You have x new messages" with the link to scheduling_main and add the numbers of new messages (if there are any) in parenthesis behind the String "Messages". http://image.ibb.co/jONJGH/shedule_in_lo

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune into lp:widelands

2018-02-08 Thread kaputtnik
Since this is a change of the map it should be clear that this is a new version, imho. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1669230-lastbastion-finetune/+merge/337083 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug

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

2018-02-08 Thread kaputtnik
kaputtnik has proposed merging lp:~widelands-dev/widelands/fix_infrastructure_return_values into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/fix_infrastructure_return_values/+merge/337364

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

2018-02-08 Thread kaputtnik
Review: Needs Fixing Ups, that will not work... -- https://code.launchpad.net/~widelands-dev/widelands/fix_infrastructure_return_values/+merge/337364 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix_infrastructure_return_values.

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

2018-02-08 Thread kaputtnik
Review: Resubmit That should work now. -- https://code.launchpad.net/~widelands-dev/widelands/fix_infrastructure_return_values/+merge/337364 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix_infrastructure_return_values. ___

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

2018-02-10 Thread kaputtnik
There was no real problem, but wrong documentation. Nevertheless this change will make it possible to work with the returned building, e.g. using building.flag for creating roads or query building.descr. -- https://code.launchpad.net/~widelands-dev/widelands/fix_infrastructure_return_values/+mer

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

2018-02-10 Thread kaputtnik
Klaus, this code is only used in scenarios or campaigns. I grep'd through the data directory and currently all campaigns which use prefilled_buildings() or place_building_in_region() didn't use any return values. I would have been surprised if they do :-D The branch linked in bug 1639514 uses t

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

2018-02-10 Thread kaputtnik
kaputtnik has proposed merging lp:~widelands-dev/widelands/bug-1639514_fix_yellow_player into lp:widelands with lp:~widelands-dev/widelands/fix_infrastructure_return_values as a prerequisite. Commit message: Use ai="empty" for second barbarian campaign Requested reviews:

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

2018-02-10 Thread kaputtnik
Review: Needs Fixing The view of Players available needs fixing: http://preview.ibb.co/iewcqn/scheduling_show_dates.png The position of the PM clock is messed up. Currently the available dates/hours for one user is shown in a column and the next column shows the available times for the next us

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

2018-02-10 Thread kaputtnik
kaputtnik has proposed merging lp:~widelands-dev/widelands/bug-1744583_fix_building_help into lp:widelands. Commit message: Fixing buildinghelp by adding a method to enclose strings in rt tags Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1744583 in widelands

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

2018-02-12 Thread kaputtnik
Took the freedom to adjust the RST parts. Mainly: - make lists of allowed attributes a bulleted list (i think this was intended) - fixed some args - fixed indentation to have it consistent over the pages - added the function definition of new_objectives() in richtext_scenarios.lua - added some lin

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

2018-02-12 Thread kaputtnik
Thanks :-) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1639514_fix_yellow_player/+merge/337507 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix_infrastructure_return_values. ___ Mailing list: https:/

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

2018-02-13 Thread kaputtnik
I didn't add any documenation ;) Double documentation is not good. What about having the richtext documentation in the cpp file and parse it like we have for src/scripting/lua_bases.cpp? -> https://bazaar.launchpad.net/~widelands-dev/widelands/trunk/view/head:/doc/sphinx/extract_rst.py#L18 The

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

2018-02-13 Thread kaputtnik
Uff, this is a big change :-D Needs a bit familiarization... In general i think the new background is better, because it is less noisy. After playing around with the main menus and in game menus i think two colors need a bit tweaking: The bluish buttons appears on one of my monitors more petrol

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

2018-02-14 Thread kaputtnik
No idea... the branch is merged in revision 8588 at: 2018-02-13 02:17:15 UTC. This could be seen when pulling trunk and also if you watch the source code https://bazaar.launchpad.net/~widelands-dev/widelands/trunk/files Maybe launchpad is confused? -- https://code.launchpad.net/~widelands-dev/w

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

2018-02-15 Thread kaputtnik
> I added also a button to hide/show the clocks, because in my tests I found > that it becomes quite cumbersum to scroll when some user have a lot of > available hours. Good idea :-) Currently the clocks are hidden by default, but i think the other way around would be better. So: Show the clock

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

2018-02-15 Thread kaputtnik
Thanks for testing :-) The subject on private messages should work now. I forgot that django_messages ships his own short.txt (used for the subject). I send you a PM reply and a new PM. If this is ok it can go in, imho. Shut off the alpha site for now. -- https://code.launchpad.net/~widelands

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

2018-02-17 Thread kaputtnik
This merged and deployed now. Thanks Trimard for this feature and being that patient with my slow answers :-) -- https://code.launchpad.net/~trimardio/widelands-website/module_scheduling/+merge/335570 Your team Widelands Developers is subscribed to branch lp:widelands-website. __

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

2018-02-17 Thread kaputtnik
kaputtnik has proposed merging lp:~widelands-dev/widelands-website/auto_copyr_year into lp:widelands-website. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands-website/auto_copyr_year/+merge/337911 Set the last

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune into lp:widelands

2018-02-17 Thread kaputtnik
I think this is ok. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1669230-lastbastion-finetune/+merge/337083 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune. ___

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

2018-02-18 Thread kaputtnik
> But you did add some Ok, i correct my self: I did not add any documentation which were in two places: > Hm, we now have the allowed attributes documented in 2 places. The allowed attributes were already at 2 places in the documentation, before i edited the RST comments. My fault that i didn't

<    4   5   6   7   8   9   10   11   12   13   >