55087 Commits

Author SHA1 Message Date
Mark de Wever
37bb1b09fa Remove Doxygen comment for non-existing parameter.
The issue was found by Clang 3.4.
2014-01-05 15:42:13 +01:00
Mark de Wever
c72691524e Remove Doxygen comment.
The parameters documented, do not match the function signature.

The issue was found by Clang 3.4.
2014-01-05 15:39:35 +01:00
Mark de Wever
5bb7e90a43 Adds -Wno-documentation-deprecated-sync flag.
Clang 3.4 is unhappy that Doxygen comment with @deprecated is not
accompanied with a deprecated attribute. Since we don't do that, disable
the warning.
2014-01-05 15:37:32 +01:00
Groggy Dice
3415026a92 SotBE 04: fix ORCISH_SHAMAN id recognition
While I tested my whofield feature, unfortunately it was on an
old version of the campaign in which all shamans were on side 1,
so the macros had no side field. Recently, it was decided that
the shamans in this scenario should start on side 3, and a side
field was inserted into the macros.

When it was time to commit, there was of course a conflict, but
I simply put my existing magic comments into the new version,
not considering that now the id field had been shifted to the
right by one, and didn't re-run wmllint.
2014-01-05 00:21:46 -05:00
Allefant
5ad589066c [wmlparser2] Fixed issue with .plain file parsing
For example defined strings with empty lines would not work. The problem
was a direct check for newlines which failed if there were chr(254)
commands on the same line.
2014-01-04 23:54:16 +01:00
Nils Kneuper
855ffbe358 post release version bump to 1.11.8+dev 2014-01-04 21:48:55 +01:00
Ignacio R. Morelle
996518a783 Remove invalid anchor reference from the trash overlay terrain graphics rules 2014-01-04 17:00:50 -03:00
Nils Kneuper
f98e1ab470 bumped version to 1.11.8 1.11.8 2014-01-04 20:11:58 +01:00
Nils Kneuper
c3cab62791 pot-update and regenerated doc files
preparing for 1.11.8
2014-01-04 20:10:31 +01:00
Ignacio R. Morelle
3c6fc31658 Add wmllint spelling exception for 'naptha' 2014-01-04 16:04:27 -03:00
Ignacio R. Morelle
8c6c79b3be Add wmllint spelling exception for 'scrollwork' 2014-01-04 16:04:16 -03:00
Ignacio R. Morelle
3ee7d5f835 Add more general Khalifate spelling exceptions for wmllint 2014-01-04 16:03:59 -03:00
Ignacio R. Morelle
ab4eb3582c Fix obvious typos in the Khalifate units' descriptions 2014-01-04 16:00:16 -03:00
Ignacio R. Morelle
c46c8ff94b Replace double space following stops in the Khalifate descriptions with single space 2014-01-04 15:48:44 -03:00
Ignacio R. Morelle
46aded67e2 gui2/taddon_description: Allow the URL textbox to become wider as needed 2014-01-04 15:32:43 -03:00
happygrue
2e550ef4c5 Updated to U.S. spelling. 2014-01-04 12:59:51 -05:00
happygrue
9d0e326415 Updated unit description by noy. 2014-01-04 12:13:16 -05:00
happygrue
6182ca1c17 Updated unit description by noy. 2014-01-04 12:13:12 -05:00
happygrue
ce92be4f26 Updated unit description by noy. 2014-01-04 12:13:08 -05:00
happygrue
a38ebecdf4 Updated unit description by noy. 2014-01-04 12:07:09 -05:00
happygrue
4db0a7c071 Updated unit description by noy. 2014-01-04 12:07:01 -05:00
happygrue
a794c71abc Updated unit description by noy. 2014-01-04 11:51:06 -05:00
happygrue
9b8882c3eb Fixed a typo. 2014-01-04 11:48:58 -05:00
happygrue
a813dc3ee8 Updated unit description by noy. 2014-01-04 11:29:16 -05:00
happygrue
767eefd577 Updated unit description by noy. 2014-01-04 11:29:12 -05:00
happygrue
fce88a924b Updated unit description by noy. 2014-01-04 11:29:08 -05:00
Ignacio R. Morelle
d6cfc9bb6b wmllint: Document markcheck off/on directives 2014-01-04 12:54:24 -03:00
Ignacio R. Morelle
f5ad4be828 Disable wmllint translation mark check around inline Lua blocks 2014-01-04 12:51:08 -03:00
ln-zookeeper
dd33333f01 Merge branch 'master' of https://github.com/wesnoth/wesnoth-old 2014-01-04 17:46:00 +02:00
ln-zookeeper
c4ea12f2e2 Fixed scouts missing from the dwarf leader's recruitment pattern. 2014-01-04 17:45:14 +02:00
Ignacio R. Morelle
03f1dea50a gui2/teditor_edit_scenario: Unify some grids for a more orderly appearance 2014-01-04 12:30:51 -03:00
Ignacio R. Morelle
39b216cb2e gui2/teditor_edit_scenario: Change XP modifier slider step and minimum values 2014-01-04 12:30:51 -03:00
Ignacio R. Morelle
a5ac4d06c6 gui2/taddon_description: Use a [stacked_widget] so URL controls may be hidden
The URL controls overlay a placeholder "None" label using the
[stacked_widget]. When there's no URL to show, the URL controls are
hidden. When there is a URL to show, the placeholder is hidden instead.
2014-01-04 12:30:51 -03:00
Groggy Dice
9894a36cb6 wmllint: minor wording tweak for "unknown speaker" message 2014-01-04 09:43:54 -05:00
Ignacio R. Morelle
684a9bfe71 gui2/tscroll_label: Undefine local macro before EOF 2014-01-04 11:32:27 -03:00
Ignacio R. Morelle
e555bc63e6 gui2/taddon_description: Align the description grid and box to the left
Fixes the description box and header being centered on the dialog when
the description box and/or its container grid are narrower than the
column containing them.
2014-01-04 10:56:48 -03:00
Ignacio R. Morelle
28a004707b s/thread/topic/g for the overview of the .pbl [feedback] syntax 2014-01-04 10:20:09 -03:00
Ignacio R. Morelle
f176119c90 gui2/taddon_description: Replace url_go button tooltip with a more passive one 2014-01-04 07:59:07 -03:00
Ignacio R. Morelle
bc1489b699 Update changelogs 2014-01-04 07:23:48 -03:00
Ignacio R. Morelle
5442b2c843 gui2/taddon_description: Add controls to display an add-on's feedback URL
This includes a textbox to display the URL, and two buttons to copy and
visit the URL.
2014-01-04 07:19:41 -03:00
Ignacio R. Morelle
46b9bd3a47 gui2/taddon_description: Completely redesigned dialog layout
The new layout merges some information rows together to increase
available vertical space for displaying additional fields later, and
uses a 'description' scroll_label type for the add-on Description field
to improve its appearance, especially for multi-line descriptions.

This also makes the dialog non-click-dismissable and adds a Close button
on the bottom right corner. Since we're about to add more interactive
controls, there's really not much of a choice about the click-dismiss
option; it gets disabled for such dialogs automatically.
2014-01-04 07:19:41 -03:00
Ignacio R. Morelle
ee39012ba9 gui2/tscroll_label: Add the definition for a 'description' scroll_label
This scroll_label definition is intended to be used for big description
boxes like in the Add-ons Manager's description dialog. It paints a
darker transparent background behind the inner grid and adds some
padding to the inner label.
2014-01-04 07:19:41 -03:00
Ignacio R. Morelle
7a9e1b5974 gui2/taddon_description: Update wiki documentation 2014-01-04 07:19:41 -03:00
Ignacio R. Morelle
6e16b0c659 addon/info: Add support for the [campaign] feedback_url field from the server 2014-01-04 07:19:41 -03:00
Ignacio R. Morelle
6df984ffd8 campaignd: Implement .pbl [feedback] block and [campaign] feedback_url field
The .pbl [feedback] block (also used in the server configuration WML)
specifies a list of format values interpolated into the
feedback_url_format string from [server_info] to build a web page URL
that is delivered to clients each time an add-on's metadata is sent in a
[campaign] block.

For example, given the following campaignd-side configuration:

  [server_info]
      feedback_url_format="http://forums.wesnoth.org/viewtopic.php?t=$thread_id"
  [/server_info]

And the following tag in the _server.pbl WML:

  [feedback]
      thread_id=32091
  [/feedback]

..., the server will deliver the following field as part of the
[campaign] block provided in the response to [request_campaign_list]:

  feedback_url="http://forums.wesnoth.org/viewtopic.php?t=32091

The fields from the [feedback] block are percent-encoded to ensure that
the .pbl WML can't manipulate query strings from the
feedback_url_format. If for a system administrator it is somehow
desirable to let authors enter arbitrary URL fragments (e.g.
feedback_url_format="$url" and [feedback]
url="http://this-site-kills-kittens.example.com, bad idea btw), then
they should probably remove the utils::urlencode() call themselves and
take responsibility for any malicious links that could be served to
users of the add-ons server that way.
2014-01-04 07:19:41 -03:00
Ignacio R. Morelle
44e823baa5 campaign: Implement [server_info] block and feedback_url_format attribute
The [server_info] configuration block is intended to contain additional
information about a campaignd instance that may be used by clients or
the server for various purposes.

As a first such information field, the feedback_url_format string
contains a format string for use with
fast_interpolate_variables_into_string() to build add-on feedback page
URLs.
2014-01-04 07:19:41 -03:00
Ignacio R. Morelle
9a1ca1cbc4 campaignd: Add dumb alternative to utils::interpolate_variables_into_string()
utils::interpolate_variables_into_string() requires a bunch of formula
AI implementation details at linking time, which really shouldn't be in
server-side code (see commit 495f481fdf6cbd6d5eea2ffaa20423f08c955eec).

Since I'm going to need a similar variable interpolation scheme for an
upcoming campaignd feature, add a
fast_interpolate_variables_into_string() function that does something
roughly equivalent, except using simple string replacements without
support for the full WML $variable syntax (e.g. pipes don't have any
meaning in this version of the functionality).
2014-01-04 07:19:41 -03:00
Ignacio R. Morelle
92938d3404 addon/client: Minor Doxygen comment clarification 2014-01-04 07:19:41 -03:00
Ignacio R. Morelle
5ee16b8aa4 Add utils::urlencode() function for percent-escaping UTF-8 strings 2014-01-04 07:19:41 -03:00
ln-zookeeper
37e5f78c6f Merge branch 'master' of https://github.com/wesnoth/wesnoth-old 2014-01-04 11:52:06 +02:00