[wesnoth-commits] [wesnoth/wesnoth] ba3d2e: update test.cpp in codeblock projectfiles
Sergey Popov
noreply at github.com
Thu Dec 10 10:10:43 UTC 2020
Branch: refs/heads/coroutine_experiment
Home: https://github.com/wesnoth/wesnoth
Commit: ba3d2ea989d65f920c78de605ad218bdc9fff37f
https://github.com/wesnoth/wesnoth/commit/ba3d2ea989d65f920c78de605ad218bdc9fff37f
Author: newfrenchy83 <31768074+newfrenchy83 at users.noreply.github.com>
Date: 2020-12-05 (Sat, 05 Dec 2020)
Changed paths:
M projectfiles/CodeBlocks/tests.cbp
Log Message:
-----------
update test.cpp in codeblock projectfiles
Commit: 73b18717d3aa15ac71c5fa3fe302fa7f36c193f8
https://github.com/wesnoth/wesnoth/commit/73b18717d3aa15ac71c5fa3fe302fa7f36c193f8
Author: newfrenchy83 <31768074+newfrenchy83 at users.noreply.github.com>
Date: 2020-12-05 (Sat, 05 Dec 2020)
Changed paths:
M src/tests/utils/wml_equivalence.cpp
Log Message:
-----------
fix invalide initialisation of preprocess_file in wml_equivalence
Commit: b18503359ff006dfe21f62e43eda6b1c3241e840
https://github.com/wesnoth/wesnoth/commit/b18503359ff006dfe21f62e43eda6b1c3241e840
Author: Charles Dang <exodia339 at gmail.com>
Date: 2020-12-06 (Sun, 06 Dec 2020)
Changed paths:
M src/network_asio.cpp
M src/network_asio.hpp
M src/wesnothd_connection.cpp
M src/wesnothd_connection.hpp
Log Message:
-----------
Rename io_service_ variables to io_context_
As of Boost 1.66 these are of type io_context, so it makes it clearer.
Commit: e69a9d50697fbd1b1901fa90d955a18db16ba15a
https://github.com/wesnoth/wesnoth/commit/e69a9d50697fbd1b1901fa90d955a18db16ba15a
Author: Charles Dang <exodia339 at gmail.com>
Date: 2020-12-06 (Sun, 06 Dec 2020)
Changed paths:
M src/network_asio.cpp
Log Message:
-----------
Network Asio: conditionally use io_context::restart on Boost >= 1.66
This is the replacement for the deprecated reset()
Commit: 7babdf3cec4561d92c7dd80df308584c0b04f606
https://github.com/wesnoth/wesnoth/commit/7babdf3cec4561d92c7dd80df308584c0b04f606
Author: Elvish_Hunter <elvish.hunter2010 at gmail.com>
Date: 2020-12-06 (Sun, 06 Dec 2020)
Changed paths:
M data/tools/wmllint
Log Message:
-----------
wmllint: added [elseif] and [wml_message] to the tags allowed inside [part]
Commit: 5eadebeb3ad6686de6451953e22a922aa342ac15
https://github.com/wesnoth/wesnoth/commit/5eadebeb3ad6686de6451953e22a922aa342ac15
Author: Elvish_Hunter <elvish.hunter2010 at gmail.com>
Date: 2020-12-06 (Sun, 06 Dec 2020)
Changed paths:
M data/tools/wmllint
Log Message:
-----------
wmllint: added four tags to the allowed children of [if]
They are [true], [false], [found_item] and [proceed_to_next_scenario]
Commit: ab95662720c540af4bb7acb4b8aa4400305ab66f
https://github.com/wesnoth/wesnoth/commit/ab95662720c540af4bb7acb4b8aa4400305ab66f
Author: Elvish_Hunter <elvish.hunter2010 at gmail.com>
Date: 2020-12-06 (Sun, 06 Dec 2020)
Changed paths:
M data/tools/wmllint
Log Message:
-----------
wmllint: warn about shroud terrain in map files
Just like _f (fog), _s (shroud) is allowed only inside mask files
Commit: 799addef0127a55396ef1f6b9efc2b984bf0cb2a
https://github.com/wesnoth/wesnoth/commit/799addef0127a55396ef1f6b9efc2b984bf0cb2a
Author: Charles Dang <exodia339 at gmail.com>
Date: 2020-12-07 (Mon, 07 Dec 2020)
Changed paths:
M src/network_asio.cpp
M src/network_asio.hpp
M src/wesnothd_connection.cpp
M src/wesnothd_connection.hpp
Log Message:
-----------
Simplify network connection code with boost::asio::async_connect
That function basically does what we were doing manually - walking through each possible endpoint and trying to connect to each one.
Commit: da29dbd380c946970eaa2b9caa7e9144f620c39f
https://github.com/wesnoth/wesnoth/commit/da29dbd380c946970eaa2b9caa7e9144f620c39f
Author: Charles Dang <exodia339 at gmail.com>
Date: 2020-12-07 (Mon, 07 Dec 2020)
Changed paths:
M src/network_asio.cpp
M src/wesnothd_connection.cpp
Log Message:
-----------
Conditionally use new interface for resolver::async_resolve
Commit: ef72a0c787ee01868921c866fb26427a539d495d
https://github.com/wesnoth/wesnoth/commit/ef72a0c787ee01868921c866fb26427a539d495d
Author: Charles Dang <exodia339 at gmail.com>
Date: 2020-12-07 (Mon, 07 Dec 2020)
Changed paths:
M src/network_asio.cpp
M src/network_asio.hpp
M src/wesnothd_connection.cpp
M src/wesnothd_connection.hpp
Log Message:
-----------
Conditionally use new resolve/connect callback interfaces
Commit: 5f959917e1d4504296a17291070d9bd2f41bb96f
https://github.com/wesnoth/wesnoth/commit/5f959917e1d4504296a17291070d9bd2f41bb96f
Author: Charles Dang <exodia339 at gmail.com>
Date: 2020-12-07 (Mon, 07 Dec 2020)
Changed paths:
M src/network_asio.hpp
M src/wesnothd_connection.hpp
Log Message:
-----------
Conditionally use io_context type directly
Commit: 33f60c16a93b7d649f7e15ed926ae394003ef463
https://github.com/wesnoth/wesnoth/commit/33f60c16a93b7d649f7e15ed926ae394003ef463
Author: Charles Dang <exodia339 at gmail.com>
Date: 2020-12-07 (Mon, 07 Dec 2020)
Changed paths:
M src/network_asio.cpp
Log Message:
-----------
Network Asio: conditionally remove use of buffer_cast
Commit: 40441fecb437be413993106fdf98eca1c93a5fcc
https://github.com/wesnoth/wesnoth/commit/40441fecb437be413993106fdf98eca1c93a5fcc
Author: Charles Dang <exodia339 at gmail.com>
Date: 2020-12-07 (Mon, 07 Dec 2020)
Changed paths:
M src/wesnothd_connection.cpp
Log Message:
-----------
Wesnothd Connection: simplify send() implementation
asio::const_buffers_1 is deprecated as of 1.66. Its replacement (const_buffer) doesn't have begin() and end() functions.
However, since (unless I'm reading this code wrong), we're dealing with a single buffer at this point, we don't need the
range constructor and can just insert the data directly into the queue via internalizer list (this also allows us to remove
the push_front call).
If we do need a range call, I think we're supposed to now use asio::buffer_sequence_begin and asio::buffer_sequence_end.
Commit: de83a80d5eccccd0fb5ca7ff8e4e8b90c887cb86
https://github.com/wesnoth/wesnoth/commit/de83a80d5eccccd0fb5ca7ff8e4e8b90c887cb86
Author: Charles Dang <exodia339 at gmail.com>
Date: 2020-12-07 (Mon, 07 Dec 2020)
Changed paths:
M src/network_asio.cpp
Log Message:
-----------
Network Asio: simplify split_buffers
Like noted in the similar function in wesnothd_connection (see 40441fecb437be413993106fdf98eca1c93a5fcc), this seems to
operate on a single buffer rather than a range of them.
Commit: 601789efa0945d60dd3dba62da9f9fb9cf1904e2
https://github.com/wesnoth/wesnoth/commit/601789efa0945d60dd3dba62da9f9fb9cf1904e2
Author: Charles Dang <exodia339 at gmail.com>
Date: 2020-12-07 (Mon, 07 Dec 2020)
Changed paths:
M src/network_asio.cpp
M src/wesnothd_connection.cpp
Log Message:
-----------
Explicitly disable deprecated boost::asio APIs client-side
Commit: 3f53050064a62c611b4e6c6366f78aa6c2389987
https://github.com/wesnoth/wesnoth/commit/3f53050064a62c611b4e6c6366f78aa6c2389987
Author: Charles Dang <exodia339 at gmail.com>
Date: 2020-12-07 (Mon, 07 Dec 2020)
Changed paths:
M src/game_initialization/multiplayer.cpp
M src/wesnothd_connection.hpp
Log Message:
-----------
Remove wesnothd_connection_ptr typedef
Commit: 5e52e8b703ffc7707c5342424f95860ab7250a0f
https://github.com/wesnoth/wesnoth/commit/5e52e8b703ffc7707c5342424f95860ab7250a0f
Author: Charles Dang <exodia339 at gmail.com>
Date: 2020-12-07 (Mon, 07 Dec 2020)
Changed paths:
M src/game_initialization/multiplayer.cpp
Log Message:
-----------
Removed spurious use of unique_ptr in enter_wait_mode
Commit: b3964c1e5fdf334fdd52b4b9d62c98b47053b4cb
https://github.com/wesnoth/wesnoth/commit/b3964c1e5fdf334fdd52b4b9d62c98b47053b4cb
Author: Charles Dang <exodia339 at gmail.com>
Date: 2020-12-07 (Mon, 07 Dec 2020)
Changed paths:
M src/network_asio.cpp
Log Message:
-----------
Fixup de83a80
Commit: f875d80de4bc0f3a79c1647e4adc70bfe09fd312
https://github.com/wesnoth/wesnoth/commit/f875d80de4bc0f3a79c1647e4adc70bfe09fd312
Author: Charles Dang <exodia339 at gmail.com>
Date: 2020-12-07 (Mon, 07 Dec 2020)
Changed paths:
M src/game_initialization/multiplayer.cpp
Log Message:
-----------
Process initial lobby config while still at the loading screen
It's only intended to be used once, so no need to keep it around. Additionally, regardless of whether it's
processed here or in run_lobby_loop, it's no more up-to-date than at the point it was fetched.
Commit: 3b8f9c989c9141da3eec4ae0dfc2cb266094eedd
https://github.com/wesnoth/wesnoth/commit/3b8f9c989c9141da3eec4ae0dfc2cb266094eedd
Author: Charles Dang <exodia339 at gmail.com>
Date: 2020-12-07 (Mon, 07 Dec 2020)
Changed paths:
M src/wesnothd_connection.hpp
Log Message:
-----------
Wesnothd Connection: documentation!
Commit: 631eca57cfda70eec24104248f234b4c583a883f
https://github.com/wesnoth/wesnoth/commit/631eca57cfda70eec24104248f234b4c583a883f
Author: Charles Dang <exodia339 at gmail.com>
Date: 2020-12-07 (Mon, 07 Dec 2020)
Changed paths:
M src/wesnothd_connection_error.hpp
Log Message:
-----------
Wesnothd Errors: formatting
Commit: ddf185595a93935b8481815d6b7f865097efcd25
https://github.com/wesnoth/wesnoth/commit/ddf185595a93935b8481815d6b7f865097efcd25
Author: Charles Dang <exodia339 at gmail.com>
Date: 2020-12-07 (Mon, 07 Dec 2020)
Changed paths:
M src/server/common/send_receive_wml_helpers.ipp
M src/server/common/server_base.cpp
M src/server/common/server_base.hpp
Log Message:
-----------
Server Base: cleaned up asio includes
Commit: 1a5fcc3a92320f8c9e0d4540a7770a8d6648340f
https://github.com/wesnoth/wesnoth/commit/1a5fcc3a92320f8c9e0d4540a7770a8d6648340f
Author: Charles Dang <exodia339 at gmail.com>
Date: 2020-12-07 (Mon, 07 Dec 2020)
Changed paths:
M src/server/common/server_base.cpp
Log Message:
-----------
Fixup ddf1855
Commit: 437c6af2a07c0c53f4f99d3e61f72aa91b9978af
https://github.com/wesnoth/wesnoth/commit/437c6af2a07c0c53f4f99d3e61f72aa91b9978af
Author: Charles Dang <exodia339 at gmail.com>
Date: 2020-12-08 (Tue, 08 Dec 2020)
Changed paths:
M src/server/campaignd/server.hpp
Log Message:
-----------
Fixup campaignd build
Commit: 70e4f7bb7e576cbe07639b43795f0d45d8411f19
https://github.com/wesnoth/wesnoth/commit/70e4f7bb7e576cbe07639b43795f0d45d8411f19
Author: newfrenchy83 <31768074+newfrenchy83 at users.noreply.github.com>
Date: 2020-12-07 (Mon, 07 Dec 2020)
Changed paths:
M data/core/macros/scenario-utils.cfg
Log Message:
-----------
Move documentation outside some macros
Fixes #5347
Commit: ae277b434efda4522b9493f14c8c279c333deb89
https://github.com/wesnoth/wesnoth/commit/ae277b434efda4522b9493f14c8c279c333deb89
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2020-12-08 (Tue, 08 Dec 2020)
Changed paths:
M src/map/location.hpp
Log Message:
-----------
map/location: Drop unused includes
Commit: 85e935e6f2edb8885f20be6cd077f1fbf510d411
https://github.com/wesnoth/wesnoth/commit/85e935e6f2edb8885f20be6cd077f1fbf510d411
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2020-12-09 (Wed, 09 Dec 2020)
Changed paths:
M src/addon/validation.cpp
M src/addon/validation.hpp
M src/server/campaignd/server.cpp
M src/server/campaignd/server.hpp
Log Message:
-----------
campaignd: Add strict version check on uploads
This makes it so by default campaignd will reject uploads of existing
add-ons without a version bump. A server-side configuration flag
(strict_versions) can be optionally enabled to lower the strictness and
allow re-uploading the same version -- while still disallowing going
backwards.
The reason for making it possible to lower the strictness is that very
often while testing campaignd itself it becomes necessary to reupload
the same add-on over and over. We don't want to get rid of *that*
particular use case.
The server does not currently have a mechanism to advertise the
different strictness levels, unfortunately, so clients may in fact need
to send a 100 MB rock before finding out it's not good enough for
upload. Such is life. This might be solved after #5338 is merged into
mainline.
Closes #5079.
Commit: 2f5ed53bb0a0327d2d6b648d1a8efd44b45adf23
https://github.com/wesnoth/wesnoth/commit/2f5ed53bb0a0327d2d6b648d1a8efd44b45adf23
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2020-12-09 (Wed, 09 Dec 2020)
Changed paths:
M changelog.md
Log Message:
-----------
Update changelog
[ci skip]
Commit: 68e6a2ad303df3b6755dc74adc924624a161eb2a
https://github.com/wesnoth/wesnoth/commit/68e6a2ad303df3b6755dc74adc924624a161eb2a
Author: Charles Dang <exodia339 at gmail.com>
Date: 2020-12-10 (Thu, 10 Dec 2020)
Changed paths:
M src/game_initialization/multiplayer.cpp
M src/preferences/game.cpp
M src/preferences/game.hpp
M src/server/wesnothd/server.cpp
M src/server/wesnothd/server.hpp
Log Message:
-----------
Wesnothd: added a login response, including admin status (#5349)
* Wesnothd: added a login response, including admin status
This adds an `is_moderator` key to the [join_lobby] response containing the moderator status.
This is instead of having the server send a message after the login is complete and before the initial gamelist.
Since we wait at the loading screen for the latter (e41534d114437b26c735915f530df2cbc28e6c15), this has needed
to be handled here (2b4ae206ab796934899a628be6d3808a4ccd6c60), but it doesn't make much sense to be handled this
way. Many years ago this message was meant to show up in chat, but after the former change that no longer happened,
(IIRC) and after the latter change it most certainly won't.
Commit: 8ef6fe62ff1acdf19de20c8c4ca3347799db2a33
https://github.com/wesnoth/wesnoth/commit/8ef6fe62ff1acdf19de20c8c4ca3347799db2a33
Author: Charles Dang <exodia339 at gmail.com>
Date: 2020-12-10 (Thu, 10 Dec 2020)
Changed paths:
M src/game_initialization/lobby_data.cpp
M src/game_initialization/lobby_data.hpp
M src/server/wesnothd/player.cpp
Log Message:
-----------
Wesnothd: added a `moderator` flag to player info
Commit: 941433e7a26f65c2c52f390b1fc13d8a2461d067
https://github.com/wesnoth/wesnoth/commit/941433e7a26f65c2c52f390b1fc13d8a2461d067
Author: Pentarctagon <pentarctagon at tutamail.com>
Date: 2020-12-09 (Wed, 09 Dec 2020)
Changed paths:
M src/CMakeLists.txt
Log Message:
-----------
Add warning ignore from d643edc9072ba870b0db9ea364c5c3d244915273 to cmake.
Commit: 50ec7a1334a579d47d7f9566921d0da26c286194
https://github.com/wesnoth/wesnoth/commit/50ec7a1334a579d47d7f9566921d0da26c286194
Author: Charles Dang <exodia339 at gmail.com>
Date: 2020-12-10 (Thu, 10 Dec 2020)
Changed paths:
M src/gui/dialogs/multiplayer/player_info.cpp
Log Message:
-----------
GUI2/Player Info: used user_info info to determine visible info
Commit: f86543f8eb3f829796892c9b75dfe72a21df252a
https://github.com/wesnoth/wesnoth/commit/f86543f8eb3f829796892c9b75dfe72a21df252a
Author: Charles Dang <exodia339 at gmail.com>
Date: 2020-12-10 (Thu, 10 Dec 2020)
Changed paths:
M src/game_initialization/multiplayer.cpp
Log Message:
-----------
Laid groundwork for unified network data processing (instead of dialog-based)
Currently, only the initial gamelist is handled by this. The idea is to treat that list like any other,
as opposed to having special handling in open_connection. This is since there may be other server data
received prior to the initial gamelist ([message]s for instance) that we'll want to handle without
adding special handling in open_connection or in some other fashion.
Commit: c7e2a5ed75d053a7dace08c99a4efc8851b076f7
https://github.com/wesnoth/wesnoth/commit/c7e2a5ed75d053a7dace08c99a4efc8851b076f7
Author: Charles Dang <exodia339 at gmail.com>
Date: 2020-12-10 (Thu, 10 Dec 2020)
Changed paths:
M src/CMakeLists.txt
Log Message:
-----------
Merge branch 'master' of github.com:wesnoth/wesnoth into master
Commit: 3ea38999f4f75210325e54b268724a058973f59d
https://github.com/wesnoth/wesnoth/commit/3ea38999f4f75210325e54b268724a058973f59d
Author: Charles Dang <exodia339 at gmail.com>
Date: 2020-12-10 (Thu, 10 Dec 2020)
Changed paths:
M src/game_initialization/lobby_data.cpp
M src/game_initialization/lobby_data.hpp
M src/game_initialization/lobby_info.cpp
M src/gui/dialogs/multiplayer/lobby.cpp
M src/gui/dialogs/multiplayer/player_info.cpp
Log Message:
-----------
MP/User Info: used scoped enums
Commit: b3f525d71aff2e44720e9ed2d3cb1b383fe91a52
https://github.com/wesnoth/wesnoth/commit/b3f525d71aff2e44720e9ed2d3cb1b383fe91a52
Author: Charles Dang <exodia339 at gmail.com>
Date: 2020-12-10 (Thu, 10 Dec 2020)
Changed paths:
M src/game_initialization/lobby_data.cpp
M src/game_initialization/lobby_data.hpp
M src/game_initialization/lobby_info.cpp
M src/gui/dialogs/multiplayer/lobby.cpp
Log Message:
-----------
MP/Game Info: used scoped enums
Commit: a41c88659af455372bbcae2a5f5a5d7c25581344
https://github.com/wesnoth/wesnoth/commit/a41c88659af455372bbcae2a5f5a5d7c25581344
Author: Charles Dang <exodia339 at gmail.com>
Date: 2020-12-10 (Thu, 10 Dec 2020)
Changed paths:
M src/gui/dialogs/multiplayer/player_info.cpp
Log Message:
-----------
Revert part of 50ec7a1334a579d47d7f9566921d0da26c286194 due to oversight
Commit: 8881002555d7f7509e89ebc4e27fa374c0b5783a
https://github.com/wesnoth/wesnoth/commit/8881002555d7f7509e89ebc4e27fa374c0b5783a
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2020-12-10 (Thu, 10 Dec 2020)
Changed paths:
M src/server/campaignd/server.cpp
M src/server/campaignd/server.hpp
Log Message:
-----------
campaignd: Add server info request, [server_id]
This new commands allows clients to request some identification and
feature capability information from the server, intended to allow
clients to find out what features the server supports and enable or
disable UI elements accordingly while preserving compatibility where
desirable.
Currently this results in a response like this:
[server_id]
version="1.15.7+dev (c7643e0785b-Modified)"
cap="auth:legacy,delta"
[/server_id]
More information might be added later, such as a website URL and a link
to a web listing for the particular server (e.g. <https://add-ons.wesnoth.org/1.16/>),
more details on add-on licensing, or even doing away with the need to
send [request_terms] before displaying the prompt on the client side.
Commit: f9631f108a0fedda6e5afc4659385ad78d115257
https://github.com/wesnoth/wesnoth/commit/f9631f108a0fedda6e5afc4659385ad78d115257
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2020-12-10 (Thu, 10 Dec 2020)
Changed paths:
M src/addon/client.cpp
M src/addon/client.hpp
Log Message:
-----------
addon/client: Initial support for [server_id]
The client now sends the [server_id] command during connection and
records the server version and capabilities for later use. A simple API
to query the client's saved info is provided but not used at this time.
If the server does not recognize [server_id], the request will result in
an error that we simply ignore, and we make an educated guess on
capabilities based on vanilla campaignd.
Commit: 38912c467a812fa50d7e40cc37e61fefca30c340
https://github.com/wesnoth/wesnoth/commit/38912c467a812fa50d7e40cc37e61fefca30c340
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2020-12-10 (Thu, 10 Dec 2020)
Changed paths:
M src/server/campaignd/server.cpp
M src/server/campaignd/server.hpp
Log Message:
-----------
campaignd: Add licensing info and add-ons web URL to [server_id]
This is the part where an attentive reader realises the [server_info]
tag was intended all along to contain information for the command's
response, not just the add-on thread URL formatting string. Talk about a
Chekhov's gun.
Still want to keep them named differently since [server_id] is a
superset of [server_info] including hardcoded values (capabilities and
version).
Commit: 239cced1d4dd7f621189bc67ece67ed16572d852
https://github.com/wesnoth/wesnoth/commit/239cced1d4dd7f621189bc67ece67ed16572d852
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2020-12-10 (Thu, 10 Dec 2020)
Changed paths:
M src/addon/client.cpp
M src/addon/client.hpp
Log Message:
-----------
addon/client: Add support for [server_id] license terms/url and web url
The URLs do not have a user interface yet, but the license terms are
used in lieu of the [request_terms] request if available at connect
time.
Commit: 1366b108a64a5339de83278bd5ea1758b4781ff4
https://github.com/wesnoth/wesnoth/commit/1366b108a64a5339de83278bd5ea1758b4781ff4
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2020-12-10 (Thu, 10 Dec 2020)
Changed paths:
M src/addon/client.cpp
M src/addon/client.hpp
Log Message:
-----------
addon/client: Clear server error and info on disconnect
Kind of an obvious thing to do when you think about it. We clear the
error too because we successfully disconnected from the server. In
theory.
Commit: 704ba04503d4616f1beb0e0650525eae167faaf5
https://github.com/wesnoth/wesnoth/commit/704ba04503d4616f1beb0e0650525eae167faaf5
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2020-12-10 (Thu, 10 Dec 2020)
Changed paths:
M src/addon/client.cpp
M src/addon/client.hpp
M src/server/campaignd/server.cpp
M src/server/campaignd/server.hpp
Log Message:
-----------
campaignd: Remove [server_id] license_url
We're better off making URLs in the license text clickable on the client
side and including any relevant URLs there instead.
Commit: 8c3918197cde8564e0cd4c1fa39795edccccb047
https://github.com/wesnoth/wesnoth/commit/8c3918197cde8564e0cd4c1fa39795edccccb047
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2020-12-10 (Thu, 10 Dec 2020)
Changed paths:
A data/gui/window/addon_license_prompt.cfg
M projectfiles/VC16/wesnoth.vcxproj
M projectfiles/VC16/wesnoth.vcxproj.filters
M source_lists/wesnoth
A src/gui/dialogs/addon/license_prompt.cpp
A src/gui/dialogs/addon/license_prompt.hpp
M src/gui/dialogs/addon/manager.cpp
Log Message:
-----------
gui/addon_manager: Add dedicated license prompt dialog
This allows using full markup for the license text and making it
independently scrollable without messing up the dialog. It also enables
URL parsing in it.
Commit: 494123131c0c9ae521e713a588b969ff5ca96f44
https://github.com/wesnoth/wesnoth/commit/494123131c0c9ae521e713a588b969ff5ca96f44
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2020-12-10 (Thu, 10 Dec 2020)
Changed paths:
M src/server/campaignd/server.cpp
Log Message:
-----------
campaignd: Reformat license terms to add a link to the full rules
And some other minor markup and spacing changes.
Commit: 3ddff73675ca169f51c2be279f9c21c796d4433f
https://github.com/wesnoth/wesnoth/commit/3ddff73675ca169f51c2be279f9c21c796d4433f
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2020-12-10 (Thu, 10 Dec 2020)
Changed paths:
M src/tests/gui/test_gui2.cpp
Log Message:
-----------
gui2: Update unit tests
Commit: d8f943664fb85ed0f03055ff5e7593f50f46eb18
https://github.com/wesnoth/wesnoth/commit/d8f943664fb85ed0f03055ff5e7593f50f46eb18
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2020-12-10 (Thu, 10 Dec 2020)
Changed paths:
M src/addon/client.cpp
M src/addon/manager.cpp
M src/addon/manager.hpp
Log Message:
-----------
addon/mg: Turn _info.cfg writer into a public API
This reduces code duplication in the client proper resulting from the
addition of delta pack support, plus makes the overall procedure less
complicated since we don't have to inject a file into the pack before
unpacking it to disk.
Commit: 220792dd07b525c9b925c8fdb811b3661578dd64
https://github.com/wesnoth/wesnoth/commit/220792dd07b525c9b925c8fdb811b3661578dd64
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2020-12-10 (Thu, 10 Dec 2020)
Changed paths:
M changelog.md
M src/addon/manager.cpp
Log Message:
-----------
addon/mg: Ensure _info.cfg has an [info] node when reading it
Fixes the dreaded "Mandatory WML child missing yet untested for. Please
report" error occurring when reading _info.cfg files that don't have a
valid [info] tag. In particular, this would cause the game version
dialog to crash to desktop.
Commit: 782ee9d7613c37cd5305577390b5b749af564a2a
https://github.com/wesnoth/wesnoth/commit/782ee9d7613c37cd5305577390b5b749af564a2a
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2020-12-10 (Thu, 10 Dec 2020)
Changed paths:
M src/server/campaignd/server.cpp
Log Message:
-----------
campaignd: Rephrase a few parts of the default license notice
Quite concerningly, people made a typo ('proscribed' instead of
'prescribed') which changes the meaning of the sentence in question
rather substantially.
Additionally, the situation with different versions of the GNU GPL
hasn't ever been quite clear -- in theory people could've used the GNU
GPL version 1 with content previously licensed under version 2 or later.
This change is meant to address this issue as well. Some redundant
wording has been removed in the process.
(Reviewed by Pentarctagon and Vultraz.)
Commit: 4fa0ac63579de516e23284273204de2738cfc91d
https://github.com/wesnoth/wesnoth/commit/4fa0ac63579de516e23284273204de2738cfc91d
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2020-12-10 (Thu, 10 Dec 2020)
Changed paths:
M data/gui/window/addon_license_prompt.cfg
Log Message:
-----------
gui2/addon_license_prompt: Revert caption to just "Terms"
Commit: f49cb62c7ca25a6d1e060d16694379073b104626
https://github.com/wesnoth/wesnoth/commit/f49cb62c7ca25a6d1e060d16694379073b104626
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2020-12-10 (Thu, 10 Dec 2020)
Changed paths:
M data/gui/window/addon_license_prompt.cfg
Log Message:
-----------
gui2/addon_license_prompt: Fix missing translation mark
Commit: 1fa08d811ca962c05891e3b7e2de01cfc3318c6c
https://github.com/wesnoth/wesnoth/commit/1fa08d811ca962c05891e3b7e2de01cfc3318c6c
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2020-12-10 (Thu, 10 Dec 2020)
Changed paths:
M src/addon/manager.cpp
M src/addon/manager_ui.cpp
M src/gui/dialogs/wml_error.cpp
Log Message:
-----------
addon/mg: Make get_addon_install_info() unwrap the retrieved [info] WML
Since write_addon_install_info() (which was just added) automatically
wraps the input in the [info] envelope, it make sense to me to do the
inverse operation in get_addon_install_info() as well instead of
off-loading the responsibility onto the callers. The file in question
should never contain any useful information outside of the singular
[info] node anyway.
(Admittedly, this obsoletes the previous bugfix in
220792dd07b525c9b925c8fdb811b3661578dd64. On the other hand, it was
useful to have it in that form in 1.14 anyway to avoid any accidental
regressions.)
Commit: aa5aec091486e7d17f30a35900d075e189b73b1f
https://github.com/wesnoth/wesnoth/commit/aa5aec091486e7d17f30a35900d075e189b73b1f
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2020-12-10 (Thu, 10 Dec 2020)
Changed paths:
M src/addon/manager.cpp
Log Message:
-----------
addon/mg: Refactor installed/available_addons()
The code in both is almost identical except for the check for .pbl
files. Furthermore, the call to filesystem::get_files_in_dir() does not
need a list of files to output since support for Addon_Name.cfg-style
add-ons was dropped in version 1.13.0.
The ADDON_ENUM_CRITERIA enumeration is there in case in the future we
need more criteria for enumerating add-ons. Right now it's just a
convenience so enumerate_addons_internal() takes a self-descriptive
parameter instead of a boolean.
Commit: b58c798875794698fdf32f68506b84478217c517
https://github.com/wesnoth/wesnoth/commit/b58c798875794698fdf32f68506b84478217c517
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2020-12-10 (Thu, 10 Dec 2020)
Changed paths:
M src/addon/manager.cpp
Log Message:
-----------
addon/mg: Remove an ABSURD amount of superfluous includes
Commit: 5cc1dc8212fd119f3f6b8d222a3cfefd6759d81f
https://github.com/wesnoth/wesnoth/commit/5cc1dc8212fd119f3f6b8d222a3cfefd6759d81f
Author: loonycyborg <loonycyborg at gmail.com>
Date: 2020-12-10 (Thu, 10 Dec 2020)
Changed paths:
M changelog.md
M data/core/macros/scenario-utils.cfg
A data/gui/window/addon_license_prompt.cfg
M data/tools/wmllint
M projectfiles/CodeBlocks/tests.cbp
M projectfiles/VC16/wesnoth.vcxproj
M projectfiles/VC16/wesnoth.vcxproj.filters
M source_lists/wesnoth
M src/CMakeLists.txt
M src/addon/client.cpp
M src/addon/client.hpp
M src/addon/manager.cpp
M src/addon/manager.hpp
M src/addon/manager_ui.cpp
M src/addon/validation.cpp
M src/addon/validation.hpp
M src/game_initialization/lobby_data.cpp
M src/game_initialization/lobby_data.hpp
M src/game_initialization/lobby_info.cpp
M src/game_initialization/multiplayer.cpp
A src/gui/dialogs/addon/license_prompt.cpp
A src/gui/dialogs/addon/license_prompt.hpp
M src/gui/dialogs/addon/manager.cpp
M src/gui/dialogs/multiplayer/lobby.cpp
M src/gui/dialogs/multiplayer/player_info.cpp
M src/gui/dialogs/wml_error.cpp
M src/map/location.hpp
M src/network_asio.cpp
M src/network_asio.hpp
M src/preferences/game.cpp
M src/preferences/game.hpp
M src/server/campaignd/server.cpp
M src/server/campaignd/server.hpp
M src/server/common/send_receive_wml_helpers.ipp
M src/server/common/server_base.cpp
M src/server/common/server_base.hpp
M src/server/wesnothd/player.cpp
M src/server/wesnothd/server.cpp
M src/server/wesnothd/server.hpp
M src/tests/gui/test_gui2.cpp
M src/tests/utils/wml_equivalence.cpp
M src/wesnothd_connection.cpp
M src/wesnothd_connection.hpp
M src/wesnothd_connection_error.hpp
Log Message:
-----------
Merge branch 'master' into coroutine_experiment
Compare: https://github.com/wesnoth/wesnoth/compare/e66d6a00a864...5cc1dc8212fd
More information about the Commits
mailing list