[Widelands-dev] [Merge] lp:~franku/widelands-website/added-css-link-classes into lp:widelands-website

2014-12-23 Thread kaputtnik
kaputtnik has proposed merging lp:~franku/widelands-website/added-css-link-classes into lp:widelands-website. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~franku/widelands-website/added-css-link-classes/+merge/245346 This branch

[Widelands-dev] [Merge] lp:~franku/widelands-website/smiley-and-codeblock-enhancements into lp:widelands-website

2015-01-07 Thread kaputtnik
kaputtnik has proposed merging lp:~franku/widelands-website/smiley-and-codeblock-enhancements into lp:widelands-website. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~franku/widelands-website/smiley-and-codeblock-enhancements

Re: [Widelands-dev] [Merge] lp:~franku/widelands-website/smiley-and-codeblock-enhancements into lp:widelands-website

2015-01-08 Thread kaputtnik
Tanks for approve. > Your changes look fine. Just one question and an answer to your question in > the code below. Yes the "#b"'s (appears twice) are unintendet, better: i forgot to remove them. I used them to trigger an error to debug the code. I haven't found a way to debug the code (make hal

Re: [Widelands-dev] [Merge] lp:~franku/widelands-website/smiley-and-codeblock-enhancements into lp:widelands-website

2015-01-08 Thread kaputtnik
Hoping i've done it the right way... Thank you for review and pointing on some mistakes. And for the hints to grep. -- https://code.launchpad.net/~franku/widelands-website/smiley-and-codeblock-enhancements/+merge/245742 Your team Widelands Developers is subscribed to branch lp:widelands-website.

Re: [Widelands-dev] [Merge] lp:~franku/widelands-website/smiley-and-codeblock-enhancements into lp:widelands-website

2015-01-11 Thread kaputtnik
:-) -- https://code.launchpad.net/~franku/widelands-website/smiley-and-codeblock-enhancements/+merge/245742 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to :

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

2015-01-21 Thread kaputtnik
kaputtnik has proposed merging lp:~franku/widelands-website/handle_big_images into lp:widelands-website. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~franku/widelands-website/handle_big_images/+merge/247235 This branch has

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

2015-02-10 Thread kaputtnik
If i add more than one normal road to each tribe, could i use this branch again for upload? Or must i create a new branch from trunk? -- https://code.launchpad.net/~widelands-dev/widelands/busy_roads_for_buildings/+merge/249013 Your team Widelands Developers is subscribed to branch lp:~widelands

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

2015-02-10 Thread kaputtnik
Forgotton: I want to store the related gimp-xcf files also somewhere in the project. I think widelands-media is the correct place for that... but its quity messy and i don't know where to put such files. -- https://code.launchpad.net/~widelands-dev/widelands/busy_roads_for_buildings/+merge/24901

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

2015-02-11 Thread kaputtnik
Thanks chuck, the zip file contains xcf-files for each tribe plus one with testpatterns. If you find the testpatterns are useless, throw it away. Because it isn't possible to make an attachment here, i provide a link to it: http://home.arcor.de/frank.ue/widelands_roads/roads_tribes.xcf.zip --

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

2015-02-14 Thread kaputtnik
@SirVer: Could you please explain, if the "is"-value has influence about growing of trees? As an example: "dry" means currently "no buildings possible, but roads". "dry" associates also to something like desert, where trees do not grow good. But i assume the new terrain affinitie-values have on

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

2015-02-14 Thread kaputtnik
Review: Needs Fixing > Yes, but that is no change in behavior to before though - This wasn't my point. I don't want to get terrain developers on the wrong path with ambiguous words. :-) "green" associates with growing plants, "dry" not. But these values haven't anything to do with growing. Thi

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

2015-02-15 Thread kaputtnik
Next week i provide more road patterns for each tribe. Each tribe will then consist of minimum two patterns for normal roads. -- https://code.launchpad.net/~widelands-dev/widelands/remove_concept_graphics/+merge/249770 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/wide

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

2015-02-15 Thread kaputtnik
Because "dead" is only applied to greenland "snow" terrain, see http://bazaar.launchpad.net/~widelands-dev/widelands/terrain_doc/view/head:/world/terrains/init.lua#L265 i suggest to remove "dead". -- https://code.launchpad.net/~widelands-dev/widelands/terrain_doc/+merge/249747 Your team Widelan

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

2015-02-16 Thread kaputtnik
I am further unhappy about the descriptions in terrains/init.lua, see below. If someone want to make more terrains, he should be able to choose the right "is" value. Call me scrupulously, sometimes i am ;) Diff comments: > === modified file 'src/ai/ai_help_structs.h' > --- src/ai/ai_help_struct

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

2015-02-16 Thread kaputtnik
Some wikipages do throw an internal server error if i try to edit them. Don't know if it is related to this changes... f.e.: https://wl.widelands.org/wiki/Main%20Page/ https://wl.widelands.org/wiki/GameHelpbasicInterface/ https://wl.widelands.org/wiki/EditorHelpHelp/ https://wl.widelands.org/wiki

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

2015-02-16 Thread kaputtnik
As SirVer said in https://code.launchpad.net/~widelands-dev/widelands/terrain_doc/+merge/249747/comments/618862 "only terrain affinity decides how trees grow." I think before the one-world merge, the is-values did have influence about the growing of trees. With the merge into one-world, this te

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

2015-02-16 Thread kaputtnik
> @kaputtnik: as you are the most active dev on the website right now, would > you be okay with me adding you to the group that receives email notifications > with backtraces about errors? Yes. > Should I use the email you signed up with on wl.widelands.org? Yes. Could i get an acc

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

2015-02-16 Thread kaputtnik
Review: Approve Thanks, > Is this branch good to go now? I think so. Thanks for your work :-) -- 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:~franku/widelands-website/handle_big_images into lp:widelands-website

2015-02-16 Thread kaputtnik
Thanks, >> Could i get an account for the admin panel too? > Done. This doesn't work. I just see nothing, except that i do not have the rights to change anything. Maybe i have to wait a while? I coudn't trigger the error on my maschine. But i assume that this error occurs with articles that co

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

2015-02-17 Thread kaputtnik
> You can try to reproduce it on alpha.widelands.org Over there the error occurs. I didn't found an article with newly uploaded images, so i tried to create a new one and to upload an image. But then the same failure happens as when i try to set up the website on my maschine: No such file or di

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

2015-02-17 Thread kaputtnik
After searching around i found this: http://stackoverflow.com/a/11346592 "As a note for other this issue can be caused when you have a double '//' in the static file resource you are looking for." The double slashes in our media path is something what i noticed erlier but i was unsure about how

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

2015-02-17 Thread kaputtnik
> It seems to be this change then. No more errors all day today. Sorry, i do not understand. But maybe i also do not explain as much. Just to be clear: As you revert the changes, all is fine. No more errors, all articles could be edited. But on the alpha sites, the error is allways there but i c

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

2015-02-18 Thread kaputtnik
Thanks :-) > also fixed the serving paths for static media, so that image uploading > actually works. I tried one picture real quick, but could not trigger the > error: http://alpha.widelands.org/wiki/edit/TestPageWithImage/ Ok, that article works. I uploaded an image there too and this aricle

[Widelands-dev] [Merge] lp:~franku/widelands-website/fix-double-slashes into lp:widelands-website

2015-02-18 Thread kaputtnik
kaputtnik has proposed merging lp:~franku/widelands-website/fix-double-slashes into lp:widelands-website. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~franku/widelands-website/fix-double-slashes/+merge/250231 This branch fixes the

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

2015-02-19 Thread kaputtnik
Thanks for the dump. > It is easily possible that it references broken data. Ok... > admin site: I thought I gave you access? I gave you full access now on alpha > too. For alpha it works, for widelands.org not. I just see nothing, except that i do not have the rights to change anything. > I t

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

2015-02-19 Thread kaputtnik
> you have a lot of rights now - please use them wisely :) I will change nothing, until i do really know what i am doing :-) The exception raises in /wlwebsite/lib/python2.7/site-packages/django/core/files/storage.py line 234. There is a function "safe_join()" called which could be found in /w

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

2015-02-19 Thread kaputtnik
Sorry... > First, how do I trigger the error on alpha - I have never seen it there. Try http://alpha.widelands.org/wiki/edit/BarbariansPage/ or http://alpha.widelands.org/wiki/edit/ImperialsPage/ These pages do trigger the Suspicious-error. It should not matter, if the files not exists, because

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

2015-02-21 Thread kaputtnik
Thanks for spending time to investigate this issue further :-) A short conclusion: > ('#sirver name: ', > u'/var/www/django_projects/wlwebsite/code/widelands/media//wlimages/WL_barbarian_tribe_1024x768middle2') Here is the file extension ".png" missing. This is maybe caused by he length of the

Re: [Widelands-dev] [Merge] lp:~hjd/widelands-website/django1.3.7 into lp:widelands-website

2015-02-23 Thread kaputtnik
Oh, i havn't seen this is deployd and sorry for testing :-( The file "pip_requirements.txt" on http://bazaar.launchpad.net/~widelands-dev/widelands-website/trunk/files is still the same (no django 1.3.7) and its still on revision 383. -- https://code.launchpad.net/~hjd/widelands-website/dj

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

2015-02-23 Thread kaputtnik
The proposal to merge lp:~franku/widelands-website/handle_big_images into lp:widelands-website has been updated. Status: Merged => Work in progress For more details, see: https://code.launchpad.net/~franku/widelands-website/handle_big_images/+merge/247235 -- Your team Widelands Developers i

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

2015-02-24 Thread kaputtnik
kaputtnik has proposed merging lp:~franku/widelands-website/forum_tables into lp:widelands-website. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~franku/widelands-website/forum_tables/+merge/250839 This branch make some corrections

[Widelands-dev] [Merge] lp:~franku/widelands-website/fix-redirect-links-coloring into lp:widelands-website

2015-02-26 Thread kaputtnik
kaputtnik has proposed merging lp:~franku/widelands-website/fix-redirect-links-coloring into lp:widelands-website. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~franku/widelands-website/fix-redirect-links-coloring/+merge/251168

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

2015-02-28 Thread kaputtnik
I am currently working on this and want to get your opinion on this behavior: > I added code to change each external image link in a clickable image link, if > it is not yet a clickable link. This has a disadvantage: Little images gets > clickable too. But i think this is acceptable. Advantage:

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

2015-03-02 Thread kaputtnik
Sorry for confusing you ... :-S >> I added code to change each external image link in a clickable image link, >> if it is not yet a clickable link. > I think that is a good solution. If it is annoying in practice will be seen > over time. This was the answer i want to read ;) The Problem i saw

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

2015-03-04 Thread kaputtnik
It's hard to explain what i meant what is happend to trigger the error. Fell free to ask if something is unclear... All following is related to widelands.org, not to the alpha-sites. Fact is: 1. All images which was uploaded in year 2009 have the faulty path (".../django_projects/widelands/medi

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

2015-03-15 Thread kaputtnik
kaputtnik has proposed merging lp:~franku/widelands-website/changes_to_admin_wlimages into lp:widelands-website. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~franku/widelands-website/changes_to_admin_wlimages/+merge/252996 This

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

2015-03-15 Thread kaputtnik
kaputtnik has proposed merging lp:~franku/widelands-website/forum_notifyings_contain_links_to_post into lp:widelands-website. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~franku/widelands-website

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

2015-03-15 Thread kaputtnik
Sorry, there went something wrong... i've updated this branch. -- https://code.launchpad.net/~franku/widelands-website/forum_notifyings_contain_links_to_post/+merge/253003 Your team Widelands Developers is requested to review the proposed merge of lp:~franku/widelands-website/forum_notifyings_con

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

2015-03-15 Thread kaputtnik
Thanks for your review :-) . I just used the current text, reorder and put the links inside. I'll change the branch to your suggestions. While the changes affect only to added posts, i use "was added to the topic" instead of "A new topic "{{ topic }}" has been added to the forum." Diff com

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

2015-03-16 Thread kaputtnik
.body }}. The result will be, that the post is displayed with full syntax, like as you write in the forum. Advantage: Quotes are better displayed, f.e.: "kaputtnik" wrote: > *someone wrote:* > > some text > > Heres is a picture: ![image](http://link_to_imag

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

2015-03-16 Thread kaputtnik
Thanks for review. We should leave it as it is for now. 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-16 07:01:06 + > @@ -1,6 +1,5 @@

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

2015-03-16 Thread kaputtnik
The current update of this branch corrects all the issues which are decribed in https://code.launchpad.net/~franku/widelands-website/handle_big_images/+merge/247235/comments/625062 in a conveniant way. I added a admin action to http://localhost:8000/admin/wlimages/image/ which easily corrects t

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 lp:widelands-website.

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 P

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

2015-03-30 Thread kaputtnik
I will split it into two branches. One containing the css-things and one with the admin action. -- https://code.launchpad.net/~franku/widelands-website/handle_big_images/+merge/247235 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___

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

2015-04-01 Thread kaputtnik
I splitted it into three branches: The branch https://code.launchpad.net/~franku/widelands-website/handle_great_images contains the css related things and the stuff to wl_markdown.py for handling big images which break the layout The branch https://code.launchpad.net/~franku/widelands-website

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

2015-04-01 Thread kaputtnik
kaputtnik has proposed merging lp:~franku/widelands-website/handle_great_images into lp:widelands-website. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~franku/widelands-website/handle_great_images/+merge/254988 In continuation of

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

2015-04-01 Thread kaputtnik
kaputtnik has proposed merging lp:~franku/widelands-website/correct_image_paths into lp:widelands-website. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~franku/widelands-website/correct_image_paths/+merge/254990 This branch

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

2015-04-01 Thread kaputtnik
kaputtnik has proposed merging lp:~franku/widelands-website/admin_action_correct_image_path into lp:widelands-website. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~franku/widelands-website/admin_action_correct_image_path/+merge

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

2015-05-10 Thread kaputtnik
I looked into it and think its a good solution. Next week i will try to implement it in the Website. Thanks :-) -- 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/au

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

2015-05-13 Thread kaputtnik
kaputtnik has proposed merging lp:~franku/widelands-website/developers_list into lp:widelands-website. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1424072 in Widelands Website: "Automatically add translator credits to authors list" https://bugs.lau

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

2015-05-13 Thread kaputtnik
Oh sorry, this branch has to be merged only together with https://code.launchpad.net/~widelands-dev/widelands/authors (if it is ready :-D ) -- https://code.launchpad.net/~franku/widelands-website/developers_list/+merge/259041 Your team Widelands Developers is requested to review the proposed mer

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

2015-05-22 Thread kaputtnik
kaputtnik has proposed merging lp:~franku/widelands-website/faulty_encyclopedia into lp:widelands-website. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~franku/widelands-website/faulty_encyclopedia/+merge/259967 Because from time

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

2015-05-23 Thread kaputtnik
Thanks :-) Text changed according to your suggestion. -- https://code.launchpad.net/~franku/widelands-website/faulty_encyclopedia/+merge/259967 Your team Widelands Developers is requested to review the proposed merge of lp:~franku/widelands-website/faulty_encyclopedia into lp:widelands-website.

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

2015-07-05 Thread kaputtnik
Thanks :-) I used this admin action to correct the paths of all images. If you want to, you could remove this admin-action now... it isn't needed anymore. -- https://code.launchpad.net/~franku/widelands-website/admin_action_correct_image_path/+merge/254993 Your team Widelands Developers is requ

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

2015-07-12 Thread kaputtnik
Yes :-) -- https://code.launchpad.net/~franku/widelands-website/handle_great_images/+merge/254988 Your team Widelands Developers is requested to review the proposed merge of lp:~franku/widelands-website/handle_great_images into lp:widelands-website.

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

2015-07-15 Thread kaputtnik
I thank you for taking your time :-) -- https://code.launchpad.net/~franku/widelands-website/handle_great_images/+merge/254988 Your team Widelands Developers is requested to review the proposed merge of lp:~franku/widelands-website/handle_great_images into lp:widelands-website. _

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

2015-07-27 Thread kaputtnik
kaputtnik has proposed merging lp:~franku/widelands-website/devs_and_locales_list into lp:widelands-website. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1424072 in Widelands Website: "Automatically add translator credits to authors list&quo

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

2015-07-28 Thread kaputtnik
Thanks for approve :-) Something i didn't found a rule for yet: When to use double quotes(") and when to use single quotes (') ... I used double quotes anywhere. Maybe it would be nicer to use single quotes on the keywords. If we have some time, i will try to optimize the code... especially the

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

2015-07-28 Thread kaputtnik
Related to ' vs. " its just programmers decision, but for one project it should be consistent. Maybe SirVer could tell his preferred syntax. I changed it now to something like 'vars/keywords that already exist' vs "new vars/real strings". break statement is a good idea, i changed the code accord

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

2015-07-29 Thread kaputtnik
After running pyformat over the file there some changes to old code also. I run a last test of the file and all is good. So i think it's ready to merge. Thanks for you hints :-) -- https://code.launchpad.net/~franku/widelands-website/devs_and_locales_list/+merge/266025 Your team Widelands Develo

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

2015-07-31 Thread kaputtnik
kaputtnik has proposed merging lp:~franku/widelands/adjust_rolling_of_winterwaves into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1408712 in widelands: "Waves are rolling in different speed /rolling angle is different&quo

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

2015-08-02 Thread kaputtnik
kaputtnik has proposed merging lp:~franku/widelands/better_dither_values into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~franku/widelands/better_dither_values/+merge/266673 This branch contains edited "dither

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

2015-08-02 Thread kaputtnik
No, those values have only visual effects for the terrains which adjoin. See https://wl.widelands.org/wiki/HelpTerrains/#dithering for consequences of this value. I tried former to adjust them, but this attempt wasn't a success to wasteland terrains. See https://bugs.launchpad.net/widelands/+bug

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

2015-08-06 Thread kaputtnik
Could i delete this branch without breaking some stuff? This branch was merged and reverted after some errors. (see: https://code.launchpad.net/~franku/widelands-website/handle_big_images/+merge/247235/comments/619163) The reason for deleting is just: I want to clean up :-) -- https://code.laun

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

2015-08-06 Thread kaputtnik
> If you set it's status to "merged" it will no longer be listed in most > listings. That's my problem: It is not merged. Merged are the new branches related to this issue. But i will leave it as is, because of the history. Thanks for your answer :-) -- https://code.launchpad.net/~franku/wide

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

2015-08-07 Thread kaputtnik
Thanks, i changed it into "abandoned" in the branch details and the merge status to "Rejected". -- https://code.launchpad.net/~franku/widelands-website/handle_big_images/+merge/247235 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___

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

2015-08-13 Thread kaputtnik
The proposal to merge lp:~franku/widelands/new_tree_values into lp:widelands has been updated. Description changed to: This branch contains the new values from king_of_nowhere for growing of trees. Edit: See https://wl.widelands.org/forum/topic/1760/?page=9#post-14345 and the whole thread. Fo

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

2015-08-13 Thread kaputtnik
kaputtnik has proposed merging lp:~franku/widelands/new_tree_values into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~franku/widelands/new_tree_values/+merge/267989 This branch contains the new values from

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

2015-08-24 Thread kaputtnik
kaputtnik has proposed merging lp:~franku/widelands-website/new_legal_notice_page into lp:widelands-website. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1484845 in Widelands Website: "Add an Immpressum (legal) site" https://bugs.launchpad.net

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

2015-08-25 Thread kaputtnik
Do you mean to use a tuple like ('name', 'emailaddress')? This should be doable. -- https://code.launchpad.net/~franku/widelands-website/new_legal_notice_page/+merge/268973 Your team Widelands Developers is requested to review the proposed merge of lp:~franku/widelands-website/new_legal_notice_p

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

2015-08-27 Thread kaputtnik
Now INQUIRY_RECIPIENTS is used to have ('name','email address'). The email part is not checked for validity. I changed also the code to gather the "message" information. -- https://code.launchpad.net/~franku/widelands-website/new_legal_notice_page/+merge/268973 Your team Widelands Developers is

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

2015-09-16 Thread kaputtnik
kaputtnik has proposed merging lp:~franku/widelands-website/css_changes into lp:widelands-website. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~franku/widelands-website/css_changes/+merge/271388 This branch contains changes to

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

2015-09-20 Thread kaputtnik
Please wait with merging, there are some changes and i will update the branch soon. -- https://code.launchpad.net/~franku/widelands-website/css_changes/+merge/271388 Your team Widelands Developers is requested to review the proposed merge of lp:~franku/widelands-website/css_changes into lp:widel

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

2015-09-20 Thread kaputtnik
Uodated... damn, there is unused code. I have to update again :-S -- https://code.launchpad.net/~franku/widelands-website/css_changes/+merge/271388 Your team Widelands Developers is requested to review the proposed merge of lp:~franku/widelands-website/css_changes into lp:widelands-website.

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

2015-09-20 Thread kaputtnik
Updated. Changes to text-shadow are reverted, so text-shadow is like the current state. Additional changes: The menu entries are font-size dependent in width. So if someone changes the font size in his browser, the width of the entries gets adjusted too. I provide screenshots in the forum topi

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

2015-09-20 Thread kaputtnik
Thanks, all works as suspected :-) I think no one would notice the changes... but if there are any unwanted changes, please report in the forum topic: https://wl.widelands.org/forum/topic/1797/ -- https://code.launchpad.net/~franku/widelands-website/css_changes/+merge/271388 Your team Widelan

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

2015-11-04 Thread kaputtnik
kaputtnik has proposed merging lp:~franku/widelands-website/little_navi_changes into lp:widelands-website. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~franku/widelands-website/little_navi_changes/+merge/276625 Just a few changes

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

2015-11-07 Thread kaputtnik
Review: Needs Fixing Because luatables have changed this needs fixing. There is also a conflict when merging with trunk. I'll take a look at this. -- https://code.launchpad.net/~widelands-dev/widelands/artifacts/+merge/276527 Your team Widelands Developers is subscribed to branch lp:~widelands

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

2015-11-07 Thread kaputtnik
Review: Resubmit Should work now again :-) -- https://code.launchpad.net/~widelands-dev/widelands/artifacts/+merge/276527 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/artifacts. ___ Mailing list: https://launchpad

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

2015-11-09 Thread kaputtnik
Review: Needs Fixing If there is nothing against it, i would change the files to have the translations back again (place an underscore in the files by hand). So we could merge this branch. Nevertheless the bug 1514342 still exists, also in current trunk. -- https://code.launchpad.net/~wideland

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

2015-11-09 Thread kaputtnik
Review: Resubmit The files are changed. -- https://code.launchpad.net/~widelands-dev/widelands/artifacts/+merge/276527 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/artifacts. ___ Mailing list: https://launchpad.ne

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

2015-11-09 Thread kaputtnik
Review: Needs Fixing Sorry, there is more lost: When loading/saving a map the suggested teams gets lost also. So this branch do not suggest teams if you want to play a map. F.e. map Elven Forest -- https://code.launchpad.net/~widelands-dev/widelands/artifacts/+merge/276527 Your team Widelands D

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

2015-11-09 Thread kaputtnik
Loosing the suggested teams happens also in current trunk. So your changes to the artifact branch do not cause the problem. I guess that making suggested teams was formerly done by editing the file "elemental" manually because we haven't had such an option in the map options menu. May this issue

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

2015-11-09 Thread kaputtnik
There where only 7 maps which have suggested teams. Done fixing suggested teams :-) -- https://code.launchpad.net/~widelands-dev/widelands/artifacts/+merge/276527 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/artifacts. __

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

2015-11-09 Thread kaputtnik
Review: Resubmit -- https://code.launchpad.net/~widelands-dev/widelands/artifacts/+merge/276527 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/artifacts. ___ Mailing list: https://launchpad.net/~widelands-dev Post

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

2015-11-25 Thread kaputtnik
kaputtnik has proposed merging lp:~widelands-dev/widelands/worker_icons into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1512077 in widelands: "change icons for workers in the menus" https://bugs.launchpad.net/widelands/+bug/1512077

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

2015-12-01 Thread kaputtnik
kaputtnik has proposed merging lp:~widelands-dev/widelands/is_value_terms into lp:widelands. Commit message: Changing the is values in world/terrains/init.lua and the terms for is-value related things in C++ code. dead -> unreachable mountain -> minebale green -> arable dry -&

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

2015-12-05 Thread kaputtnik
The proposal to merge lp:~widelands-dev/widelands/is_value_terms into lp:widelands has been updated. Commit Message changed to: Changing the is values in world/terrains/init.lua and the terms for is-value related things in C++ code. dead -> unreachable mountain -> minebale green -> arable dry

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

2015-12-05 Thread kaputtnik
Sorry that i couldn't approve your code... i could only say it works :-D -- https://code.launchpad.net/~widelands-dev/widelands/is_value_terms/+merge/279205 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/is_value_terms.

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

2015-12-07 Thread kaputtnik
> pics/ai_strong.png is now unused I could put it into the media branch. Currently i compile this branch and try to test the changes. After i am ready i will update this branch (removing the png file) and update the media branch also. -- https://code.launchpad.net/~widelands-dev/widelands/ai_l

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

2015-12-07 Thread kaputtnik
I could confirm the fuzzy roads. Additionally the buildings menu is messed up. I put a screenshot into the bug 1425870. -- https://code.launchpad.net/~widelands-dev/widelands/render_queue/+merge/250524 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/render_queu

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

2015-12-07 Thread kaputtnik
mode: terminate called after throwing an instance of 'ImageNotFound' what(): [/home/kaputtnik/Quellcode/widelands-repo/ai_level_names/src/graphic/image_io.h:35] Image not found: pics/ai_Normal.png I fixed this by editing scripting/widelands/multiplayer_help.lua and changed string &qu

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

2015-12-07 Thread kaputtnik
The proposal to merge lp:~widelands-dev/widelands/spinbox into lp:widelands has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~widelands-dev/widelands/spinbox/+merge/279153 -- Your team Widelands Developers is requested to review the propos

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

2015-12-07 Thread kaputtnik
I've tested the option window and the spin boxes with resolution 800x600 and 1024x768. Looks good :-) -- https://code.launchpad.net/~widelands-dev/widelands/spinbox/+merge/279153 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/spinbox into

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

2015-12-08 Thread kaputtnik
I am not sure where the Ware help could be found :-S *lol* Open the tribal help by hitting the questionmark on the bottom i found two things: 1. The worker icon in the tab is the old icon. I think we should use the same icons for workers in all menus. Somewhere i found also the old one, but i d

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

2015-12-08 Thread kaputtnik
I will test your changes tomorrow. We should have an overlook on the whole icons i believe. I feel that there are some icons which are either not used or could be replaced with other existing icons... hm... time... give me time... -- https://code.launchpad.net/~widelands-dev/widelands/ware_help

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

2015-12-08 Thread kaputtnik
The proposal to merge lp:~widelands-dev/widelands/ware_help into lp:widelands has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~widelands-dev/widelands/ware_help/+merge/276516 -- Your team Widelands Developers is subscribed to branch lp:~

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

2015-12-08 Thread kaputtnik
Review: Approve Looks good :-) One thing: In the wares help and in workers help the deep mines comes before mines. F.e. for ware "coal" I will approve nevertheless. You could self decide if you want to fix this in here. -- https://code.launchpad.net/~widelands-dev/widelands/ware_help/+merge/2

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

2015-12-09 Thread kaputtnik
Sorry. -- https://code.launchpad.net/~widelands-dev/widelands/ware_help/+merge/276516 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/one_tribe. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : w

  1   2   3   4   5   6   7   8   9   10   >