[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1625502-tips-in-help into lp:widelands

2017-01-24 Thread noreply 
The proposal to merge lp:~widelands-dev/widelands/bug-1625502-tips-in-help into 
lp:widelands has been updated.

Status: Needs review => Merged

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1625502-tips-in-help/+merge/312969
-- 
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1625502-tips-in-help.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1625502-tips-in-help into lp:widelands

2017-01-24 Thread GunChleoc 
Let's get this branch in so we can add the content changes in another branch.

@bunnybot merge
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1625502-tips-in-help/+merge/312969
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1625502-tips-in-help.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1625502-tips-in-help into lp:widelands

2017-01-23 Thread kaputtnik 
Do you want to add/change the tips suggested in the forum in this branch? Since 
it could be a job for a person who don't  know much about C++, the related 
changes could be made in another branch after this one is merged.

https://wl.widelands.org/forum/topic/2819/
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1625502-tips-in-help/+merge/312969
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1625502-tips-in-help.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1625502-tips-in-help into lp:widelands

2017-01-22 Thread Klaus Halfmann 
Code LGTM, one nit about  but as this HTML is not in the wild,
it may not be worth changing.
Will compile / test this now
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1625502-tips-in-help/+merge/312969
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1625502-tips-in-help.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1625502-tips-in-help into lp:widelands

2017-01-19 Thread kaputtnik 
Review: Approve testing

> How about we do a general overhaul if the tips?

Yes, that is a good idea. I think we could ask in the forums for such tips and 
get good answers then :-)
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1625502-tips-in-help/+merge/312969
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1625502-tips-in-help.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1625502-tips-in-help into lp:widelands

2017-01-16 Thread bunnybot 
Continuous integration builds have changed state:

Travis build 1761. State: passed. Details: 
https://travis-ci.org/widelands/widelands/builds/182981313.
Appveyor build 1601. State: success. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1625502_tips_in_help-1601.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1625502-tips-in-help/+merge/312969
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1625502-tips-in-help into lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1625502-tips-in-help into lp:widelands

2017-01-16 Thread bunnybot 
Bunnybot encountered an error while working on this merge proposal:

('The read operation timed out',)
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1625502-tips-in-help/+merge/312969
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1625502-tips-in-help into lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1625502-tips-in-help into lp:widelands

2016-12-14 Thread bunnybot 
Continuous integration builds have changed state:

Travis build 1761. State: passed. Details: 
https://travis-ci.org/widelands/widelands/builds/182981313.
Appveyor build 1601. State: success. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1625502_tips_in_help-1601.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1625502-tips-in-help/+merge/312969
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1625502-tips-in-help into lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1625502-tips-in-help into lp:widelands

2016-12-14 Thread bunnybot 
Bunnybot encountered an error while working on this merge proposal:

('The read operation timed out',)
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1625502-tips-in-help/+merge/312969
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1625502-tips-in-help into lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1625502-tips-in-help into lp:widelands

2016-12-11 Thread bunnybot 
Continuous integration builds have changed state:

Travis build 1761. State: passed. Details: 
https://travis-ci.org/widelands/widelands/builds/182981313.
Appveyor build 1601. State: success. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1625502_tips_in_help-1601.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1625502-tips-in-help/+merge/312969
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1625502-tips-in-help into lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1625502-tips-in-help into lp:widelands

2016-12-10 Thread bunnybot 
Continuous integration builds have changed state:

Travis build 1754. State: failed. Details: 
https://travis-ci.org/widelands/widelands/builds/182871607.
Appveyor build 1594. State: success. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1625502_tips_in_help-1594.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1625502-tips-in-help/+merge/312969
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1625502-tips-in-help into lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1625502-tips-in-help into lp:widelands

2016-12-10 Thread GunChleoc 
GunChleoc has proposed merging 
lp:~widelands-dev/widelands/bug-1625502-tips-in-help into lp:widelands.

Commit message:
Convert editor/game tips to Lua and display them in the in-editor/in-game help.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1625502 in widelands: "Add game and editor tips to in-game help"
  https://bugs.launchpad.net/widelands/+bug/1625502

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1625502-tips-in-help/+merge/312969
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1625502-tips-in-help into lp:widelands.
=== modified file 'data/scripting/editor/editor_help.lua'
--- data/scripting/editor/editor_help.lua	2016-04-02 08:09:19 +
+++ data/scripting/editor/editor_help.lua	2016-12-10 16:14:18 +
@@ -65,7 +65,14 @@
title = _"Controls",
script = "scripting/editor/editor_controls.lua",
script_parameters = {}
+},
+{
+   name = "tips",
+   title = _"Tips",
+   script = "scripting/editor/tips.lua",
+   script_parameters = {}
 }
+
  }
   },
   {

=== added file 'data/scripting/editor/tips.lua'
--- data/scripting/editor/tips.lua	1970-01-01 00:00:00 +
+++ data/scripting/editor/tips.lua	2016-12-10 16:14:18 +
@@ -0,0 +1,18 @@
+include "scripting/formatting.lua"
+
+function get_editor_tips()
+   include "txts/tips/editor.lua"
+   return tips
+end
+
+local text = paragraphdivider()
+for index, contents in pairs(get_editor_tips()) do
+   text = text .. listitem_bullet(contents["text"])
+end
+text = text .. ""
+
+set_textdomain("widelands_editor")
+return {
+  title = _"Tips",
+  text = rt(text)
+}

=== modified file 'data/scripting/format_scenario.lua'
--- data/scripting/format_scenario.lua	2016-04-02 10:53:01 +
+++ data/scripting/format_scenario.lua	2016-12-10 16:14:18 +
@@ -48,18 +48,6 @@
 
 
 -- RST
--- .. function:: paragraphdivider()
---
---Closes a paragraph and opens a new paragraph. Use this when you format a string with the speech function
---and need to divide the speech into multiple paragraphs.
---
---:returns: 
-function paragraphdivider()
-   return ("")
-end
-
-
--- RST
 -- .. function:: objective_text(heading, body)
 --
 --Provides nice formatting for objective texts.

=== modified file 'data/scripting/formatting.lua'
--- data/scripting/formatting.lua	2016-09-21 08:41:51 +
+++ data/scripting/formatting.lua	2016-12-10 16:14:18 +
@@ -264,3 +264,14 @@
  t2 .. " "
end
 end
+
+-- RST
+-- .. function:: paragraphdivider()
+--
+--Closes a paragraph and opens a new paragraph. Use this when you format a string with the speech function
+--and need to divide the speech into multiple paragraphs.
+--
+--:returns: 
+function paragraphdivider()
+   return ("")
+end

=== modified file 'data/tribes/scripting/help/init.lua'
--- data/tribes/scripting/help/init.lua	2016-04-02 08:21:25 +
+++ data/tribes/scripting/help/init.lua	2016-12-10 16:14:18 +
@@ -42,7 +42,7 @@
 
 -- Main function
 return {
-   func = function(tribename)
+   func = function(tribename, game_type)
   set_textdomain("tribes_encyclopedia")
   return {
  title = _"Tribal Encyclopedia",
@@ -64,6 +64,12 @@
  title = _"Controls",
  script = "tribes/scripting/help/controls.lua",
  script_parameters = {}
+  },
+  {
+ name = "tips",
+ title = _"Tips",
+ script = "tribes/scripting/help/tips.lua",
+ script_parameters = {tribename, game_type}
   }
}
 },

=== added file 'data/tribes/scripting/help/tips.lua'
--- data/tribes/scripting/help/tips.lua	1970-01-01 00:00:00 +
+++ data/tribes/scripting/help/tips.lua	2016-12-10 16:14:18 +
@@ -0,0 +1,76 @@
+include "scripting/formatting.lua"
+
+function get_general_tips()
+   include "txts/tips/general_game.lua"
+   return tips
+end
+
+function get_atlantean_tips()
+   include "txts/tips/atlanteans.lua"
+   return tips
+end
+
+function get_barbarian_tips()
+   include "txts/tips/barbarians.lua"
+   return tips
+end
+
+function get_empire_tips()
+   include "txts/tips/empire.lua"
+   return tips
+end
+
+function get_singleplayer_tips()
+   include "txts/tips/singleplayer.lua"
+   return tips
+end
+
+function get_multiplayer_tips()
+   include "txts/tips/multiplayer.lua"
+   return tips
+end
+
+function format_tips(tips)
+   local text