Merge branch 'master' into renderpath_redo

RELEASE_NOTES

@@ -27,6 +27,21 @@ SDL version 1.2.x has been removed in favour of SDL version 2.0.x. The build sys
 [/list]
 [/rasection]
 
+[rasection="Wesnoth Formula Language update"]
+The Wesnoth formula language used by $(...) substitution, the formula= key in standard unit filters, and a few other places has received some significant updates. The changlog has the full list, but some highlights are:
+[list]
+[*]New operators for string concatenation, ranges, and testing containment
+[*]New string interpolation syntax
+[*]Dot operator can access identifier-friendly string keys in maps
+[*]Function definitions work outside FormulaAI and GUI2
+[*]Many new functions for math and string manipulation
+[*]Exponentiation operator is now right-associative (meaning 2^3^2 now produces 512 rather than 64)
+[*]Dice operator is now synced
+[*]Improved formula debugger
+[/list]
+The "fai" and "faiend" keywords are deprecated in favour of "wfl" and "wflend" respectively. This is part of a move to more clearly distinguish [wiki]Wesnoth Formula Language[/wiki], the language itself, from [wiki]FormulaAI[/wiki], which is just one use of the language in Wesnoth.
+[/rasection]
+
 ==========
 KNOWN BUGS
 ==========

changelog

@@ -5,6 +5,7 @@ Version 1.13.4+dev:
  * WML engine:
    * Fix some issues with [foreach]
    * Fix some issues with backstab-like weapon specials
+   * Support [effect]times=<integer>
  * Lua API:
    * wesnoth.match_unit can now take a location (rather than a unit) as
      the optional third parameter. This will cause the filter to consider
@@ -21,6 +22,10 @@ Version 1.13.4+dev:
      (where "array" is a table whose keys are all integers). This joins
      the elements of the array with commas and produces a single string
      value. eg {x = {1,2,3}} is equivalent to {x = "1,2,3"}.
+   * wesnoth.effects table can now be used to alter the behaviour of
+     built-in effects - for example, to add a new feature to
+     [effect]apply_to=attack. It also now supports effect descriptions,
+     for use by the [trait] tag.
  * Wesnoth formula engine:
    * Formulas in unit filters can now access nearly all unit attributes
    * New syntax features:
@@ -43,7 +48,7 @@ Version 1.13.4+dev:
        formula contexts, which means that they can be used outside FormulaAI.
        However, non-FormulaAI functions are currently local to the formula
        that declares them.
-     * Maps containing string keyss that are valid identifiers can now be
+     * Maps containing string keys that are valid identifiers can now be
        indexed with the dot operator instead of the indexing operator.
      * Strings can now be indexed via 'string'.char[n]. Also supported are
        'string'.word[n] and 'string'.item[n] (the latter splits on commas)
@@ -92,6 +97,8 @@ Version 1.13.4+dev:
        still work, but any future code should use wfl/wflend instead.
        Use of the .fai file extension is still fine for FormulaAI code;
        for other formula code in a separate file, .wfl is recommended instead.
+ * Miscellaneous and bug fixes:
+   * Resolve translated logo images not being used (bug #24357)
 
 Version 1.13.4:
  * Language and i18n:

data/ai/micro_ais/scenarios/animals.cfg

@@ -357,7 +357,7 @@ Also note: The Animal AIs are coded as Micro AIs. A Micro AI can be added and ad
             # wmlindent: stop ignoring
             # wmllint: unbalanced-off
             [option]
-                message= _ "<span font='16'>I'll just watch the animals.</span>"
+                label= _ "<span font='16'>I'll just watch the animals.</span>"
                 [command]
                     [modify_side]
                         side=1
@@ -370,7 +370,7 @@ Also note: The Animal AIs are coded as Micro AIs. A Micro AI can be added and ad
                 [/command]
             [/option]
             [option]
-                message= _ "<span font='16'>I want to have control of Side 1.</span>"
+                label= _ "<span font='16'>I want to have control of Side 1.</span>"
             [/option]
         [/message]
 

data/ai/micro_ais/scenarios/bottleneck_defense.cfg

@@ -98,10 +98,10 @@ Note: The Bottleneck Defense AI is coded as a Micro AI. A Micro AI can be added
             image=wesnoth-icon.png
             message= _ "In this scenario, the AI playing the humans in the east is instructed to form a defensive line at the pass and hold off the orcs for as long as possible. Do you want to play the orc side or let the default (RCA) AI do that?"
             [option]
-                message= _ "<span font='16'>I'll watch the two AIs fight it out.</span>"
+                label= _ "<span font='16'>I'll watch the two AIs fight it out.</span>"
             [/option]
             [option]
-                message= _ "<span font='16'>I'll play the orcs.</span>"
+                label= _ "<span font='16'>I'll play the orcs.</span>"
                 [command]
                     [modify_side]
                         side=2

data/ai/micro_ais/scenarios/protect_unit.cfg

@@ -140,10 +140,10 @@
 Note: The Protect Unit AI is coded as a Micro AI. A Micro AI can be added and adapted to the need of a scenario easily using only WML and the [micro_ai] tag. Check out the <span color='#00A000'>Micro AI wiki page</span> at http://wiki.wesnoth.org/Micro_AIs for more information." # wmllint: no spellcheck
             # wmllint: unbalanced-off
             [option]
-                message= _ "<span font='16'>I'll watch the two AIs fight it out</span>" # wmllint: no spellcheck
+                label= _ "<span font='16'>I'll watch the two AIs fight it out</span>" # wmllint: no spellcheck
             [/option]
             [option]
-                message= _ "<span font='16'>I'll play Langzhar's side (to see how Koorzhar's units target Rossauba)</span>"
+                label= _ "<span font='16'>I'll play Langzhar's side (to see how Koorzhar's units target Rossauba)</span>"
                 [command]
                     [modify_side]
                         side=1
@@ -152,7 +152,7 @@ Note: The Protect Unit AI is coded as a Micro AI. A Micro AI can be added and ad
                 [/command]
             [/option]
             [option]
-                message= _ "<span font='16'>I'll play Koorzhar's side (to see how Langzhar's units protect Rossauba)</span>"
+                label= _ "<span font='16'>I'll play Koorzhar's side (to see how Langzhar's units protect Rossauba)</span>"
                 [command]
                     [modify_side]
                         side=2

data/ai/micro_ais/scenarios/wolves.cfg

@@ -202,7 +202,7 @@ Note that the leader of the human-controlled side, Rutburt, can move 99 hexes pe
 Also note that the wolves AI is coded as a Micro AI. A Micro AI can be added and adapted to the need of a scenario easily using only WML and the [micro_ai] tag. Check out the <span color='#00A000'>Micro AI wiki page</span> at http://wiki.wesnoth.org/Micro_AIs for more information." # wmllint: no spellcheck
             # wmllint: unbalanced-off
             [option]
-                message= _ "<span font='16'>I'll just watch the two wolf sides.</span>"
+                label= _ "<span font='16'>I'll just watch the two wolf sides.</span>"
                 [command]
                     [modify_side]
                         side=1
@@ -215,7 +215,7 @@ Also note that the wolves AI is coded as a Micro AI. A Micro AI can be added and
                 [/command]
             [/option]
             [option]
-                message= _ "<span font='16'>I want to have control of Side 1.</span>"
+                label= _ "<span font='16'>I want to have control of Side 1.</span>"
             [/option]
         [/message]