[wesnoth-commits] [wesnoth/wesnoth] 8afe3f: MP/Lobby: flipped blocked players filter

Wed Dec 30 13:01:30 UTC 2020

  Branch: refs/heads/coroutine_experiment
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 8afe3f595cdbed60335502c091ff08165aa1e49b
      https://github.com/wesnoth/wesnoth/commit/8afe3f595cdbed60335502c091ff08165aa1e49b
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2020-12-23 (Wed, 23 Dec 2020)

  Changed paths:
    M data/gui/window/lobby_main.cfg
    M src/gui/dialogs/multiplayer/lobby.cpp
    M src/preferences/lobby.cpp

  Log Message:
  -----------
  MP/Lobby: flipped blocked players filter

Now it's an inclusion filter (false by default) rather than an inclusion filter.

  Commit: dd05156cf98fabf8e8fe8f9818a6bd47325e9057
      https://github.com/wesnoth/wesnoth/commit/dd05156cf98fabf8e8fe8f9818a6bd47325e9057
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2020-12-23 (Wed, 23 Dec 2020)

  Changed paths:
    M data/gui/window/lobby_main.cfg

  Log Message:
  -----------
  MP/Lobby: further tweaked filter labels, added tooltips

  Commit: c460a4c69de2a374ae55189b548b3848aeb1bbcd
      https://github.com/wesnoth/wesnoth/commit/c460a4c69de2a374ae55189b548b3848aeb1bbcd
  Author: Nils Kneuper <crazy-ivanovic at gmx.net>
  Date:   2020-12-23 (Wed, 23 Dec 2020)

  Changed paths:
    M changelog.md
    M po/wesnoth-anl/pt_BR.po
    M po/wesnoth-did/pt_BR.po
    M po/wesnoth-dm/pt_BR.po
    M po/wesnoth-dw/pt_BR.po
    M po/wesnoth-editor/pt_BR.po
    M po/wesnoth-ei/pt_BR.po
    M po/wesnoth-httt/pt_BR.po
    M po/wesnoth-low/pt_BR.po
    M po/wesnoth-nr/pt_BR.po
    M po/wesnoth-sota/pt_BR.po
    M po/wesnoth-sotbe/pt_BR.po
    M po/wesnoth-tb/pt_BR.po
    M po/wesnoth-trow/pt_BR.po
    M po/wesnoth-tsg/pt_BR.po
    M po/wesnoth-utbs/pt_BR.po

  Log Message:
  -----------
  updated Portuguese (Brazil) translation

  Commit: 47c4b4049fa47c7499f4141d73f980a7452530e2
      https://github.com/wesnoth/wesnoth/commit/47c4b4049fa47c7499f4141d73f980a7452530e2
  Author: Nils Kneuper <crazy-ivanovic at gmx.net>
  Date:   2020-12-23 (Wed, 23 Dec 2020)

  Changed paths:
    M changelog.md
    M po/wesnoth-did/es.po
    M po/wesnoth-manpages/es.po
    M po/wesnoth-utbs/es.po
    M po/wesnoth/es.po

  Log Message:
  -----------
  updated Spanish translation

  Commit: 8a84a63bf7a90eea8547e6082460c0dce32c5057
      https://github.com/wesnoth/wesnoth/commit/8a84a63bf7a90eea8547e6082460c0dce32c5057
  Author: Nils Kneuper <crazy-ivanovic at gmx.net>
  Date:   2020-12-23 (Wed, 23 Dec 2020)

  Changed paths:
    M changelog.md
    M po/wesnoth-did/zh_TW.po
    M po/wesnoth-manpages/zh_TW.po
    M po/wesnoth-manual/zh_TW.po
    M po/wesnoth-nr/zh_TW.po
    M po/wesnoth-tsg/zh_TW.po
    M po/wesnoth-utbs/zh_TW.po
    M po/wesnoth/zh_TW.po

  Log Message:
  -----------
  updated Chinese (Traditional) translation

  Commit: c6d3e7176afff6879807802b9c69f76cad0dea5b
      https://github.com/wesnoth/wesnoth/commit/c6d3e7176afff6879807802b9c69f76cad0dea5b
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2020-12-24 (Thu, 24 Dec 2020)

  Changed paths:
    M src/gui/dialogs/multiplayer/mp_staging.cpp

  Log Message:
  -----------
  Revert "mp_staging: Build all teams, not only those that have a side assigned to them (fixes #3849)"

This reverts commit d0283e8a38bb46a6c8e772dd762461f257bc1ba3.

  Commit: 0217e633fb9b40464a89341be4768f949e6b28c6
      https://github.com/wesnoth/wesnoth/commit/0217e633fb9b40464a89341be4768f949e6b28c6
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2020-12-24 (Thu, 24 Dec 2020)

  Changed paths:
    M src/gui/dialogs/multiplayer/mp_staging.cpp
    M src/gui/dialogs/multiplayer/mp_staging.hpp

  Log Message:
  -----------
  MP/Staging: better fix for #3849 (fixes #3978)

  Commit: 056466b0c3629b61e93ee3e96d50a2e503110ade
      https://github.com/wesnoth/wesnoth/commit/056466b0c3629b61e93ee3e96d50a2e503110ade
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2020-12-24 (Thu, 24 Dec 2020)

  Changed paths:
    M src/gui/widgets/tree_view_node.hpp

  Log Message:
  -----------
  GUI2/Tree View Node: added a siblings getter

  Commit: 8edeb2310828409d5e9cd06d6d0d9b04dee48233
      https://github.com/wesnoth/wesnoth/commit/8edeb2310828409d5e9cd06d6d0d9b04dee48233
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2020-12-24 (Thu, 24 Dec 2020)

  Changed paths:
    M src/gui/dialogs/multiplayer/mp_staging.cpp

  Log Message:
  -----------
  MP/Staging: removed empty team nodes after reassigning sides

Relates to #3978. 0217e633fb9b40464a89341be4768f949e6b28c6 already handled the case where the unused team nodes
were initially visible. This ensures they're no longer around if emptied by side shuffling.

  Commit: 514a4f7ff1ecf03cb80c88d01eacf9c0517250f7
      https://github.com/wesnoth/wesnoth/commit/514a4f7ff1ecf03cb80c88d01eacf9c0517250f7
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2020-12-24 (Thu, 24 Dec 2020)

  Changed paths:
    M src/game_initialization/connect_engine.cpp
    M src/game_initialization/connect_engine.hpp

  Log Message:
  -----------
  Connect Engine: removed unused receive_from_server function

  Commit: 63e161f78b8b203db2131e68601ce5ad5c804220
      https://github.com/wesnoth/wesnoth/commit/63e161f78b8b203db2131e68601ce5ad5c804220
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2020-12-24 (Thu, 24 Dec 2020)

  Changed paths:
    M src/gui/dialogs/multiplayer/mp_join_game.cpp
    M src/gui/dialogs/multiplayer/mp_staging.cpp

  Log Message:
  -----------
  MP/Staging and Join: display game name (resolves #3508)

  Commit: 2d6a9fd4e616176ac45d32bc8fe8355731174a37
      https://github.com/wesnoth/wesnoth/commit/2d6a9fd4e616176ac45d32bc8fe8355731174a37
  Author: kabachuha <artemkhrapov2001 at yandex.ru>
  Date:   2020-12-25 (Fri, 25 Dec 2020)

  Changed paths:
    M data/campaigns/Dead_Water/scenarios/10_The_Flaming_Sword.cfg
    M data/campaigns/Dead_Water/scenarios/12_Revenge.cfg

  Log Message:
  -----------
  DW: fix missing translation marks

  Commit: 67bef9198c2f8c32114a0dbde21911a94e2a1f92
      https://github.com/wesnoth/wesnoth/commit/67bef9198c2f8c32114a0dbde21911a94e2a1f92
  Author: doofus-01 <doofus-01 at users.noreply.github.com>
  Date:   2020-12-25 (Fri, 25 Dec 2020)

  Changed paths:
    R data/core/images/units/monsters/wild-wyvern.png
    A data/core/images/units/monsters/wyvern/wild-wyvern-defend1.png
    A data/core/images/units/monsters/wyvern/wild-wyvern-defend2.png
    A data/core/images/units/monsters/wyvern/wild-wyvern-fly-defend.png
    A data/core/images/units/monsters/wyvern/wild-wyvern-fly-shadow.png
    A data/core/images/units/monsters/wyvern/wild-wyvern-fly-takeoff1.png
    A data/core/images/units/monsters/wyvern/wild-wyvern-fly-takeoff2.png
    A data/core/images/units/monsters/wyvern/wild-wyvern-fly-takeoff3.png
    A data/core/images/units/monsters/wyvern/wild-wyvern-fly-takeoff4.png
    A data/core/images/units/monsters/wyvern/wild-wyvern-fly-takeoff5.png
    A data/core/images/units/monsters/wyvern/wild-wyvern-fly-takeoff6.png
    A data/core/images/units/monsters/wyvern/wild-wyvern-fly-takeoff7.png
    A data/core/images/units/monsters/wyvern/wild-wyvern-fly-takeoff8.png
    A data/core/images/units/monsters/wyvern/wild-wyvern-fly1.png
    A data/core/images/units/monsters/wyvern/wild-wyvern-fly2.png
    A data/core/images/units/monsters/wyvern/wild-wyvern-fly3.png
    A data/core/images/units/monsters/wyvern/wild-wyvern-fly4.png
    A data/core/images/units/monsters/wyvern/wild-wyvern-fly5.png
    A data/core/images/units/monsters/wyvern/wild-wyvern-fly6.png
    A data/core/images/units/monsters/wyvern/wild-wyvern-fly7.png
    A data/core/images/units/monsters/wyvern/wild-wyvern.png
    M data/core/units/monsters/Wild_Wyvern.cfg

  Log Message:
  -----------
  Fauna Project - Wyverns (#5384)

- Revise base sprite, add defense, takeoff/landing, and flying anims.
- Revise attacks.
- Added a description.

  Commit: 5f26e9ea63db49e26d39e22c27068290807c761c
      https://github.com/wesnoth/wesnoth/commit/5f26e9ea63db49e26d39e22c27068290807c761c
  Author: Pentarctagon <pentarctagon at tutamail.com>
  Date:   2020-12-26 (Sat, 26 Dec 2020)

  Changed paths:
    M src/server/common/dbconn.cpp
    M src/server/common/dbconn.hpp
    M src/server/common/forum_user_handler.cpp
    M src/server/common/forum_user_handler.hpp
    M src/server/common/user_handler.hpp
    M src/server/wesnothd/player.cpp
    M src/server/wesnothd/player.hpp
    M src/server/wesnothd/server.cpp

  Log Message:
  -----------
  Send the player forum ids to the client on the player list.

  Commit: 80121720a2b4c987dcbd7cd00c3dcf0e6338b573
      https://github.com/wesnoth/wesnoth/commit/80121720a2b4c987dcbd7cd00c3dcf0e6338b573
  Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
  Date:   2020-12-28 (Mon, 28 Dec 2020)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/06b_The_Long_March.cfg

  Log Message:
  -----------
  TSG: fix hiding ability

Apply PR #5387 to TSG

  Commit: d661b68f73608deef240365a77af4bbb37d72d63
      https://github.com/wesnoth/wesnoth/commit/d661b68f73608deef240365a77af4bbb37d72d63
  Author: newfrenchy83 <31768074+newfrenchy83 at users.noreply.github.com>
  Date:   2020-12-28 (Mon, 28 Dec 2020)

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg

  Log Message:
  -----------
  HttT S07: fix ambushers not working

closes #5383

  Commit: d9205190278263f7344cb794600d06bfcd324c7e
      https://github.com/wesnoth/wesnoth/commit/d9205190278263f7344cb794600d06bfcd324c7e
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2020-12-28 (Mon, 28 Dec 2020)

  Changed paths:
    M src/game_initialization/multiplayer.cpp

  Log Message:
  -----------
  MP/Manager: added network poller handling for error and gamelist_diff

  Commit: 2894ba86f0c089444a35d26681e1d07a5a280004
      https://github.com/wesnoth/wesnoth/commit/2894ba86f0c089444a35d26681e1d07a5a280004
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2020-12-28 (Mon, 28 Dec 2020)

  Changed paths:
    M src/game_initialization/multiplayer.cpp

  Log Message:
  -----------
  MP: reordered some function implementations (no behavior changes)

These are the order in which they are invoked. It was only the other way for when they weren't class members.

  Commit: 30e0996f83907c7b775e52e80f2a4c0c33af94ca
      https://github.com/wesnoth/wesnoth/commit/30e0996f83907c7b775e52e80f2a4c0c33af94ca
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2020-12-28 (Mon, 28 Dec 2020)

  Changed paths:
    M src/game_initialization/connect_engine.hpp

  Log Message:
  -----------
  Connect Engine: removed mp_campaign_info accessor

  Commit: b98acd4ed6940518ed01e35d43690c3c08d38822
      https://github.com/wesnoth/wesnoth/commit/b98acd4ed6940518ed01e35d43690c3c08d38822
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2020-12-28 (Mon, 28 Dec 2020)

  Changed paths:
    M src/game_initialization/connect_engine.cpp
    M src/game_initialization/connect_engine.hpp
    M src/game_initialization/multiplayer.cpp
    M src/game_initialization/playcampaign.hpp
    M src/playmp_controller.cpp
    M src/playmp_controller.hpp

  Log Message:
  -----------
  Renamed mp_campaign_info to mp_game_metadata

  Commit: 783e6ccec4b5c610092fc49981e5fcc0ca03a5fe
      https://github.com/wesnoth/wesnoth/commit/783e6ccec4b5c610092fc49981e5fcc0ca03a5fe
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2020-12-28 (Mon, 28 Dec 2020)

  Changed paths:
    M src/gui/dialogs/multiplayer/mp_join_game.cpp

  Log Message:
  -----------
  MP/Join Game: minor cleanup to fetch_game_config

wait_and_receive_data should always return true since it waits until data is available.

  Commit: 1f3f337515c06943ed61050765f371754ad90bda
      https://github.com/wesnoth/wesnoth/commit/1f3f337515c06943ed61050765f371754ad90bda
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2020-12-29 (Tue, 29 Dec 2020)

  Changed paths:
    M src/game_initialization/connect_engine.cpp
    M src/game_initialization/connect_engine.hpp

  Log Message:
  -----------
  Connect Engine: cleanup

  Commit: 41b2030113e721d49a0f08b4ff6bfd0e3d103b6b
      https://github.com/wesnoth/wesnoth/commit/41b2030113e721d49a0f08b4ff6bfd0e3d103b6b
  Author: doofus-01 <doofus-01 at users.noreply.github.com>
  Date:   2020-12-28 (Mon, 28 Dec 2020)

  Changed paths:
    A data/core/images/units/orcs/grunt-ne-defend-1.png
    A data/core/images/units/orcs/grunt-ne-defend-2.png
    A data/core/images/units/orcs/grunt-ne.png
    A data/core/images/units/orcs/grunt-stand-ne-1.png
    A data/core/images/units/orcs/grunt-stand-ne-2.png
    A data/core/images/units/orcs/grunt-stand-ne-3.png
    A data/core/images/units/orcs/grunt-stand-ne-4.png
    A data/core/images/units/orcs/grunt-stand-ne-5.png
    M data/core/images/units/orcs/grunt-stand-se-1.png
    M data/core/images/units/orcs/grunt-stand-se-2.png
    M data/core/images/units/orcs/grunt-stand-se-3.png
    M data/core/images/units/orcs/grunt-stand-se-4.png
    M data/core/images/units/orcs/grunt-stand-se-5.png
    M data/core/images/units/orcs/grunt.png
    M data/core/macros/animation-utils.cfg
    M data/core/macros/animation-utils2.cfg
    M data/core/macros/unit-utils.cfg
    M data/core/units/dwarves/Berserker.cfg
    M data/core/units/dwarves/Dragonguard.cfg
    M data/core/units/dwarves/Fighter.cfg
    M data/core/units/dwarves/Guardsman.cfg
    M data/core/units/dwarves/Lord.cfg
    M data/core/units/dwarves/Runesmith.cfg
    M data/core/units/dwarves/Sentinel.cfg
    M data/core/units/dwarves/Stalwart.cfg
    M data/core/units/dwarves/Steelclad.cfg
    M data/core/units/dwarves/Thunderer.cfg
    M data/core/units/dwarves/Thunderguard.cfg
    M data/core/units/dwarves/Ulfserker.cfg
    M data/core/units/humans/Horse_Knight.cfg
    M data/core/units/humans/Horseman.cfg
    M data/core/units/humans/Loyalist_Fencer.cfg
    M data/core/units/humans/Loyalist_Spearman.cfg
    M data/core/units/humans/Mage_Arch.cfg
    M data/core/units/orcs/Archer.cfg
    M data/core/units/orcs/Grunt.cfg

  Log Message:
  -----------
  Revise the bobbing animation convention (#5388)

This shifts many bobbing animations to only run if the unit HP falls below a certain point.  Bobbing animations are a subset of standing animation, it is a case-by-case decision whether an animation should fall into this category or even be affected by this change.

Also in this:

* add wounded filter to STANDARD_IDLE_FILTER

* unit sprites - update orcish grunt and heaving anim

* units - north-facing sprites for orcish grunt

  Commit: bb6491f54f06873ccf9f509eb023a16f3daaaa6e
      https://github.com/wesnoth/wesnoth/commit/bb6491f54f06873ccf9f509eb023a16f3daaaa6e
  Author: doofus-01 <doofus-01 at users.noreply.github.com>
  Date:   2020-12-28 (Mon, 28 Dec 2020)

  Changed paths:
    M changelog.md

  Log Message:
  -----------
  Update changelog.md

  Commit: 40c6090c2e75cff2e81f628776f5566ddf2ea222
      https://github.com/wesnoth/wesnoth/commit/40c6090c2e75cff2e81f628776f5566ddf2ea222
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2020-12-28 (Mon, 28 Dec 2020)

  Changed paths:
    M src/scripting/lua_widget_methods.cpp

  Log Message:
  -----------
  Add Lua GUI2 dialogs to the window stack

This fixes a possible crash when showing a custom GUI2 dialog.

  Commit: de08d53adce63c085a8f2060a838bef338c06cb0
      https://github.com/wesnoth/wesnoth/commit/de08d53adce63c085a8f2060a838bef338c06cb0
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2020-12-28 (Mon, 28 Dec 2020)

  Changed paths:
    M src/scripting/lua_widget_attributes.cpp

  Log Message:
  -----------
  Lua GUI2 API: Add setters and getters for a slider's min and max values

  Commit: 927fcbfb471c5e2280acc7efeba16bcb0f3d2e0f
      https://github.com/wesnoth/wesnoth/commit/927fcbfb471c5e2280acc7efeba16bcb0f3d2e0f
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2020-12-28 (Mon, 28 Dec 2020)

  Changed paths:
    M data/lua/wml/set_variable.lua

  Log Message:
  -----------
  Add [set_variable]reverse=yes for string reversal operation

  Commit: 4b2599864ab719ef4a44d36906f9a2435a1d88d6
      https://github.com/wesnoth/wesnoth/commit/4b2599864ab719ef4a44d36906f9a2435a1d88d6
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2020-12-28 (Mon, 28 Dec 2020)

  Changed paths:
    M data/lua/wml/set_variable.lua

  Log Message:
  -----------
  Add [set_variable]min|max= to calculate an extremum value

  Commit: fe713172803ea9c1fe05eabf53911ab7eaefb475
      https://github.com/wesnoth/wesnoth/commit/fe713172803ea9c1fe05eabf53911ab7eaefb475
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2020-12-28 (Mon, 28 Dec 2020)

  Changed paths:
    M changelog.md

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

  Commit: f0e21279c9c8184478169d71981968a374490dc1
      https://github.com/wesnoth/wesnoth/commit/f0e21279c9c8184478169d71981968a374490dc1
  Author: Nils Kneuper <crazy-ivanovic at gmx.net>
  Date:   2020-12-29 (Tue, 29 Dec 2020)

  Changed paths:
    M po/wesnoth-help/pt_BR.po
    M po/wesnoth-lib/pt_BR.po
    M po/wesnoth-tb/pt_BR.po
    M po/wesnoth-tutorial/pt_BR.po
    M po/wesnoth-units/pt_BR.po
    M po/wesnoth-wc/pt_BR.po

  Log Message:
  -----------
  updated Portuguese (Brazil) translation

  Commit: 166bc610577ee08a82e9c0463b55409f524cf6ea
      https://github.com/wesnoth/wesnoth/commit/166bc610577ee08a82e9c0463b55409f524cf6ea
  Author: Nils Kneuper <crazy-ivanovic at gmx.net>
  Date:   2020-12-29 (Tue, 29 Dec 2020)

  Changed paths:
    M po/wesnoth/es.po

  Log Message:
  -----------
  updated Spanish translation

  Commit: e01fa8e2fde7db20e18a633ec33065ef328d22f9
      https://github.com/wesnoth/wesnoth/commit/e01fa8e2fde7db20e18a633ec33065ef328d22f9
  Author: Nils Kneuper <crazy-ivanovic at gmx.net>
  Date:   2020-12-29 (Tue, 29 Dec 2020)

  Changed paths:
    M changelog.md
    M po/wesnoth-did/ca.po

  Log Message:
  -----------
  updated Catalan translation

  Commit: d7a5fa2ff8eddf26f1859ead2f9f2f9a59c058c1
      https://github.com/wesnoth/wesnoth/commit/d7a5fa2ff8eddf26f1859ead2f9f2f9a59c058c1
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2020-12-30 (Wed, 30 Dec 2020)

  Changed paths:
    M src/server/common/dbconn.cpp
    M src/server/common/dbconn.hpp
    M src/server/common/forum_user_handler.cpp
    M src/server/common/forum_user_handler.hpp
    M src/server/common/user_handler.hpp
    M src/server/wesnothd/player.cpp
    M src/server/wesnothd/player.hpp
    M src/server/wesnothd/server.cpp

  Log Message:
  -----------
  Merge pull request #5386 from Pentarctagon/userid-userlist

Send the player forum ids to the client on the player list.

  Commit: 34081a9798168b7211bbcf7da1320f08fc3d0240
      https://github.com/wesnoth/wesnoth/commit/34081a9798168b7211bbcf7da1320f08fc3d0240
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2020-12-30 (Wed, 30 Dec 2020)

  Changed paths:
    M src/game_initialization/lobby_data.cpp
    M src/game_initialization/lobby_data.hpp

  Log Message:
  -----------
  Added forum_id to user_info

  Commit: 4657e92df90d4dd5af512ef97490d942451a27e3
      https://github.com/wesnoth/wesnoth/commit/4657e92df90d4dd5af512ef97490d942451a27e3
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2020-12-30 (Wed, 30 Dec 2020)

  Changed paths:
    M src/gui/dialogs/multiplayer/lobby.cpp

  Log Message:
  -----------
  MP/Lobby: used gray for players in other games instead of red

  Commit: 8aa4471d9a040a1b5ba671698082988dcae75ee2
      https://github.com/wesnoth/wesnoth/commit/8aa4471d9a040a1b5ba671698082988dcae75ee2
  Author: Steve Cotton <steve at octalot.co.uk>
  Date:   2020-12-30 (Wed, 30 Dec 2020)

  Changed paths:
    M changelog.md
    M data/core/editor/help.cfg

  Log Message:
  -----------
  Add help topics for the Editor, as it stands in the 1.14 branch

This commit is on the master branch. There have been no changes at all to the
editor documentation in the 1.14 branch, while there have been several updates
to the master branch that would be good to backport if the help is displayed in
the 1.14 branch - therefore my plan is to get this set of changes reviewed in
the master branch, and then simply pull the entire file into the 1.14 branch
along with enabling the editor documentation (a small change to
data/core/help.cfg, as done in commit
ed611f94385f608512da55d691d3c9753240d5d5).

A couple of warnings about the scenario mode being buggy are added to the
user-visible text, find these by looking for <bold> tags within the text.

  Commit: 893b569be8cb695dd352b13b9ca92d1434371ed3
      https://github.com/wesnoth/wesnoth/commit/893b569be8cb695dd352b13b9ca92d1434371ed3
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2020-12-30 (Wed, 30 Dec 2020)

  Changed paths:
    M changelog.md
    M data/campaigns/Dead_Water/scenarios/10_The_Flaming_Sword.cfg
    M data/campaigns/Dead_Water/scenarios/12_Revenge.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg
    M data/campaigns/The_South_Guard/scenarios/06b_The_Long_March.cfg
    M data/core/editor/help.cfg
    R data/core/images/units/monsters/wild-wyvern.png
    A data/core/images/units/monsters/wyvern/wild-wyvern-defend1.png
    A data/core/images/units/monsters/wyvern/wild-wyvern-defend2.png
    A data/core/images/units/monsters/wyvern/wild-wyvern-fly-defend.png
    A data/core/images/units/monsters/wyvern/wild-wyvern-fly-shadow.png
    A data/core/images/units/monsters/wyvern/wild-wyvern-fly-takeoff1.png
    A data/core/images/units/monsters/wyvern/wild-wyvern-fly-takeoff2.png
    A data/core/images/units/monsters/wyvern/wild-wyvern-fly-takeoff3.png
    A data/core/images/units/monsters/wyvern/wild-wyvern-fly-takeoff4.png
    A data/core/images/units/monsters/wyvern/wild-wyvern-fly-takeoff5.png
    A data/core/images/units/monsters/wyvern/wild-wyvern-fly-takeoff6.png
    A data/core/images/units/monsters/wyvern/wild-wyvern-fly-takeoff7.png
    A data/core/images/units/monsters/wyvern/wild-wyvern-fly-takeoff8.png
    A data/core/images/units/monsters/wyvern/wild-wyvern-fly1.png
    A data/core/images/units/monsters/wyvern/wild-wyvern-fly2.png
    A data/core/images/units/monsters/wyvern/wild-wyvern-fly3.png
    A data/core/images/units/monsters/wyvern/wild-wyvern-fly4.png
    A data/core/images/units/monsters/wyvern/wild-wyvern-fly5.png
    A data/core/images/units/monsters/wyvern/wild-wyvern-fly6.png
    A data/core/images/units/monsters/wyvern/wild-wyvern-fly7.png
    A data/core/images/units/monsters/wyvern/wild-wyvern.png
    A data/core/images/units/orcs/grunt-ne-defend-1.png
    A data/core/images/units/orcs/grunt-ne-defend-2.png
    A data/core/images/units/orcs/grunt-ne.png
    A data/core/images/units/orcs/grunt-stand-ne-1.png
    A data/core/images/units/orcs/grunt-stand-ne-2.png
    A data/core/images/units/orcs/grunt-stand-ne-3.png
    A data/core/images/units/orcs/grunt-stand-ne-4.png
    A data/core/images/units/orcs/grunt-stand-ne-5.png
    M data/core/images/units/orcs/grunt-stand-se-1.png
    M data/core/images/units/orcs/grunt-stand-se-2.png
    M data/core/images/units/orcs/grunt-stand-se-3.png
    M data/core/images/units/orcs/grunt-stand-se-4.png
    M data/core/images/units/orcs/grunt-stand-se-5.png
    M data/core/images/units/orcs/grunt.png
    M data/core/macros/animation-utils.cfg
    M data/core/macros/animation-utils2.cfg
    M data/core/macros/unit-utils.cfg
    M data/core/units/dwarves/Berserker.cfg
    M data/core/units/dwarves/Dragonguard.cfg
    M data/core/units/dwarves/Fighter.cfg
    M data/core/units/dwarves/Guardsman.cfg
    M data/core/units/dwarves/Lord.cfg
    M data/core/units/dwarves/Runesmith.cfg
    M data/core/units/dwarves/Sentinel.cfg
    M data/core/units/dwarves/Stalwart.cfg
    M data/core/units/dwarves/Steelclad.cfg
    M data/core/units/dwarves/Thunderer.cfg
    M data/core/units/dwarves/Thunderguard.cfg
    M data/core/units/dwarves/Ulfserker.cfg
    M data/core/units/humans/Horse_Knight.cfg
    M data/core/units/humans/Horseman.cfg
    M data/core/units/humans/Loyalist_Fencer.cfg
    M data/core/units/humans/Loyalist_Spearman.cfg
    M data/core/units/humans/Mage_Arch.cfg
    M data/core/units/monsters/Wild_Wyvern.cfg
    M data/core/units/orcs/Archer.cfg
    M data/core/units/orcs/Grunt.cfg
    M data/gui/window/lobby_main.cfg
    M data/lua/wml/set_variable.lua
    M po/wesnoth-anl/pt_BR.po
    M po/wesnoth-did/ca.po
    M po/wesnoth-did/es.po
    M po/wesnoth-did/pt_BR.po
    M po/wesnoth-did/zh_TW.po
    M po/wesnoth-dm/pt_BR.po
    M po/wesnoth-dw/pt_BR.po
    M po/wesnoth-editor/pt_BR.po
    M po/wesnoth-ei/pt_BR.po
    M po/wesnoth-help/pt_BR.po
    M po/wesnoth-httt/pt_BR.po
    M po/wesnoth-lib/pt_BR.po
    M po/wesnoth-low/pt_BR.po
    M po/wesnoth-manpages/es.po
    M po/wesnoth-manpages/zh_TW.po
    M po/wesnoth-manual/zh_TW.po
    M po/wesnoth-nr/pt_BR.po
    M po/wesnoth-nr/zh_TW.po
    M po/wesnoth-sota/pt_BR.po
    M po/wesnoth-sotbe/pt_BR.po
    M po/wesnoth-tb/pt_BR.po
    M po/wesnoth-trow/pt_BR.po
    M po/wesnoth-tsg/pt_BR.po
    M po/wesnoth-tsg/zh_TW.po
    M po/wesnoth-tutorial/pt_BR.po
    M po/wesnoth-units/pt_BR.po
    M po/wesnoth-utbs/es.po
    M po/wesnoth-utbs/pt_BR.po
    M po/wesnoth-utbs/zh_TW.po
    M po/wesnoth-wc/pt_BR.po
    M po/wesnoth/es.po
    M po/wesnoth/zh_TW.po
    M src/game_initialization/connect_engine.cpp
    M src/game_initialization/connect_engine.hpp
    M src/game_initialization/lobby_data.cpp
    M src/game_initialization/lobby_data.hpp
    M src/game_initialization/multiplayer.cpp
    M src/game_initialization/playcampaign.hpp
    M src/gui/dialogs/multiplayer/lobby.cpp
    M src/gui/dialogs/multiplayer/mp_join_game.cpp
    M src/gui/dialogs/multiplayer/mp_staging.cpp
    M src/gui/dialogs/multiplayer/mp_staging.hpp
    M src/gui/widgets/tree_view_node.hpp
    M src/playmp_controller.cpp
    M src/playmp_controller.hpp
    M src/preferences/lobby.cpp
    M src/scripting/lua_widget_attributes.cpp
    M src/scripting/lua_widget_methods.cpp
    M src/server/common/dbconn.cpp
    M src/server/common/dbconn.hpp
    M src/server/common/forum_user_handler.cpp
    M src/server/common/forum_user_handler.hpp
    M src/server/common/user_handler.hpp
    M src/server/wesnothd/player.cpp
    M src/server/wesnothd/player.hpp
    M src/server/wesnothd/server.cpp

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

Compare: https://github.com/wesnoth/wesnoth/compare/e91cffd03922...893b569be8cb