[wesnoth-commits] [wesnoth/wesnoth] b72b7a: Add TLS codepath to server_base

Sergey Popov noreply at github.com
Tue May 18 09:03:14 UTC 2021


  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: b72b7a05edc742101cf67b0da6a67334395e14a9
      https://github.com/wesnoth/wesnoth/commit/b72b7a05edc742101cf67b0da6a67334395e14a9
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2021-05-06 (Thu, 06 May 2021)

  Changed paths:
    M SConstruct
    M src/server/campaignd/server.cpp
    M src/server/common/server_base.cpp
    M src/server/common/server_base.hpp
    M src/server/wesnothd/server.cpp
    M src/server/wesnothd/server.hpp

  Log Message:
  -----------
  Add TLS codepath to server_base


  Commit: 54a2bc3ee4f41f02bad556067b6ee6cd101aa565
      https://github.com/wesnoth/wesnoth/commit/54a2bc3ee4f41f02bad556067b6ee6cd101aa565
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2021-05-06 (Thu, 06 May 2021)

  Changed paths:
    M src/server/common/forum_user_handler.cpp
    M src/server/common/forum_user_handler.hpp
    M src/server/common/server_base.cpp
    M src/server/common/server_base.hpp
    M src/server/common/user_handler.hpp
    M src/server/wesnothd/game.cpp
    M src/server/wesnothd/player_connection.hpp
    M src/server/wesnothd/server.cpp
    M src/server/wesnothd/server.hpp

  Log Message:
  -----------
  Implement support in wesnothd to handle both unencrypted and TLS sockets


  Commit: 356efd1b0246d3605a4e3abf3e102e98a268bdfe
      https://github.com/wesnoth/wesnoth/commit/356efd1b0246d3605a4e3abf3e102e98a268bdfe
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2021-05-06 (Thu, 06 May 2021)

  Changed paths:
    M src/server/common/server_base.cpp
    M src/wesnothd_connection.cpp
    M src/wesnothd_connection.hpp

  Log Message:
  -----------
  Add TLS support to multiplayer client


  Commit: abf7bcda5204fc9b6dd19275aa9ff132d6b41bf5
      https://github.com/wesnoth/wesnoth/commit/abf7bcda5204fc9b6dd19275aa9ff132d6b41bf5
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2021-05-06 (Thu, 06 May 2021)

  Changed paths:
    M src/wesnothd_connection.cpp

  Log Message:
  -----------
  Prevent hang in case of connecting to old server not supporting new handshake value


  Commit: 857d47b17a0fc092323ad2e47eec36886bfbf6fd
      https://github.com/wesnoth/wesnoth/commit/857d47b17a0fc092323ad2e47eec36886bfbf6fd
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2021-05-06 (Thu, 06 May 2021)

  Changed paths:
    M src/wesnothd_connection.cpp
    M src/wesnothd_connection.hpp

  Log Message:
  -----------
  Implemented auto-fallback for servers that don't support TLS


  Commit: 3dc0ee3978ae4997419344ef36453ea433fc56da
      https://github.com/wesnoth/wesnoth/commit/3dc0ee3978ae4997419344ef36453ea433fc56da
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2021-05-06 (Thu, 06 May 2021)

  Changed paths:
    M src/server/common/server_base.cpp
    M src/wesnothd_connection.cpp

  Log Message:
  -----------
  Avoid extra reconnect when connecting to server with TLS disabled


  Commit: 586787d02a5dd56215d6e891727becfe0591ae9a
      https://github.com/wesnoth/wesnoth/commit/586787d02a5dd56215d6e891727becfe0591ae9a
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2021-05-06 (Thu, 06 May 2021)

  Changed paths:
    M src/server/common/server_base.cpp

  Log Message:
  -----------
  Fixed type check in if constexpr


  Commit: 288ad7795c9fde6a7a271683feb09c5407436c7a
      https://github.com/wesnoth/wesnoth/commit/288ad7795c9fde6a7a271683feb09c5407436c7a
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2021-05-06 (Thu, 06 May 2021)

  Changed paths:
    M src/wesnothd_connection.cpp

  Log Message:
  -----------
  Don't use TLS for explicitly specified ip adresses


  Commit: 495cfedcf4a8f2618c96d34949d13c12a35ff983
      https://github.com/wesnoth/wesnoth/commit/495cfedcf4a8f2618c96d34949d13c12a35ff983
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2021-05-06 (Thu, 06 May 2021)

  Changed paths:
    M src/wesnothd_connection.cpp

  Log Message:
  -----------
  Don't use TLS for connections to loopback addresses


  Commit: cb3bef43a8f3cb9b27fbd57caac2c805c913b276
      https://github.com/wesnoth/wesnoth/commit/cb3bef43a8f3cb9b27fbd57caac2c805c913b276
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2021-05-06 (Thu, 06 May 2021)

  Changed paths:
    M src/wesnothd_connection.cpp

  Log Message:
  -----------
  Properly shut down client connection preventing TLS tuncation


  Commit: a9ebae77dfdbfe9e14abeabb61de0458c213f4d1
      https://github.com/wesnoth/wesnoth/commit/a9ebae77dfdbfe9e14abeabb61de0458c213f4d1
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2021-05-06 (Thu, 06 May 2021)

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

  Log Message:
  -----------
  Avoid TLS truncation in user kick operation


  Commit: c010a4072e37d916006606fc2783932891ef6dda
      https://github.com/wesnoth/wesnoth/commit/c010a4072e37d916006606fc2783932891ef6dda
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2021-05-06 (Thu, 06 May 2021)

  Changed paths:
    M src/wesnothd_connection.cpp

  Log Message:
  -----------
  Made use of utils::get_if


  Commit: d4c2d391fd70d08ee2c5776fc6f59f8c6486a6c2
      https://github.com/wesnoth/wesnoth/commit/d4c2d391fd70d08ee2c5776fc6f59f8c6486a6c2
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2021-05-06 (Thu, 06 May 2021)

  Changed paths:
    M src/server/campaignd/server.cpp
    M src/server/campaignd/server.hpp
    M src/server/common/server_base.cpp

  Log Message:
  -----------
  Add TLS support to campaignd


  Commit: 11d7384fc2f6ce53699b4689e8a024b44eab7a79
      https://github.com/wesnoth/wesnoth/commit/11d7384fc2f6ce53699b4689e8a024b44eab7a79
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2021-05-06 (Thu, 06 May 2021)

  Changed paths:
    M src/network_asio.cpp
    M src/network_asio.hpp

  Log Message:
  -----------
  Add TLS support to addon client


  Commit: a0dd401d90e0873245ae67e0434c3eac95516f3d
      https://github.com/wesnoth/wesnoth/commit/a0dd401d90e0873245ae67e0434c3eac95516f3d
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2021-05-06 (Thu, 06 May 2021)

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

  Log Message:
  -----------
  Add userspace codepath for coro_send_file


  Commit: d89fc738d81f2be0fc409815f2fec9f1f6287e61
      https://github.com/wesnoth/wesnoth/commit/d89fc738d81f2be0fc409815f2fec9f1f6287e61
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2021-05-06 (Thu, 06 May 2021)

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

  Log Message:
  -----------
  Add TLS marker to campaignd's log output


  Commit: 6732bf1e4dfda1d7c4ef0c522c33b588dcc73298
      https://github.com/wesnoth/wesnoth/commit/6732bf1e4dfda1d7c4ef0c522c33b588dcc73298
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2021-05-06 (Thu, 06 May 2021)

  Changed paths:
    M src/network_asio.cpp
    M src/wesnothd_connection.cpp

  Log Message:
  -----------
  Fix build with boost < 1.73


  Commit: 7f1f1cecdfb11dba3bfddc07463f6fd7d1866e6e
      https://github.com/wesnoth/wesnoth/commit/7f1f1cecdfb11dba3bfddc07463f6fd7d1866e6e
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2021-05-06 (Thu, 06 May 2021)

  Changed paths:
    M CMakeLists.txt
    M src/CMakeLists.txt

  Log Message:
  -----------
  Fix cmake build


  Commit: 6cf7f82f08a8bd963f1a60aadedc9a4a03e5071a
      https://github.com/wesnoth/wesnoth/commit/6cf7f82f08a8bd963f1a60aadedc9a4a03e5071a
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2021-05-06 (Thu, 06 May 2021)

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

  Log Message:
  -----------
  Made use of utils::holds_alternative


  Commit: efafaead8dde20e7b545f13c8bae71ab37343918
      https://github.com/wesnoth/wesnoth/commit/efafaead8dde20e7b545f13c8bae71ab37343918
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2021-05-06 (Thu, 06 May 2021)

  Changed paths:
    M src/server/common/forum_user_handler.hpp
    M src/wesnothd_connection.hpp

  Log Message:
  -----------
  Fix out-of=date doxygen comments


  Commit: aad7e14ed18baa339f939962211e31771597e375
      https://github.com/wesnoth/wesnoth/commit/aad7e14ed18baa339f939962211e31771597e375
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2021-05-06 (Thu, 06 May 2021)

  Changed paths:
    M src/network_asio.cpp
    M src/network_asio.hpp
    M src/wesnothd_connection.cpp
    M src/wesnothd_connection.hpp

  Log Message:
  -----------
  Hold sockets in unique_ptrs to avoid the need for variant::emplace()


  Commit: 1c4c5d4d1eb0f7e57eec51f092141ecd414b4a48
      https://github.com/wesnoth/wesnoth/commit/1c4c5d4d1eb0f7e57eec51f092141ecd414b4a48
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2021-05-06 (Thu, 06 May 2021)

  Changed paths:
    M CMakeLists.txt
    M SConstruct
    M src/network_asio.cpp
    M src/network_asio.hpp
    M src/wesnothd_connection.cpp
    M src/wesnothd_connection.hpp

  Log Message:
  -----------
  Drop compatibility for boost 1.65


  Commit: e40871189fb976a873fac1993bce6851ba23d88f
      https://github.com/wesnoth/wesnoth/commit/e40871189fb976a873fac1993bce6851ba23d88f
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2021-05-06 (Thu, 06 May 2021)

  Changed paths:
    M src/server/common/server_base.cpp
    M src/server/common/server_base.hpp

  Log Message:
  -----------
  Replace constexpr if abuse with function overloading


  Commit: ae8b526310b6e6caf134d0ce8d21cc2d39180dcb
      https://github.com/wesnoth/wesnoth/commit/ae8b526310b6e6caf134d0ce8d21cc2d39180dcb
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2021-05-06 (Thu, 06 May 2021)

  Changed paths:
    M src/network_asio.cpp
    M src/network_asio.hpp
    M src/wesnothd_connection.cpp
    M src/wesnothd_connection.hpp

  Log Message:
  -----------
  Initialize use_tls_ variable in the constructor for consistency


  Commit: 8e3d6b229f335bf5247bab153ea460938ad22d5c
      https://github.com/wesnoth/wesnoth/commit/8e3d6b229f335bf5247bab153ea460938ad22d5c
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2021-05-06 (Thu, 06 May 2021)

  Changed paths:
    M src/network_asio.cpp
    M src/network_asio.hpp

  Log Message:
  -----------
  Prevent TLS truncation when addon client disconnects


  Commit: 070d1196b7cefece3e29e82e74691533f264a70d
      https://github.com/wesnoth/wesnoth/commit/070d1196b7cefece3e29e82e74691533f264a70d
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2021-05-06 (Thu, 06 May 2021)

  Changed paths:
    M src/network_asio.hpp
    M src/wesnothd_connection.hpp

  Log Message:
  -----------
  Added methods to check if connection is using TLS


  Commit: a4f9024808698b40cbd1260358820ce1b44d0242
      https://github.com/wesnoth/wesnoth/commit/a4f9024808698b40cbd1260358820ce1b44d0242
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2021-05-06 (Thu, 06 May 2021)

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

  Log Message:
  -----------
  Change logging annotation for TLS in campaignd


  Commit: 2bc117fc668d2f4a980239c8a8e3a79ea74f6254
      https://github.com/wesnoth/wesnoth/commit/2bc117fc668d2f4a980239c8a8e3a79ea74f6254
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2021-05-06 (Thu, 06 May 2021)

  Changed paths:
    M src/server/common/server_base.cpp
    M src/server/common/server_base.hpp
    M src/server/wesnothd/server.cpp

  Log Message:
  -----------
  Added "+" prefix in wesnothd when logging tls connections


  Commit: ec5300b1dfc3caa8fcc53cb662d6fa22b9aacefd
      https://github.com/wesnoth/wesnoth/commit/ec5300b1dfc3caa8fcc53cb662d6fa22b9aacefd
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2021-05-06 (Thu, 06 May 2021)

  Changed paths:
    M src/server/common/server_base.cpp

  Log Message:
  -----------
  Replace union type punning with reinterpret_cast


  Commit: c37a7baf452f3c1ca95b4acf29af044eb04bd36c
      https://github.com/wesnoth/wesnoth/commit/c37a7baf452f3c1ca95b4acf29af044eb04bd36c
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2021-05-06 (Thu, 06 May 2021)

  Changed paths:
    M src/network_asio.cpp
    M src/server/common/server_base.cpp
    M src/wesnothd_connection.cpp

  Log Message:
  -----------
  Whitespace fix


  Commit: 924b77aead2874f2969dd2395f494f8b8c375412
      https://github.com/wesnoth/wesnoth/commit/924b77aead2874f2969dd2395f494f8b8c375412
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2021-05-10 (Mon, 10 May 2021)

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

  Log Message:
  -----------
  Fix improper use of return statement in context of lambda

it was really meant for calling function.


  Commit: 56f9138de760a7530bfedbef77e114dd3475581b
      https://github.com/wesnoth/wesnoth/commit/56f9138de760a7530bfedbef77e114dd3475581b
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2021-05-12 (Wed, 12 May 2021)

  Changed paths:
    M .github/workflows/ci-main.yml
    M .gitignore
    M CMakeLists.txt
    M INSTALL.md
    M changelog.md
    R cmake/FindGLEW.cmake
    R cmake/FindOpenGL.cmake
    M data/ai/lua/ai_helper.lua
    M data/ai/lua/battle_calcs.lua
    M data/ai/lua/ca_castle_switch.lua
    M data/ai/lua/ca_grab_villages.lua
    M data/ai/lua/ca_move_to_any_enemy.lua
    M data/ai/lua/ca_place_healers.lua
    M data/ai/lua/ca_retreat_injured.lua
    M data/ai/lua/ca_spread_poison.lua
    M data/ai/lua/ca_village_hunt.lua
    M data/ai/lua/generic_recruit_engine.lua
    M data/ai/micro_ais/cas/ca_hang_out.lua
    M data/campaigns/Delfadors_Memoirs/utils/sides.cfg
    M data/campaigns/Descent_Into_Darkness/scenarios/04_Spring_of_Reprisal.cfg
    M data/campaigns/Eastern_Invasion/lua/bandits.lua
    M data/campaigns/Heir_To_The_Throne/scenarios/13_The_Dwarven_Doors.cfg
    M data/campaigns/Northern_Rebirth/lua/respawn_utils.lua
    M data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg
    M data/campaigns/The_Hammer_of_Thursagan/lua/spawns.lua
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/05_Fear.cfg
    M data/campaigns/World_Conquest/lua/campaign/enemy.lua
    M data/campaigns/World_Conquest/lua/campaign/enemy_themed.lua
    M data/campaigns/World_Conquest/lua/campaign/scenario.lua
    M data/campaigns/World_Conquest/lua/era/era.lua
    M data/campaigns/World_Conquest/lua/game_mechanics/bonus.lua
    M data/campaigns/World_Conquest/lua/game_mechanics/heroes.lua
    M data/campaigns/World_Conquest/lua/game_mechanics/invest/invest.lua
    M data/campaigns/World_Conquest/lua/game_mechanics/training.lua
    M data/campaigns/World_Conquest/lua/game_mechanics/utils.lua
    M data/campaigns/World_Conquest/lua/game_mechanics/wocopedia/help.lua
    M data/campaigns/World_Conquest/lua/map/generator/utilities.lua
    M data/campaigns/World_Conquest/lua/map/main.lua
    M data/campaigns/World_Conquest/lua/map/postgeneration/1A_Start.lua
    M data/campaigns/World_Conquest/lua/map/postgeneration/2A_Springs.lua
    M data/campaigns/World_Conquest/lua/map/postgeneration/2B_Lakes.lua
    M data/campaigns/World_Conquest/lua/map/postgeneration/2C_Glaciers.lua
    M data/campaigns/World_Conquest/lua/map/postgeneration/2D_Provinces.lua
    M data/campaigns/World_Conquest/lua/map/postgeneration/2E_Paradise.lua
    M data/campaigns/World_Conquest/lua/map/postgeneration/3A_Savannah.lua
    M data/campaigns/World_Conquest/lua/map/postgeneration/3C_Delta.lua
    M data/campaigns/World_Conquest/lua/map/postgeneration/3F_Wetland.lua
    M data/campaigns/World_Conquest/lua/map/postgeneration/4A_Thermal.lua
    M data/campaigns/World_Conquest/lua/map/postgeneration/4B_Volcanic.lua
    M data/campaigns/World_Conquest/lua/map/postgeneration/4C_Mines.lua
    M data/campaigns/World_Conquest/lua/map/postgeneration/4D_Podzol.lua
    M data/campaigns/World_Conquest/lua/map/postgeneration/4E_Wicked.lua
    M data/campaigns/World_Conquest/lua/map/postgeneration/4F_Wild.lua
    M data/campaigns/World_Conquest/lua/map/postgeneration/6A_Rural.lua
    M data/campaigns/World_Conquest/lua/map/postgeneration/6B_Maritime.lua
    M data/campaigns/World_Conquest/lua/map/postgeneration/6C_Industrial.lua
    M data/campaigns/World_Conquest/lua/map/postgeneration/6D_Feudal.lua
    M data/campaigns/World_Conquest/lua/map/postgeneration_utils/engine.lua
    M data/campaigns/World_Conquest/lua/map/postgeneration_utils/events.lua
    M data/campaigns/World_Conquest/lua/map/postgeneration_utils/noise.lua
    M data/campaigns/World_Conquest/lua/map/postgeneration_utils/snow.lua
    M data/campaigns/World_Conquest/lua/map/postgeneration_utils/utilities.lua
    M data/campaigns/World_Conquest/lua/map/postgeneration_utils/wild_zones.lua
    M data/campaigns/World_Conquest/lua/map/scenario_utils/bonus_points.lua
    M data/campaigns/World_Conquest/lua/map/scenario_utils/plot.lua
    M data/campaigns/World_Conquest/lua/map/settings/settings_dialog.lua
    M data/campaigns/World_Conquest/lua/map/tools/filter_converter.lua
    M data/campaigns/World_Conquest/lua/map/utility.lua
    M data/campaigns/World_Conquest/lua/map/wct_map_generator.lua
    M data/campaigns/World_Conquest/lua/optional_mechanics/destruction.lua
    M data/core/about_i18n.cfg
    A data/core/images/attacks/fangs-horse.png
    A data/core/images/attacks/hoof-nightmare.png
    A data/core/images/attacks/hoof.png
    A data/core/images/portraits/monsters/black-stallion.png
    A data/core/images/portraits/monsters/horse.png
    A data/core/images/portraits/monsters/nightmare.png
    A data/core/images/portraits/undead/zombie-horse.png
    A data/core/images/units/dunefolk/rider/cataphract-bow.png
    M data/core/images/units/dunefolk/rider/cataphract-defend1.png
    M data/core/images/units/dunefolk/rider/cataphract-defend2.png
    M data/core/images/units/dunefolk/rider/cataphract-lance-defend1.png
    M data/core/images/units/dunefolk/rider/cataphract-lance-defend2.png
    M data/core/images/units/dunefolk/rider/cataphract-lance.png
    A data/core/images/units/dunefolk/rider/cataphract-mace.png
    M data/core/images/units/dunefolk/rider/cataphract.png
    A data/core/images/units/monsters/horse/horse-attack1.png
    A data/core/images/units/monsters/horse/horse-attack2.png
    A data/core/images/units/monsters/horse/horse-attack3.png
    A data/core/images/units/monsters/horse/horse-attack4.png
    A data/core/images/units/monsters/horse/horse-attack5.png
    A data/core/images/units/monsters/horse/horse-attack6.png
    A data/core/images/units/monsters/horse/horse-attack7.png
    A data/core/images/units/monsters/horse/horse-defend-1.png
    A data/core/images/units/monsters/horse/horse-defend-2.png
    A data/core/images/units/monsters/horse/horse-larger+female.png
    A data/core/images/units/monsters/horse/horse-larger-attack1.png
    A data/core/images/units/monsters/horse/horse-larger-attack2.png
    A data/core/images/units/monsters/horse/horse-larger-attack3.png
    A data/core/images/units/monsters/horse/horse-larger-attack4.png
    A data/core/images/units/monsters/horse/horse-larger-attack5.png
    A data/core/images/units/monsters/horse/horse-larger-attack6.png
    A data/core/images/units/monsters/horse/horse-larger-attack7.png
    A data/core/images/units/monsters/horse/horse-larger-defend-1.png
    A data/core/images/units/monsters/horse/horse-larger-defend-2.png
    A data/core/images/units/monsters/horse/horse-larger.png
    A data/core/images/units/monsters/horse/horse.png
    A data/core/images/units/monsters/seahorse-mask.png
    A data/core/images/units/monsters/seahorse-shadow.png
    A data/core/images/units/monsters/seahorse.png
    A data/core/images/units/undead/soulless-horse-attack-n.png
    A data/core/images/units/undead/soulless-horse-attack-s.png
    A data/core/images/units/undead/soulless-horse-attack.png
    A data/core/images/units/undead/soulless-horse-defend.png
    A data/core/images/units/undead/soulless-horse-die-1.png
    A data/core/images/units/undead/soulless-horse-die-2.png
    A data/core/images/units/undead/soulless-horse-die-3.png
    A data/core/images/units/undead/soulless-horse-die-4.png
    A data/core/images/units/undead/soulless-horse.png
    A data/core/images/units/undead/zombie-horse-attack-n.png
    A data/core/images/units/undead/zombie-horse-attack-s.png
    A data/core/images/units/undead/zombie-horse-attack.png
    A data/core/images/units/undead/zombie-horse-defend.png
    A data/core/images/units/undead/zombie-horse-die-1.png
    A data/core/images/units/undead/zombie-horse-die-2.png
    A data/core/images/units/undead/zombie-horse-die-3.png
    A data/core/images/units/undead/zombie-horse-die-4.png
    A data/core/images/units/undead/zombie-horse.png
    M data/core/units.cfg
    M data/core/units/dunefolk/Cataphract.cfg
    A data/core/units/monsters/Horse.cfg
    A data/core/units/monsters/Horse_Black.cfg
    A data/core/units/monsters/Horse_Great.cfg
    A data/core/units/monsters/Seahorse.cfg
    M data/core/units/undead/Corpse_Soulless.cfg
    M data/core/units/undead/Corpse_Walking.cfg
    M data/lua/cave_map_generator.lua
    M data/lua/core/_initial.lua
    A data/lua/core/audio.lua
    A data/lua/core/filesystem.lua
    M data/lua/core/gui.lua
    M data/lua/core/interface.lua
    M data/lua/core/map.lua
    A data/lua/core/mathx.lua
    M data/lua/core/sides.lua
    M data/lua/core/units.lua
    M data/lua/core/wml.lua
    M data/lua/helper.lua
    M data/lua/location_set.lua
    M data/lua/package.lua
    M data/lua/wml-flow.lua
    M data/lua/wml-tags.lua
    M data/lua/wml/animate_unit.lua
    M data/lua/wml/endlevel.lua
    M data/lua/wml/harm_unit.lua
    M data/lua/wml/heal_unit.lua
    M data/lua/wml/kill.lua
    M data/lua/wml/message.lua
    M data/lua/wml/move_unit.lua
    M data/lua/wml/objectives.lua
    M data/lua/wml/random_placement.lua
    M data/lua/wml/set_variable.lua
    M data/lua/wml/test_condition.lua
    M data/modifications/pick_advance/main.lua
    M data/multiplayer/eras.lua
    M data/multiplayer/scenarios/2p_Dark_Forecast.lua
    M data/scenario-test.cfg
    M data/test/_main.cfg
    A data/test/maps/test_hills_square.mask
    M data/test/scenarios/event_handlers_in_events.cfg
    M data/test/scenarios/test_create_side.cfg
    A data/test/scenarios/test_lua_version_api.cfg
    M data/test/scenarios/test_terrain_mask.cfg
    M po/wesnoth-anl/cs.po
    M po/wesnoth-did/cs.po
    M po/wesnoth-dm/cs.po
    M po/wesnoth-dw/cs.po
    M po/wesnoth-editor/cs.po
    M po/wesnoth-ei/cs.po
    M po/wesnoth-help/cs.po
    M po/wesnoth-httt/cs.po
    M po/wesnoth-l/cs.po
    M po/wesnoth-lib/cs.po
    M po/wesnoth-low/cs.po
    M po/wesnoth-manpages/cs.po
    M po/wesnoth-manual/cs.po
    M po/wesnoth-multiplayer/cs.po
    M po/wesnoth-nr/cs.po
    M po/wesnoth-sof/cs.po
    M po/wesnoth-sota/cs.po
    M po/wesnoth-sotbe/cs.po
    M po/wesnoth-tb/cs.po
    M po/wesnoth-thot/cs.po
    M po/wesnoth-trow/cs.po
    M po/wesnoth-tsg/cs.po
    M po/wesnoth-tutorial/cs.po
    M po/wesnoth-units/cs.po
    M po/wesnoth-units/ru.po
    M po/wesnoth-utbs/cs.po
    M po/wesnoth-wc/cs.po
    M po/wesnoth/cs.po
    R projectfiles/VC16/README.md
    R projectfiles/VC16/campaignd.vcxproj
    R projectfiles/VC16/campaignd.vcxproj.filters
    R projectfiles/VC16/files_with_deactivated_warnings.txt
    R projectfiles/VC16/liblua.vcxproj
    R projectfiles/VC16/liblua.vcxproj.filters
    R projectfiles/VC16/wesnoth.sln
    R projectfiles/VC16/wesnoth.vcxproj
    R projectfiles/VC16/wesnoth.vcxproj.filters
    R projectfiles/VC16/wesnothd.vcxproj
    R projectfiles/VC16/wesnothd.vcxproj.filters
    R projectfiles/VC16/wesnothlib.vcxproj
    R projectfiles/VC16/wesnothlib.vcxproj.filters
    M projectfiles/Xcode/The Battle for Wesnoth.xcodeproj/project.pbxproj
    M simulate-lobby-activity.lua
    M source_lists/libwesnoth
    M source_lists/libwesnoth_core
    M source_lists/lua
    M source_lists/wesnoth
    M src/CMakeLists.txt
    M src/ai/composite/aspect.hpp
    M src/config.hpp
    M src/config_cache.cpp
    M src/filesystem.cpp
    M src/filesystem.hpp
    M src/font/text.cpp
    M src/font/text.hpp
    M src/formula/callable_objects.cpp
    M src/game_version.hpp
    M src/generators/lua_map_generator.cpp
    M src/gui/core/canvas.cpp
    M src/gui/dialogs/game_load.cpp
    M src/gui/dialogs/unit_recall.cpp
    M src/help/help.cpp
    M src/help/help.hpp
    M src/lexical_cast.hpp
    M src/save_index.cpp
    M src/scripting/game_lua_kernel.cpp
    M src/scripting/game_lua_kernel.hpp
    M src/scripting/lua_audio.cpp
    M src/scripting/lua_common.hpp
    M src/scripting/lua_fileops.cpp
    M src/scripting/lua_fileops.hpp
    M src/scripting/lua_gui2.cpp
    M src/scripting/lua_kernel_base.cpp
    A src/scripting/lua_mathx.cpp
    A src/scripting/lua_mathx.hpp
    M src/scripting/lua_unit_attacks.cpp
    M src/scripting/lua_unit_attacks.hpp
    M src/scripting/mapgen_lua_kernel.cpp
    M src/scripting/mapgen_lua_kernel.hpp
    M src/soundsource.cpp
    M src/soundsource.hpp
    M src/tests/test_filesystem.cpp
    M src/tests/test_lexical_cast.cpp
    M src/tests/test_rng.cpp
    M src/tests/test_serialization.cpp
    M src/wesnoth.cpp
    R utils/indexed2rgb.sh
    R utils/wesnoth-optipng
    M utils/woptipng.py
    A vcpkg.json
    M wml_test_schedule

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


  Commit: e5ac78527f0619535a40f1dd67695f135f2bf8ad
      https://github.com/wesnoth/wesnoth/commit/e5ac78527f0619535a40f1dd67695f135f2bf8ad
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2021-05-18 (Tue, 18 May 2021)

  Changed paths:
    M CMakeLists.txt
    M SConstruct
    M src/CMakeLists.txt
    M src/network_asio.cpp
    M src/network_asio.hpp
    M src/server/campaignd/server.cpp
    M src/server/campaignd/server.hpp
    M src/server/common/forum_user_handler.cpp
    M src/server/common/forum_user_handler.hpp
    M src/server/common/server_base.cpp
    M src/server/common/server_base.hpp
    M src/server/common/user_handler.hpp
    M src/server/wesnothd/game.cpp
    M src/server/wesnothd/player_connection.hpp
    M src/server/wesnothd/server.cpp
    M src/server/wesnothd/server.hpp
    M src/wesnothd_connection.cpp
    M src/wesnothd_connection.hpp

  Log Message:
  -----------
  Merge branch 'tls_wip'


Compare: https://github.com/wesnoth/wesnoth/compare/1122ed00fbcc...e5ac78527f06



More information about the Commits mailing list