[wesnoth-commits] [wesnoth/wesnoth] d3f94a: unit animations - fix wrong-facing glitch for unit...

Tue Feb 16 02:11:21 UTC 2021

  Branch: refs/heads/scoped_vars
  Home:   https://github.com/wesnoth/wesnoth
  Commit: d3f94aaaa63094de3896dac4c2e6905b041fd2cb
      https://github.com/wesnoth/wesnoth/commit/d3f94aaaa63094de3896dac4c2e6905b041fd2cb
  Author: doofus-01 <dk0045 at comcast.net>
  Date:   2021-02-06 (Sat, 06 Feb 2021)

  Changed paths:
    M data/core/macros/animation-utils.cfg

  Log Message:
  -----------
  unit animations - fix wrong-facing glitch for units with animated torch flame overlay - also allow for ne facing standing animations

  Commit: 57d3539bfe4ddd4d11e4477b65b8645c36a18777
      https://github.com/wesnoth/wesnoth/commit/57d3539bfe4ddd4d11e4477b65b8645c36a18777
  Author: doofus-01 <dk0045 at comcast.net>
  Date:   2021-02-13 (Sat, 13 Feb 2021)

  Changed paths:
    M data/core/units/dunefolk/Cataphract.cfg
    M data/core/units/dunefolk/Horse_Archer.cfg
    M data/core/units/dunefolk/Marauder.cfg
    M data/core/units/dunefolk/Raider.cfg
    M data/core/units/dunefolk/Rider.cfg
    M data/core/units/dunefolk/Sunderer.cfg
    M data/core/units/dunefolk/Windbolt.cfg

  Log Message:
  -----------
  units - make horse-based dunefolk have mounted undead variation

  Commit: 888edc85dbe6f2fa955185df34873efd1f8a524c
      https://github.com/wesnoth/wesnoth/commit/888edc85dbe6f2fa955185df34873efd1f8a524c
  Author: doofus-01 <doofus-01 at users.noreply.github.com>
  Date:   2021-02-13 (Sat, 13 Feb 2021)

  Changed paths:
    M data/core/macros/animation-utils.cfg
    M data/core/units/dunefolk/Cataphract.cfg
    M data/core/units/dunefolk/Horse_Archer.cfg
    M data/core/units/dunefolk/Marauder.cfg
    M data/core/units/dunefolk/Raider.cfg
    M data/core/units/dunefolk/Rider.cfg
    M data/core/units/dunefolk/Sunderer.cfg
    M data/core/units/dunefolk/Windbolt.cfg

  Log Message:
  -----------
  Units - minor fixes to Dunefolk - Merge pull request #5522

 - Fix some sprite graphics configurations
 - Give mounted dunefolk the mounted undead variation

  Commit: c5abf1bb00b8ee797d08182d44b604e990b2cd15
      https://github.com/wesnoth/wesnoth/commit/c5abf1bb00b8ee797d08182d44b604e990b2cd15
  Author: Iris Morelle <shadowm at wesnoth.org>
  Date:   2021-02-13 (Sat, 13 Feb 2021)

  Changed paths:
    M src/server/campaignd/server.cpp

  Log Message:
  -----------
  campaignd: Fix UB when servicing [request_campaign]

std::distance(A, B) requires A and B to be random access iterators if
the expression B < A is even expected to make any sense. std::map
produces bidirectional iterators instead, so this code was causing UB
when [request_campaign] was used with a From version newer than the To
version (a.k.a. downgrading an add-on).

This fix also allows us to skip a lot of nonsense in the event that From
== To.

  Commit: dc451cae2460a48b7de8481f6f3adf7c3f3f42c6
      https://github.com/wesnoth/wesnoth/commit/dc451cae2460a48b7de8481f6f3adf7c3f3f42c6
  Author: Iris Morelle <shadowm at wesnoth.org>
  Date:   2021-02-13 (Sat, 13 Feb 2021)

  Changed paths:
    M src/server/campaignd/server.cpp

  Log Message:
  -----------
  campaignd: Fix minor log message typo

  Commit: bbcf9db1b512b28617bff49a114f42912dc35c60
      https://github.com/wesnoth/wesnoth/commit/bbcf9db1b512b28617bff49a114f42912dc35c60
  Author: Iris Morelle <shadowm at wesnoth.org>
  Date:   2021-02-13 (Sat, 13 Feb 2021)

  Changed paths:
    M changelog.md

  Log Message:
  -----------
  Update changelog

  Commit: 53f9dbb51a2fcae9ffb616c91026de33e4f5913d
      https://github.com/wesnoth/wesnoth/commit/53f9dbb51a2fcae9ffb616c91026de33e4f5913d
  Author: Pentarctagon <pentarctagon at tutamail.com>
  Date:   2021-02-13 (Sat, 13 Feb 2021)

  Changed paths:
    M data/modifications.cfg
    M src/play_controller.cpp
    M src/units/helper.cpp

  Log Message:
  -----------
  Remove the Delay Advancements modification.

While implementationally it's very simple, the feedback so far (minimal as it may be) has been negative due to the side effects on existing gameplay mechanics:
* Delaying advancement until the next time it's the advancing unit's side's turn gives enemies a much larger window to kill the unit to prevent it from leveling up.
* The majority of units don't have multiple advancement options, so delaying their advancement as well isn't helpful.

Additionally, leaving this in for 1.16 would mean that it would not be possible to remove it in 1.17 or later without breaking any replays that did use it.

  Commit: c05e39ecc1d10b66b380b93bc46e2da14e36c021
      https://github.com/wesnoth/wesnoth/commit/c05e39ecc1d10b66b380b93bc46e2da14e36c021
  Author: Pentarctagon <pentarctagon at tutamail.com>
  Date:   2021-02-13 (Sat, 13 Feb 2021)

  Changed paths:
    M src/actions/advancement.cpp

  Log Message:
  -----------
  Always have units with multiple advancements level up to the first one listed in the unit_type.

There's already enough randomness in Wesnoth; having the game randomly choose what a unit levels up to in a multiplayer game because it happens to advance on someone else's turn is unnecessary.
This also reduces the need to manually select a unit's advancement path for advancement planning modifications. For example, if you want your Mage to level up into a White Mage, this is now the default and doesn't need to be manually selected by the player.

  Commit: 093db78cc73b4ade5c186298f31997877a69ccd6
      https://github.com/wesnoth/wesnoth/commit/093db78cc73b4ade5c186298f31997877a69ccd6
  Author: Pentarctagon <pentarctagon at tutamail.com>
  Date:   2021-02-13 (Sat, 13 Feb 2021)

  Changed paths:
    M data/core/_main.cfg
    A data/lua/as_text.lua
    M data/modifications.cfg
    A data/modifications/pick_advance/README.md
    A data/modifications/pick_advance/dialog.lua
    A data/modifications/pick_advance/main.lua
    A data/test/scenarios/as_text.cfg
    M wml_test_schedule

  Log Message:
  -----------
  Add the Plan Unit Advance modification to mainline.

  Commit: a7aeff9e498602735826b555a152463a8bb19fb5
      https://github.com/wesnoth/wesnoth/commit/a7aeff9e498602735826b555a152463a8bb19fb5
  Author: Pentarctagon <pentarctagon at tutamail.com>
  Date:   2021-02-13 (Sat, 13 Feb 2021)

  Changed paths:
    M changelog.md

  Log Message:
  -----------
  Changelog update.

  Commit: e03ebed407466482a8c8fdb5d40e0c1c48f7e19f
      https://github.com/wesnoth/wesnoth/commit/e03ebed407466482a8c8fdb5d40e0c1c48f7e19f
  Author: Iris Morelle <shadowm at wesnoth.org>
  Date:   2021-02-13 (Sat, 13 Feb 2021)

  Changed paths:
    M data/tools/addon_manager/html.py
    M data/tools/helptrailer.html
    M data/tools/unit_tree/html_output.py

  Log Message:
  -----------
  website: New Year copyright update

[ci skip]

  Commit: e12f08f58d39a15d066528facb3e6b1a2397443b
      https://github.com/wesnoth/wesnoth/commit/e12f08f58d39a15d066528facb3e6b1a2397443b
  Author: Iris Morelle <shadowm at wesnoth.org>
  Date:   2021-02-14 (Sun, 14 Feb 2021)

  Changed paths:
    M data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg

  Log Message:
  -----------
  UtBS: Revert incomplete gender swap in scenario 9

No need to break UMC for the sake of historical accuracy.

  Commit: e238f6e9e0b1554b98cfca147dfeb950b7c4b152
      https://github.com/wesnoth/wesnoth/commit/e238f6e9e0b1554b98cfca147dfeb950b7c4b152
  Author: nemaara <nemaara at gmail.com>
  Date:   2021-02-14 (Sun, 14 Feb 2021)

  Changed paths:
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/01_A_Summer_of_Storms.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/02_The_Fall.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/03_A_Harrowing_Escape.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/04a_The_Swamp_of_Esten.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/04b_The_Midlands.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/05_The_Oldwood.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/06_Temple_in_the_Deep.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/08_Clearwater_Port.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/09_Fallen_Lich_Point.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/10_Sewer_of_Southbay.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/12_A_Final_Spring.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/13_Peoples_in_Decline.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/14_Rough_Landing.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/17a_The_Dragon.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/17b_Lizard_Beach.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/17c_Troll_Hole.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/17d_Cursed_Isle.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/19_The_Vanguard.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/20_Return_of_the_Fleet.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/22_The_Rise_of_Wesnoth.cfg

  Log Message:
  -----------
  TRoW: rebalance pass

  Commit: 3e81f0e34edfb797b92930f19e82201c2b2fe170
      https://github.com/wesnoth/wesnoth/commit/3e81f0e34edfb797b92930f19e82201c2b2fe170
  Author: nemaara <nemaara at gmail.com>
  Date:   2021-02-14 (Sun, 14 Feb 2021)

  Changed paths:
    M changelog.md

  Log Message:
  -----------
  Add TRoW rebalance to changelog

  Commit: 3d08a2a0db48b96378b2729cdab6791868de5ec7
      https://github.com/wesnoth/wesnoth/commit/3d08a2a0db48b96378b2729cdab6791868de5ec7
  Author: nemaara <nemaara at gmail.com>
  Date:   2021-02-14 (Sun, 14 Feb 2021)

  Changed paths:
    M data/campaigns/Descent_Into_Darkness/_main.cfg

  Log Message:
  -----------
  DiD: use background instead of image

  Commit: b6be6c8243a85e8d4bcce7c44ddfb6d218ec6cae
      https://github.com/wesnoth/wesnoth/commit/b6be6c8243a85e8d4bcce7c44ddfb6d218ec6cae
  Author: nemaara <nemaara at gmail.com>
  Date:   2021-02-14 (Sun, 14 Feb 2021)

  Changed paths:
    M data/campaigns/Two_Brothers/_main.cfg

  Log Message:
  -----------
  AToTB: use background instead of image

  Commit: 157ed152e771ca43af1ac81b6e5b33f3763f897f
      https://github.com/wesnoth/wesnoth/commit/157ed152e771ca43af1ac81b6e5b33f3763f897f
  Author: nemaara <nemaara at gmail.com>
  Date:   2021-02-14 (Sun, 14 Feb 2021)

  Changed paths:
    M data/campaigns/Liberty/_main.cfg

  Log Message:
  -----------
  Liberty: use background

  Commit: 565fae7c5ba05462fc7600e5804a39288f1b6705
      https://github.com/wesnoth/wesnoth/commit/565fae7c5ba05462fc7600e5804a39288f1b6705
  Author: nemaara <nemaara at gmail.com>
  Date:   2021-02-14 (Sun, 14 Feb 2021)

  Changed paths:
    M data/campaigns/Northern_Rebirth/_main.cfg

  Log Message:
  -----------
  NR: use background

  Commit: f179fdb35f15521395a1191a285c09d75a619dd3
      https://github.com/wesnoth/wesnoth/commit/f179fdb35f15521395a1191a285c09d75a619dd3
  Author: nemaara <nemaara at gmail.com>
  Date:   2021-02-14 (Sun, 14 Feb 2021)

  Changed paths:
    M data/campaigns/The_Rise_Of_Wesnoth/_main.cfg

  Log Message:
  -----------
  TRoW: use background

  Commit: e28d0399b475cda2a6838d08fef8d8ff84400a4b
      https://github.com/wesnoth/wesnoth/commit/e28d0399b475cda2a6838d08fef8d8ff84400a4b
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2021-02-15 (Mon, 15 Feb 2021)

  Changed paths:
    M data/schema/core/addons.cfg

  Log Message:
  -----------
  Updated schema for [campaign] background

  Commit: f1f8769f7d2ecfe3a044b8f51c4fe3a4fe24ac9d
      https://github.com/wesnoth/wesnoth/commit/f1f8769f7d2ecfe3a044b8f51c4fe3a4fe24ac9d
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2021-02-16 (Tue, 16 Feb 2021)

  Changed paths:
    M src/utils/optional_reference.hpp

  Log Message:
  -----------
  Made optional_reference::ptr return nullptr of no reference is held

Makes more sense than propagating the exception from value(). operator-> *should* throw without value, though, so that was retained.

  Commit: 625c41b93be00d32a8f8376d4cda7ebeddfa4b03
      https://github.com/wesnoth/wesnoth/commit/625c41b93be00d32a8f8376d4cda7ebeddfa4b03
  Author: doofus-01 <dk0045 at comcast.net>
  Date:   2021-02-15 (Mon, 15 Feb 2021)

  Changed paths:
    M data/core/terrain-graphics.cfg
    M data/core/terrain-graphics/new-macros.cfg

  Log Message:
  -----------
  terrain-graphics - small changes related to water transitions

  Commit: 7349ac65e0620e2483a5c7b23aeb9c3516e3803f
      https://github.com/wesnoth/wesnoth/commit/7349ac65e0620e2483a5c7b23aeb9c3516e3803f
  Author: Pentarctagon <pentarctagon at tutamail.com>
  Date:   2021-02-15 (Mon, 15 Feb 2021)

  Changed paths:
    M data/lua/core.lua

  Log Message:
  -----------
  lua unpack -> table.unpack

lua 5.4 apparently fully did away with the former.

Fixes #5546

  Commit: d435ec3d0b9fbc00a829c53ace1010c5b2708d01
      https://github.com/wesnoth/wesnoth/commit/d435ec3d0b9fbc00a829c53ace1010c5b2708d01
  Author: doofus-01 <dk0045 at comcast.net>
  Date:   2021-02-15 (Mon, 15 Feb 2021)

  Changed paths:
    M data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
    M data/campaigns/Under_the_Burning_Suns/utils/terrain.cfg
    M data/campaigns/Under_the_Burning_Suns/utils/terrain_graphics.cfg

  Log Message:
  -----------
  campaigns - Add flood water to UtBS S8

  Commit: c52b71bffd58126e5daaa2e062aaaff3bfadbcde
      https://github.com/wesnoth/wesnoth/commit/c52b71bffd58126e5daaa2e062aaaff3bfadbcde
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2021-02-15 (Mon, 15 Feb 2021)

  Changed paths:
    M data/lua/core.lua

  Log Message:
  -----------
  Add a deprecated declaration for unpack so that any older add-on code that uses it still works

  Commit: b60164b8c1e25ceb77e072f06836e791c1952e63
      https://github.com/wesnoth/wesnoth/commit/b60164b8c1e25ceb77e072f06836e791c1952e63
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2021-02-15 (Mon, 15 Feb 2021)

  Changed paths:
    M src/scripting/lua_kernel_base.cpp
    M src/scripting/lua_kernel_base.hpp

  Log Message:
  -----------
  Utilize the new Lua warning system to push deprecation messages to the in-game console

  Commit: 7e699ca3982ba4538aefbc28828080b0de4243d4
      https://github.com/wesnoth/wesnoth/commit/7e699ca3982ba4538aefbc28828080b0de4243d4
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2021-02-15 (Mon, 15 Feb 2021)

  Changed paths:
    M data/lua/core.lua

  Log Message:
  -----------
  Fix a deprecate_api bug

  Commit: 3671d3a8a9b062ae77bacd0b6ec96b0bcadc8312
      https://github.com/wesnoth/wesnoth/commit/3671d3a8a9b062ae77bacd0b6ec96b0bcadc8312
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2021-02-15 (Mon, 15 Feb 2021)

  Changed paths:
    M src/scripting/lua_audio.cpp

  Log Message:
  -----------
  Fix music track valid key not working

  Commit: aef55dcc9e231686125a9ac62e5088d995e6fb5e
      https://github.com/wesnoth/wesnoth/commit/aef55dcc9e231686125a9ac62e5088d995e6fb5e
  Author: doofus-01 <doofus-01 at users.noreply.github.com>
  Date:   2021-02-15 (Mon, 15 Feb 2021)

  Changed paths:
    M data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
    M data/campaigns/Under_the_Burning_Suns/utils/terrain.cfg
    M data/campaigns/Under_the_Burning_Suns/utils/terrain_graphics.cfg
    M data/core/terrain-graphics.cfg
    M data/core/terrain-graphics/new-macros.cfg

  Log Message:
  -----------
  UtBS Sc8 terrain graphics - Merge pull request #5547

UtBS - new terrain-graphics rules for flood water

  Commit: 438b661494e9a59734c5df32f014984240e622f0
      https://github.com/wesnoth/wesnoth/commit/438b661494e9a59734c5df32f014984240e622f0
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2021-02-15 (Mon, 15 Feb 2021)

  Changed paths:
    M data/lua/cave_map_generator.lua

  Log Message:
  -----------
  Avoid map borders in cave generator

Addresses #5407

  Commit: a2d676e394cbdc1b38774f210fb14b9f11b205d7
      https://github.com/wesnoth/wesnoth/commit/a2d676e394cbdc1b38774f210fb14b9f11b205d7
  Author: Iris Morelle <shadowm at wesnoth.org>
  Date:   2021-02-15 (Mon, 15 Feb 2021)

  Changed paths:
    M changelog.md
    M src/units/frame.cpp

  Log Message:
  -----------
  Take display zoom into account when rendering unit animation frames

It was already considered for registering halos, just not for rendering
regular frames. This commit touches the halo code a little so we don't
need to call get_zoom_factor() multiple times per frame.

Closes #5508.

  Commit: 526c9960dac336273f743b976ee56f4205b73d36
      https://github.com/wesnoth/wesnoth/commit/526c9960dac336273f743b976ee56f4205b73d36
  Author: Celtic Minstrel <CelticMinstrel at users.noreply.github.com>
  Date:   2021-02-15 (Mon, 15 Feb 2021)

  Changed paths:
    M changelog.md
    M data/campaigns/Descent_Into_Darkness/_main.cfg
    M data/campaigns/Liberty/_main.cfg
    M data/campaigns/Northern_Rebirth/_main.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/_main.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/01_A_Summer_of_Storms.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/02_The_Fall.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/03_A_Harrowing_Escape.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/04a_The_Swamp_of_Esten.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/04b_The_Midlands.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/05_The_Oldwood.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/06_Temple_in_the_Deep.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/08_Clearwater_Port.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/09_Fallen_Lich_Point.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/10_Sewer_of_Southbay.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/12_A_Final_Spring.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/13_Peoples_in_Decline.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/14_Rough_Landing.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/17a_The_Dragon.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/17b_Lizard_Beach.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/17c_Troll_Hole.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/17d_Cursed_Isle.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/19_The_Vanguard.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/20_Return_of_the_Fleet.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/22_The_Rise_of_Wesnoth.cfg
    M data/campaigns/Two_Brothers/_main.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg
    M data/campaigns/Under_the_Burning_Suns/utils/terrain.cfg
    M data/campaigns/Under_the_Burning_Suns/utils/terrain_graphics.cfg
    M data/core/_main.cfg
    M data/core/macros/animation-utils.cfg
    M data/core/terrain-graphics.cfg
    M data/core/terrain-graphics/new-macros.cfg
    M data/core/units/dunefolk/Cataphract.cfg
    M data/core/units/dunefolk/Horse_Archer.cfg
    M data/core/units/dunefolk/Marauder.cfg
    M data/core/units/dunefolk/Raider.cfg
    M data/core/units/dunefolk/Rider.cfg
    M data/core/units/dunefolk/Sunderer.cfg
    M data/core/units/dunefolk/Windbolt.cfg
    A data/lua/as_text.lua
    M data/lua/cave_map_generator.lua
    M data/lua/core.lua
    M data/modifications.cfg
    A data/modifications/pick_advance/README.md
    A data/modifications/pick_advance/dialog.lua
    A data/modifications/pick_advance/main.lua
    M data/schema/core/addons.cfg
    A data/test/scenarios/as_text.cfg
    M data/tools/addon_manager/html.py
    M data/tools/helptrailer.html
    M data/tools/unit_tree/html_output.py
    M src/actions/advancement.cpp
    M src/play_controller.cpp
    M src/scripting/lua_audio.cpp
    M src/scripting/lua_kernel_base.cpp
    M src/scripting/lua_kernel_base.hpp
    M src/server/campaignd/server.cpp
    M src/units/frame.cpp
    M src/units/helper.cpp
    M src/utils/optional_reference.hpp
    M wml_test_schedule

  Log Message:
  -----------
  Merge branch 'master' into scoped_vars

Compare: https://github.com/wesnoth/wesnoth/compare/95c565e7ace0...526c9960dac3