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

2016-04-09 Thread kaputtnik
I just get a crash in Economy tutorial. The crash happens after clicking the "OK" button of first text screen: Error in Lua Coroutine [/home/kaputtnik/Quellcode/widelands-repo/bug-1543001-eris/src/scripting/lua_errors.cc:22] [string "scripting/ui.lua"]:102: bad argumen

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

2016-04-09 Thread kaputtnik
Another crash with a savegame saved with current trunk: Reading Scripting Data ... PANIC: unprotected error in call to Lua API (incompatible integer type) I attach the savegame to the bug. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1543001-eris/+merge/291294 Your team Widelands

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

2016-04-09 Thread kaputtnik
Review: Needs Fixing I just mentioned this because GunChleoc says: > I could even load some savegames, so I haven't upgraded any packet numbers. If the packet numbers are upgraded a message box is displayed automatically when trying to load an incompatible save game :-) -- https://code.launchp

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

2016-04-10 Thread kaputtnik
Review: Approve testing I have played some Tutorials and Campaigns, played a new game and also played with the editor. Works fine i think :-) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1543001-eris/+merge/291294 Your team Widelands Developers is subscribed to branch lp:~widelan

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

2016-04-12 Thread kaputtnik
kaputtnik has proposed merging lp:~widelands-dev/widelands/bug_1480961_configure_economy into lp:widelands. Commit message: Hide wares from configure economy which does not need prerequisites and therefor are produced 'endless' Requested reviews: Widelands Developers (widelands-de

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

2016-04-13 Thread kaputtnik
Thanks Tibor and GunChleoc :-) Hopefully i didn't forgot any other ware. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug_1480961_configure_economy/+merge/291669 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug_1480961_configure_ec

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

2016-04-14 Thread kaputtnik
kaputtnik has proposed merging lp:~widelands-dev/widelands/bug_1570094_resource into lp:widelands. Commit message: Fix for resource tool bug 1570094 Removed comparisons of UInt < 0 Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1570094 in widelands: &quo

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

2016-04-14 Thread kaputtnik
The proposal to merge lp:~widelands-dev/widelands/bug_156675_editor_initial_tool into lp:widelands has been updated. Commit Message changed to: Use info tool as initial tool for the editor Fixes bug 1566675 For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug_156675_e

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

2016-04-14 Thread kaputtnik
kaputtnik has proposed merging lp:~widelands-dev/widelands/bug_156675_editor_initial_tool into lp:widelands. Commit message: Use info tool as initial tool for the editor Fixes bug 1566675 Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1566675 in widelands

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

2016-04-15 Thread kaputtnik
:-) -- https://code.launchpad.net/~widelands-dev/widelands/fh1_multiline_textarea/+merge/292033 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fh1_multiline_textarea into lp:widelands. ___ Maili

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

2016-04-15 Thread kaputtnik
:-D Klaus, this is just for bug 1535732 , see https://bugs.launchpad.net/widelands/+bug/1535732/comments/62 ff -- https://code.launchpad.net/~widelands-dev/widelands/fh1_multiline_textarea/+merge/292033 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-de

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

2016-04-15 Thread kaputtnik
Good ideas :-) Some things: 1. The slider of the scrollbar does not change his size if there is less to scroll (the slider is always small) Good to see in screen resolution 1280x720 and map Four Mountains. 2. There are obsolete information: "Map size" and "2/3/4/... Player map". These informati

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

2016-04-16 Thread kaputtnik
Got a crash when trying to access a folder in 'editor load map' and 'New game': terminate called after throwing an instance of 'RT::SyntaxErrorImpl' what(): Syntax error at 1:65: expected an allowed tag, got 'parent'. String continues with: '' > 1. Fixed Yeah :-) > > 2. There are obsolete in

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

2016-04-18 Thread kaputtnik
Hm, i don't know really. The two colored texts are better in my opinion. I have made some screenshots for a comparison and changed the code to use the bright gray color for "txt as_content": http://home.arcor.de/frank.ue/menu_shots.jpg Above left: Current trunk Above right: This branch with ital

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

2016-04-20 Thread kaputtnik
Review: Approve testing I think it's good now... maybe decrease the font size a bit in the load game menu? There is now different coloring for headers in editor and load game, but the color scheme in editor is the same as for the help, so there is a consistent coloring "white headers on wooden

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

2016-04-22 Thread kaputtnik
I tried the version with deactivated texture cache and here all texts change then every second (or faster). F.e. the buttons of the main screen automatically change the strings without doing anything. It looks like the buttons are some kind of animated. Is this normal with deactivated font cach

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

2016-04-23 Thread kaputtnik
> You don't need to waste your time testing > anything with this branch until I have fixed the actual problem. I am just interested and thought you might be happy to have some response :-) But i don't want to waste your time. Nevertheless i have attached a short video to the bug report. In my op

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

2016-04-23 Thread kaputtnik
Review: Approve testing This change does not affect save games, i was able to load a save game from last week :-) -- 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. __

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

2016-04-23 Thread kaputtnik
Review: Needs Fixing Now i get a crash when 1. Start editor 2. Place a player 3. Save the map 4. Load the previous saved map Result: widelands: /home/kaputtnik/widelands-repo/bug-1573968-new-map-crash/src/logic/map.h:205: Widelands::Coords Widelands::Map::get_starting_pos(Widelands

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

2016-04-24 Thread kaputtnik
Review: Needs Fixing No changes... the "animated Button texts" are gone, but the texts are still partially replaced with image or text fragments. See the last attachment in the bug report, where i write some more of things i noticed. Should i try the build with log output? -- https://code.laun

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

2016-04-24 Thread kaputtnik
Review: Needs Fixing I got other crashs of the same type, but couldn't reproduce it with explicit steps. Sometimes with the steps described earlier, sometimes when a map was loaded and then a new map is created ... feels randomly :-( Are there no initial data for the editor to which it can be r

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

2016-04-24 Thread kaputtnik
I think it's the buildhelp overlay what's causing this. I can reproduce this now as follows: 1. Start editor 2. Deactivate buildhelp 3. Place player (the buildhelp should normally be activated, but it isn't) 4. Save map 5. Load previous saved map Crash. -- https://code.launchpad.net/~widelands-

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

2016-04-24 Thread kaputtnik
Review: Approve Nice :-) -- 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 Po

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

2016-04-25 Thread kaputtnik
Review: Approve testing I think it works 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. _

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

2016-05-14 Thread kaputtnik
Review: Approve compiling Compiles fine again. Except the warnings regarding NEVER_HERE(): Warnung: throw will always call terminate() [-Wterminate] Seems to be ok then. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1581647-compiler-warnings/+merge/294698 Your team Widelands Develo

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

2016-05-14 Thread kaputtnik
Have you tried the wl_django1_8 branch? Even if some things won't work with this branch (mainly the third party apps) it should work for testing your changes. We could also try to submit my latest wlwebsite installation as a zipfile from me to you and you could try to use it. But i am not sure i

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

2016-05-15 Thread kaputtnik
Review: Needs Fixing > - 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 > - After creating a new directory, enter it Good idea :-)

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

2016-05-15 Thread kaputtnik
> > As mentioned in the bug report i would like to see the "Shipped maps" in a > sub > > folder in menu "Load map" where the shipped maps could be found. In menu > "Save > > map" this folder shouldn't be shown then. I believe this would be the better > > approach. Isn't that possible? > > And how

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

2016-05-16 Thread kaputtnik
> > > - Automatically focus map name editbox when creating new map > > I couldn't find this feature :-S Either it is not working or i do not > > understand it. > > Sorry, I meant create directory, not create map. If i create a new directory the map name editbox isn't focused here ("f" button tog

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

2016-05-17 Thread kaputtnik
Review: Approve testing Ahhh... now i got it. I've always tested the map name edit box (as the commit message says, even after you've changed it) but you meant the directory name edit box... This is a really good enhancement :-) Showing the relative directory is IMHO ok. The position of this co

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

2016-05-17 Thread kaputtnik
If the focus is in the directory name edit box, all works correct, no keyboard shortcuts works then. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1560454-mapdir/+merge/294725 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1560454-mapdir. ___

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1573057-graph-relative-plotmode into lp:widelands

2016-05-20 Thread kaputtnik
Review: Approve testing Works as expected :-) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1573057-graph-relative-plotmode/+merge/295198 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1573057-graph-relative-plotmode.

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

2016-05-20 Thread kaputtnik
Review: Approve testing > Since this happens at the same time as the port is placed, it shouldn't be > visually annoying. Yes, i think so too. I've tested this also with portspaces full of trees and for me, as a player, its ok that the trees disappear when the port construction site is set.

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

2016-05-20 Thread kaputtnik
Review: Approve testing I have merged this branch into the actual website code and ran ./manage.py update_help and update_help_pdf Both works fine :-) I didn't checked for correct output but i think it looks good. One thing i noticed: Military buildings does not show how many soldiers they cou

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

2016-05-21 Thread kaputtnik
Review: Needs Fixing image_url Ah, ok, i just looked in the tables in column "Stores" ... but this column meant only wares, not workers. Some nits: 1. Please check for correct indentation (python prefers spaces for indentation). The file update_wlhelp.py has a mix of tabs and spaces. See also

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

2016-05-22 Thread kaputtnik
Widelands is updated on the server and a cronjob was fixed to get the WIDELANDS_SVN_DIR updated (many thanks to janus for help). I have installed this on the alpha site and get an error when trying to update the help: --- $ ./manage.py update_help JSON files will

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

2016-05-22 Thread kaputtnik
Review: Needs Fixing in widelands code Because the culprit is in widelands wl_map_object_info and not on the website code, i leave this branch merged. But i do not deploy it on the productive website until wl_map_object_info is fixed. Klaus, the map_info uses also an initialized SDL to get some

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

2016-05-23 Thread kaputtnik
I don't believe that set_locale() is the culprit. I think when uploading a map the SDL is initialized through the browser and when trying to do it manually on the server it fails. This happens also with wl_map_info when trying to use it in console on the server ( i uploaded the map "Crossing the

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

2016-05-23 Thread kaputtnik
It's a bit difficult to explain... wl_map_info is working on the server. It is used to get some informations when uploading a map and to extract the picture from the mapfile. Everytime a user uploads a map wl_map_info is executed. The difference to wl_map_object_info is, that wl_map_info is star

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

2016-05-24 Thread kaputtnik
Thanks SirVer for explanation :-) So my thoughts where half correct :-D > Maybe a Django admin module would do the trick? Thats what i meant with "or we create a view for updating the encyclopedia so that the SDL is initialized through the browser." Now we know that the website uses the server

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

2016-05-24 Thread kaputtnik
Adding it to the README isn't good, because the README.txt is for local testing and setting the environment variable is only needed on the server. We could deploy this on wl.widelands.org, set the environment variable, run update_help and unset the environment variable again. Doing so we have a

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

2016-05-25 Thread kaputtnik
Creating such a view isn't as difficult. Problematic would be to redirect the output to such a view. So for now i would suggest another approach: Setting DISPLAY through update_help.py: # Because wl_map_object_info needs access to a graphical server, which is running at # DISPLAY :1 we have to

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

2016-05-25 Thread kaputtnik
See https://code.launchpad.net/~widelands-dev/widelands-website/add_DISPLAY_to_update_help/+merge/295756 -- https://code.launchpad.net/~widelands-dev/widelands-website/encyclopedia/+merge/287410 Your team Widelands Developers is subscribed to branch lp:widelands-website.

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

2016-05-25 Thread kaputtnik
kaputtnik has proposed merging lp:~widelands-dev/widelands-website/add_DISPLAY_to_update_help into lp:widelands-website. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands-website/add_DISPLAY_to_update_help

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

2016-05-31 Thread kaputtnik
I am not sure if unsetting DISPLAY is needed at all. The cron script runs only the commands for the productive website, as i can see. I try it this evening to update the productive website and set the environment variable in the cron script. -- https://code.launchpad.net/~widelands-dev/widela

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

2016-06-02 Thread kaputtnik
After i wrote you the PN a few days ago i have reverted the changes to /etc/cron.daily/django_regular_commands. I couldn't get it to work. I have managed now to update the help by hand, except the update_help_pdf. The latter one complains about "Operation not permitted:" when writing the pdf (i

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

2016-06-03 Thread kaputtnik
Uhh i didn't checked if the output is really good :-( Thanks for looking into this. I think i have found it... The MEDIA_ROOT path contained double slashes. I don't know why, but this causes the slice in line 154 of update_help.py to cut too many chars: return '%s%s' % (MEDIA_URL, new_name[len

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

2016-06-03 Thread kaputtnik
> Running os.path.normpath(directory) should take care of any double slashes - > this is how I fixed up things during the last code review round. Looks like we > have missed a few :( I think having paths with double slashes should be fixed where they are build. Failures like this one would otherw

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

2016-06-04 Thread kaputtnik
> Agreed - ron the normpath ove it at the place that it is built if possible Hm, i don't know... running normpath over each path constant after it has been build?: bd = "/path/to/some/thing/" MEDIA = bd + "/extended/path/" MEDIA = os.path.normpath(MEDIA) Looks like the programmer doesn't trust

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

2016-06-04 Thread kaputtnik
kaputtnik has proposed merging lp:~widelands-dev/widelands-website/add_DISPLAY_hint into lp:widelands-website. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands-website/add_DISPLAY_hint/+merge/296491 If

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

2016-06-04 Thread kaputtnik
The proposal to merge lp:~widelands-dev/widelands-website/add_DISPLAY_to_update_help into lp:widelands-website has been updated. Status: Needs review => Rejected For more details, see: https://code.launchpad.net/~widelands-dev/widelands-website/add_DISPLAY_to_update_help/+merge/295756 -- Y

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

2016-06-04 Thread kaputtnik
Review: Resubmit Thanks for approving, but it needs a resubmit. If wl_map_object_info doesn't work the script should stop also to progress and should exit with code 1. Seems to be a never ending story :-) -- https://code.launchpad.net/~widelands-dev/widelands-website/add_DISPLAY_hint/+merge/2

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

2016-06-04 Thread kaputtnik
Review: Approve I think it looks good. -- https://code.launchpad.net/~widelands-dev/widelands/appdata/+merge/294722 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/appdata. ___ Mailing list: https://launchpad.net/~wi

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

2016-06-05 Thread kaputtnik
Review: Resubmit -- https://code.launchpad.net/~widelands-dev/widelands-website/add_DISPLAY_hint/+merge/296491 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-website/add_DISPLAY_hint into lp:widelands-website

2016-06-05 Thread kaputtnik
Since automatic updates working now, i have removed the hint regarding display. But added code to stop the script if one of the dependent sub processes fails. -- https://code.launchpad.net/~widelands-dev/widelands-website/add_DISPLAY_hint/+merge/296491 Your team Widelands Developers is subscrib

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

2016-06-05 Thread kaputtnik
Merged and deployed. Thanks to GunChleoc for this amazing work :-) And sorry that i haven't named you in the previous merge. -- https://code.launchpad.net/~widelands-dev/widelands-website/add_DISPLAY_hint/+merge/296491 Your team Widelands Developers is subscribed to branch lp:widelands-website.

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

2016-06-18 Thread kaputtnik
Review: Approve I played a 30 minutes from a previous desynct savegame with Klaus, and all is fine. This should go in: @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1581828/+merge/297668 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/wid

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

2016-06-28 Thread kaputtnik
The proposal to merge lp:~widelands-dev/widelands-website/django1_8 into lp:widelands-website has been updated. Description changed to: Upgrade the website code to use Django 1.8 There are three text conflicts when merging which are caused by mixed indentations, IMHO. Especially the conflict i

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

2016-06-28 Thread kaputtnik
kaputtnik has proposed merging lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names into lp:widelands. Commit message: Unify german spelled terrains to english spelling. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1570086 in widelands: "Unify te

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

2016-06-28 Thread kaputtnik
:-D done renaming ice_flows -> ice_floes "floes" looks so un-english ;) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1570086_unify_terrain_names/+merge/298572 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1570086_unify

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

2016-06-28 Thread kaputtnik
Don't test yet, i have forgotton to change the init.lua... :-S Update is in progress -- https://code.launchpad.net/~widelands-dev/widelands/bug-1570086_unify_terrain_names/+merge/298572 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-15

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

2016-06-28 Thread kaputtnik
Review: Resubmit -- https://code.launchpad.net/~widelands-dev/widelands/bug-1570086_unify_terrain_names/+merge/298572 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names. ___ Mailing list

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

2016-06-29 Thread kaputtnik
Yes a review is somehow useless because i adapted only code to the changes of DJango. So a review would need knowledge of the Django changes. But may you could look at some changes here: http://bazaar.launchpad.net/~widelands-dev/widelands-website/django1_8/revision/415#wlpoll/models.py http://b

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

2016-06-30 Thread kaputtnik
Ah, and some information about the setting ATUTH_PROFILE_MODULE: http://bazaar.launchpad.net/~widelands-dev/widelands-website/django1_8/view/head:/settings.py#L174 I understand this isn't used anymore (see the link in comment). We have an extended user profile, and have to link our wlprofile wit

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

2016-07-02 Thread kaputtnik
Thanks for approve :-) > According to the docs: > https://docs.djangoproject.com/en/1.9/ref/models/fields/#default, default is > either a default value or a callable object. So, the lambda should work: The note below the example says: "Note that lambdas cannot be used for field options like defau

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

2016-07-03 Thread kaputtnik
Seems to me that this branch is some kind incompatible with trunk... i get 186 conflicts when i try to merge trunk. So what is the state here? Should we unlink the bugs? I have removed the links to "fix commited" bugs. -- https://code.launchpad.net/~widelands-dev/widelands/fh1/+merge/177228 You

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

2016-07-05 Thread kaputtnik
kaputtnik has proposed merging lp:~widelands-dev/widelands/bug-1592692-production_sounds into lp:widelands. Commit message: Corrected function stereo_position() regarding sound sources which are near the edge of map_end/map_start. Requested reviews: Widelands Developers (widelands-dev

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

2016-07-05 Thread kaputtnik
Review: Needs Fixing Hm, the tests do not run through. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1570086_unify_terrain_names/+merge/298572 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names. ___

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

2016-07-06 Thread kaputtnik
The changes in PostOneWorldLegacyLookupTable() should take care of incompatibilities. It just changes "old_terrain_name" with "new_terrain_name" if an older map or a savgame get loaded. This is tested and works. Scenarios (campaigns) do also work. But i have not tested the altantean campaign, t

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

2016-07-06 Thread kaputtnik
Review: Resubmit I should read the errors better: > Reading Terrain Data ... WidelandsMapLoader::load_map_complete() for '00Test' > took 2ms > Scenario not started: Game data error: terrain: Terrain 'steppe' exists in > map, not in world! The map get loaded without errors but the scripting doe

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

2016-07-10 Thread kaputtnik
I am not sure what your are want to do now. I understand you want to rename also the 'name' attribute into english terms? -- https://code.launchpad.net/~widelands-dev/widelands/bug-1570086_unify_terrain_names/+merge/298572 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/

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

2016-07-10 Thread kaputtnik
Review: Resubmit The problem here is, that the PostWorldLookupTable isn't used when a scenario map get loaded. Loading a scenario takes care only of the OneWorldLookupTable. But i don't know why... A solution is to add the changed names also to the OneWorldLookupTable. But i 'feel' this isn't

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

2016-07-10 Thread kaputtnik
Thanks ! -- https://code.launchpad.net/~widelands-dev/widelands/bug-1570086_unify_terrain_names/+merge/298572 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names. ___ Mailing list: https://

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

2016-07-11 Thread kaputtnik
Tested also the atlantean campaign. First it did not work but after deleting the build directory and compiling from scratch, the campaign could be completed. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1570086_unify_terrain_names/+merge/298572 Your team Widelands Developers is subs

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

2016-07-17 Thread kaputtnik
Review: Approve testing For investigation the second attached scenario contains a map where a crash happen with current trunk when the debug window is used on position 0/0. This branch is fine. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1603763/+merge/300278 Your team Widelands

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

2016-07-25 Thread kaputtnik
Thanks a lot :-) Now i can finally work on the impassable water branch :-D -- https://code.launchpad.net/~widelands-dev/widelands/bug-1570086_unify_terrain_names/+merge/298572 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names. ___

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

2016-07-25 Thread kaputtnik
kaputtnik has proposed merging lp:~widelands-dev/widelands-website/rework_http500_error into lp:widelands-website. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands-website/rework_http500_error/+merge/301112

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

2016-07-26 Thread kaputtnik
Review: Resubmit Yes, you're right. I've just modified the file without much thinking... Instead using the 500.html inside the normal website we could also just show a plain white page with the text. Then the additional view in mainpage/views.py could also be removed. Ups, i just see my text:

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

2016-07-26 Thread kaputtnik
Thanks :-) -- https://code.launchpad.net/~widelands-dev/widelands-website/rework_http500_error/+merge/301112 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-website/rework_http500_error into lp:widelands-website

2016-07-28 Thread kaputtnik
Thanks, merged and deployed. -- https://code.launchpad.net/~widelands-dev/widelands-website/rework_http500_error/+merge/301112 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelan

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

2016-07-31 Thread kaputtnik
kaputtnik has proposed merging lp:~widelands-dev/widelands-website/cleanup_ggz into lp:widelands-website. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands-website/cleanup_ggz/+merge/301588 This branch contains

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

2016-08-02 Thread kaputtnik
Open old savegames isn't possible anymore since we have merged the "unify terrain names" branch. Hopefully this was the last incompatible change... -- https://code.launchpad.net/~widelands-dev/widelands/seafaring-final-objective/+merge/301060 Your team Widelands Developers is subscribed to branc

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

2016-08-02 Thread kaputtnik
kaputtnik has proposed merging lp:~widelands-dev/widelands-website/sphinx_fixes into lp:widelands-website. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1512093 in Widelands Website: "Add tribes directory to developer scripting reference&quo

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

2016-08-02 Thread kaputtnik
Ah, and fixed a 'Dajngo1.9 warning' regarding a redirect. -- https://code.launchpad.net/~widelands-dev/widelands-website/sphinx_fixes/+merge/301829 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands-website/sphinx_fixes into lp:widelands-websit

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

2016-08-03 Thread kaputtnik
To be clear: The colored math symbols are part of the widelands branch: https://code.launchpad.net/~widelands-dev/widelands/sphinx_changes But this branch isn't ready to merge yet. The branch proposed here isn't problematic so i will merge it without approving by someone else. -- https://code.

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

2016-08-03 Thread kaputtnik
Merged and deployed ... -- https://code.launchpad.net/~widelands-dev/widelands-website/sphinx_fixes/+merge/301829 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands-website/sphinx_fixes into lp:widelands-website. __

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

2016-08-04 Thread kaputtnik
Regarding your code comment: I actually do not know how sending e-mails is processed on the server. A value for EMAIL_BACKEND isn't set there. So adding a comment like: "Disable this on the widelands server"? Or we make it dependent of the DEBUG value: if DEBUG = True: EMAIL_BACKEND =

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

2016-08-05 Thread kaputtnik
Review: Resubmit I found a failure due to a missing import in this branch and fixed it. The culprit why i not stumbled over this the first time was a remaining fields.pyc file which i haven't deleted when removing fields.py. So the missing import doesn't show up in my local branch... lesson lea

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

2016-08-06 Thread kaputtnik
kaputtnik has proposed merging lp:~widelands-dev/widelands/fix_RST_comments into lp:widelands. Commit message: - Fixes for misaligned RST comments which appear after running clang-format. - Changed the black coloring of formulas Requested reviews: Widelands Developers (widelands-dev) For

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/clang-format-no-RST into lp:widelands

2016-08-07 Thread kaputtnik
It should be CommentPragmas: ('^ RST.*') The string has to be surrounded with braces. Launchpad shows some unidentified red rules around the string: http://bazaar.launchpad.net/~widelands-dev/widelands/clang-format-no-RST/view/head:/.clang-format Hopefully you tested this regular expression :

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

2016-08-07 Thread kaputtnik
kaputtnik has proposed merging lp:~widelands-dev/widelands-website/fix_sphinx_index_links into lp:widelands-website. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands-website/fix_sphinx_index_links/+merge/302225

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

2016-08-08 Thread kaputtnik
I am unsure if this should be a part of the website, because it affects the whole server system. And this is Debian/Ubuntu specific. If one forgot to run this script and use the regular commands the errors will be shown again. So maybe a global alias would do the trick? Something like: alias up

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

2016-08-08 Thread kaputtnik
Merged and deployed. -- https://code.launchpad.net/~widelands-dev/widelands-website/fix_sphinx_index_links/+merge/302225 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-website/cleanup_ggz into lp:widelands-website

2016-08-08 Thread kaputtnik
The branch is merged and tested on alpha. I had some problems because of permission on the alpha site which i solved. There was a unknown conflict (unknown because i couldn't find any description to this conflict): conflicts: Conflict adding file media/wlmaps. Moved existing file to media/wlm

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

2016-08-09 Thread kaputtnik
Thanks for confirming :-) -- https://code.launchpad.net/~widelands-dev/widelands-website/cleanup_ggz/+merge/301588 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post t

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

2016-08-09 Thread kaputtnik
Review: Approve I think this looks good but i am still unsure... Where is the border to decide which things get in the ops directory of the website? But i will not start an endless discussion :-) -- https://code.launchpad.net/~widelands-dev/widelands-website/add_ops/+merge/302269 Your team W

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

2016-08-09 Thread kaputtnik
One question: > apt-get update's can fail and/or query for decisions. An admin needs to make > the calls there (which usually are: keep the config files that are in place > and/or reload all services). I prefer doing this manually - I do it every 30 > days. In the script there is the '-y' opti

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

2016-08-14 Thread kaputtnik
Review: Needs Fixing I got a crash with this branch when trying to save a game: 1. Start a normal game and trying to save: Fatal exception: ZipFilesystem::open_for_unzip: not a .zip file: /home/kaputtnik/.widelands/save/campvis Game: Writing Preload Data ... GameSaver::save() took 3ms

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

2016-08-14 Thread kaputtnik
Review: Approve testing Sorry i didn't noticed that you have updated the branch. The crashs are gone :-) -- https://code.launchpad.net/~widelands-dev/widelands/map_compatibility/+merge/302869 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/map_compatibility. _

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

2016-08-14 Thread kaputtnik
kaputtnik has proposed merging lp:~widelands-dev/widelands-website/correct_migration into lp:widelands-website. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1608270 in Widelands Website: "One wrong migration / migrations files in general&quo

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