[wesnoth-commits] [wesnoth/wesnoth] 430531: Post-release version bump
GitHub
noreply at github.com
Sun Oct 14 09:13:42 UTC 2018
Branch: refs/heads/development
Home: https://github.com/wesnoth/wesnoth
Commit: 43053105f358e548a84b2667669cfe07048255b9
https://github.com/wesnoth/wesnoth/commit/43053105f358e548a84b2667669cfe07048255b9
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M Doxyfile
M changelog.md
M players_changelog.md
M src/wesconfig.h
Log Message:
-----------
Post-release version bump
The stable 1.14 branch has now diverged, and master is back in development mode for
the 1.15 series. Therefor, bumping to 1.15.0-dev here on master.
(cherry-picked from commit 0094a19e8550f354e2fcdd80700a8a2cb74f0ed3)
Commit: 4dd1437cef982271ed756475fae41f01a7365f62
https://github.com/wesnoth/wesnoth/commit/4dd1437cef982271ed756475fae41f01a7365f62
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
R .appveyor.vs2013.yml
M .appveyor.vs2015.yml
M .appveyor.vs2017.yml
R projectfiles/VC12/README.md
R projectfiles/VC12/WML_tests.cmd
R projectfiles/VC12/WindowsTimeout.cpp
R projectfiles/VC12/WindowsTimeout.vcxproj
R projectfiles/VC12/campaignd.vcxproj
R projectfiles/VC12/campaignd.vcxproj.filters
R projectfiles/VC12/files_with_deactivated_warnings.txt
R projectfiles/VC12/liblua.vcxproj
R projectfiles/VC12/liblua.vcxproj.filters
R projectfiles/VC12/wesnoth.sln
R projectfiles/VC12/wesnoth.vcxproj
R projectfiles/VC12/wesnoth.vcxproj.filters
R projectfiles/VC12/wesnothd.vcxproj
R projectfiles/VC12/wesnothd.vcxproj.filters
R projectfiles/VC12/wesnothlib.vcxproj
R projectfiles/VC12/wesnothlib.vcxproj.filters
A projectfiles/VC14/README.md
A projectfiles/VC14/WML_tests.cmd
A projectfiles/VC14/WindowsTimeout.cpp
A projectfiles/VC14/WindowsTimeout.vcxproj
A projectfiles/VC14/campaignd.vcxproj
A projectfiles/VC14/campaignd.vcxproj.filters
A projectfiles/VC14/files_with_deactivated_warnings.txt
A projectfiles/VC14/liblua.vcxproj
A projectfiles/VC14/liblua.vcxproj.filters
A projectfiles/VC14/wesnoth.sln
A projectfiles/VC14/wesnoth.vcxproj
A projectfiles/VC14/wesnoth.vcxproj.filters
A projectfiles/VC14/wesnothd.vcxproj
A projectfiles/VC14/wesnothd.vcxproj.filters
A projectfiles/VC14/wesnothlib.vcxproj
A projectfiles/VC14/wesnothlib.vcxproj.filters
Log Message:
-----------
Update Visual Studio project file to VS2015 toolset
I also enabled /DEBUG:FASTLINK and /LTCG:incremental to speed up compile
times. VS2015 introduces support for both switches.
(cherry-picked from commit 3555b6278c2103391214e1da303d6c3e652387dc)
Commit: 9b7e1ed38386a8a60642b9c02919085727beaaa5
https://github.com/wesnoth/wesnoth/commit/9b7e1ed38386a8a60642b9c02919085727beaaa5
Author: ln-zookeeper <lari.nieminen at iki.fi>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Sun_Singer.cfg
Log Message:
-----------
UtBS: Corrected Sun Singer movetype from float to foot
(cherry-picked from commit 3cea4790b872803063854e28bffa40999ae00258)
Commit: 24cc0b01d4362a9dcb88a974f60f6f325a26b4b2
https://github.com/wesnoth/wesnoth/commit/24cc0b01d4362a9dcb88a974f60f6f325a26b4b2
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/editor/map/editor_map.hpp
M src/exceptions.hpp
M src/filesystem_boost.cpp
M src/formula/formula.hpp
M src/game_end_exceptions.hpp
M src/global.hpp
M src/gui/widgets/grid.hpp
M src/gui/widgets/unit_preview_pane.cpp
M src/image_modifications.hpp
M src/lexical_cast.hpp
M src/libc_error.hpp
M src/log.cpp
M src/log.hpp
M src/lua_jailbreak_exception.cpp
M src/lua_jailbreak_exception.hpp
M src/sdl/rect.hpp
M src/serialization/string_view.hpp
M src/utils/general.hpp
M src/utils/make_enum.hpp
M src/utils/name_generator.hpp
M src/variable_info.cpp
M src/variable_info.hpp
M src/wml_exception.hpp
Log Message:
-----------
Used constexpr and noexcept keywords directly
We can do this now since were bumping min compiler support.
(cherry-picked from commit 8120843b2ef6ff2348d76e962d40d8f4d83d9ca6)
Commit: 4f1c4dcafddd67bc62aee3386f64eab86c2347fc
https://github.com/wesnoth/wesnoth/commit/4f1c4dcafddd67bc62aee3386f64eab86c2347fc
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gettext_boost.cpp
M src/global.hpp
M src/gui/dialogs/addon/manager.cpp
M src/gui/widgets/debug.cpp
M src/log.cpp
M src/log_windows.cpp
M src/reports.cpp
R src/utils/io.hpp
Log Message:
-----------
Used std::put time everywhere
The utils::put_time wrapper was only for GCC 4.x.
(cherry-picked from commit 80c2d1a405111f4cd2f3cb7a50768e9ffdc8ee5b)
Commit: 7785d711ed8d28a5937b024942e394c392b7c409
https://github.com/wesnoth/wesnoth/commit/7785d711ed8d28a5937b024942e394c392b7c409
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/config_attribute_value.hpp
M src/gui/core/event/dispatcher.hpp
M src/gui/core/event/dispatcher_private.hpp
M src/gui/widgets/status_label_helper.hpp
M src/lexical_cast.hpp
M src/scripting/lua_unit_attacks.cpp
M src/scripting/push_check.hpp
M src/units/unit.hpp
M src/utils/const_clone.hpp
M src/utils/type_trait_aliases.hpp
M src/variable_info.cpp
M src/variable_info.hpp
Log Message:
-----------
Removed the type trait alias wrappers
This completely removes the wrappers for aliases included in c++14. It also enables
use of the value alias wrappers, since we now have variable templates.
(cherry-picked from commit c1fcba17b75362d1639361fdd4ade7b1a85c0575)
Commit: 56406aeedc5b1e4cd69c6620ec947aee8a7f20e1
https://github.com/wesnoth/wesnoth/commit/56406aeedc5b1e4cd69c6620ec947aee8a7f20e1
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/font/text.cpp
M src/font/text.hpp
M src/gui/core/canvas.cpp
M src/gui/widgets/styled_widget.hpp
Log Message:
-----------
Added a getter for a static pango_text object
The reason I added this was so I can refactor some temporary pango_text objects out of the display class.
styled_widget doesn't use this for reasons explained in the comment.
(cherry-picked from commit 770664d1f34a274dd8da70af589719d30b44263b)
Commit: 0546b5162ff99b4a5809b44196ad717477f554a5
https://github.com/wesnoth/wesnoth/commit/0546b5162ff99b4a5809b44196ad717477f554a5
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/image.cpp
Log Message:
-----------
Improved console output on IPF fail
Yes, I know the duplicate code should be consolidated.
(cherry-picked from commit b746829692b702b7c3fc83726c16b0c789ad8651)
Commit: a2d5d159163f2a2e50661e1fe839a5d9396dc8ff
https://github.com/wesnoth/wesnoth/commit/a2d5d159163f2a2e50661e1fe839a5d9396dc8ff
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/hotkey/command_executor.cpp
Log Message:
-----------
Fix #2681: minimap buttons don't do anything
Regression from commit ecc0dca665737bcb411fbd355edd37df8a9038b8.
(cherry-picked from commit 750d558cd9c771a7d2dae528f8e25a2b5d534fc6)
Commit: 8d1611c32233d28cd33affadb95905834f683d6e
https://github.com/wesnoth/wesnoth/commit/8d1611c32233d28cd33affadb95905834f683d6e
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M .gitignore
Log Message:
-----------
Update gitignore for VC project file update
(cherry-picked from commit b27c4c651273a8eed8a029be7bfe374dff03b35e)
Commit: 0da9c0ab622c8da7f68ced6e0a3c418bcc140a92
https://github.com/wesnoth/wesnoth/commit/0da9c0ab622c8da7f68ced6e0a3c418bcc140a92
Author: Sofartin <hrubymar10 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
Log Message:
-----------
Fixed Xcode Project for new Wesnoth 1.15
(cherry-picked from commit 4764dcaf5e84d1bcf30d64d0cd6624d2d3c72bce)
Commit: cc5fe2adc1ceba4c266f66c149499b31dd970400
https://github.com/wesnoth/wesnoth/commit/cc5fe2adc1ceba4c266f66c149499b31dd970400
Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M CMakeLists.txt
M SConstruct
Log Message:
-----------
Change SCons and CMake to C++14
(cherry-picked from commit 2a17ecccfcbf30f0d966db74c176cae87648c6d6)
Commit: e8bce7762c7fa1473f2c61a9392b627a9b712c87
https://github.com/wesnoth/wesnoth/commit/e8bce7762c7fa1473f2c61a9392b627a9b712c87
Author: pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M .travis.yml
Log Message:
-----------
Set travis use c++14.
(cherry-picked from commit 503e921d2ffa0ed3991e037dfa38de7dfe926277)
Commit: efb193a446655fdcb63cb4b5dd03de390f4fa34b
https://github.com/wesnoth/wesnoth/commit/efb193a446655fdcb63cb4b5dd03de390f4fa34b
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M .appveyor.vs2015.yml
Log Message:
-----------
Attempted fix for AppVeyor build failures on VS2015
Apparently AppVeyor uses VS2013 tools by default
_even in the VS2015 image_, which makes approximately zero sense.
(cherry-picked from commit 950d4f86e5c4878c9a73bf06bd70aa46c16d84f5)
Commit: 5e0d9b3310a12acf2ad012b9580ed067b8e03f1b
https://github.com/wesnoth/wesnoth/commit/5e0d9b3310a12acf2ad012b9580ed067b8e03f1b
Author: Gunter Labes <soliton at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/server/server.cpp
Log Message:
-----------
Enable lobby message logging again
Also re-enable flood protection and truncating too long messages.
(cherry-picked from commit b115be99e15d01506cbff6a78d823a02dba63ac2)
Commit: 7f0827b848ef2954586bb76e8e3fd9ca6303f8a9
https://github.com/wesnoth/wesnoth/commit/7f0827b848ef2954586bb76e8e3fd9ca6303f8a9
Author: pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M CMakeLists.txt
M utils/travis/docker_run.sh
Log Message:
-----------
Stop hard-coding cmake's -std version.
Adds the CXX_STD variable which can be set. Currently defaults to 14. This also now makes cmake honor the CXXSTD env variable set on travis.
(cherry-picked from commit 983045718aa13a2b7b1b45bb37baa76a88a1d47e)
Commit: ea63a148cb5d55af5fa800291310a5c45ca9d5db
https://github.com/wesnoth/wesnoth/commit/ea63a148cb5d55af5fa800291310a5c45ca9d5db
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M doc/man/wesnoth.6
Log Message:
-----------
Document --log-none command line option
This reverts commit e1ac4298eaf5bee6c885263e179588a051de24a8.
(cherry-picked from commit 49ad25fc696112aaa8f7b840abeded7d0660aaaa)
Commit: d849dfcf89d6678b5b63e640aa6de8a9ca96db2d
https://github.com/wesnoth/wesnoth/commit/d849dfcf89d6678b5b63e640aa6de8a9ca96db2d
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/advanced_preferences.cfg
Log Message:
-----------
Add the advanced prefs entry for the deprecation setting
(cherry-picked from commit 9902a2df31aaa0755c10d2dbf8ea2954087e6a43)
Commit: 2c623ecc9212ca898e992a8aaa4fcf754cb1066e
https://github.com/wesnoth/wesnoth/commit/2c623ecc9212ca898e992a8aaa4fcf754cb1066e
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/core/canvas.cpp
Log Message:
-----------
Used std::exchange for a thing
Note we don't really need to set the other object's renderer ptr to null since
the canvas dtor doesn't destroy it anymore, but still. Good to do.
(cherry-picked from commit 68f4bd14d6eaf546cec3c49d04b14b5d50ac6ebd)
Commit: 45f871067f76cad96f39acb5e37e236d30e9a3d7
https://github.com/wesnoth/wesnoth/commit/45f871067f76cad96f39acb5e37e236d30e9a3d7
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/actions/advancement.cpp
M src/actions/attack.cpp
M src/actions/create.cpp
M src/actions/move.cpp
M src/actions/move.hpp
M src/actions/undo.cpp
M src/actions/undo_action.cpp
M src/actions/undo_action.hpp
M src/actions/vision.cpp
M src/actions/vision.hpp
M src/addon/client.cpp
M src/addon/manager.cpp
M src/addon/validation.cpp
M src/ai/actions.cpp
M src/ai/contexts.cpp
M src/ai/default/aspect_attacks.cpp
M src/ai/default/attack.cpp
M src/ai/default/ca.cpp
M src/ai/default/ca.hpp
M src/ai/default/ca_move_to_targets.cpp
M src/ai/default/contexts.cpp
M src/ai/default/recruitment.cpp
M src/ai/default/recruitment.hpp
M src/ai/default/stage_rca.cpp
M src/ai/formula/ai.cpp
M src/ai/formula/candidates.cpp
M src/ai/formula/function_table.cpp
M src/ai/manager.hpp
M src/ai/simulated_actions.cpp
M src/animated.hpp
M src/animated.tpp
M src/build_info.cpp
M src/campaign_server/campaign_server.cpp
M src/campaign_server/campaign_server.hpp
M src/campaign_server/control.hpp
M src/color.hpp
M src/config.cpp
M src/config_attribute_value.cpp
M src/config_attribute_value.hpp
M src/cursor.cpp
M src/desktop/dbus_notification.cpp
M src/desktop/windows_tray_notification.cpp
M src/desktop/windows_tray_notification.hpp
M src/display.cpp
M src/display.hpp
M src/display_context.cpp
M src/editor/controller/editor_controller.cpp
M src/editor/map/context_manager.cpp
M src/editor/map/context_manager.hpp
M src/editor/map/editor_map.cpp
M src/editor/map/editor_map.hpp
M src/editor/map/map_context.cpp
M src/editor/map/map_context.hpp
M src/editor/palette/common_palette.hpp
M src/editor/palette/editor_palettes.cpp
M src/editor/palette/editor_palettes.hpp
M src/editor/palette/empty_palette.hpp
M src/editor/palette/location_palette.hpp
M src/editor/palette/palette_manager.cpp
M src/editor/palette/palette_manager.hpp
M src/filesystem.hpp
M src/filesystem_boost.cpp
M src/filesystem_sdl.cpp
M src/floating_label.cpp
M src/floating_label.hpp
M src/font/constants.cpp
M src/font/constants.hpp
M src/font/font_description.hpp
M src/font/marked-up_text.cpp
M src/font/sdl_ttf.cpp
M src/font/text.cpp
M src/font/text.hpp
M src/font/text_cache.cpp
M src/font/text_surface.cpp
M src/font/text_surface.hpp
M src/formula/debugger.cpp
M src/formula/formula.cpp
M src/formula/function.cpp
M src/formula/function.hpp
M src/formula/function_gamestate.cpp
M src/formula/string_utils.cpp
M src/formula/variant.cpp
M src/formula/variant.hpp
M src/formula/variant_value.cpp
M src/formula/variant_value.hpp
M src/game_board.cpp
M src/game_board.hpp
M src/game_config.cpp
M src/game_config.hpp
M src/game_config_manager.cpp
M src/game_events/action_wml.cpp
M src/game_events/conditional_wml.cpp
M src/game_events/entity_location.cpp
M src/game_events/entity_location.hpp
M src/game_events/manager_impl.hpp
M src/game_events/pump.cpp
M src/game_events/pump.hpp
M src/game_events/wmi_manager.hpp
M src/game_initialization/connect_engine.cpp
M src/game_initialization/create_engine.cpp
M src/game_initialization/create_engine.hpp
M src/game_initialization/lobby_data.cpp
M src/game_initialization/lobby_data.hpp
M src/game_initialization/multiplayer.hpp
M src/game_launcher.cpp
M src/game_state.cpp
M src/generators/cave_map_generator.cpp
M src/generators/cave_map_generator.hpp
M src/generators/default_map_generator_job.cpp
M src/generators/default_map_generator_job.hpp
M src/gui/core/event/distributor.hpp
M src/gui/core/event/handler.cpp
M src/gui/core/timer.cpp
M src/gui/core/timer.hpp
M src/gui/dialogs/advanced_graphics_options.cpp
M src/gui/dialogs/editor/generate_map.cpp
M src/gui/dialogs/file_dialog.cpp
M src/gui/dialogs/game_load.cpp
M src/gui/dialogs/gamestate_inspector.cpp
M src/gui/dialogs/label_settings.cpp
M src/gui/dialogs/loading_screen.hpp
M src/gui/dialogs/lua_interpreter.cpp
M src/gui/dialogs/multiplayer/lobby.hpp
M src/gui/dialogs/multiplayer/mp_create_game.cpp
M src/gui/dialogs/multiplayer/mp_join_game.hpp
M src/gui/dialogs/multiplayer/mp_staging.hpp
M src/gui/dialogs/multiplayer/plugin_executor.hpp
M src/gui/dialogs/network_transmission.cpp
M src/gui/dialogs/network_transmission.hpp
M src/gui/dialogs/outro.cpp
M src/gui/dialogs/outro.hpp
M src/gui/dialogs/preferences_dialog.cpp
M src/gui/dialogs/statistics_dialog.cpp
M src/gui/dialogs/statistics_dialog.hpp
M src/gui/dialogs/story_viewer.hpp
M src/gui/dialogs/unit_advance.cpp
M src/gui/dialogs/unit_advance.hpp
M src/gui/dialogs/unit_attack.cpp
M src/gui/dialogs/unit_create.cpp
M src/gui/dialogs/unit_recall.cpp
M src/gui/dialogs/wml_error.cpp
M src/gui/dialogs/wml_message.cpp
M src/gui/widgets/chatbox.cpp
M src/gui/widgets/chatbox.hpp
M src/gui/widgets/debug.cpp
M src/gui/widgets/generator.cpp
M src/gui/widgets/generator_private.hpp
M src/gui/widgets/grid.cpp
M src/gui/widgets/horizontal_scrollbar.cpp
M src/gui/widgets/list.cpp
M src/gui/widgets/listbox.cpp
M src/gui/widgets/menu_button.cpp
M src/gui/widgets/multimenu_button.cpp
M src/gui/widgets/password_box.cpp
M src/gui/widgets/repeating_button.hpp
M src/gui/widgets/slider.cpp
M src/gui/widgets/text_box.hpp
M src/gui/widgets/text_box_base.cpp
M src/gui/widgets/text_box_base.hpp
M src/gui/widgets/tree_view_node.cpp
M src/gui/widgets/tree_view_node.hpp
M src/gui/widgets/unit_preview_pane.cpp
M src/gui/widgets/vertical_scrollbar.cpp
M src/hash.cpp
M src/hash.hpp
M src/help/help_impl.cpp
M src/help/help_menu.cpp
M src/help/help_text_area.cpp
M src/help/help_topic_generators.cpp
M src/hotkey/command_executor.cpp
M src/hotkey/hotkey_command.cpp
M src/hotkey/hotkey_handler.cpp
M src/image.cpp
M src/image_modifications.cpp
M src/image_modifications.hpp
M src/joystick.cpp
M src/log_windows.cpp
M src/map/label.cpp
M src/map/location.cpp
M src/map/location.hpp
M src/map/map.cpp
M src/map_command_handler.hpp
M src/menu_events.cpp
M src/minimap.cpp
M src/mouse_events.cpp
M src/mouse_events.hpp
M src/pathfind/astarsearch.cpp
M src/pathfind/pathfind.hpp
M src/pathutils.cpp
M src/pathutils.hpp
M src/persist_context.cpp
M src/persist_context.hpp
M src/persist_var.cpp
M src/play_controller.cpp
M src/play_controller.hpp
M src/playsingle_controller.cpp
M src/playturn.cpp
M src/preferences/credentials.cpp
M src/preferences/display.cpp
M src/preferences/editor.cpp
M src/preferences/game.cpp
M src/preferences/general.cpp
M src/preferences/general.hpp
M src/quit_confirmation.cpp
M src/recall_list_manager.cpp
M src/recall_list_manager.hpp
M src/replay.cpp
M src/replay_helper.cpp
M src/replay_helper.hpp
M src/reports.cpp
M src/scripting/application_lua_kernel.cpp
M src/scripting/game_lua_kernel.cpp
M src/scripting/lua_audio.cpp
M src/scripting/lua_common.cpp
M src/scripting/lua_common.hpp
M src/scripting/lua_fileops.cpp
M src/scripting/lua_formula_bridge.cpp
M src/scripting/lua_gui2.cpp
M src/scripting/lua_kernel_base.cpp
M src/scripting/lua_unit.hpp
M src/scripting/lua_unit_attacks.cpp
M src/scripting/plugins/context.cpp
M src/scripting/plugins/context.hpp
M src/scripting/plugins/manager.cpp
M src/scripting/plugins/manager.hpp
M src/sdl/utils.cpp
M src/sdl/utils.hpp
M src/serialization/base64.cpp
M src/serialization/parser.cpp
M src/serialization/preprocessor.cpp
M src/serialization/string_utils.cpp
M src/serialization/string_utils.hpp
M src/serialization/string_view.hpp
M src/serialization/ucs4_convert_impl.hpp
M src/serialization/unicode.cpp
M src/serialization/unicode.hpp
M src/serialization/unicode_cast.hpp
M src/server/ban.cpp
M src/server/ban.hpp
M src/server/game.cpp
M src/server/game.hpp
M src/server/metrics.cpp
M src/server/player.cpp
M src/server/player.hpp
M src/server/player_network.cpp
M src/server/send_receive_wml_helpers.ipp
M src/server/server.cpp
M src/server/server.hpp
M src/server/server_base.cpp
M src/server/simple_wml.cpp
M src/server/simple_wml.hpp
M src/show_dialog.cpp
M src/sound.cpp
M src/statistics.cpp
M src/synced_commands.cpp
M src/team.cpp
M src/team.hpp
M src/terrain/builder.cpp
M src/terrain/filter.cpp
M src/terrain/filter.hpp
M src/terrain/translation.cpp
M src/terrain/translation.hpp
M src/tests/gui/test_gui2.cpp
M src/tests/test_filesystem.cpp
M src/tests/test_formula_function.cpp
M src/tests/test_image_modifications.cpp
M src/tests/test_map_location.cpp
M src/tests/test_unit_map.cpp
M src/tests/test_whiteboard_side_actions.cpp
M src/theme.cpp
M src/theme.hpp
M src/tod_manager.cpp
M src/tracer.cpp
M src/tstring.cpp
M src/tstring.hpp
M src/units/abilities.cpp
M src/units/animation.cpp
M src/units/drawer.cpp
M src/units/drawer.hpp
M src/units/id.cpp
M src/units/id.hpp
M src/units/map.cpp
M src/units/map.hpp
M src/units/types.cpp
M src/units/udisplay.cpp
M src/units/udisplay.hpp
M src/units/unit.cpp
M src/units/unit.hpp
M src/utils/irdya_datetime.cpp
M src/utils/make_enum.hpp
M src/utils/markov_generator.cpp
M src/utils/markov_generator.hpp
M src/variable.cpp
M src/variable.hpp
M src/variable_info.cpp
M src/variable_info_private.hpp
M src/version.cpp
M src/version.hpp
M src/wesnoth.cpp
M src/wesnothd_connection.cpp
M src/whiteboard/action.cpp
M src/whiteboard/action.hpp
M src/whiteboard/attack.cpp
M src/whiteboard/attack.hpp
M src/whiteboard/manager.cpp
M src/whiteboard/manager.hpp
M src/whiteboard/mapbuilder.cpp
M src/whiteboard/mapbuilder.hpp
M src/whiteboard/move.cpp
M src/whiteboard/move.hpp
M src/whiteboard/recall.cpp
M src/whiteboard/recall.hpp
M src/whiteboard/recruit.cpp
M src/whiteboard/recruit.hpp
M src/whiteboard/side_actions.cpp
M src/whiteboard/side_actions.hpp
M src/whiteboard/suppose_dead.cpp
M src/whiteboard/suppose_dead.hpp
M src/whiteboard/utility.cpp
M src/whiteboard/utility.hpp
M src/widgets/menu.cpp
M src/widgets/menu.hpp
M src/widgets/menu_style.cpp
M src/widgets/textbox.cpp
M src/widgets/textbox.hpp
Log Message:
-----------
Use std::size_t everywhere instead of plain size_t
Excludes:
* spirit_po/
* xBRZ/
(cherry-picked from commit fc2a58f6935176b70a035d3e1c03080f79687f94)
Commit: ec4967351a2cef9b20f65f92cb9efb3d30089e86
https://github.com/wesnoth/wesnoth/commit/ec4967351a2cef9b20f65f92cb9efb3d30089e86
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/VC14/wesnoth.vcxproj
M projectfiles/VC14/wesnoth.vcxproj.filters
Log Message:
-----------
Updated VS projectfile for recent changes
[ci skip]
(cherry-picked from commit bb3d5b9a9d247c07238af9817356df0dd8fecccf)
Commit: 7eb172b7e9db180965a8608bdfc889314be51931
https://github.com/wesnoth/wesnoth/commit/7eb172b7e9db180965a8608bdfc889314be51931
Author: Sofartin <hrubymar10 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
Log Message:
-----------
Fix InfoPlist.strings encoding
(cherry-picked from commit d584ebded602a8ae5957feea2c3eb09620e87d34)
Commit: 4f97d6794b40c538088622314377e0b9be59308c
https://github.com/wesnoth/wesnoth/commit/4f97d6794b40c538088622314377e0b9be59308c
Author: Sofartin <hrubymar10 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/Xcode/README.md
M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
Log Message:
-----------
Fixed campaignd Xcode target
(cherry-picked from commit a766c00b7e79f1746c8390b0b73a76b5f4394e3e)
Commit: c04d542e554a8bc2e452e0ebb9dfff8acddfdda2
https://github.com/wesnoth/wesnoth/commit/c04d542e554a8bc2e452e0ebb9dfff8acddfdda2
Author: lundberg <gregory_lundberg at gmx.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/VC14/wesnoth.vcxproj
M projectfiles/VC14/wesnothd.vcxproj
M projectfiles/VC14/wesnothlib.vcxproj
Log Message:
-----------
Suppress upstream variable-hide-variable errors.
(cherry-picked from commit c187f069e8d0133976b3e0dafaecad2af09a8ed0)
Commit: 21b1ea778c71eecdfe6acd8b707b650e6809f466
https://github.com/wesnoth/wesnoth/commit/21b1ea778c71eecdfe6acd8b707b650e6809f466
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/hotkey/command_executor.cpp
Log Message:
-----------
Restore ability to recruit full keep of one unit by holding Ctrl+Alt+R
(cherry-picked from commit e43d1f5430f209b1c13b549e07d2ed832f7a90a7)
Commit: 934c34f42626cb808e4c5e834b7244b110012e63
https://github.com/wesnoth/wesnoth/commit/934c34f42626cb808e4c5e834b7244b110012e63
Author: Sofartin <hrubymar10 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
Log Message:
-----------
Fixed Xcode project
(cherry-picked from commit 9e73b49d867ba6c63b817979b0295669da317d59)
Commit: 42fc801e41471ea8093e6df57ca6cd3d42b9d095
https://github.com/wesnoth/wesnoth/commit/42fc801e41471ea8093e6df57ca6cd3d42b9d095
Author: Wedge009 <wedge009 at wedge009.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/VC14/campaignd.vcxproj
M projectfiles/VC14/wesnoth.vcxproj
M projectfiles/VC14/wesnoth.vcxproj.filters
M projectfiles/VC14/wesnothd.vcxproj
M projectfiles/VC14/wesnothlib.vcxproj.filters
Log Message:
-----------
Update VC project files.
* Switch libeay32 to libcrypto for OpenSSL 1.1.0 update in https://github.com/aquileia/external/
* Added recent source additions not yet present in MSVC projects.
* Miscellaneous minor tidying/sorting in filters and build configurations.
[ci skip]
(cherry-picked from commit 899b4b73b2b1819ffa41b35f7a276959e179c46e)
Commit: b58003b5f86cfa4bfa205599bfa5107cc7db588d
https://github.com/wesnoth/wesnoth/commit/b58003b5f86cfa4bfa205599bfa5107cc7db588d
Author: Sofartin <hrubymar10 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
Log Message:
-----------
Fixed Xcode Project
(cherry-picked from commit 1e96d9c87b0905cbb90c7d52f928ffe223d45301)
Commit: a082cf1493f445c1fc9ddc5f787198281c4e19f6
https://github.com/wesnoth/wesnoth/commit/a082cf1493f445c1fc9ddc5f787198281c4e19f6
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/VC14/wesnoth.vcxproj
M projectfiles/VC14/wesnoth.vcxproj.filters
Log Message:
-----------
Updated VS projectfile for 5022a38
[ci skip]
(cherry-picked from commit 6ea405174e8574bc0b64ddbc3489a3103f67ba02)
Commit: e14f712e732241495fb45bc6e0df4801b3bebe36
https://github.com/wesnoth/wesnoth/commit/e14f712e732241495fb45bc6e0df4801b3bebe36
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M INSTALL.md
Log Message:
-----------
update INSTALL.md for c++14 requirement
clang 3.8 is needed for "Money, Time, and hexfloat I/O manipulators (N2071)" (a c++11 feature)
(cherry-picked from commit 439340ce787415d9f8cb48a2ecf1280f28c63db2)
Commit: 1ab0301064ba8f3658dce014c1ff5c83687f96ee
https://github.com/wesnoth/wesnoth/commit/1ab0301064ba8f3658dce014c1ff5c83687f96ee
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/tools/addon_manager/html.py
Log Message:
-----------
wam: Update description and name for Modifications
They are no longer just for multiplayer mode (see issue #1475, commit
a09e2bb8583c6125f8c4e3157d6eba8bbd800b62).
[ci skip]
(cherry-picked from commit 39b05dd0dbc1fc14e50e7db19401651ec3eae154)
Commit: 69efae74270fc73b1e3c6159b5b6a2438e2efed8
https://github.com/wesnoth/wesnoth/commit/69efae74270fc73b1e3c6159b5b6a2438e2efed8
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/loading_screen.cpp
M src/gui/widgets/grid.hpp
M src/terrain/translation.hpp
M src/units/filter.hpp
M src/wesnothd_connection.hpp
Log Message:
-----------
Cleaned up MSVC 2013 compatibility code
We no longer support that compiler.
(cherry-picked from commit 1e9f2548a6fe83f933a4e45c398093fa6cb2746b)
Commit: ccf6998d2b0ba6a4fff4012d061cbca838826bac
https://github.com/wesnoth/wesnoth/commit/ccf6998d2b0ba6a4fff4012d061cbca838826bac
Author: Sofartin <hrubymar10 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
Log Message:
-----------
Fixed Xcode Project
(cherry-picked from commit 00dac71a9036c2bc897bb4adf3ea510dfe37ee12)
Commit: 733d8ff979769f5c169f7413b82d441087ab440b
https://github.com/wesnoth/wesnoth/commit/733d8ff979769f5c169f7413b82d441087ab440b
Author: ln-zookeeper <lari.nieminen at iki.fi>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Eastern_Invasion/scenarios/03_An_Unexpected_Appearance.cfg
Log Message:
-----------
EI S03: Changed Mal-Kallat back to male
He was changed to female in f4d67031a436 even though he's addressed as "brother" in dialogue. Reported on the forums.
(cherry-picked from commit 3be2ff518781c7a7104e810707be64567cc26e27)
Commit: fa1e37d71dd206044b45c459ddcde8daebd6ce04
https://github.com/wesnoth/wesnoth/commit/fa1e37d71dd206044b45c459ddcde8daebd6ce04
Author: Lari Nieminen <lari.nieminen at iki.fi>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Eastern_Invasion/lua/bandits.lua
Log Message:
-----------
EI: Fix Lua syntax error from 3783693cbe95
[ci skip]
(cherry-picked from commit 4d86af796ca46f204f958b712465a05bdfa0de75)
Commit: d5227d8fab5041bf3596a352567a2eb5100823c0
https://github.com/wesnoth/wesnoth/commit/d5227d8fab5041bf3596a352567a2eb5100823c0
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/gui/macros/custom_options_tree.cfg
M data/gui/macros/player_list_panel.cfg
Log Message:
-----------
Added two missing textdomain headers
[ci skip]
Should fix two of the issues mentioned in 2709.
(cherry-picked from commit 8d1ec6216bb336f29f5e213df5b1418703cdc0a0)
Commit: 3fce0c38163d4cec765e278fb07e7fa9bf0a2713
https://github.com/wesnoth/wesnoth/commit/3fce0c38163d4cec765e278fb07e7fa9bf0a2713
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/ai/contexts.cpp
M src/ai/default/recruitment.cpp
M src/display.cpp
M src/formula/function.cpp
M src/formula/variant.cpp
M src/gui/widgets/generator.cpp
M src/joystick.cpp
M src/sdl/utils.cpp
M src/tests/test_formula_function.cpp
Log Message:
-----------
Used stdlib math functions instead of global C versions
(cherry-picked from commit 410398a70b37d6cf4a75ff1e3abd43225413c9d2)
Commit: 6f1263d34dafbe15ebec2a041d78bb032f6b970e
https://github.com/wesnoth/wesnoth/commit/6f1263d34dafbe15ebec2a041d78bb032f6b970e
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/ai/formula/function_table.cpp
M src/campaign_server/campaign_server.cpp
M src/formula/function.cpp
M src/gui/dialogs/lua_interpreter.cpp
M src/scripting/game_lua_kernel.cpp
M src/wesnoth.cpp
Log Message:
-----------
Used UNUSED macro instead of (void) where applicable
(cherry-picked from commit 7a9ed8d3631cecc7053ed91b2501d6d145d7a4cd)
Commit: 1ef6c5b2c085be92de1842b37abe1772ed3efcbe
https://github.com/wesnoth/wesnoth/commit/1ef6c5b2c085be92de1842b37abe1772ed3efcbe
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/actions/move.cpp
M src/addon/client.cpp
M src/addon/manager_ui.cpp
M src/chat_events.cpp
M src/editor/map/context_manager.cpp
M src/editor/map/editor_map.cpp
M src/editor/map/map_context.cpp
M src/editor/palette/location_palette.cpp
M src/game_initialization/configure_engine.cpp
M src/game_initialization/connect_engine.cpp
M src/game_initialization/flg_manager.cpp
M src/game_initialization/lobby_data.cpp
M src/game_initialization/mp_game_utils.cpp
M src/game_initialization/multiplayer.cpp
M src/gui/core/linked_group_definition.cpp
M src/gui/core/window_builder.cpp
M src/gui/dialogs/addon/manager.cpp
M src/gui/dialogs/depcheck_confirm_change.cpp
M src/gui/dialogs/file_dialog.cpp
M src/gui/dialogs/game_load.cpp
M src/gui/dialogs/label_settings.cpp
M src/gui/dialogs/multiplayer/lobby.cpp
M src/gui/dialogs/multiplayer/mp_change_control.cpp
M src/gui/dialogs/multiplayer/mp_join_game.cpp
M src/gui/dialogs/preferences_dialog.cpp
M src/gui/widgets/chatbox.cpp
M src/gui/widgets/helper.cpp
M src/gui/widgets/unit_preview_pane.cpp
M src/hotkey/hotkey_handler.cpp
M src/hotkey/hotkey_handler_sp.cpp
M src/menu_events.cpp
M src/mp_ui_alerts.cpp
M src/playturn.cpp
M src/preferences/display.cpp
M src/synced_commands.cpp
M src/synced_user_choice.cpp
M src/units/unit.cpp
M src/whiteboard/manager.cpp
M src/wml_exception.cpp
Log Message:
-----------
Replace all instances of naked vgettext() calls with VGETTEXT()
The vgettext() function, while declared in src/formula/string_utils.hpp,
actually has its implementation out-of-line in
src/formula/string_utils.cpp where GETTEXT_TEXTDOMAIN is defined to
"wesnoth-lib". Because vgettext() is implemented in terms of the _()
function (an inline wrapper around translation::dsgettext()), it passes
the textdomain defined in the file where it was implemented as a
parameter.
This means that every case of vgettext() being used in other code units
where GETTEXT_TEXTDOMAIN is not defined to "wesnoth-lib", is broken if
the string being looked upon doesn't coincidentally exist in the
wesnoth-lib textdomain.
Ages ago, to work around this limitation, an overload of vgettext() that
takes the textdomain name as a parameter was introduced (see commit
0ba3d05204abff72f7d95cf11a91536dab5aa20a). Since this form of vgettext()
is rather unwieldy to use (and in particular, the xgettext message
extraction tool mistakes the first argument for the msgid, see below), a
VGETTEXT() macro was also added that uses the GETTEXT_TEXTDOMAIN symbol
defined in the file where the call is made, and thus we get the correct
string from the correct textdomain.
Switching all cases of naked vgettext() in mainline to VGETTEXT() fixes
a myriad of situations where an interpolated string that has an extant
translation does not actually get translated in practice because of the
mismatched textdomain reference (see issue #2709 for an example with MP
game titles). I couldn't find any cases of the companion vngettext()
function (which handles plurals) being used in the wild naked, but for
future reference it also has a companion VNGETTEXT() macro to pass the
correct textdomain to its textdomain-parameter overload.
One caveat is that this commit DOES break the string freeze in one
particular case -- src/units/unit.cpp has a case where the
textdomain-parameter version of naked vgettext() was in use with
"wesnoth" as the first parameter, and xgettext misidentified this as a
translation entry for a "wesnoth" string in the file's assigned
textdomain (which is the default textdomain, wesnoth). So this will
result in the next pot-update both removing the spurious "wesnoth"
string AND adding the correct string to the relevant catalogue template
("<span color=\"$color\">$number_or_percent</span> HP").
to that textdomain.
Other than that, I believe this does not break the string freeze in any
other fashion and it shouldn't result in any regressions for i18n.
It might be worth considering in the future renaming vgettext() and
vngettext() to names that make people less likely to misidentify them as
functions they can freely call directly without regard to the textdomain
assignment issue.
(cherry-picked from commit c5b3947e4a837dc98868e3b2c3fa55668fec27a4)
Commit: dfc7c41cb6137c1be84650e641d4e84b8305d2e7
https://github.com/wesnoth/wesnoth/commit/dfc7c41cb6137c1be84650e641d4e84b8305d2e7
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/formula/string_utils.hpp
Log Message:
-----------
i18n: Forcefully pull gettext.hpp into formula/string_utils.hpp
There are cases (deprecation.cpp for one) where string_utils.hpp is
included first, which causes the VGETTEXT/VNGETTEXT definition to use
the textdomain-less (a.k.a. forced wesnoth-lib textdomain) overloads of
vgettext() and vngettext(), because GETTEXT_DOMAIN has not yet been
defined by anything. This again results in strings being looked up in
catalogues where xgettext is not adding them.
This is a companion for PR #2711 I should've noticed sooner. Without it,
there were still cases where interpolated strings would not be
translated due to vgettext() using the wrong textdomain for them.
I ran a quick scan on the codebase to make sure there aren't any files
including formula/string_utils.hpp before defining their own
GETTEXT_DOMAIN instead of the gettext.hpp default.
(cherry-picked from commit 5c28dcaab66e34af718c7ceff6ccc9e33b58b039)
Commit: 824f8363af7761c5995cc44c029bcd29da4b5694
https://github.com/wesnoth/wesnoth/commit/824f8363af7761c5995cc44c029bcd29da4b5694
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/formula/string_utils.hpp
Log Message:
-----------
i18n: Make VGETTEXT()/VNGETTEXT() always require a GETTEXT_DOMAIN to be defined
This drops a preprocessor conditional branch that is dead code now that
the file pulls gettext.hpp and the GETTEXT_DOMAIN defaults with it.
See also PR #2711.
(cherry-picked from commit a60239116863ea7592d27f2819017b57a34e0ce5)
Commit: a9fc823845b665e8a8172a20b9b0a234606133cd
https://github.com/wesnoth/wesnoth/commit/a9fc823845b665e8a8172a20b9b0a234606133cd
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gettext.hpp
M src/gettext_boost.cpp
M src/tests/utils/game_config_manager.cpp
M src/wesnoth.cpp
Log Message:
-----------
i18n: Remove no-op translation::init() function
This function only ever had an implementation when building the i18n API
to use libintl instead of Boost.Locale was possible, in which case its
implementation would be a std::setlocale() call specific to POSIX
systems.
I'm not backporting this to 1.14 since it's an inconsequential cosmetic
thing, or so I'd like to think. Last time someone tried to remove a
similarly empty "init" function elsewhere, things went south pretty
quickly.
(cherry-picked from commit 94c5f64cc62452f420a9886eefc75d5e4af121fc)
Commit: ecc0e8a36dd4a86aa6c610ecb547b5bc28256179
https://github.com/wesnoth/wesnoth/commit/ecc0e8a36dd4a86aa6c610ecb547b5bc28256179
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Update the changelog
[ci skip]
(cherry-picked from commit 9d76278e71375257d528df91e82a6156b61f5a45)
Commit: 2e76d2fe403604f25f81baf6358d93797608a4c3
https://github.com/wesnoth/wesnoth/commit/2e76d2fe403604f25f81baf6358d93797608a4c3
Author: pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M utils/travis/steps/script.sh
Log Message:
-----------
Remove debugging symbols from Travis xcode build.
This removes the -g option from the xcode travis build, since debugging information isn't needed and the increased size was causing the cache to timeout when compressing and uploading it. ccache max cache size is also decreased from 2 GBs to 200 MBs, which matches the linux+cmake builds. Fixes #2670.
(cherry-picked from commit b801140344c7cbf86980ff54ef963f9ec2122897)
Commit: c41d0ff7bf186a6bb5f1a95bcf439d683df872e3
https://github.com/wesnoth/wesnoth/commit/c41d0ff7bf186a6bb5f1a95bcf439d683df872e3
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/multiplayer/mp_create_game.cpp
Log Message:
-----------
MP Create Game: attempt to fix RFM type labels being untranslated (#2709)
Since these are defined in their MAKE_ENUM enum with N_, we need to manually un-not-translate
them here.
(cherry-picked from commit 2e502334f23447609e2553cbbbae8b251f9796bc)
Commit: a386e1a6a3ad41f41c897a3c0ff3b013f1b22649
https://github.com/wesnoth/wesnoth/commit/a386e1a6a3ad41f41c897a3c0ff3b013f1b22649
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/controller_base.cpp
M src/editor/controller/editor_controller.cpp
M src/editor/map/context_manager.cpp
M src/editor/palette/editor_palettes.cpp
M src/game_events/action_wml.cpp
M src/game_events/wmi_manager.cpp
M src/gui/dialogs/addon/manager.cpp
M src/gui/dialogs/campaign_selection.cpp
M src/gui/dialogs/multiplayer/faction_select.cpp
M src/gui/dialogs/multiplayer/mp_create_game.cpp
M src/gui/dialogs/multiplayer/mp_staging.cpp
M src/gui/dialogs/preferences_dialog.cpp
M src/gui/dialogs/statistics_dialog.cpp
M src/hotkey/hotkey_handler.cpp
M src/theme.cpp
Log Message:
-----------
Cleaned up unnecessary instances of emplace_back(config {})
No need to invoke the copy ctor.
(cherry-picked from commit c2fd4f48f912c48e71382c61e4012ec7fae2f930)
Commit: aa1c926065a5f8d8ecd08d918b31fa2bb71eb733
https://github.com/wesnoth/wesnoth/commit/aa1c926065a5f8d8ecd08d918b31fa2bb71eb733
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M players_changelog.md
M po/wesnoth-help/es.po
M po/wesnoth-httt/es.po
M po/wesnoth-lib/es.po
M po/wesnoth-multiplayer/es.po
M po/wesnoth-sof/es.po
M po/wesnoth-sota/es.po
M po/wesnoth-tb/es.po
M po/wesnoth-trow/es.po
M po/wesnoth-tsg/es.po
M po/wesnoth-units/es.po
M po/wesnoth/es.po
Log Message:
-----------
updated Spanish translation
(cherry-picked from commit 0bab3fb4d385a326c79bc1f0a27afe399a481d37)
Commit: 5a017b5ef1cc4c232f1d120067ccf6e5795f979d
https://github.com/wesnoth/wesnoth/commit/5a017b5ef1cc4c232f1d120067ccf6e5795f979d
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/display.cpp
M src/generators/cave_map_generator.hpp
Log Message:
-----------
0 -> nullptr in 2 places
(cherry-picked from commit 3be39a98fe753123ae4685d124876e7a7eb93160)
Commit: 0c69e40d52d98ad1288670396d8cc1ef195d5c59
https://github.com/wesnoth/wesnoth/commit/0c69e40d52d98ad1288670396d8cc1ef195d5c59
Author: pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/macros/deprecated-utils.cfg
M data/core/units.cfg
R data/core/units/dunefolk/deprecated.cfg
Log Message:
-----------
Remove deprecated Khalifate references.
(cherry-picked from commit 994e6efa796681e0952d4aeb623adcf3cf75d1ef)
Commit: 55ec77b7c4f143178e0ba2d418f423c3467ac308
https://github.com/wesnoth/wesnoth/commit/55ec77b7c4f143178e0ba2d418f423c3467ac308
Author: pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/units.cfg
Log Message:
-----------
Add the updated Dunefolk race description.
See: https://forums.wesnoth.org/viewtopic.php?f=32&t=47721&start=375#p624668
[ci skip]
(cherry-picked from commit 3b5cbc3e3c5e7529412ba38e64145b9303474da3)
Commit: 14089528e79e6013050030f6abb178b016f6fcfe
https://github.com/wesnoth/wesnoth/commit/14089528e79e6013050030f6abb178b016f6fcfe
Author: pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
R utils/travis/exit_wrapper.sh
R utils/travis/install_deps.sh
M utils/travis/steps/install.sh
R utils/travis/test_wrapper.sh
Log Message:
-----------
Removes a couple scripts that are not used.
utils/travis/install_deps.sh - no longer executes anything outside of the osx if block.
utils/travis/exit_wrapper.sh - I honestly don't know why this exists.
utils/travis/test_wrapper.sh - No longer used as of 7ca5a0df6449b4b895842566d33a38872f1f507e.
(cherry-picked from commit 344b5c56b90cffcbc9638bcb7535bb3e0f073da7)
Commit: 5e386ef43b7ef5200dea0f2781a37d551a930073
https://github.com/wesnoth/wesnoth/commit/5e386ef43b7ef5200dea0f2781a37d551a930073
Author: pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M utils/travis/check_utf8.sh
M utils/travis/docker_run.sh
M utils/travis/steps/script.sh
M utils/travis/utf8_bom_dog.sh
Log Message:
-----------
Make UTF8 checks fail the build if they find anything.
Also fixes a comment typo in docker_run.sh.
(cherry-picked from commit c456d4b288ca6df59cca3663c10131f2c75e8574)
Commit: 660aacb10a1154f0b368990421f4a67ed990b922
https://github.com/wesnoth/wesnoth/commit/660aacb10a1154f0b368990421f4a67ed990b922
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/multiplayer/mp_create_game.cpp
M src/mp_game_settings.hpp
Log Message:
-----------
Use the correct textdomain for the random faction mirror options
Fixes up commit 2e502334f23447609e2553cbbbae8b251f9796bc.
See issue #2709.
(cherry-picked from commit 5c59fade0f96d75e306d48cf3a2448602ae29c7c)
Commit: 777eb9ef2d5ede52b0ab5041bdb3dd165898065d
https://github.com/wesnoth/wesnoth/commit/777eb9ef2d5ede52b0ab5041bdb3dd165898065d
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M CMakeLists.txt
M INSTALL.md
M SConstruct
Log Message:
-----------
Revert "Bump min Boost version to 1.56.0"
This reverts commit c82c1ff9059aa19adda6a527f41595a18b8c0a1f.
(cherry-picked from commit cdf9b465c668648721c4638ce117da130ad36284)
Commit: d0c9a021893c76d0d045693d6886d111fad15da6
https://github.com/wesnoth/wesnoth/commit/d0c9a021893c76d0d045693d6886d111fad15da6
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M CMakeLists.txt
M INSTALL.md
M SConstruct
Log Message:
-----------
Revert "Revert "Bump min Boost version to 1.56.0""
This reverts commit cdf9b465c668648721c4638ce117da130ad36284.
May this noise be my vengeance.
(cherry-picked from commit f6a128579ad6d94cc7c8a57bebd1fc2bb0f735a0)
Commit: ca150a91291db610a08ff8b78522e3bbcbea8612
https://github.com/wesnoth/wesnoth/commit/ca150a91291db610a08ff8b78522e3bbcbea8612
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/VC14/campaignd.vcxproj
M projectfiles/VC14/wesnoth.vcxproj
M projectfiles/VC14/wesnothd.vcxproj
M projectfiles/VC14/wesnothlib.vcxproj
M src/formula/tokenizer.cpp
M src/generic_event.cpp
M src/halo.cpp
M src/scripting/lua_common.cpp
M src/sdl/utils.cpp
M src/server/send_receive_wml_helpers.ipp
Log Message:
-----------
Visual Studio: increased warning level to /W4 even for release builds
In particular, this enables C4100, the warning for unreferenced function
parameters.
I also fixed some /W4 warnings.
(cherry-picked from commit d4c9db9e3529434bf29a4ed237bc64e67f868f45)
Commit: d0c76505b9904f8cc29953c630d8e6563f463932
https://github.com/wesnoth/wesnoth/commit/d0c76505b9904f8cc29953c630d8e6563f463932
Author: Sofartin <hrubymar10 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
Log Message:
-----------
Fixed Xcode Project after 5ece7ac5b71032ec2c6f9bccb57be9a0a863c5ba
(cherry-picked from commit 29b12782a82be70965faf38bfffa2aeacc1ac0ac)
Commit: 7a8009472419826b56f19be678c23a57146e5f79
https://github.com/wesnoth/wesnoth/commit/7a8009472419826b56f19be678c23a57146e5f79
Author: newfrenchy83 <31768074+newfrenchy83 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/CodeBlocks/wesnothd.cbp
Log Message:
-----------
Update wesnothd.cbp
(cherry-picked from commit 67f2ba9767e659d9e6589b1279d8eb5e6c5fd2af)
Commit: 751a697093600c7654ef566210cf5c048dcaccaa
https://github.com/wesnoth/wesnoth/commit/751a697093600c7654ef566210cf5c048dcaccaa
Author: Sofartin <hrubymar10 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/Xcode/Fix_Xcode_Dependencies
M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
Log Message:
-----------
Add new unit_tests dependencies
(cherry-picked from commit 00e9f4482feecc21ffa88f1a0f8e24f6160f007c)
Commit: 6aaf275a4e7b5d5ab18908f6495b5db5d81b2576
https://github.com/wesnoth/wesnoth/commit/6aaf275a4e7b5d5ab18908f6495b5db5d81b2576
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/game_events/manager_impl.cpp
Log Message:
-----------
Don't show a message for missing name in [event] if it has an id
(cherry-picked from commit e317f346e8d9c4363075532efb762cc42646d42f)
Commit: e92c97c18b3f9fc53865c5524ee1ed01f2f31b4e
https://github.com/wesnoth/wesnoth/commit/e92c97c18b3f9fc53865c5524ee1ed01f2f31b4e
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/game_events/manager_impl.cpp
Log Message:
-----------
Don't bother trying to standardize event name if there isn't one
(cherry-picked from commit f7cc1842bb630bd8c642ea025124ddbfa1c57433)
Commit: d422f2172c1daa57d2bd59927c7aa6f62726f1d1
https://github.com/wesnoth/wesnoth/commit/d422f2172c1daa57d2bd59927c7aa6f62726f1d1
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/game_events/manager_impl.cpp
Log Message:
-----------
Fixup last commit
(cherry-picked from commit cf385537c234f00e34dc9892b0acd6ecf302aea5)
Commit: 2220078c65349693d1d69cdb26a53a2941badb1e
https://github.com/wesnoth/wesnoth/commit/2220078c65349693d1d69cdb26a53a2941badb1e
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/game_events/manager.cpp
M src/game_events/manager.hpp
M src/gui/dialogs/gamestate_inspector.cpp
Log Message:
-----------
Add ability to bypass strict no-disabled-events assertion when writing events
This is since the Gamestate Inspector can be invoked mid-event (using [inspect])
and it makes use of write_events().
(cherry-picked from commit afaa75842c8914406bed75d3557ec241b0de9b6a)
Commit: 0b6e87742fa2339291ca39b7206378922e671ae6
https://github.com/wesnoth/wesnoth/commit/0b6e87742fa2339291ca39b7206378922e671ae6
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/game_initialization/create_engine.cpp
Log Message:
-----------
fix initial selection of mods in sp
(cherry-picked from commit da2081de7713b1c19b2be268e8dd0a48e898bf1c)
Commit: 1e0c357612dff8fc315b74fc65b228b346b9c10d
https://github.com/wesnoth/wesnoth/commit/1e0c357612dff8fc315b74fc65b228b346b9c10d
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/play_controller.hpp
M src/synced_commands.cpp
Log Message:
-----------
show the oos savegame dialog when receiving a debug command in mp
with a different text of course.
fixes #2683
(cherry-picked from commit 7621af926b1bd1343c48be8c6dd821b3f1778c26)
Commit: 48fee80ac662a9e94d0b9a9ff705ca2c15372db2
https://github.com/wesnoth/wesnoth/commit/48fee80ac662a9e94d0b9a9ff705ca2c15372db2
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/utils/abilities.cfg
Log Message:
-----------
remove a [on_redo]
since it was removed in 10561d3e539e6c92aa99d164bbe5bb106c7f35fd this will cause errors. Please make sure it is not used in mainline before you remove something.
(cherry-picked from commit 83007d4825c0a9daca158ec821da34c8968b7536)
Commit: 09ebf302e093b027c6d242fcac2c02f39e0ba388
https://github.com/wesnoth/wesnoth/commit/09ebf302e093b027c6d242fcac2c02f39e0ba388
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/game_initialization/multiplayer.cpp
Log Message:
-----------
Fixed infinite loading screen when logging in with an invalid nickname
Fixes #2728.
(cherry-picked from commit e4b7820ab094fa3847bd8b47fdaca376b4c5ad2b)
Commit: 9a8462eff7886a091b8d29348c58cdd10660d8e9
https://github.com/wesnoth/wesnoth/commit/9a8462eff7886a091b8d29348c58cdd10660d8e9
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Eastern_Invasion/lua/bandits.lua
Log Message:
-----------
EI: fixed another Lua syntax error from 3783693cbe95
[ci skip]
I misread the intent of that line in the original. It was supposed to clear the
var, not set it.
(cherry-picked from commit bad574f7c8f6106e6879c14318f3fcf0ec4cc2bf)
Commit: 0c0df08e623100a0461e4862a35f809988d60ddd
https://github.com/wesnoth/wesnoth/commit/0c0df08e623100a0461e4862a35f809988d60ddd
Author: pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M .travis.yml
Log Message:
-----------
Explicitly set osx_image for osx+scons job.
This is the current default, and even though the job uses scons this also sets the osx version to use. Therefore it's better to set it explicitly in case the default changes at some point.
(cherry-picked from commit 376f2e9dbe562c21671f88e8f3ef932b003a7fb5)
Commit: 66ad6568058fedba796dad15e16bb37b3213be54
https://github.com/wesnoth/wesnoth/commit/66ad6568058fedba796dad15e16bb37b3213be54
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
A fonts/OldaniaADFStd-Bold.otf
A fonts/OldaniaADFStd-BoldItalic.otf
A fonts/OldaniaADFStd-Italic.otf
M fonts/OldaniaADFStd-Regular.otf
Log Message:
-----------
Updated Oldania font files to version 1.007 (FFEdit)
[ci skip]
Source: http://arkandis.tuxfamily.org/adffonts.html. Previous version was 1.006 (FFEdit).
Also includes the italic and bold variants we didn't have before.
Thanks to @sevu for finding this updated version. :)
(cherry-picked from commit cef0edb4ac02e9cbb3c7044466f9655a1e66278f)
Commit: d2a465a126a1db164f53b210c2637c5a79d2387b
https://github.com/wesnoth/wesnoth/commit/d2a465a126a1db164f53b210c2637c5a79d2387b
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/lua/wml-conditionals.lua
Log Message:
-----------
Support formula= in [variable] ConditionalWML
(cherry-picked from commit 4e52d62963b10c26f33bccfcbad758c0072da393)
Commit: aeb48e82b8779cd037e81c4a8e497da47a358b61
https://github.com/wesnoth/wesnoth/commit/aeb48e82b8779cd037e81c4a8e497da47a358b61
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Update changelog
(cherry-picked from commit 7a1ea36d3943050bd26072ed8d1cabb7aca2f6eb)
Commit: 435dcbaad9fabad42ad476cdf21f6544d0e56320
https://github.com/wesnoth/wesnoth/commit/435dcbaad9fabad42ad476cdf21f6544d0e56320
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M fonts/DejaVuSans-Bold.ttf
M fonts/DejaVuSans-Oblique.ttf
M fonts/DejaVuSans.ttf
M fonts/DejaVuSansMono-Bold.ttf
M fonts/DejaVuSansMono.ttf
Log Message:
-----------
Updated DejaVu Sans font files to version 2.37 (from 2.35)
[ci skip]
Source: https://dejavu-fonts.github.io/Download.html
I haven't done any codepoint list updates in data/hardwired/fonts.cfg, but that's
not relevant anymore since it's for the legacy TTF rendering system which is in
the process of being removed.
(cherry-picked from commit 11e88dd1caf22af0d65a1785ff8e972f6a99270d)
Commit: 02b698715833dabcc2f8f6e60df94196e254ede5
https://github.com/wesnoth/wesnoth/commit/02b698715833dabcc2f8f6e60df94196e254ede5
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M data/lua/wml/move_unit.lua
Log Message:
-----------
Support to_location in [move_unit]
(cherry-picked from commit 1dd411a84eb6a45c81d14359aaaec7af34351a39)
Commit: 82f728abd073cbad7462ee701f4ba7538c18b216
https://github.com/wesnoth/wesnoth/commit/82f728abd073cbad7462ee701f4ba7538c18b216
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/widgets/unit_preview_pane.cpp
Log Message:
-----------
gui2/unit_attack: Fix alignments being displayed in English
Part of issue #2732.
(cherry-picked from commit 7056ae014ced381cec3e1fdd86a268749bb83562)
Commit: ca2368edd1b1b13c53d820482d726d95db89d5b7
https://github.com/wesnoth/wesnoth/commit/ca2368edd1b1b13c53d820482d726d95db89d5b7
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/widgets/unit_preview_pane.cpp
Log Message:
-----------
gui2/unit_attack: Fix damage types and ranges being displayed in English
Part of issue #2732.
(cherry-picked from commit 84ce75af191590823033f3186213f1b39375934c)
Commit: b132db160259e9c5a3b6d8e545c7620eaccdbe53
https://github.com/wesnoth/wesnoth/commit/b132db160259e9c5a3b6d8e545c7620eaccdbe53
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/about_i18n.cfg
Log Message:
-----------
Update credits
[ci skip]
(cherry-picked from commit 3c6bb665c6bd6686eeee2711534ee52fcd65ce5a)
Commit: 4d28725441ec21bb6d4398b3db2e1be006cd8aeb
https://github.com/wesnoth/wesnoth/commit/4d28725441ec21bb6d4398b3db2e1be006cd8aeb
Author: newfrenchy83 <31768074+newfrenchy83 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/CodeBlocks/wesnoth.cbp
Log Message:
-----------
Update wesnoth.cbp
(cherry-picked from commit f8abea0de496cdde1da854151a26b570fea06144)
Commit: cf606d23f3539517580e8308b8872526611e4a18
https://github.com/wesnoth/wesnoth/commit/cf606d23f3539517580e8308b8872526611e4a18
Author: Martin Hrubý <hrubymar10 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/Xcode/Fix_Xcode_Dependencies
M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
M src/build_info.cpp
M src/desktop/apple_notification.mm
Log Message:
-----------
Drop OS X 10.7 and Growl support (#2749)
(cherry-picked from commit 39d1476ade2a438c783ee0570a51db12da30b33e)
Commit: adda2d3062f7de0527a43a930dcd43ccf26a212d
https://github.com/wesnoth/wesnoth/commit/adda2d3062f7de0527a43a930dcd43ccf26a212d
Author: Hironori Fujimoto <broadbarredfirefish at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/widgets/text_box_base.cpp
Log Message:
-----------
Turn ime_in_progress_ off when composition text is nothing
(cherry-picked from commit 16a8ac7e4956bdf236b518e42913af1ae7360cbf)
Commit: 60f00b4a694fad05a29b093034a954975d577437
https://github.com/wesnoth/wesnoth/commit/60f00b4a694fad05a29b093034a954975d577437
Author: Hironori Fujimoto <broadbarredfirefish at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/widgets/text_box_base.cpp
M src/gui/widgets/text_box_base.hpp
Log Message:
-----------
Remove private member 'ime_length_'
In order to get length of composition text, just compare text_ and
text_cached
(cherry-picked from commit 5e22b2b714d58b7f6041c323b0e4c9c7e02bc0b1)
Commit: db183b331a2d1451256fff576207f09a83e7e187
https://github.com/wesnoth/wesnoth/commit/db183b331a2d1451256fff576207f09a83e7e187
Author: Hironori Fujimoto <broadbarredfirefish at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/widgets/text_box_base.cpp
Log Message:
-----------
Use is_composing() instead of raw ime_in_progress_
(cherry-picked from commit 6212a62a985b60110a7350ed28bfb0601cc1d0b8)
Commit: 9bb1168a6b700c7df122a804793d40d76f0b25d0
https://github.com/wesnoth/wesnoth/commit/9bb1168a6b700c7df122a804793d40d76f0b25d0
Author: Hironori Fujimoto <broadbarredfirefish at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/widgets/text_box_base.cpp
M src/gui/widgets/text_box_base.hpp
Log Message:
-----------
Rename variable so that it's role becomes clearly
(cherry-picked from commit 6b98bbdca125a748bc4eafb5f54394d0f14a7177)
Commit: 7c13c40e1a21a54567eff308cdcdde22ecbca203
https://github.com/wesnoth/wesnoth/commit/7c13c40e1a21a54567eff308cdcdde22ecbca203
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/controller_base.hpp
M src/playmp_controller.cpp
M src/playmp_controller.hpp
M src/playturn.cpp
M src/playturn.hpp
M src/playturn_network_adapter.cpp
M src/playturn_network_adapter.hpp
Log Message:
-----------
fix chat during [delay] and animations
fixes #1856
(cherry-picked from commit 274da80788b3ec1c2517a9ed305d796d688382d3)
Commit: a4c1a7f659a89ac1a8a200a556e7519b55bea948
https://github.com/wesnoth/wesnoth/commit/a4c1a7f659a89ac1a8a200a556e7519b55bea948
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/playmp_controller.cpp
Log Message:
-----------
fix moves sometimes not undone when control is changed.
with the 'fix chat not working during delay/animation' it could happen
that play_slice_catch would process a incoming controller change in
which case that while loop would end without the code inside that 'if
(player_type_changed_)' being executed, which woudl lead to oos errors
since that client woudl have made moves that other players don't have.
(cherry-picked from commit 94aa24c5a80076feb16018e1e7939622934a3a29)
Commit: cd622afb0f8176e6afb5820f7befb0810d60f0ee
https://github.com/wesnoth/wesnoth/commit/cd622afb0f8176e6afb5820f7befb0810d60f0ee
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/playmp_controller.cpp
Log Message:
-----------
fix playmp_controller reading later network packages
in linger mode.
playmp_controller::play_linger_turn calls play_slice after processing
end_linger/[notify_next_scenario] which would (after 'fix chat in
[delay]' commit) then read more data from the network in particular data
for the next scenario which will then be lost.
(cherry-picked from commit f219b527e4b5b83dade346a2091e45380c0961ef)
Commit: 717511a42864afba9dd50e89b898308d2fb176f6
https://github.com/wesnoth/wesnoth/commit/717511a42864afba9dd50e89b898308d2fb176f6
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/gui/window/mp_login.cfg
M src/game_initialization/multiplayer.cpp
M src/gui/dialogs/multiplayer/mp_login.cpp
Log Message:
-----------
MP Login: removed Password Reminder functionality
Resolves #2748.
Essentially, all this did was tell users to go use the forum, so it wasn't worth
it to keep it and solve the infinite loading screen issues it was causing.
The server backend still needs to be cleaned up.
Also removed a dead reference to some "Change Username" button in the Login dialog's
code.
(cherry-picked from commit ebec4d6ce8fd8e46ce1d8a4bb4f5d04fddd87c72)
Commit: 122976bef0964c590a21d67419d6586c7d3b0578
https://github.com/wesnoth/wesnoth/commit/122976bef0964c590a21d67419d6586c7d3b0578
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/server/forum_user_handler.cpp
M src/server/forum_user_handler.hpp
M src/server/sample_user_handler.cpp
M src/server/sample_user_handler.hpp
M src/server/server.cpp
M src/server/user_handler.hpp
Log Message:
-----------
wesnothd: removed password reminder backend (closes #2753)
(cherry-picked from commit e52682e07b74e63cdcc670a9b6113f6c8934e86b)
Commit: ebb980a45e7cc94376a7d008038a465627983f66
https://github.com/wesnoth/wesnoth/commit/ebb980a45e7cc94376a7d008038a465627983f66
Author: newfrenchy83 <31768074+newfrenchy83 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M src/actions/attack.cpp
M src/actions/attack.hpp
M src/gui/dialogs/attack_predictions.cpp
M src/reports.cpp
M src/units/abilities.cpp
M src/units/unit.cpp
M src/units/unit.hpp
Log Message:
-----------
Implement [filter_weapon] in leadership and resistance abilities
Closes #2718
(cherry-picked from commit 76c2cbac46a6417bf15a52ce3c6589c0c3954c74)
Commit: c27082b459bc915cf3c6e1c53c611ed86bab0da1
https://github.com/wesnoth/wesnoth/commit/c27082b459bc915cf3c6e1c53c611ed86bab0da1
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/attack_predictions.cpp
Log Message:
-----------
Fixup 76c2cbac46a6417
Using assignment is for 1.14. We can use `boost::optional::emplace` here on master.
(cherry-picked from commit 46598681b61d1c85b665ca902648b9d587903894)
Commit: c023f7b222a6b4ec17094d6f5682814930be045f
https://github.com/wesnoth/wesnoth/commit/c023f7b222a6b4ec17094d6f5682814930be045f
Author: Celtic Minstrel <CelticMinstrel at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/lua/wml/move_unit.lua
Log Message:
-----------
Fix typo in 1dd411a84eb6a45c81d14359aaaec7af34351a39
(cherry-picked from commit 4427ee19362bc739a51945b9f2b2eec59de7010c)
Commit: d7d3bc692b8eebdf55d462e265df3169f82c3776
https://github.com/wesnoth/wesnoth/commit/d7d3bc692b8eebdf55d462e265df3169f82c3776
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M INSTALL.md
Log Message:
-----------
remove outdated information from install.md
[ci skip]
(cherry-picked from commit 409c596fa134decdccc9d703468e2ce8d8b81c1e)
Commit: 01316312201b27895d597e0ffce17adbefbc8421
https://github.com/wesnoth/wesnoth/commit/01316312201b27895d597e0ffce17adbefbc8421
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M data/lua/wml/random_placement.lua
Log Message:
-----------
Allow WFL for [random_placement]num_items=
(cherry-picked from commit e4a2c141776124c4e0b16677265c4623a4a02aad)
Commit: d72612443f7d9d1a353c1a03f0e3984670f5812e
https://github.com/wesnoth/wesnoth/commit/d72612443f7d9d1a353c1a03f0e3984670f5812e
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M data/lua/wml/random_placement.lua
Log Message:
-----------
Allow percentages in [random_placement]num_items=
(cherry-picked from commit 229d2f04831fc75a154b5b718c7d308fb3d81217)
Commit: 31320923bfca7e1a2c64109a7fc97cb7420d265c
https://github.com/wesnoth/wesnoth/commit/31320923bfca7e1a2c64109a7fc97cb7420d265c
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/gui/schema.cfg
M src/gui/core/canvas.cpp
M src/gui/core/canvas_private.hpp
Log Message:
-----------
GUI2/Canvas: allow formula values for [text] font_size=
(cherry-picked from commit 2b9c7b1abd7f881953552dac49d68f2aa5cf2525)
Commit: e0b35791e2ba15c0ca1fca850793b04c79c82d93
https://github.com/wesnoth/wesnoth/commit/e0b35791e2ba15c0ca1fca850793b04c79c82d93
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/gui/macros/_initial.cfg
M data/gui/schema.cfg
M data/gui/widget/text_box_default.cfg
M data/gui/window/addon_manager.cfg
M data/gui/window/chat_log.cfg
M data/gui/window/game_load.cfg
M data/gui/window/lobby_main.cfg
M data/gui/window/mp_create_game.cfg
M data/gui/window/unit_create.cfg
M data/gui/window/unit_recall.cfg
M src/gui/widgets/text_box.cpp
M src/gui/widgets/text_box.hpp
Log Message:
-----------
GUI2/Text Box: refactored hint text interface
Previously, I had implemented the hint text ("Search)" and image (the magnifying glass)
as a custom text box definition. This caused some problems, though. Since the string was
hard-coded as part of a WFL formula, it couldn't be translated (see #2709 and #2732). It
also wasn't expandable to any other usecase.
Instead, I've added two new hint_text= and hint_image= keys to [text_box], wrapped the
"Search" text and magnifying image path in a helper macro, and refactored the default
definition to display the hint text and image when appropriate.
This also fixes a minor issue where selected text wouldn't remain highlighted when the
box wasn't focused when using the filter definition (it did with the default one).
This should fix the untranslatable "Search" text issue mentioned in both issues above.
The new string is in the wesnoth-lib textdomain.
(cherry-picked from commit db5abb7e637fd87699fce49a9543faafc3f58068)
Commit: 3f98bdb04b7991824f62690718712b232cb3438a
https://github.com/wesnoth/wesnoth/commit/3f98bdb04b7991824f62690718712b232cb3438a
Author: lundberg <gregory_lundberg at gmx.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/VC14/campaignd.vcxproj
M projectfiles/VC14/wesnoth.vcxproj
M projectfiles/VC14/wesnothd.vcxproj
M projectfiles/VC14/wesnothlib.vcxproj
Log Message:
-----------
Fix VC warnings about upstream issues
Disable some warnings pertaining to Boost issues such as name-hides-global.
(cherry-picked from commit a8539cfca0cfd5c79430f430b6f6256987e37c28)
Commit: 6e59f4a8004da2baf9660a2bfe356f6d62a341ae
https://github.com/wesnoth/wesnoth/commit/6e59f4a8004da2baf9660a2bfe356f6d62a341ae
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/help/help_topic_generators.cpp
Log Message:
-----------
Help: marked "Level" string in unit topic description translatable
I apparently forgot to do this at some point... Fixes one of the issues mentioned in #2732.
(cherry-picked from commit 0a67e9725c02989ed625d527725a5accec4dbdce)
Commit: 06751ff697c1482a8128a0e9a06014cedadcd213
https://github.com/wesnoth/wesnoth/commit/06751ff697c1482a8128a0e9a06014cedadcd213
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M INSTALL.md
Log Message:
-----------
install.md: cmake version requirement had changed
[ci skip]
(cherry-picked from commit e0c9d7b9f6479fe028a7613b5f5148ab3b3d4bf6)
Commit: 3fbeb809e729747e7f03ba31f9c4ea8ab4781950
https://github.com/wesnoth/wesnoth/commit/3fbeb809e729747e7f03ba31f9c4ea8ab4781950
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/synced_commands.cpp
Log Message:
-----------
Let synced debug command notifications be localized, fix them up a bit
There's a gettext call but there was nothing to mark the strings as
translatable in xgettext's view. Additionally, fixed a minor case of
missing the colon before the command name, replaced ASCII apostrophes,
and rewrote a notification with awkward wording.
(cherry-picked from commit ab67b402d1449384c12564e6a6a1d79a4bfb7e14)
Commit: c97251921a84b813f22f57b083e4ee05ed0d54bb
https://github.com/wesnoth/wesnoth/commit/c97251921a84b813f22f57b083e4ee05ed0d54bb
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/savegame.cpp
M src/savegame.hpp
M src/synced_commands.cpp
Log Message:
-----------
Set a custom dialog caption for the synced debug command prompt
This replaces the caption with something more apropos than the generic
"Save Game" caption. It necessitates a minor API change though.
(cherry-picked from commit b7e08977edd703ad9f146fd81768b2f09c39facd)
Commit: bb95a35c3a3c3539419ac08d87c3ae63cd16f466
https://github.com/wesnoth/wesnoth/commit/bb95a35c3a3c3539419ac08d87c3ae63cd16f466
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/synced_commands.cpp
Log Message:
-----------
New translatable version of the synced debug command prompt text
(cherry-picked from commit cbec739e238a603e579131016fc0d7c918ba1095)
Commit: 140c077b6c0adcccded5bdab92ed31d1aace96c1
https://github.com/wesnoth/wesnoth/commit/140c077b6c0adcccded5bdab92ed31d1aace96c1
Author: lundberg <gregory_lundberg at gmx.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/VC14/campaignd.vcxproj
Log Message:
-----------
Fix missing VC project options
campaignd project did not inherit warning supression for simple_wml from project/solution options.
(cherry-picked from commit 8b7eb536ebb34eb8915cd409d8917e1a2398f3f4)
Commit: ddc2ba4a00664c2da98409ab2c494caecc3db387
https://github.com/wesnoth/wesnoth/commit/ddc2ba4a00664c2da98409ab2c494caecc3db387
Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M .gitignore
Log Message:
-----------
Add fonts.uuid to .gitignore for fontconfig 2.13.0
(cherry-picked from commit 49ecb08338be1987250a2f6c6ca2b3f5fd13b9a1)
Commit: 46eadd7264f59f438d7d50fbe12545c852a0e57d
https://github.com/wesnoth/wesnoth/commit/46eadd7264f59f438d7d50fbe12545c852a0e57d
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/widgets/text_box.cpp
M src/gui/widgets/text_box.hpp
Log Message:
-----------
gui2/text_box: Store hint text as a t_string
Storing it in a regular string results in issues with the game getting
stuck with the translation for the locale that was set during GUI2
initialization and not reflecting changes when switching languages later
on.
(cherry-picked from commit eacbc5f6959f57ff05451a2874a8e494ac3cb8db)
Commit: 5c8eed358c2d3a730a962b97044c3d188c5bc0e8
https://github.com/wesnoth/wesnoth/commit/5c8eed358c2d3a730a962b97044c3d188c5bc0e8
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/synced_commands.cpp
Log Message:
-----------
Refactor synced debug commands prompt to bring the string count down to 2
Otherwise there are too many repetitive strings for translators to work
with, which is rather unfair for an exception like this during the 1.14
RC phase. It also makes for better code.
Also added an article "The" at the start of the strings for :command
notifications.
(cherry-picked from commit 56e7b01ac4cdfd6cf51c36cc7bf1cac33391cc58)
Commit: bff5dcee30742e44be194291b21bfead87444809
https://github.com/wesnoth/wesnoth/commit/bff5dcee30742e44be194291b21bfead87444809
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Update changelog for issue #2732 and issue #2709
[ci skip]
(cherry-picked from commit 6f17695d7cde2af39db6d8ee85314cdfe64cbc87)
Commit: 599405c9ea9233f5a397f9bd6fc62d86a0342586
https://github.com/wesnoth/wesnoth/commit/599405c9ea9233f5a397f9bd6fc62d86a0342586
Author: Sofartin <hrubymar10 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/Xcode/Fix_Xcode_Dependencies
M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
Log Message:
-----------
Fixed Xcode project and removed SDL2_ttf
(cherry-picked from commit bc027b4fba2787461fbf5e68a5b4eadd79068eb3)
Commit: 5ae25a8453f8efe4958fe8d6d02b6909b3eb5da7
https://github.com/wesnoth/wesnoth/commit/5ae25a8453f8efe4958fe8d6d02b6909b3eb5da7
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Alphabetical order, alphabetical order, alphabetical order...
[ci skip]
(cherry-picked from commit 28c35e71fa49f76dc14b9f34d1c26cf9e0874328)
Commit: 3b2cc5da78d0c8521e094516240f2e3f2cc5aef4
https://github.com/wesnoth/wesnoth/commit/3b2cc5da78d0c8521e094516240f2e3f2cc5aef4
Author: newfrenchy83 <31768074+newfrenchy83 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/CodeBlocks/wesnoth.cbp
Log Message:
-----------
Update wesnoth.cbp
(cherry-picked from commit cf70a6bb54fa6e6e1332ed5aa1abe1dc93de28a6)
Commit: 5cd2d2403debc2d70ddce8123defa1d2f505a885
https://github.com/wesnoth/wesnoth/commit/5cd2d2403debc2d70ddce8123defa1d2f505a885
Author: lundberg <gregory_lundberg at gmx.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/VC14/campaignd.vcxproj
Log Message:
-----------
Suppress VC warning 4706 for campaignd
(cherry-picked from commit d322e1fb973e89354b6d851a902c048702df94ba)
Commit: 263d5f38df665f208424bd04ca33362325faac4e
https://github.com/wesnoth/wesnoth/commit/263d5f38df665f208424bd04ca33362325faac4e
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/hotkey/hotkey_handler_sp.cpp
M src/menu_events.cpp
Log Message:
-----------
disable debug command off-turn in mp
the serer wouldn't accept these commands anyways.
(cherry-picked from commit a1c06fbc65c380574f5449e5ea067d414544c155)
Commit: 6afc63bae99df69564927d57264321b7c00d0e7f
https://github.com/wesnoth/wesnoth/commit/6afc63bae99df69564927d57264321b7c00d0e7f
Author: loonycyborg <loonycyborg at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M doc/manual/SConscript
Log Message:
-----------
scons: look for xhtml.xsl in several dirs as its location can vary
(cherry-picked from commit 3221e2259968d9378e5278918dbad702ec1f341f)
Commit: 6750171fa18b52f9829bfeb27be21e6c3274df81
https://github.com/wesnoth/wesnoth/commit/6750171fa18b52f9829bfeb27be21e6c3274df81
Author: loonycyborg <loonycyborg at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/languages/bg_BG.cfg
M data/languages/cs_CZ.cfg
M data/languages/en_GB.cfg
M data/languages/es_ES.cfg
M data/languages/et_EE.cfg
M data/languages/fi_FI.cfg
M data/languages/fr_FR.cfg
M data/languages/gd_GB.cfg
M data/languages/gl_ES.cfg
M data/languages/hu_HU.cfg
M data/languages/id_ID.cfg
M data/languages/it_IT.cfg
M data/languages/ja_JP.cfg
M data/languages/lt_LT.cfg
M data/languages/mr_IN.cfg
M data/languages/nb_NO.cfg
M data/languages/pl_PL.cfg
M data/languages/ru_RU.cfg
M data/languages/sk_SK.cfg
M data/languages/sr_RS.cfg
M data/languages/sr_RS at ijekavian.cfg
M data/languages/sr_RS at ijekavianlatin.cfg
M data/languages/sr_RS at latin.cfg
M data/languages/tr_TR.cfg
M data/languages/uk_UA.cfg
M data/languages/vi_VN.cfg
M data/languages/zh_CN.cfg
M data/languages/zh_TW.cfg
M po/wesnoth-editor/af.po
M po/wesnoth-editor/ang.po
M po/wesnoth-editor/ang at latin.po
M po/wesnoth-editor/ar.po
M po/wesnoth-editor/ast.po
M po/wesnoth-editor/bg.po
M po/wesnoth-editor/ca.po
M po/wesnoth-editor/ca_ES at valencia.po
M po/wesnoth-editor/cs.po
M po/wesnoth-editor/da.po
M po/wesnoth-editor/de.po
M po/wesnoth-editor/el.po
M po/wesnoth-editor/en at shaw.po
M po/wesnoth-editor/en_GB.po
M po/wesnoth-editor/eo.po
M po/wesnoth-editor/es.po
M po/wesnoth-editor/et.po
M po/wesnoth-editor/eu.po
M po/wesnoth-editor/fi.po
M po/wesnoth-editor/fr.po
M po/wesnoth-editor/fur_IT.po
M po/wesnoth-editor/ga.po
M po/wesnoth-editor/gd.po
M po/wesnoth-editor/gl.po
M po/wesnoth-editor/he.po
M po/wesnoth-editor/hr.po
M po/wesnoth-editor/hu.po
M po/wesnoth-editor/id.po
M po/wesnoth-editor/is.po
M po/wesnoth-editor/it.po
M po/wesnoth-editor/ja.po
M po/wesnoth-editor/ko.po
M po/wesnoth-editor/la.po
M po/wesnoth-editor/lt.po
M po/wesnoth-editor/lv.po
M po/wesnoth-editor/mk.po
M po/wesnoth-editor/mr.po
M po/wesnoth-editor/nb_NO.po
M po/wesnoth-editor/nl.po
M po/wesnoth-editor/pl.po
M po/wesnoth-editor/pt.po
M po/wesnoth-editor/pt_BR.po
M po/wesnoth-editor/racv.po
M po/wesnoth-editor/ro.po
M po/wesnoth-editor/ru.po
M po/wesnoth-editor/sk.po
M po/wesnoth-editor/sl.po
M po/wesnoth-editor/sr.po
M po/wesnoth-editor/sr at ijekavian.po
M po/wesnoth-editor/sr at ijekavianlatin.po
M po/wesnoth-editor/sr at latin.po
M po/wesnoth-editor/sv.po
M po/wesnoth-editor/tl.po
M po/wesnoth-editor/tr.po
M po/wesnoth-editor/uk.po
M po/wesnoth-editor/vi.po
M po/wesnoth-editor/wesnoth-editor.pot
M po/wesnoth-editor/zh_CN.po
M po/wesnoth-editor/zh_TW.po
M po/wesnoth-ei/af.po
M po/wesnoth-ei/ang.po
M po/wesnoth-ei/ang at latin.po
M po/wesnoth-ei/ar.po
M po/wesnoth-ei/ast.po
M po/wesnoth-ei/bg.po
M po/wesnoth-ei/ca.po
M po/wesnoth-ei/ca_ES at valencia.po
M po/wesnoth-ei/cs.po
M po/wesnoth-ei/da.po
M po/wesnoth-ei/de.po
M po/wesnoth-ei/el.po
M po/wesnoth-ei/en at shaw.po
M po/wesnoth-ei/en_GB.po
M po/wesnoth-ei/eo.po
M po/wesnoth-ei/es.po
M po/wesnoth-ei/et.po
M po/wesnoth-ei/eu.po
M po/wesnoth-ei/fi.po
M po/wesnoth-ei/fr.po
M po/wesnoth-ei/fur_IT.po
M po/wesnoth-ei/ga.po
M po/wesnoth-ei/gd.po
M po/wesnoth-ei/gl.po
M po/wesnoth-ei/he.po
M po/wesnoth-ei/hr.po
M po/wesnoth-ei/hu.po
M po/wesnoth-ei/id.po
M po/wesnoth-ei/is.po
M po/wesnoth-ei/it.po
M po/wesnoth-ei/ja.po
M po/wesnoth-ei/ko.po
M po/wesnoth-ei/la.po
M po/wesnoth-ei/lt.po
M po/wesnoth-ei/lv.po
M po/wesnoth-ei/mk.po
M po/wesnoth-ei/mr.po
M po/wesnoth-ei/nb_NO.po
M po/wesnoth-ei/nl.po
M po/wesnoth-ei/pl.po
M po/wesnoth-ei/pt.po
M po/wesnoth-ei/pt_BR.po
M po/wesnoth-ei/racv.po
M po/wesnoth-ei/ro.po
M po/wesnoth-ei/ru.po
M po/wesnoth-ei/sk.po
M po/wesnoth-ei/sl.po
M po/wesnoth-ei/sr.po
M po/wesnoth-ei/sr at ijekavian.po
M po/wesnoth-ei/sr at ijekavianlatin.po
M po/wesnoth-ei/sr at latin.po
M po/wesnoth-ei/sv.po
M po/wesnoth-ei/tl.po
M po/wesnoth-ei/tr.po
M po/wesnoth-ei/uk.po
M po/wesnoth-ei/vi.po
M po/wesnoth-ei/wesnoth-ei.pot
M po/wesnoth-ei/zh_CN.po
M po/wesnoth-ei/zh_TW.po
M po/wesnoth-help/af.po
M po/wesnoth-help/ang.po
M po/wesnoth-help/ang at latin.po
M po/wesnoth-help/ar.po
M po/wesnoth-help/ast.po
M po/wesnoth-help/bg.po
M po/wesnoth-help/ca.po
M po/wesnoth-help/ca_ES at valencia.po
M po/wesnoth-help/cs.po
M po/wesnoth-help/da.po
M po/wesnoth-help/de.po
M po/wesnoth-help/el.po
M po/wesnoth-help/en at shaw.po
M po/wesnoth-help/en_GB.po
M po/wesnoth-help/eo.po
M po/wesnoth-help/es.po
M po/wesnoth-help/et.po
M po/wesnoth-help/eu.po
M po/wesnoth-help/fi.po
M po/wesnoth-help/fr.po
M po/wesnoth-help/fur_IT.po
M po/wesnoth-help/ga.po
M po/wesnoth-help/gd.po
M po/wesnoth-help/gl.po
M po/wesnoth-help/he.po
M po/wesnoth-help/hr.po
M po/wesnoth-help/hu.po
M po/wesnoth-help/id.po
M po/wesnoth-help/is.po
M po/wesnoth-help/it.po
M po/wesnoth-help/ja.po
M po/wesnoth-help/ko.po
M po/wesnoth-help/la.po
M po/wesnoth-help/lt.po
M po/wesnoth-help/lv.po
M po/wesnoth-help/mk.po
M po/wesnoth-help/mr.po
M po/wesnoth-help/nb_NO.po
M po/wesnoth-help/nl.po
M po/wesnoth-help/pl.po
M po/wesnoth-help/pt.po
M po/wesnoth-help/pt_BR.po
M po/wesnoth-help/racv.po
M po/wesnoth-help/ro.po
M po/wesnoth-help/ru.po
M po/wesnoth-help/sk.po
M po/wesnoth-help/sl.po
M po/wesnoth-help/sr.po
M po/wesnoth-help/sr at ijekavian.po
M po/wesnoth-help/sr at ijekavianlatin.po
M po/wesnoth-help/sr at latin.po
M po/wesnoth-help/sv.po
M po/wesnoth-help/tl.po
M po/wesnoth-help/tr.po
M po/wesnoth-help/uk.po
M po/wesnoth-help/vi.po
M po/wesnoth-help/wesnoth-help.pot
M po/wesnoth-help/zh_CN.po
M po/wesnoth-help/zh_TW.po
M po/wesnoth-lib/af.po
M po/wesnoth-lib/ang.po
M po/wesnoth-lib/ang at latin.po
M po/wesnoth-lib/ar.po
M po/wesnoth-lib/ast.po
M po/wesnoth-lib/bg.po
M po/wesnoth-lib/ca.po
M po/wesnoth-lib/ca_ES at valencia.po
M po/wesnoth-lib/cs.po
M po/wesnoth-lib/da.po
M po/wesnoth-lib/de.po
M po/wesnoth-lib/el.po
M po/wesnoth-lib/en at shaw.po
M po/wesnoth-lib/en_GB.po
M po/wesnoth-lib/eo.po
M po/wesnoth-lib/es.po
M po/wesnoth-lib/et.po
M po/wesnoth-lib/eu.po
M po/wesnoth-lib/fi.po
M po/wesnoth-lib/fr.po
M po/wesnoth-lib/fur_IT.po
M po/wesnoth-lib/ga.po
M po/wesnoth-lib/gd.po
M po/wesnoth-lib/gl.po
M po/wesnoth-lib/he.po
M po/wesnoth-lib/hr.po
M po/wesnoth-lib/hu.po
M po/wesnoth-lib/id.po
M po/wesnoth-lib/is.po
M po/wesnoth-lib/it.po
M po/wesnoth-lib/ja.po
M po/wesnoth-lib/ko.po
M po/wesnoth-lib/la.po
M po/wesnoth-lib/lt.po
M po/wesnoth-lib/lv.po
M po/wesnoth-lib/mk.po
M po/wesnoth-lib/mr.po
M po/wesnoth-lib/nb_NO.po
M po/wesnoth-lib/nl.po
M po/wesnoth-lib/pl.po
M po/wesnoth-lib/pt.po
M po/wesnoth-lib/pt_BR.po
M po/wesnoth-lib/racv.po
M po/wesnoth-lib/ro.po
M po/wesnoth-lib/ru.po
M po/wesnoth-lib/sk.po
M po/wesnoth-lib/sl.po
M po/wesnoth-lib/sr.po
M po/wesnoth-lib/sr at ijekavian.po
M po/wesnoth-lib/sr at ijekavianlatin.po
M po/wesnoth-lib/sr at latin.po
M po/wesnoth-lib/sv.po
M po/wesnoth-lib/tl.po
M po/wesnoth-lib/tr.po
M po/wesnoth-lib/uk.po
M po/wesnoth-lib/vi.po
M po/wesnoth-lib/wesnoth-lib.pot
M po/wesnoth-lib/zh_CN.po
M po/wesnoth-lib/zh_TW.po
M po/wesnoth-low/af.po
M po/wesnoth-low/ang.po
M po/wesnoth-low/ang at latin.po
M po/wesnoth-low/ar.po
M po/wesnoth-low/ast.po
M po/wesnoth-low/bg.po
M po/wesnoth-low/ca.po
M po/wesnoth-low/ca_ES at valencia.po
M po/wesnoth-low/cs.po
M po/wesnoth-low/da.po
M po/wesnoth-low/de.po
M po/wesnoth-low/el.po
M po/wesnoth-low/en at shaw.po
M po/wesnoth-low/en_GB.po
M po/wesnoth-low/eo.po
M po/wesnoth-low/es.po
M po/wesnoth-low/et.po
M po/wesnoth-low/eu.po
M po/wesnoth-low/fi.po
M po/wesnoth-low/fr.po
M po/wesnoth-low/fur_IT.po
M po/wesnoth-low/ga.po
M po/wesnoth-low/gd.po
M po/wesnoth-low/gl.po
M po/wesnoth-low/he.po
M po/wesnoth-low/hr.po
M po/wesnoth-low/hu.po
M po/wesnoth-low/id.po
M po/wesnoth-low/is.po
M po/wesnoth-low/it.po
M po/wesnoth-low/ja.po
M po/wesnoth-low/ko.po
M po/wesnoth-low/la.po
M po/wesnoth-low/lt.po
M po/wesnoth-low/lv.po
M po/wesnoth-low/mk.po
M po/wesnoth-low/mr.po
M po/wesnoth-low/nb_NO.po
M po/wesnoth-low/nl.po
M po/wesnoth-low/pl.po
M po/wesnoth-low/pt.po
M po/wesnoth-low/pt_BR.po
M po/wesnoth-low/racv.po
M po/wesnoth-low/ro.po
M po/wesnoth-low/ru.po
M po/wesnoth-low/sk.po
M po/wesnoth-low/sl.po
M po/wesnoth-low/sr.po
M po/wesnoth-low/sr at ijekavian.po
M po/wesnoth-low/sr at ijekavianlatin.po
M po/wesnoth-low/sr at latin.po
M po/wesnoth-low/sv.po
M po/wesnoth-low/tl.po
M po/wesnoth-low/tr.po
M po/wesnoth-low/uk.po
M po/wesnoth-low/vi.po
M po/wesnoth-low/wesnoth-low.pot
M po/wesnoth-low/zh_CN.po
M po/wesnoth-low/zh_TW.po
M po/wesnoth-units/af.po
M po/wesnoth-units/ang.po
M po/wesnoth-units/ang at latin.po
M po/wesnoth-units/ar.po
M po/wesnoth-units/ast.po
M po/wesnoth-units/bg.po
M po/wesnoth-units/ca.po
M po/wesnoth-units/ca_ES at valencia.po
M po/wesnoth-units/cs.po
M po/wesnoth-units/da.po
M po/wesnoth-units/de.po
M po/wesnoth-units/el.po
M po/wesnoth-units/en at shaw.po
M po/wesnoth-units/en_GB.po
M po/wesnoth-units/eo.po
M po/wesnoth-units/es.po
M po/wesnoth-units/et.po
M po/wesnoth-units/eu.po
M po/wesnoth-units/fi.po
M po/wesnoth-units/fr.po
M po/wesnoth-units/fur_IT.po
M po/wesnoth-units/ga.po
M po/wesnoth-units/gd.po
M po/wesnoth-units/gl.po
M po/wesnoth-units/he.po
M po/wesnoth-units/hr.po
M po/wesnoth-units/hu.po
M po/wesnoth-units/id.po
M po/wesnoth-units/is.po
M po/wesnoth-units/it.po
M po/wesnoth-units/ja.po
M po/wesnoth-units/ko.po
M po/wesnoth-units/la.po
M po/wesnoth-units/lt.po
M po/wesnoth-units/lv.po
M po/wesnoth-units/mk.po
M po/wesnoth-units/mr.po
M po/wesnoth-units/nb_NO.po
M po/wesnoth-units/nl.po
M po/wesnoth-units/pl.po
M po/wesnoth-units/pt.po
M po/wesnoth-units/pt_BR.po
M po/wesnoth-units/racv.po
M po/wesnoth-units/ro.po
M po/wesnoth-units/ru.po
M po/wesnoth-units/sk.po
M po/wesnoth-units/sl.po
M po/wesnoth-units/sr.po
M po/wesnoth-units/sr at ijekavian.po
M po/wesnoth-units/sr at ijekavianlatin.po
M po/wesnoth-units/sr at latin.po
M po/wesnoth-units/sv.po
M po/wesnoth-units/tl.po
M po/wesnoth-units/tr.po
M po/wesnoth-units/uk.po
M po/wesnoth-units/vi.po
M po/wesnoth-units/wesnoth-units.pot
M po/wesnoth-units/zh_CN.po
M po/wesnoth-units/zh_TW.po
M po/wesnoth/af.po
M po/wesnoth/ang.po
M po/wesnoth/ang at latin.po
M po/wesnoth/ar.po
M po/wesnoth/ast.po
M po/wesnoth/bg.po
M po/wesnoth/ca.po
M po/wesnoth/ca_ES at valencia.po
M po/wesnoth/cs.po
M po/wesnoth/da.po
M po/wesnoth/de.po
M po/wesnoth/el.po
M po/wesnoth/en at shaw.po
M po/wesnoth/en_GB.po
M po/wesnoth/eo.po
M po/wesnoth/es.po
M po/wesnoth/et.po
M po/wesnoth/eu.po
M po/wesnoth/fi.po
M po/wesnoth/fr.po
M po/wesnoth/fur_IT.po
M po/wesnoth/ga.po
M po/wesnoth/gd.po
M po/wesnoth/gl.po
M po/wesnoth/he.po
M po/wesnoth/hr.po
M po/wesnoth/hu.po
M po/wesnoth/id.po
M po/wesnoth/is.po
M po/wesnoth/it.po
M po/wesnoth/ja.po
M po/wesnoth/ko.po
M po/wesnoth/la.po
M po/wesnoth/lt.po
M po/wesnoth/lv.po
M po/wesnoth/mk.po
M po/wesnoth/mr.po
M po/wesnoth/nb_NO.po
M po/wesnoth/nl.po
M po/wesnoth/pl.po
M po/wesnoth/pt.po
M po/wesnoth/pt_BR.po
M po/wesnoth/racv.po
M po/wesnoth/ro.po
M po/wesnoth/ru.po
M po/wesnoth/sk.po
M po/wesnoth/sl.po
M po/wesnoth/sr.po
M po/wesnoth/sr at ijekavian.po
M po/wesnoth/sr at ijekavianlatin.po
M po/wesnoth/sr at latin.po
M po/wesnoth/sv.po
M po/wesnoth/tl.po
M po/wesnoth/tr.po
M po/wesnoth/uk.po
M po/wesnoth/vi.po
M po/wesnoth/wesnoth.pot
M po/wesnoth/zh_CN.po
M po/wesnoth/zh_TW.po
Log Message:
-----------
pot-update and regenerate doc files
(cherry-picked from commit abcded267b886dec8799eadf47ffc3d6abae624b)
Commit: 1123c8a7071283a9c5fc130c839d26a0e264ba80
https://github.com/wesnoth/wesnoth/commit/1123c8a7071283a9c5fc130c839d26a0e264ba80
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/multiplayer/eras.lua
M data/multiplayer/scenarios/2p_Dark_Forecast.lua
M data/scenario-test.cfg
M data/test/scenarios/test_lua_wml_tagnames.cfg
Log Message:
-----------
Remove some uses of set_wml_tag_metatable
(cherry-picked from commit 3939c332b908e9c9a4672688b4e0ef8095fc66ca)
Commit: 36781c62d021380f545a37d8df389bd4cea17fc7
https://github.com/wesnoth/wesnoth/commit/36781c62d021380f545a37d8df389bd4cea17fc7
Author: Hironori Fujimoto <broadbarredfirefish at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Youth.cfg
Log Message:
-----------
UtBS: Fix Nym's hit sound to be female
(cherry-picked from commit f63ca02984345d968a2b67e1a04e81fcd2b3a545)
Commit: 391ddd45b2337138a8e423ae04f323e4c9d66746
https://github.com/wesnoth/wesnoth/commit/391ddd45b2337138a8e423ae04f323e4c9d66746
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/tools/wesnoth_addon_manager
Log Message:
-----------
wam: Add *.ini to upload blacklist to match the engine, reorder a few items
[ci skip]
(cherry-picked from commit 51111db8f7477bfab758d62d9e414405a8494e9c)
Commit: 2584a21716c299330a39adb4bfa36fa3721ac62e
https://github.com/wesnoth/wesnoth/commit/2584a21716c299330a39adb4bfa36fa3721ac62e
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M SConstruct
Log Message:
-----------
Sort scons --help output
(cherry-picked from commit a31b5ebcba90787eb9d0de8ceecfbc5293dd2eb3)
Commit: cdae5011bf3632fec1b040e15b4d3b25541c9bdc
https://github.com/wesnoth/wesnoth/commit/cdae5011bf3632fec1b040e15b4d3b25541c9bdc
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M SConstruct
Log Message:
-----------
scons: Sort help text with a custom function that will run on Python 3
(cherry-picked from commit 6b67c18d8927cf7f982a1feac867c301211a186e)
Commit: 74ed9d2dcacaf66a7401f82a92f354575a1a7dc7
https://github.com/wesnoth/wesnoth/commit/74ed9d2dcacaf66a7401f82a92f354575a1a7dc7
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Update changelog for the synced debug command UX changes
[ci skip]
(cherry-picked from commit 66b60f4731f663d1809a5652cb039c327b2732d6)
Commit: f1453d7f7a056449e7fea07be67a6c114955fc31
https://github.com/wesnoth/wesnoth/commit/f1453d7f7a056449e7fea07be67a6c114955fc31
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Fix up previous commit to match 1.14
[ci skip]
(cherry-picked from commit ecb80e607ec760af50162d354b045227dc15ab69)
Commit: 065501bfbf39dc9488b35058a20e6e97309412bc
https://github.com/wesnoth/wesnoth/commit/065501bfbf39dc9488b35058a20e6e97309412bc
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M players_changelog.md
Log Message:
-----------
Sync changelogs across branches
[ci skip]
(cherry-picked from commit 139695d7b1fe97dc528d04f1d96d0435273d519a)
Commit: fac4a58ba69814b029611c61b62cda3013c0faf5
https://github.com/wesnoth/wesnoth/commit/fac4a58ba69814b029611c61b62cda3013c0faf5
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/VC14/README.md
Log Message:
-----------
Updated Visual Studio projectfile readme
[ci skip]
(cherry-picked from commit 8d2244628adbb2bf2199b297004f9428a512cbb5)
Commit: 4e653eba660f2c4b150d7daf08a4a4c7e14a7797
https://github.com/wesnoth/wesnoth/commit/4e653eba660f2c4b150d7daf08a4a4c7e14a7797
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M data/core/about_i18n.cfg
M players_changelog.md
M po/wesnoth-ai/zh_CN.po
M po/wesnoth-anl/zh_CN.po
M po/wesnoth-aoi/zh_CN.po
M po/wesnoth-did/zh_CN.po
M po/wesnoth-dm/zh_CN.po
M po/wesnoth-dw/zh_CN.po
M po/wesnoth-editor/zh_CN.po
M po/wesnoth-ei/zh_CN.po
M po/wesnoth-help/zh_CN.po
M po/wesnoth-httt/zh_CN.po
M po/wesnoth-l/zh_CN.po
M po/wesnoth-lib/zh_CN.po
M po/wesnoth-low/zh_CN.po
M po/wesnoth-manpages/zh_CN.po
M po/wesnoth-manual/zh_CN.po
M po/wesnoth-multiplayer/zh_CN.po
M po/wesnoth-nr/zh_CN.po
M po/wesnoth-sof/zh_CN.po
M po/wesnoth-sota/zh_CN.po
M po/wesnoth-sotbe/zh_CN.po
M po/wesnoth-tb/zh_CN.po
M po/wesnoth-test/zh_CN.po
M po/wesnoth-thot/zh_CN.po
M po/wesnoth-trow/zh_CN.po
M po/wesnoth-tsg/zh_CN.po
M po/wesnoth-tutorial/zh_CN.po
M po/wesnoth-units/zh_CN.po
M po/wesnoth-utbs/zh_CN.po
M po/wesnoth/zh_CN.po
Log Message:
-----------
updated Chinese (Simplified) translation
(cherry-picked from commit 40d63a4a25f30bf5544348a57642d8939e780964)
Commit: 0b860acf00391f48bc4fc52d0dc5e75da3b79ec7
https://github.com/wesnoth/wesnoth/commit/0b860acf00391f48bc4fc52d0dc5e75da3b79ec7
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-help/es.po
M po/wesnoth-lib/es.po
M po/wesnoth-manual/es.po
M po/wesnoth/es.po
Log Message:
-----------
updated Spanish translation
(cherry-picked from commit 065e8cc1280c32ced9e2797ccaf836263631a618)
Commit: 6f5f1482d2f129c10e82912c60059c0119f469a6
https://github.com/wesnoth/wesnoth/commit/6f5f1482d2f129c10e82912c60059c0119f469a6
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M CMakeLists.txt
M SConstruct
M src/CMakeLists.txt
Log Message:
-----------
cmake, scons: Drop option to enable or disable the removed SDL_SavePNG code
Commit dfc42e8a8dd550ca04ae16e2d2d7ebffbba0bc21 removed said code since
Wesnoth can use IMG_SavePNG() from SDL_image 2.0 instead. However, the
author left the build-time configuration options intact, and also part
of the necessary code for CMake to link Wesnoth against libpng.
Note that this change also eliminates an unnecessary direct link-time
dependency on libpng when using both CMake and SCons.
(cherry-picked from commit 4799ca05fe40838c41814433780d0464d9b8f071)
Commit: c38811f3107376f72c39372ce3dd651714704359
https://github.com/wesnoth/wesnoth/commit/c38811f3107376f72c39372ce3dd651714704359
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Update changelog
[ci skip]
(cherry-picked from commit 0cdee6b04c8082bf99dc4111609802beb41439e6)
Commit: 97fbeb6c7d93ac04fc88db60833bc7603a5b53d7
https://github.com/wesnoth/wesnoth/commit/97fbeb6c7d93ac04fc88db60833bc7603a5b53d7
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M data/campaigns/Under_the_Burning_Suns/utils/terrain.cfg
Log Message:
-----------
UtBS: Hide technical terrains in the Help browser
[ci skip]
(cherry-picked from commit 9808a6a7223cb486cf41d85d66ca726836aff009)
Commit: d9bfb7511ca7f2ff3b27f560546491ab2006cf57
https://github.com/wesnoth/wesnoth/commit/d9bfb7511ca7f2ff3b27f560546491ab2006cf57
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Secrets_of_the_Ancients/_main.cfg
Log Message:
-----------
SotA: Drop UMC translations section from the campaign's credits
[ci skip]
(cherry-picked from commit 56470323c377ea70cb71de950b1a97ba090dddd0)
Commit: eed7e5d8c6246f5197e412a706f3a39f51730006
https://github.com/wesnoth/wesnoth/commit/eed7e5d8c6246f5197e412a706f3a39f51730006
Author: pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/CMakeLists.txt
Log Message:
-----------
Remove tools-external-libs.
Also put Boost_RANDOM_LIBRARY, CRYPTO_LIBRARY, and MYSQL_LIBS into server-external-libs.
(cherry-picked from commit 0bbc78945ee9945be708396f71d80d3869a31951)
Commit: ef199d426471400c220559c750a6b177d429554e
https://github.com/wesnoth/wesnoth/commit/ef199d426471400c220559c750a6b177d429554e
Author: Martin Hrubý <hrubymar10 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/Xcode/README.md
Log Message:
-----------
Updated Xcode's README.md
(cherry-picked from commit 212cb9be186c1e95d5a22c4c7696508da1a122d9)
Commit: fd480bbd17b91fe45af54a2a12a4ccb5aa230840
https://github.com/wesnoth/wesnoth/commit/fd480bbd17b91fe45af54a2a12a4ccb5aa230840
Author: Victor Sergienko <singalen at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/about_i18n.cfg
Log Message:
-----------
Credits for Chinese translation of iOS announcements
(cherry-picked from commit 004d7b541b19cdb29c9be3b8dae80c65be7f4d48)
Commit: e1506f86bd1368da28bc0181724dcfbf0248c61e
https://github.com/wesnoth/wesnoth/commit/e1506f86bd1368da28bc0181724dcfbf0248c61e
Author: Wedge009 <wedge009 at wedge009.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/units.cfg
M utils/pofix.py
Log Message:
-----------
'moreso' isn't a word in any dialect of English.
[ci skip]
(cherry-picked from commit fb866c6d1310d8398f0f481a8ab16b1606286cdd)
Commit: 602a914698cdd7758ea0576b3f4bc85691c6b6d9
https://github.com/wesnoth/wesnoth/commit/602a914698cdd7758ea0576b3f4bc85691c6b6d9
Author: pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
A .dockerignore
Log Message:
-----------
Don't copy the .git directory into docker.
(cherry-picked from commit de48b9fbb13331a8a38911ee0ece47fd8f95d178)
Commit: a8fda1e0eb4e9a344727f895f20cb09fb0d416d6
https://github.com/wesnoth/wesnoth/commit/a8fda1e0eb4e9a344727f895f20cb09fb0d416d6
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/server/send_receive_wml_helpers.ipp
Log Message:
-----------
wesnothd, campaignd: Fix warning about uninitialized field on _WIN32
(cherry-picked from commit 8a905134a4fd6e230d978e59a91615b37072461c)
Commit: b2d715a4da27afda350ab52114efaa9b34feb9eb
https://github.com/wesnoth/wesnoth/commit/b2d715a4da27afda350ab52114efaa9b34feb9eb
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M players_changelog.md
M po/wesnoth-ai/gd.po
M po/wesnoth-aoi/gd.po
M po/wesnoth-editor/gd.po
M po/wesnoth-help/gd.po
M po/wesnoth-httt/gd.po
M po/wesnoth-lib/gd.po
M po/wesnoth-multiplayer/gd.po
M po/wesnoth-tb/gd.po
M po/wesnoth-tsg/gd.po
M po/wesnoth-tutorial/gd.po
M po/wesnoth-units/gd.po
M po/wesnoth/gd.po
Log Message:
-----------
updated Scottish Gaelic translation
(cherry-picked from commit f19db187fab50e6a709c6bc3a737b996ac8e3756)
Commit: b02b6d0853c9001b573435126a543255ac5897f9
https://github.com/wesnoth/wesnoth/commit/b02b6d0853c9001b573435126a543255ac5897f9
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M players_changelog.md
M po/wesnoth-help/uk.po
M po/wesnoth-httt/uk.po
M po/wesnoth-lib/uk.po
M po/wesnoth-tutorial/uk.po
M po/wesnoth/uk.po
Log Message:
-----------
updated Ukrainian translation
(cherry-picked from commit 4bcfada88a009301c8dbf6a1513cb1395a090432)
Commit: 79e6e578d2d762e09f6e6cf7397821fa1b2538e1
https://github.com/wesnoth/wesnoth/commit/79e6e578d2d762e09f6e6cf7397821fa1b2538e1
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M players_changelog.md
M po/wesnoth-help/en_GB.po
M po/wesnoth-httt/en_GB.po
M po/wesnoth-lib/en_GB.po
M po/wesnoth-sota/en_GB.po
M po/wesnoth-tb/en_GB.po
M po/wesnoth-units/en_GB.po
M po/wesnoth/en_GB.po
Log Message:
-----------
updated British English translation
(cherry-picked from commit 57c1a671344d38705d918cce7a2208273a7c9f9b)
Commit: 1071fc7d2ba0fe27ad71845e6af24c4e77490b86
https://github.com/wesnoth/wesnoth/commit/1071fc7d2ba0fe27ad71845e6af24c4e77490b86
Author: Celtic Minstrel <CelticMinstrel at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/editor/map/map_context.cpp
Log Message:
-----------
Fix scenario editor writing to wrong key
(cherry-picked from commit dd4f80fdd1fb22ebee4c6ec1bf883611e0e823d2)
Commit: dcf2767a14c64994546732c69d7f2341d01983eb
https://github.com/wesnoth/wesnoth/commit/dcf2767a14c64994546732c69d7f2341d01983eb
Author: pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M .travis.yml
R docker/Dockerfile-base
A docker/Dockerfile-base-1604-master
R docker/Dockerfile-travis
A docker/Dockerfile-travis-1604-master
M utils/travis/steps/install.sh
M utils/travis/steps/script.sh
Log Message:
-----------
Add using dockerfiles based on the LTS and BRANCH env vars
This makes it simpler in the future to have branches that have dependencies that are different from master, rather than having a single image with all necessary dependencies installed, which may at some point end up not being possible to do.
(cherry-picked from commit 1bb5fdf2830515d33793c52f298d305bd12b5a60)
Commit: 23ba088e22318e0c686d8881857ee4832e348367
https://github.com/wesnoth/wesnoth/commit/23ba088e22318e0c686d8881857ee4832e348367
Author: doofus-01 <doofus-01 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/champion-defend1.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/champion-defend2.png
M data/campaigns/Under_the_Burning_Suns/images/units/quenoth/scout.png
R data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun-shyde.png
R data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun-singer.png
M data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-backglow.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-def-flare.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-defend1.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-defend2.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-fly-defend1.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-fly-defend2.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-fly1.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-fly2.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-fly3.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-fly4.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-fly5.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-fly6.png
M data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-stand.png
M data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_singer/sun-singer-defend1.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_singer/sun-singer-defend2.png
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Champion.cfg
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Sun_Shyde.cfg
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Sun_Singer.cfg
M data/campaigns/Under_the_Burning_Suns/utils/animation_macros.cfg
Log Message:
-----------
[UtBS] Quenoth elf animations (#2679)
* sun-shyde standing animations, draft
* additions to sun-shyde floating animation
* singer defense animation
* defense animations for sun-singer and sun-shyde
* try to make scout less leaning backwards
* champion defense animation
* fixing and rounding out basic animations (esp. wrt to floating/standing) for sun_shyde
(cherry-picked from commit 816dd075dcf36e154475fdd84043680d49ad58c1)
Commit: 0d1df0f2d73d2d9be17a6deed56d81e9beeb9727
https://github.com/wesnoth/wesnoth/commit/0d1df0f2d73d2d9be17a6deed56d81e9beeb9727
Author: Celtic Minstrel <CelticMinstrel at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/lua/wml/modify_side.lua
Log Message:
-----------
Fix unintended change to the semantics of [modify_side]income=
(cherry-picked from commit 79bc18fe9522049d1844a99e37d58eab43898941)
Commit: fa71ab4be00407902145e695fb607b9bb3f5a1a3
https://github.com/wesnoth/wesnoth/commit/fa71ab4be00407902145e695fb607b9bb3f5a1a3
Author: Vasya <33452702+vgaming at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/lua/functional.lua
Log Message:
-----------
Lua API: simplify functional.reduce (#2788)
simplify code and remove `indentity or 0` VS `indentity` inconsistency.
(cherry-picked from commit 2b8782923a758eee2e167e5c4097f2803e6e2be6)
Commit: 165e8a63fa4b821fdf64fd179e2fc4787671dc39
https://github.com/wesnoth/wesnoth/commit/165e8a63fa4b821fdf64fd179e2fc4787671dc39
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/config.cpp
Log Message:
-----------
Fix [filter_wml] implementation so that [or] tags actually work
(cherry-picked from commit b483d96f500827ccacc78f3c2e89fc6690a3d2df)
Commit: 6c068684d65ffe65b172eeb69489b6bb6ba69c23
https://github.com/wesnoth/wesnoth/commit/6c068684d65ffe65b172eeb69489b6bb6ba69c23
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/config.cpp
Log Message:
-----------
Add a way in [filter_wml] to match key values against a glob
(cherry-picked from commit 5ee9b094708e456e94e1b6ac2309bccac3d03a9d)
Commit: 52d3b7bb6a6fd1d8bc29296601ee6feab9edf945
https://github.com/wesnoth/wesnoth/commit/52d3b7bb6a6fd1d8bc29296601ee6feab9edf945
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/lua/wml/set_variable.lua
Log Message:
-----------
Support [set_variable]round=trunc
(cherry-picked from commit beb5dc75aaa60af30dcfe58074771080b5da3aeb)
Commit: 05a45b8cd1c70c09f36f782521fa8d06bdd5c817
https://github.com/wesnoth/wesnoth/commit/05a45b8cd1c70c09f36f782521fa8d06bdd5c817
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/lua/wml/message.lua
Log Message:
-----------
Handle speaker=id directly in [message] instead of relying on SUF
(cherry-picked from commit 2bd2a8b1b6d7bba67b6d1b4eb0e03dca56f5a54a)
Commit: aef2b5eb9a8f75ab9b9594e9e608cf665fe06fed
https://github.com/wesnoth/wesnoth/commit/aef2b5eb9a8f75ab9b9594e9e608cf665fe06fed
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/units/filter.cpp
Log Message:
-----------
Remove speaker=id support from SUF
(cherry-picked from commit d48206bdbe73c1060f1705ca07d3ee02641f85c1)
Commit: b5b87ef37340dac0938a81c8aba283a909617e2a
https://github.com/wesnoth/wesnoth/commit/b5b87ef37340dac0938a81c8aba283a909617e2a
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/lua/wml/message.lua
Log Message:
-----------
Nicer handling of some Pango formatting attributes in [message]
(cherry-picked from commit c835e5b7e660e0842ab765d6cab7615a8790af2b)
Commit: 12ada04b8fcfa999a145cd0515b775d0d3e7c848
https://github.com/wesnoth/wesnoth/commit/12ada04b8fcfa999a145cd0515b775d0d3e7c848
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/lua/wml/objectives.lua
Log Message:
-----------
Use wesnoth.format instead of string.format for translateable strings in [objectives]
(cherry-picked from commit 15ae9fcb0cc93da52c4ee1100c4422d815b8b28d)
Commit: b35a7f73521e5b24b094578a795b8b48925386ad
https://github.com/wesnoth/wesnoth/commit/b35a7f73521e5b24b094578a795b8b48925386ad
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/lua/wml/set_variable.lua
Log Message:
-----------
Support root=cube and root=int in [set_variable]
(cherry-picked from commit 7a3d6f958a2f8c89488a7a3d2439c37ae50032c8)
Commit: fb99db6cd11b00695965ef7d19bf75a3dcc13768
https://github.com/wesnoth/wesnoth/commit/fb99db6cd11b00695965ef7d19bf75a3dcc13768
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/game_events/action_wml.cpp
Log Message:
-----------
Support force_scroll in [move_units_fake] (same as in [move_unit_fake])
(cherry-picked from commit 325f4c40705b96ed4f5a009bfb76e0d30297743c)
Commit: b1e96b08dd56edb8b276d0665e90856e46035f97
https://github.com/wesnoth/wesnoth/commit/b1e96b08dd56edb8b276d0665e90856e46035f97
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/lua/wml/role.lua
Log Message:
-----------
Support facing in [role][auto_recall]
(cherry-picked from commit ea0bcec92f021c9e2c1efc838508d5d662803771)
Commit: 755816c4a405a3e09ba6263eac82ded2fee6cbd1
https://github.com/wesnoth/wesnoth/commit/755816c4a405a3e09ba6263eac82ded2fee6cbd1
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/persist_var.cpp
Log Message:
-----------
Fix an incorrect error message in [clear_global_variable]
(cherry-picked from commit 6184489a6523ef91433cf894825184e9011177c2)
Commit: 5a30e97c911866061313255a47c40bead62e42c0
https://github.com/wesnoth/wesnoth/commit/5a30e97c911866061313255a47c40bead62e42c0
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Update changelog
(cherry-picked from commit 8becc799c1b5cce8f08d756dfb41628cb5c3be68)
Commit: c5ab8871364b3cc41a63f9a117af52d590a3c744
https://github.com/wesnoth/wesnoth/commit/c5ab8871364b3cc41a63f9a117af52d590a3c744
Author: Sofartin <hrubymar10 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
R projectfiles/Xcode/Resources/Growl Registration Ticket.growlRegDict
M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
Log Message:
-----------
Remove rest of Growl things and CodeSign everything after copy
(cherry-picked from commit 917401acaa1d0e98b0946c36fd2ab857c3476cc0)
Commit: 8b4032436c96314bdd36c9474196860728c0acb5
https://github.com/wesnoth/wesnoth/commit/8b4032436c96314bdd36c9474196860728c0acb5
Author: ln-zookeeper <lari.nieminen at iki.fi>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/multiplayer/scenarios/4p_A_New_Land.cfg
Log Message:
-----------
ANL: Fixed scenario brokenness stemming from force_lock_settings=yes
[ci skip]
(cherry-picked from commit d0a2fde239d86d9d539846e001f96f342383ad0d)
Commit: 7257d555f202d470518bec3ab614312fa6336816
https://github.com/wesnoth/wesnoth/commit/7257d555f202d470518bec3ab614312fa6336816
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M players_changelog.md
M po/wesnoth-lib/fr.po
M po/wesnoth-sota/fr.po
M po/wesnoth/fr.po
Log Message:
-----------
updated French translation
(cherry-picked from commit a32d689c46a2a71c958007695eab953637ecb9f9)
Commit: 85922c67e572ca707f67df13d1c47e6f9681afc9
https://github.com/wesnoth/wesnoth/commit/85922c67e572ca707f67df13d1c47e6f9681afc9
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/synced_user_choice.cpp
Log Message:
-----------
pull remote user input even if we are doing a local choice.
this mainly effects wesnoth.synchronize_choices:
previously the client would not process incoming choices from other
players while it was exeucting its own local choice (usually a dialog).
The problem this commit fixes is that with the old behaviour any choice
from another player would block the incoming queue, in particular
chatmessages after that command would be delayed until the
wesnoth.synchronize_choices is finished.
(cherry-picked from commit edd7a82255e6ec7d8882900e0df56fb3af853436)
Commit: 0a32ffd16ec94fa16266380a23e138ce77556aef
https://github.com/wesnoth/wesnoth/commit/0a32ffd16ec94fa16266380a23e138ce77556aef
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/replay.cpp
Log Message:
-----------
treat local choices as like sycned contexts in replay.cpp
this makes more sense as the game cannot handle sycned commands while
executing local choices. It also fixes an OOS in
wesnoth.synchronize_choices
(cherry-picked from commit bce8c29568a0ba28455579e0057180f00bdd9190)
Commit: 222d29dfef02643e64998dcf7cccfc966e0d2133
https://github.com/wesnoth/wesnoth/commit/222d29dfef02643e64998dcf7cccfc966e0d2133
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/synced_user_choice.cpp
Log Message:
-----------
guard against calling user_choice_manager::pull() recursively
(cherry-picked from commit 9593062fc65eb1769ebdab16ed4b1d380e6aaa69)
Commit: d9a10089e84f1a5c982024a3cb9095c33fc213e9
https://github.com/wesnoth/wesnoth/commit/d9a10089e84f1a5c982024a3cb9095c33fc213e9
Author: Sofartin <hrubymar10 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
Log Message:
-----------
Fix Wesnoth's Application Support dir name
(cherry-picked from commit 0a9b10cfa8863b56fc8f309fb49e2fdbbd516c53)
Commit: f9c416ad07d78a7514f38eb96f3819598ff3c20b
https://github.com/wesnoth/wesnoth/commit/f9c416ad07d78a7514f38eb96f3819598ff3c20b
Author: Sofartin <hrubymar10 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
Log Message:
-----------
Enable Testability for macOS DEBUG builds
(cherry-picked from commit 2e2015b6da71a918db32e216a1bd30be51980830)
Commit: 37795f4271b60b2cb42f7681f04dc4f066d0ac8b
https://github.com/wesnoth/wesnoth/commit/37795f4271b60b2cb42f7681f04dc4f066d0ac8b
Author: Sofartin <hrubymar10 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/Xcode/Fix_Xcode_Dependencies
Log Message:
-----------
Remove redundand cp
(cherry-picked from commit 62febff94ea444e3b09ce599f2fa497bf639bde8)
Commit: f7b66ca40e55adf7b7a138ed5da6f4cfcce769ea
https://github.com/wesnoth/wesnoth/commit/f7b66ca40e55adf7b7a138ed5da6f4cfcce769ea
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M players_changelog.md
M po/wesnoth-ai/cs.po
M po/wesnoth-anl/cs.po
M po/wesnoth-aoi/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-test/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-utbs/cs.po
M po/wesnoth/cs.po
Log Message:
-----------
updated Czech translation
(cherry-picked from commit 742c378361f43a49f20b3d7f11061da6ea575166)
Commit: 9160f112978f7262d339590c75d2df6f275e6a20
https://github.com/wesnoth/wesnoth/commit/9160f112978f7262d339590c75d2df6f275e6a20
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-did/es.po
M po/wesnoth-dm/es.po
M po/wesnoth-help/es.po
M po/wesnoth-httt/es.po
M po/wesnoth-l/es.po
M po/wesnoth-lib/es.po
M po/wesnoth-low/es.po
M po/wesnoth-nr/es.po
M po/wesnoth-sotbe/es.po
M po/wesnoth-trow/es.po
M po/wesnoth-tutorial/es.po
M po/wesnoth/es.po
Log Message:
-----------
updated Spanish translation
(cherry-picked from commit 7f35558799f55cd36bc738ceb8ce34a9e1ba143c)
Commit: 53780f51653df8b8a87ee0e107a2c04cf89b65b0
https://github.com/wesnoth/wesnoth/commit/53780f51653df8b8a87ee0e107a2c04cf89b65b0
Author: Steve Cotton <steve at octalot.co.uk>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg
Log Message:
-----------
THoT S12 Put the sneak-passageway's door on the right hex (fixes #2804)
This matches with the "Another old caved-in passageway..." event
around line 835, the trigger is on 55,33 and the walls that open are
[terrain]
x=55,55
y=34,35
terrain=Uu
[/terrain]
Debian bug #483893, for which the original fix in
4c473187e658607b17c113d66b2bf549e48e41e5 changed the wrong digit.
This is a cherry-pick from 1.14 to master (fixes #2804) of
bcaac1ef (the change) and 5b7aca97 (the changelog).
[ci skip]
(cherry-picked from commit d6661fdb802a06050a9a76693c40566e9ecbdc10)
Commit: 83a6243fb94cc699dd83d2a47a997e75ab48d3a0
https://github.com/wesnoth/wesnoth/commit/83a6243fb94cc699dd83d2a47a997e75ab48d3a0
Author: Celtic Minstrel <CelticMinstrel at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/lua/core.lua
Log Message:
-----------
Fix incorrect error message when encountering an unknown persistent tag
(cherry-picked from commit d2a8c5bb3200898a068aa24b7b968e444c7dc851)
Commit: 5e4b5a56b281153faeaa61c3fe8bc2fd91bdd4d8
https://github.com/wesnoth/wesnoth/commit/5e4b5a56b281153faeaa61c3fe8bc2fd91bdd4d8
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M data/lua/wml-tags.lua
Log Message:
-----------
Support location_id in [teleport]
(cherry-picked from commit fed46ec45f37baab8bd4491f4b67492256e42132)
Commit: f4c221216b6a5a0cad9006b258d255c95a2ef9ce
https://github.com/wesnoth/wesnoth/commit/f4c221216b6a5a0cad9006b258d255c95a2ef9ce
Author: pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
R docker/Dockerfile-travis-1604-master
M utils/travis/steps/install.sh
Log Message:
-----------
Create travis dockerfile in the travis script step.
This allows having multiple Dockerfile-base-* files without also needing to add a separate Dockerfile-travis-* file due to the FROM line changing.
(cherry-picked from commit 3f67c2fbf051aa9e322defb66c782477cd53b8bd)
Commit: b4736dcc526d910910ee29a752c01227c4692a53
https://github.com/wesnoth/wesnoth/commit/b4736dcc526d910910ee29a752c01227c4692a53
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M players_changelog.md
M po/wesnoth/pl.po
Log Message:
-----------
updated Polish translation
(cherry-picked from commit 65f690d905b26a404b646e0523f38568dea3c0d3)
Commit: e851bf877a90d150eb47e437792dc61b22dbb1f3
https://github.com/wesnoth/wesnoth/commit/e851bf877a90d150eb47e437792dc61b22dbb1f3
Author: Steve Cotton <steve at octalot.co.uk>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg
Log Message:
-----------
THoT S12 Fix some "x=" tests that should be "x,y=" tests
Taking the chest south of the start hid the door and chest that are
north of the start.
The sneak-door opened much earlier in the level, allowing the undead
from the south-east lich to go north to the spider room. The ghosts
and nightstalkers that are supposed to ambush the player's forces in
the south (after opening the 3-hex door) instead go north and end up
joining the spider fight. The slower-moving undead also go north,
and are easily fought one-by-one in the sneak passage instead of the
south-east.
[ci skip]
(cherry-picked from commit 2caed06cdb0847c7b6d14531647a7b2cbede1505)
Commit: b79cb16edd73dbee18acdbfb15b2943d2ab23df4
https://github.com/wesnoth/wesnoth/commit/b79cb16edd73dbee18acdbfb15b2943d2ab23df4
Author: Martin Hrubý <hrubymar10 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/Xcode/Resources/SDLMain.nib/designable.nib
M projectfiles/Xcode/Resources/SDLMain.nib/keyedobjects.nib
Log Message:
-----------
Updated changelog style (#2680)
* Updated changelog style
I have to do that because maximum size for textfield is 1000x1000 so full changelog doesn't fit there
* Disaled Spell Checking and bumped to 1.13.13
(cherry-picked from commit bca6203bf45b44515603918232950a58b3a45cf8)
Commit: 47dd4eb3771598646f8c0ece4fc11c3b11bd22d1
https://github.com/wesnoth/wesnoth/commit/47dd4eb3771598646f8c0ece4fc11c3b11bd22d1
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/actions/attack.cpp
M src/actions/attack.hpp
M src/gui/dialogs/attack_predictions.cpp
M src/units/abilities.cpp
M src/units/unit.cpp
M src/units/unit.hpp
Log Message:
-----------
Add [filter_second_weapon] to leadership and resistance abilities
Closes #2761
(cherry-picked from commit 7f60fb0fbc3b8245562503376905a16ab51a8d13)
Commit: 3f5d554f8c48e45b8c2bd956ca475b9c3fe80508
https://github.com/wesnoth/wesnoth/commit/3f5d554f8c48e45b8c2bd956ca475b9c3fe80508
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/gui/widget/label_default.cfg
Log Message:
-----------
GUI2/Label: tweaked link color
[ci skip]
(cherry-picked from commit 1903b05ab11107fad80a38733a1af2bf1d00727b)
Commit: 9b1431b4d74cfcb0544bafc7cf9aa0dcdab12cd0
https://github.com/wesnoth/wesnoth/commit/9b1431b4d74cfcb0544bafc7cf9aa0dcdab12cd0
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/widgets/label.cpp
Log Message:
-----------
GUI2/Label: tweaked link confirmation prompt
(cherry-picked from commit 384ba46c86c401a37b11eb427e1e9317453db33e)
Commit: d52737b5d0fbcf3a1eca25dc750c0e4eee36dfcc
https://github.com/wesnoth/wesnoth/commit/d52737b5d0fbcf3a1eca25dc750c0e4eee36dfcc
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M data/gui/window/lobby_main.cfg
M src/gui/dialogs/multiplayer/lobby.cpp
Log Message:
-----------
Swapped the position and formatting of game names and titles in the MP lobby
Addresses point 2 of #2815.
(cherry-picked from commit 6615aa7efe2de65362e3ec19ee3e72a65dea50d8)
Commit: 5d460f8cf3424124d3b3490beeb1357165ce19c2
https://github.com/wesnoth/wesnoth/commit/5d460f8cf3424124d3b3490beeb1357165ce19c2
Author: Sofartin <hrubymar10 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
Log Message:
-----------
Fix Xcode Project after 23e78abb20b00786ad58bbefda08904742974f8e
(cherry-picked from commit 2ae6c9e4d056863cd7266d947e05d8f89fc137a7)
Commit: c2f010d3788d2486a99aff534e50760aebbc571f
https://github.com/wesnoth/wesnoth/commit/c2f010d3788d2486a99aff534e50760aebbc571f
Author: newfrenchy83 <31768074+newfrenchy83 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/CodeBlocks/wesnoth.cbp
Log Message:
-----------
Update wesnoth.cbp
(cherry-picked from commit 596f3f1bda5e09b2f2d29ae5d1c4a1a5f635ae5b)
Commit: 8eee8aa1799b4587304378b6e49bc83e01cf6d83
https://github.com/wesnoth/wesnoth/commit/8eee8aa1799b4587304378b6e49bc83e01cf6d83
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/playmp_controller.cpp
M src/playturn.cpp
M src/synced_context.cpp
M src/synced_context.hpp
Log Message:
-----------
fix OOS when undoing actions with synced choices
The problm was that the old code tried to use `undo_stack().can_undo()`
to check whether the current action can be undone. But
`undo_stack().can_undo()` uses the undo stack which is only updated at
the end of each action, so it cannot be used to check whether the action
that is currently executed can be undone.
This code removes some assertion that were wrong due to the
justmentioned.
(cherry-picked from commit 79072b7c3d7ab662f1ca7bb27aa257bf9fd1a9fe)
Commit: fc797272109dcdb228329c41d9300089a950ffd8
https://github.com/wesnoth/wesnoth/commit/fc797272109dcdb228329c41d9300089a950ffd8
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/actions/attack.cpp
M src/gui/dialogs/unit_attack.cpp
Log Message:
-----------
fix filter not working in [disable] (#2826)
The problem was that the specials_context was not set during those
two get_special_bool calls
This removes what seems to be a rather useless optimisation in
battle_context::battle_context since choose_attacker_weapon would
just return 0 in that case.
fixes #2801
(cherry-picked from commit c4cf0c9da4b24589bd34a8aee9b41cda479ff35c)
Commit: 202e3141d30645a59e8e825e3f9a814b8b7efa1b
https://github.com/wesnoth/wesnoth/commit/202e3141d30645a59e8e825e3f9a814b8b7efa1b
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Changelog entry for c4cf0c9
[ci skip]
(cherry-picked from commit f4fb2a6dcc22e6890b08b1256e140d6f9a2a880a)
Commit: 0a409c391f17604f47388bf953ee0f59c2a1fe07
https://github.com/wesnoth/wesnoth/commit/0a409c391f17604f47388bf953ee0f59c2a1fe07
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M src/image.cpp
M src/sdl/utils.cpp
Log Message:
-----------
Fixed images with no alpha channel rendering incorrectly
See https://forums.wesnoth.org/viewtopic.php?p=625159#p625159
Since this problem can also be solved with make_neutral_surface, and is_neutral already
check a surface's alpha mask, I moved the is-not-indexed check to is_neutral and made use
of it for the on-load standardization check.
(cherry-picked from commit 6babb773d2319625a5b7def241fc0f9e4921db42)
Commit: 553cacd88eed1c44b6464485697d2960fa2a447d
https://github.com/wesnoth/wesnoth/commit/553cacd88eed1c44b6464485697d2960fa2a447d
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/addon/info.cpp
M src/ai/testing.cpp
M src/build_info.cpp
M src/color_range.cpp
M src/deprecation.cpp
M src/display.hpp
M src/game_classification.cpp
M src/game_config.cpp
M src/game_config.hpp
M src/game_end_exceptions.cpp
M src/game_initialization/mp_game_utils.cpp
M src/game_initialization/multiplayer.cpp
M src/gui/dialogs/unit_create.cpp
M src/image.hpp
M src/mouse_events.cpp
M src/savegame.cpp
M src/scripting/lua_kernel_base.cpp
M src/serialization/preprocessor.cpp
M src/server/server.cpp
M src/terrain/filter.hpp
M src/units/animation.hpp
M src/units/frame.hpp
M src/version.cpp
M src/version.hpp
M src/wesnoth.cpp
Log Message:
-----------
Moved game version stuff from game_config.hpp to version.hpp
They're still in the game_config namespace but are now in a more logical header.
game_config::version has been replaced with wesnoth_version.str(), save for one case
where it was replaced with wesnoth_version directly (it was a comparison against another
version_info object; no need to compare against a string...).
Also cleaned up a bunch of game_config.hpp includes.
(cherry-picked from commit b8d051cb72e51682d0fc41a3a37442ed7ecb553d)
Commit: dfce371287c336e03ac85733420b22bbf283ad6b
https://github.com/wesnoth/wesnoth/commit/dfce371287c336e03ac85733420b22bbf283ad6b
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/addon/client.cpp
M src/addon/validation.cpp
M src/desktop/windows_tray_notification.cpp
M src/display_chat_manager.cpp
M src/font/marked-up_text.cpp
M src/font/marked-up_text.hpp
M src/font/text.cpp
M src/font/text.hpp
M src/gui/core/event/dispatcher.cpp
M src/gui/core/event/dispatcher.hpp
M src/gui/core/event/distributor.cpp
M src/gui/core/event/distributor.hpp
M src/gui/core/event/handler.cpp
M src/gui/widgets/password_box.cpp
M src/gui/widgets/password_box.hpp
M src/gui/widgets/text_box.cpp
M src/gui/widgets/text_box_base.cpp
M src/gui/widgets/text_box_base.hpp
M src/help/help_impl.cpp
M src/hotkey/hotkey_item.cpp
M src/preferences/credentials.cpp
M src/savegame.cpp
M src/serialization/ucs4_convert_impl.hpp
M src/serialization/ucs4_iterator_base.hpp
M src/serialization/unicode.cpp
M src/serialization/unicode.hpp
M src/serialization/unicode_cast.hpp
R src/serialization/unicode_types.hpp
A src/serialization/utf8_exception.hpp
M src/server/player_network.cpp
M src/tests/test_serialization.cpp
M src/utils/markov_generator.cpp
M src/utils/markov_generator.hpp
M src/widgets/textbox.cpp
M src/widgets/textbox.hpp
Log Message:
-----------
Convert custom unicode type aliases to proper types (available as of C++11)
This changes:
utf8::char_t -> char
utf8::string -> std::string
utf16::char_t -> char16_t
utf16::string -> std::u16string
ucs4::char_t -> char32_t
ucs4::string -> std::u32string
utf16::string and ucs4::string are now proper strings instead of vectors of characters too.
In order to get this change to compile at all, I needed to add a ucs4_convert_impl::convert_impl
specialization for wchar_t alongside the new char16_t specialization; both point to the same
conversion implementation type.
This commit doesn't do any additional cleanup. I'm sure if we looked, we could get rid of a
lot of the custom conversion code and probably a bunch of stuff that might have had to do with
supporting utf16::string and ucs4::string being vectors instead of basic_string specializations.
Either way, I don't know the code (or encoding handling in general) to make a call as to what's
needed or not. I'll let someone else do that.
(cherry-picked from commit 1deacd89f640e1ddada75e1286c14a09ab8cce62)
Commit: 687d81850a951cb70e6eb5d9701d60badbdc405d
https://github.com/wesnoth/wesnoth/commit/687d81850a951cb70e6eb5d9701d60badbdc405d
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-lib/pl.po
Log Message:
-----------
updated Polish translation
(cherry-picked from commit b45b0a3cbd99eb6558e0462f14f7cc8be111e264)
Commit: 59cc2448dcc0b4087a3cffcd89604eaf5c685d87
https://github.com/wesnoth/wesnoth/commit/59cc2448dcc0b4087a3cffcd89604eaf5c685d87
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/lua/wml/message.lua
Log Message:
-----------
fix [message] side_for= not working for the last side.
fixes #2776
(cherry-picked from commit 0f756b81899ed9e965eb4f40b67bfeaaa3a1e518)
Commit: 8b5b9ff45a0460272e17a1769e9bba02abbe0b15
https://github.com/wesnoth/wesnoth/commit/8b5b9ff45a0460272e17a1769e9bba02abbe0b15
Author: Sofartin <hrubymar10 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
Log Message:
-----------
Update Xcode project after 3922a48c5cd694995c76148cfaadc12ca5a20e0b
(cherry-picked from commit 0d4bd9f9084cad320e84283d32602b9dfc92e973)
Commit: b41d523461876dfb05fd64b9ebd04a980258b6f9
https://github.com/wesnoth/wesnoth/commit/b41d523461876dfb05fd64b9ebd04a980258b6f9
Author: Martin Hrubý <hrubymar10 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/utils/irdya_datetime.cpp
Log Message:
-----------
Fixed typo
(cherry-picked from commit 31192cb44bb94efb437eaa15c97af8f4965ad338)
Commit: 8cfae7ffd03db346d6d64dc6e1f65dfec7c7935e
https://github.com/wesnoth/wesnoth/commit/8cfae7ffd03db346d6d64dc6e1f65dfec7c7935e
Author: Sofartin <hrubymar10 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/Xcode/Fix_Xcode_Dependencies
Log Message:
-----------
Remove libpng headers
(cherry-picked from commit 756f24d85e3752c6ff5f629a485c6089629e24bf)
Commit: 101188cc6157574450c3e7f36fec45ef840aaa99
https://github.com/wesnoth/wesnoth/commit/101188cc6157574450c3e7f36fec45ef840aaa99
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/ai/lua/core.cpp
Log Message:
-----------
Remove ai.synced_command stub
(cherry-picked from commit 2afb40e3e95e63fb4399fad857de1f1e053a8bb5)
Commit: a2c5129ddad12553356eb2449fa3d02119c7c62f
https://github.com/wesnoth/wesnoth/commit/a2c5129ddad12553356eb2449fa3d02119c7c62f
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/widgets/matrix.hpp
M src/gui/widgets/pane.cpp
M src/gui/widgets/pane.hpp
Log Message:
-----------
Renamed two t-prefix typedefs
[ci skip]
(cherry-picked from commit e7a8af0c40578aa29ccefe6c45a15c5057188162)
Commit: bb7afe25bbd27cff8cd16ca3e8ac74d26d12a006
https://github.com/wesnoth/wesnoth/commit/bb7afe25bbd27cff8cd16ca3e8ac74d26d12a006
Author: loonycyborg <loonycyborg at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M packaging/flatpak/org.wesnoth.Wesnoth.json
Log Message:
-----------
flatpak-builder manifest: cleanup a buildtime only dependency
(cherry-picked from commit c955416ef2d5ece6a15a473320b974391dfe878f)
Commit: 99d2919f5d54eeb8a42324e173ea6a978194c1f3
https://github.com/wesnoth/wesnoth/commit/99d2919f5d54eeb8a42324e173ea6a978194c1f3
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M data/gui/window/logging.cfg
Log Message:
-----------
gui2/log_settings: Make log options tooltips translatable
Fixes #2837.
(cherry-picked from commit 3967fd190e60b59cb9017bf4013a177dfcb44fdd)
Commit: f806b194ae21128254d6c5f68f1f60a1249932bd
https://github.com/wesnoth/wesnoth/commit/f806b194ae21128254d6c5f68f1f60a1249932bd
Author: Sofartin <hrubymar10 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/Xcode/Info.plist
Log Message:
-----------
Bump wesnoth version
(cherry-picked from commit 83c0fc5073fea7b2f5dbed0351baf9f248dd31e8)
Commit: e39a71fd221e4ea0980c4b03b7dfff59d7ed378f
https://github.com/wesnoth/wesnoth/commit/e39a71fd221e4ea0980c4b03b7dfff59d7ed378f
Author: stevecotton <steve at octalot.co.uk>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Legend_of_Wesmere/lua/wml_tags.lua
Log Message:
-----------
LoW S09 Lua cleanup: fix a line that was missed in 3783693cb (#2835)
3783693cbe95be6c51553dfa71bf0ecd5ed8116f was a general rename of
'V' to 'vars', and this line was missed. It caused an error at the
start of S09.
[ci skip]
(cherry-picked from commit 2b406a37ec009e4a13251035267356b4d82ab1f1)
Commit: a4ece0ce2da9b7040a1ae2829643eabbe8c60935
https://github.com/wesnoth/wesnoth/commit/a4ece0ce2da9b7040a1ae2829643eabbe8c60935
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-dw/fr.po
M po/wesnoth-lib/fr.po
M po/wesnoth/fr.po
Log Message:
-----------
updated French translation
(cherry-picked from commit 6be41f51a5ef4714749b05577509cd3ebab24cdb)
Commit: c37baf10a4b6fe9c395fea28eca32a8085181b56
https://github.com/wesnoth/wesnoth/commit/c37baf10a4b6fe9c395fea28eca32a8085181b56
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/image.cpp
Log Message:
-----------
Image: handle case where l10n-track file is not present
Resolves #2825.
(cherry-picked from commit d786fd6622c64660c88ced38c1a442eb9a7389c7)
Commit: eac9fe785cbf5c6a15c77534de3f2b2bb8a14052
https://github.com/wesnoth/wesnoth/commit/eac9fe785cbf5c6a15c77534de3f2b2bb8a14052
Author: Sofartin <hrubymar10 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
Log Message:
-----------
Add l10n-track to macOS Package - #2825
(cherry-picked from commit d27e359d6eafe840d7c8fb3f75483a6b9ab29f3b)
Commit: e81512ba8312721f293e797b02110e4d3b4336dd
https://github.com/wesnoth/wesnoth/commit/e81512ba8312721f293e797b02110e4d3b4336dd
Author: newfrenchy83 <31768074+newfrenchy83 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/CodeBlocks/wesnoth.cbp
Log Message:
-----------
Update wesnoth.cbp
(cherry-picked from commit 2c65dff722f16d4c0a0892941c05062ccff59966)
Commit: 92f8e24796b40f40841ab80b9e7db5877a775136
https://github.com/wesnoth/wesnoth/commit/92f8e24796b40f40841ab80b9e7db5877a775136
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/CMakeLists.txt
Log Message:
-----------
Fix linking of C++ unit tests with CMake
The problem with them is that the "libraries" into which Wesnoth is split
have circular dependencies, and linking of the game succeeds only by chance
(everything just happens to be used by the time the linker encounters it).
Fixed by allowing the linker to use multiple passes over the libraries
until all references are resolved.
(cherry-picked from commit e7ed3cbbb9ad474f2f89137fceece946eaa95e81)
Commit: 75a9a511665b11f730e1c9d79ff355d9d929fc6d
https://github.com/wesnoth/wesnoth/commit/75a9a511665b11f730e1c9d79ff355d9d929fc6d
Author: loonycyborg <loonycyborg at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M packaging/windows/Wesnoth.nsi.in
Log Message:
-----------
nsi script: update expected extensions of changelogs
(cherry-picked from commit 0e5463fd818b8cce388142c3ea949a289f6340ef)
Commit: 6a698064d65790c07bb53b46187825d6c5718a15
https://github.com/wesnoth/wesnoth/commit/6a698064d65790c07bb53b46187825d6c5718a15
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/game_events/action_wml.cpp
Log Message:
-----------
Deprecate [replace_map]map= in favour of [replace_map]map_data=
This gives greater consistency between similar APIs, and allows macros
intended to drop a map into [scenario] to also work in [replace_map].
(cherry-picked from commit c62a4820fcab36e3c556f698d60e1afa9d242f84)
Commit: 8d3fd89800c7d0dbdbfaf311c0d6008b06cbe632
https://github.com/wesnoth/wesnoth/commit/8d3fd89800c7d0dbdbfaf311c0d6008b06cbe632
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/units/attack_type.cpp
Log Message:
-----------
SWF: Support lists for special= and special_active=
(cherry-picked from commit 46f4b514822aadfed173f705ec401439b6aae74d)
Commit: 0d1ee9aa63fb1cb210dbc005279e7ae65a9d0f1c
https://github.com/wesnoth/wesnoth/commit/0d1ee9aa63fb1cb210dbc005279e7ae65a9d0f1c
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/units/filter.cpp
Log Message:
-----------
Support usage= in SUF
(cherry-picked from commit 62d39d653230f98100a5de5aac9e8c7be2b7e7ea)
Commit: 139d80ecb37720853b029fc3424b981528a296fd
https://github.com/wesnoth/wesnoth/commit/139d80ecb37720853b029fc3424b981528a296fd
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/units/filter.cpp
Log Message:
-----------
Support alignment= in SUF
(cherry-picked from commit 4b2dd68595a55b5fea68a26f28a464b312a82cf4)
Commit: 65092a4cfb6f0dbfc9f3982f58b74eb5e9b86b41
https://github.com/wesnoth/wesnoth/commit/65092a4cfb6f0dbfc9f3982f58b74eb5e9b86b41
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Update changelog
(cherry-picked from commit 8581637b5146152fdd14af9ac4372a63995195e7)
Commit: 6ae7c8e6c2711a9ccf1f4049eb7e579cbfba104b
https://github.com/wesnoth/wesnoth/commit/6ae7c8e6c2711a9ccf1f4049eb7e579cbfba104b
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M src/gui/dialogs/unit_create.cpp
Log Message:
-----------
Unit Create: fixed unit selection not persisting between uses (fixes #2822)
I had been unconditionally selecting the first entry after setting the active
sorting option. This overrode the previous unit selection.
Regression from 6b52d16faedaf6499f4777ed8156b1eaa09ab554.
(cherry-picked from commit ccce10511a2e74e23448e54e652874711bf6bad8)
Commit: dc46369288ee4342a967a1bbf804341a881e53ec
https://github.com/wesnoth/wesnoth/commit/dc46369288ee4342a967a1bbf804341a881e53ec
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Secrets_of_the_Ancients/scenarios/02_Dark_Business.cfg
Log Message:
-----------
SotA S2: fixed units with translatable IDs........
[ci skip[
(cherry-picked from commit 48010f514e32deac20e286174c487d2aa13134ad)
Commit: 1bd22008f0247379a51f9ca8b056487933d8e62a
https://github.com/wesnoth/wesnoth/commit/1bd22008f0247379a51f9ca8b056487933d8e62a
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Secrets_of_the_Ancients/scenarios/02_Dark_Business.cfg
Log Message:
-----------
SotA S2: fixed inconsistency between unit name and dialog (fixes #2844)
[ci skip]
(cherry-picked from commit 77863cc52685dd33e1587a2e9e437f21d8f1574f)
Commit: 72d3f15dc61cd1fe15ba4d2e9628a5f3d2bcf694
https://github.com/wesnoth/wesnoth/commit/72d3f15dc61cd1fe15ba4d2e9628a5f3d2bcf694
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M data/gui/window/mp_staging.cfg
Log Message:
-----------
MP Staging: make Faction Select button's purpose more clear
[ci skip]
(cherry-picked from commit 1f0588883cdb9158caff7f9bbceda01e0774f27f)
Commit: b25f813d94e02c1c752d5388c6072664561b2f4e
https://github.com/wesnoth/wesnoth/commit/b25f813d94e02c1c752d5388c6072664561b2f4e
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Secrets_of_the_Ancients/scenarios/07_Meeting_of_the_Minds.cfg
Log Message:
-----------
SotA S7: fixed inconsistent town name (fixes #2845)
[ci skip]
The two r's version is used in two other locations.
(cherry-picked from commit 565c4dbf60b38908025bae78d9a84002de6968f2)
Commit: cbcd728ad215fdc6263c376e027d2342b9ca7373
https://github.com/wesnoth/wesnoth/commit/cbcd728ad215fdc6263c376e027d2342b9ca7373
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Secrets_of_the_Ancients/scenarios/08_Carcyn.cfg
Log Message:
-----------
SotA S8: fixed inconsistent Ghost name (fixes #2846)
[ci skip]
The dashed version is used in prior scenarios.
(cherry-picked from commit 57c797d516bc909af36bced83b6a2bc2b90c0e42)
Commit: 224da8cfc74ffd9a1d788468a380dc7586d3f816
https://github.com/wesnoth/wesnoth/commit/224da8cfc74ffd9a1d788468a380dc7586d3f816
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Changelog entry for recent SotA fixes
[ci skip]
(cherry-picked from commit 7942b53ee8e3848f500e336bbbc74a1dacb520e6)
Commit: b6991ced4d1ca5700a6c4d3d0e1c7b382d28e72a
https://github.com/wesnoth/wesnoth/commit/b6991ced4d1ca5700a6c4d3d0e1c7b382d28e72a
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/gui/widget/button_25x25.cfg
M data/gui/window/mp_staging.cfg
Log Message:
-----------
MP Staging: made the faction select button about as prominent as you can get
[ci skip]
Thanks to grzywacz for pointing out the possible use of the unit icon.
(cherry-picked from commit dba3d409fcf64b356f34ad82a32fa762cc5dfb8c)
Commit: 4f2f2926187fc02958e9283364ae805d5b978cb6
https://github.com/wesnoth/wesnoth/commit/4f2f2926187fc02958e9283364ae805d5b978cb6
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/image_modifications.cpp
Log Message:
-----------
Add u and v variables to pixel_callable
It's currently calculated from x,y and w,h, but with the switch to shaders
this situation could be reversed to calculate x,y from u,v and w,h
(cherry-picked from commit 46c46b5548e1c02179a32b43f5d77696cbb68a9c)
Commit: af7adf2df67cfae9135f7326a3126d650d8f4aeb
https://github.com/wesnoth/wesnoth/commit/af7adf2df67cfae9135f7326a3126d650d8f4aeb
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Update changelog
[ci skip]
(cherry-picked from commit 81b4ef1d7c65615aa069edc84697167329911a51)
Commit: 46dea8734247b50b0e6a3bc7ca4ae65e05875605
https://github.com/wesnoth/wesnoth/commit/46dea8734247b50b0e6a3bc7ca4ae65e05875605
Author: Sofartin <hrubymar10 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/about.cfg
Log Message:
-----------
Add new packager
(cherry-picked from commit 769f102f2ec0438eec714cc2d541b5d46ac3113e)
Commit: ff283e85d0046c50bcce6da57e8a9940b3ce5948
https://github.com/wesnoth/wesnoth/commit/ff283e85d0046c50bcce6da57e8a9940b3ce5948
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/about_i18n.cfg
M po/wesnoth-ai/zh_CN.po
M po/wesnoth-anl/zh_CN.po
M po/wesnoth-aoi/zh_CN.po
M po/wesnoth-did/zh_CN.po
M po/wesnoth-dm/zh_CN.po
M po/wesnoth-dw/zh_CN.po
M po/wesnoth-editor/zh_CN.po
M po/wesnoth-ei/zh_CN.po
M po/wesnoth-help/zh_CN.po
M po/wesnoth-httt/zh_CN.po
M po/wesnoth-l/zh_CN.po
M po/wesnoth-lib/zh_CN.po
M po/wesnoth-low/zh_CN.po
M po/wesnoth-manpages/zh_CN.po
M po/wesnoth-manual/zh_CN.po
M po/wesnoth-multiplayer/zh_CN.po
M po/wesnoth-nr/zh_CN.po
M po/wesnoth-sof/zh_CN.po
M po/wesnoth-sota/zh_CN.po
M po/wesnoth-sotbe/zh_CN.po
M po/wesnoth-tb/zh_CN.po
M po/wesnoth-test/zh_CN.po
M po/wesnoth-thot/zh_CN.po
M po/wesnoth-trow/zh_CN.po
M po/wesnoth-tsg/zh_CN.po
M po/wesnoth-tutorial/zh_CN.po
M po/wesnoth-units/zh_CN.po
M po/wesnoth-utbs/zh_CN.po
M po/wesnoth/zh_CN.po
Log Message:
-----------
updated Chinese (Simplified) translation
(cherry-picked from commit fd4f36e3c93ea91fb020cff998f6bf7df97eee9d)
Commit: 9bcb4bbf353e3b54b4dc1ca65aff0f46ffc95644
https://github.com/wesnoth/wesnoth/commit/9bcb4bbf353e3b54b4dc1ca65aff0f46ffc95644
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
A doc/manual/images/README.md
R doc/manual/images/README.txt
Log Message:
-----------
Convert README for manual images to Markdown
I also updated the filenames for the images, changed the recommended
format for screenshots other than "fullscreen" screenshots to PNG,
and removed the (no longer true) claim that the example places to create
the screenshots match where the English screenshots were taken.
Resolves #2856.
[ci skip]
(cherry-picked from commit 134a51204b730ff2123e2af5b19f1fae58aa0515)
Commit: a01cde437a0939c7ae5c0c031bad2b8f4b815108
https://github.com/wesnoth/wesnoth/commit/a01cde437a0939c7ae5c0c031bad2b8f4b815108
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/events.cpp
Log Message:
-----------
Fix #1736: on GNU/Linux, a hotkey can trigger multiple commands
SDL_TEXTINPUT events aren't generated on Windows when Alt is held down.
Let's ensure that the behavior is the same on all platforms.
(cherry-picked from commit c42401a8deb92acc16039fbeed0acf16287e286c)
Commit: 47794122e8f6779dd739b4830b11f80dbd16e8ce
https://github.com/wesnoth/wesnoth/commit/47794122e8f6779dd739b4830b11f80dbd16e8ce
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M players_changelog.md
Log Message:
-----------
Changelog entry for commit c42401a8deb92acc16039fbeed0acf16287e286c
(cherry-picked from commit c23fc2b66645fe82d290de09a36f6e625747ed69)
Commit: 5462bc5d1798f675f73bec9d08e0beab9d460e64
https://github.com/wesnoth/wesnoth/commit/5462bc5d1798f675f73bec9d08e0beab9d460e64
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/multiplayer/mp_create_game.cpp
Log Message:
-----------
MP Create Game: fixed campaign player numbers label being untranslatable
Fixes #2861.
Also changed the logic for when the "min to max" label is shown from != to >.
(cherry-picked from commit a4dd74c32afb2f6c37453eafb60f60b8b215df01)
Commit: 693d5f3687e3dd58f5951160aea8b1147eaa5531
https://github.com/wesnoth/wesnoth/commit/693d5f3687e3dd58f5951160aea8b1147eaa5531
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gettext.hpp
Log Message:
-----------
Gettext: used [[maybe_unused]] for UNUSEDNOWARN on C++17
(cherry-picked from commit 275057df59ae52214761d73bc32bbb96a7595f10)
Commit: 81494ce3eec05aa0c313c69e158c07ebf7191305
https://github.com/wesnoth/wesnoth/commit/81494ce3eec05aa0c313c69e158c07ebf7191305
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Changelog entry for 79072b7c3d7ab662f1ca7bb27aa257bf9fd1a9fe
[ci skip]
(cherry-picked from commit b0f767bdb5056ed2f12c26b5c52157abcf6908b4)
Commit: 0fbb01e2192398a5dd9f1d0444832dc68a36dc54
https://github.com/wesnoth/wesnoth/commit/0fbb01e2192398a5dd9f1d0444832dc68a36dc54
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M src/game_events/manager.cpp
M src/game_events/manager.hpp
M src/gui/dialogs/gamestate_inspector.cpp
Log Message:
-----------
Game Events/Manager: skip disabled assertion if write_events is called mid-event
This reverts afaa75842c8914406bed75d3557ec241b0de9b6a and replaces it with a more general
no-assert-during-events check. This is because there are other instances besides [inspect]
where this function can be called mid-event, and it wouldn't be convenient to add nested
'strict' parameters to multiple functions just to handle them.
Fixes #2750.
(cherry-picked from commit a1810bde32a95ae00827b5db5ac08f63d9907acb)
Commit: 6ddfd840937dc0789b769e5e85dba822a4f52ea5
https://github.com/wesnoth/wesnoth/commit/6ddfd840937dc0789b769e5e85dba822a4f52ea5
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/utils/abilities.cfg
Log Message:
-----------
Fix #2857
(cherry-picked from commit b46381c83a290b081cc700c13fc182c88301bebd)
Commit: 47bffc18e28b03c950844c1b1f6cce5a4db0cbc0
https://github.com/wesnoth/wesnoth/commit/47bffc18e28b03c950844c1b1f6cce5a4db0cbc0
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Secrets_of_the_Ancients/scenarios/09_Training_Session.cfg
M data/campaigns/Secrets_of_the_Ancients/scenarios/10_Merfolk_Revenge.cfg
Log Message:
-----------
Fix #2848
(cherry-picked from commit 04d51a4b17b9eabb59c077b235e9c952b8890540)
Commit: 257f71340ebff43ff7ffcf126be53b44c77121fe
https://github.com/wesnoth/wesnoth/commit/257f71340ebff43ff7ffcf126be53b44c77121fe
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Secrets_of_the_Ancients/scenarios/09_Training_Session.cfg
M data/campaigns/Secrets_of_the_Ancients/scenarios/10_Merfolk_Revenge.cfg
Log Message:
-----------
Fix gender-dependent strings in SotA involving the kids
(cherry-picked from commit 7661c655b07f739738ef791719b80b8af1c69880)
Commit: ed3620869f31444ba1455adbb9535367d13468af
https://github.com/wesnoth/wesnoth/commit/ed3620869f31444ba1455adbb9535367d13468af
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/_main.cfg
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer+female-bow-attack1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer+female-bow-attack2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer+female-bow-attack3.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer+female-bow-attack4.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer+female-bow-defend.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer+female-bow.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer+female-sword-1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer+female-sword-2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer+female-sword-3.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer+female-sword-4.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer+female-sword-defend.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer+female-sword.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer+female.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer-bow-attack1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer-bow-attack2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer-bow-attack3.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer-bow-attack4.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer-bow-defend.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer-bow.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer-idle-1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer-idle-2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer-idle-3.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer-idle-4.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer-idle-5.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer-idle-6.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer-sword-1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer-sword-2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer-sword-3.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer-sword-4.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer-sword-defend.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer-sword.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/archer.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/avenger+female-bow-attack1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/avenger+female-bow-attack2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/avenger+female-bow-attack3.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/avenger+female-bow-attack4.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/avenger+female-bow-defend.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/avenger+female-bow.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/avenger+female-sword-1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/avenger+female-sword-2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/avenger+female-sword-3.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/avenger+female-sword.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/avenger+female.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/avenger-bow-attack1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/avenger-bow-attack2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/avenger-bow-attack3.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/avenger-bow-attack4.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/avenger-bow-defend.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/avenger-bow.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/avenger-sword-1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/avenger-sword-2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/avenger-sword-3.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/avenger-sword-defend.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/avenger-sword.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/avenger.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/captain-bow-attack1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/captain-bow-attack2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/captain-bow-attack3.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/captain-bow-attack4.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/captain-bow-defend.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/captain-bow.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/captain-defend.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/captain-leading.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/captain-melee-1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/captain-melee-2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/captain.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/champion-attack-1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/champion-attack-2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/champion-attack-3.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/champion-attack-4.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/champion-attack-5.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/champion-attack-6.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/champion-bow-attack1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/champion-bow-attack2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/champion-bow-attack3.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/champion-bow-attack4.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/champion-bow-defend.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/champion-bow.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/champion-defend.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/champion.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/corrupted-elf-attack.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/corrupted-elf-defend.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/corrupted-elf.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/druid-attack.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/druid-defend-1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/druid-defend-2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/druid-magic-1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/druid-magic-2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/druid-magic-3.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/druid-magic-4.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/druid.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/eloh-serene.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/fighter-bow-attack1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/fighter-bow-attack2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/fighter-bow-attack3.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/fighter-bow-attack4.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/fighter-bow-defend.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/fighter-bow.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/fighter-defend.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/fighter-idle-1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/fighter-idle-10.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/fighter-idle-11.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/fighter-idle-12.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/fighter-idle-2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/fighter-idle-3.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/fighter-idle-4.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/fighter-idle-5.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/fighter-idle-6.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/fighter-idle-7.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/fighter-idle-8.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/fighter-idle-9.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/fighter-melee-1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/fighter-melee-2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/fighter.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hero-bow-attack1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hero-bow-attack2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hero-bow-attack3.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hero-bow-attack4.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hero-bow-defend.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hero-bow.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hero-defend.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hero-melee-1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hero-melee-2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hero-melee-3.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hero-melee-4.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hero.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/horseman-defend.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/horseman-melee.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/horseman-moving.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/horseman-ranged-1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/horseman-ranged-2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/horseman.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter+female-ranged-1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter+female-ranged-2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter+female-ranged-3.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter+female-ranged-4.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter+female-ranged-defend.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter+female-sword-1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter+female-sword-2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter+female-sword-3.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter+female-sword-4.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter+female-sword-defend.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter+female.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter-ranged-1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter-ranged-2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter-ranged-3.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter-ranged-4.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter-ranged-defend.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter-sword-1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter-sword-2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter-sword-3.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter-sword-4.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter-sword-defend.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/kaleh-defend.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/kaleh-leading.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/kaleh-melee-1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/kaleh-melee-2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/kaleh-ranged-1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/kaleh-ranged-2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/kaleh-ranged-3.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/kaleh-ranged-4.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/kaleh-ranged-defend.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/kaleh-ranged.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/kaleh.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman+female-bow-attack1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman+female-bow-attack2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman+female-bow-attack3.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman+female-bow-attack4.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman+female-bow-defend.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman+female-bow.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman+female-die-1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman+female-die-2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman+female-die-3.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman+female-sword-1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman+female-sword-2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman+female-sword-3.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman+female-sword-defend.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman+female-sword.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman+female.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman-bow-attack1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman-bow-attack2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman-bow-attack3.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman-bow-attack4.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman-bow-defend.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman-bow.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman-die-1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman-die-2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman-die-3.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman-die-4.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman-die-5.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman-sword-1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman-sword-2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman-sword-3.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman-sword-defend.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman-sword.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marksman.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marshal-bow-attack1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marshal-bow-attack2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marshal-bow-attack3.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marshal-bow-attack4.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marshal-bow-defend.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marshal-bow.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marshal-defend.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marshal-leading.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marshal-melee-1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marshal-melee-2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/marshal.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/nym-defend.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/nym-melee-1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/nym-melee-2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/nym-ranged-1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/nym-ranged-2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/nym-ranged-3.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/nym.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/outrider-attack1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/outrider-attack2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/outrider-defend.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/outrider-melee-1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/outrider-melee-2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/outrider-moving.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/outrider.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/prowler+female.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/prowler.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/ranger+female-bow-attack1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/ranger+female-bow-attack2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/ranger+female-bow-attack3.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/ranger+female-bow-attack4.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/ranger+female-bow-defend.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/ranger+female-bow.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/ranger+female-sword-1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/ranger+female-sword-2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/ranger+female-sword-3.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/ranger+female-sword.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/ranger+female.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/ranger-bow-attack1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/ranger-bow-attack2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/ranger-bow-attack3.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/ranger-bow-attack4.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/ranger-bow-defend.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/ranger-bow.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/ranger-sword-1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/ranger-sword-2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/ranger-sword-3.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/ranger-sword-defend.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/ranger-sword.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/ranger.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/rider-attack1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/rider-attack2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/rider-defend.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/rider-melee-1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/rider-melee-2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/rider-moving.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/rider.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/scout-attack.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/scout-attack1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/scout-attack2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/scout-defend.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/scout-idle-1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/scout-idle-10.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/scout-idle-11.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/scout-idle-12.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/scout-idle-13.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/scout-idle-14.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/scout-idle-15.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/scout-idle-16.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/scout-idle-2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/scout-idle-3.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/scout-idle-4.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/scout-idle-5.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/scout-idle-6.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/scout-idle-7.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/scout-idle-8.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/scout-idle-9.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/scout-moving.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/scout.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sentinel+female.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sentinel.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shaman-attack.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shaman-attack2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shaman-defend.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shaman-heal1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shaman-heal2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shaman-heal3.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shaman-heal4.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shaman-heal5.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shaman-heal6.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shaman-heal7.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shaman-heal8.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shaman-heal9.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shaman.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sharpshooter+female-bow-attack1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sharpshooter+female-bow-attack2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sharpshooter+female-bow-attack3.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sharpshooter+female-bow-attack4.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sharpshooter+female-bow-attack5.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sharpshooter+female-bow-defend.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sharpshooter+female-bow.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sharpshooter+female-sword-1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sharpshooter+female-sword-2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sharpshooter+female-sword-3.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sharpshooter+female-sword-defend.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sharpshooter+female-sword.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sharpshooter+female.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sharpshooter-bow-attack1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sharpshooter-bow-attack2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sharpshooter-bow-attack3.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sharpshooter-bow-attack4.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sharpshooter-bow-attack5.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sharpshooter-bow-defend.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sharpshooter-bow.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sharpshooter-sword-1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sharpshooter-sword-2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sharpshooter-sword-3.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sharpshooter-sword-defend.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sharpshooter-sword.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/sharpshooter.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shyde-defend.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shyde-ftouch-attack1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shyde-ftouch-attack2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shyde-ftouch-attack3.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shyde-healing1.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shyde-healing10.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shyde-healing11.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shyde-healing12.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shyde-healing2.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shyde-healing3.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shyde-healing4.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shyde-healing5.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shyde-healing6.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shyde-healing7.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shyde-healing8.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shyde-healing9.png
R data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shyde.png
R data/campaigns/Under_the_Burning_Suns/scenarios_old/01_The_Morning_After.cfg
R data/campaigns/Under_the_Burning_Suns/scenarios_old/02_Across_the_Harsh_Sands.cfg
R data/campaigns/Under_the_Burning_Suns/scenarios_old/03_Stirring_in_the_Night.cfg
R data/campaigns/Under_the_Burning_Suns/scenarios_old/04_Descending_into_Darkness.cfg
R data/campaigns/Under_the_Burning_Suns/scenarios_old/05_A_Subterranean_Struggle.cfg
R data/campaigns/Under_the_Burning_Suns/scenarios_old/06a_In_the_Tunnels_of_Trolls.cfg
R data/campaigns/Under_the_Burning_Suns/scenarios_old/06b_In_the_Domain_of_Dwarves.cfg
R data/campaigns/Under_the_Burning_Suns/scenarios_old/07a_Dealing_with_Dwarves.cfg
R data/campaigns/Under_the_Burning_Suns/scenarios_old/07b_Talking_with_Trolls.cfg
R data/campaigns/Under_the_Burning_Suns/scenarios_old/08_Out_of_the_Frying_Pan.cfg
R data/campaigns/Under_the_Burning_Suns/scenarios_old/09_Blood_is_Thicker_Than_Water.cfg
R data/campaigns/Under_the_Burning_Suns/scenarios_old/10_Speaking_with_the_Fishes.cfg
R data/campaigns/Under_the_Burning_Suns/scenarios_old/11_Battle_for_Zocthanol_Isle.cfg
R data/campaigns/Under_the_Burning_Suns/scenarios_old/12_The_Final_Confrontation.cfg
R data/campaigns/Under_the_Burning_Suns/scenarios_old/13_Epilogue.cfg
R data/campaigns/Under_the_Burning_Suns/units/elves/Corrupted_Elf.cfg
R data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Archer.cfg
R data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Avenger.cfg
R data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Captain.cfg
R data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Champion.cfg
R data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Druid.cfg
R data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Fighter.cfg
R data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Hero.cfg
R data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Horseman.cfg
R data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Hunter.cfg
R data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Marksman.cfg
R data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Marshal.cfg
R data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Outrider.cfg
R data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Prowler.cfg
R data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Ranger.cfg
R data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Rider.cfg
R data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Scout.cfg
R data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Sentinel.cfg
R data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Shaman.cfg
R data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Sharpshooter.cfg
R data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Shyde.cfg
R data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Star.cfg
R data/campaigns/Under_the_Burning_Suns/units/elves/Divine_Avatar.cfg
R data/campaigns/Under_the_Burning_Suns/units/elves/Divine_Incarnation.cfg
R data/campaigns/Under_the_Burning_Suns/units/elves/Kaleh.cfg
R data/campaigns/Under_the_Burning_Suns/units/elves/Nym.cfg
M data/campaigns/Under_the_Burning_Suns/utils/character-definitions.cfg
M data/campaigns/Under_the_Burning_Suns/utils/macros.cfg
Log Message:
-----------
UtBS: removed old Desert Elves and accompanying scenarios and loading code
[ci skip]
Also fixed the campaign icon to use the new Kaleh sprite instead of the old one.
(cherry-picked from commit 1068ca128c0e50f09cfc77effafde98aa678b251)
Commit: f536852a54a078a8df8c477b36b49a3311a7f2b7
https://github.com/wesnoth/wesnoth/commit/f536852a54a078a8df8c477b36b49a3311a7f2b7
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/game_events/manager.cpp
Log Message:
-----------
Fixup a1810bde32a95 (better comment)
[ci skip]
(cherry-picked from commit 4b6e5478be3293794e030d7f63071a13fecbb0b1)
Commit: b20f8389330369a384245e760d4432b97d37b6cb
https://github.com/wesnoth/wesnoth/commit/b20f8389330369a384245e760d4432b97d37b6cb
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/game_events/manager.cpp
Log Message:
-----------
Fixup 4b6e547 because apparently I cannot write
[ci skip]
(cherry-picked from commit 607bc4c935beaa698d5985eafc5074fbe41bbf37)
Commit: 28b591204377c559af62a5da961e856db6c922fa
https://github.com/wesnoth/wesnoth/commit/28b591204377c559af62a5da961e856db6c922fa
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M players_changelog.md
Log Message:
-----------
Revert "Changelog entry for commit c42401a8deb92acc16039fbeed0acf16287e286c"
This reverts commit c23fc2b66645fe82d290de09a36f6e625747ed69.
(cherry-picked from commit 2562a7e3b008a9e349a2f5ce3f215dae62bf9958)
Commit: 16535c33551e7d5e4266628d6b937370d2d9039a
https://github.com/wesnoth/wesnoth/commit/16535c33551e7d5e4266628d6b937370d2d9039a
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/events.cpp
Log Message:
-----------
Revert "Fix #1736: on GNU/Linux, a hotkey can trigger multiple commands"
This reverts commit c42401a8deb92acc16039fbeed0acf16287e286c.
As @CelticMinstrel pointed out, that commit made it impossible to input characters which require
AltGr to type (e.g. @, € and $ in Finnish keyboard).
Reopens #1736.
(cherry-picked from commit 934f0326d85c90b7b0250f38365f56073540e357)
Commit: 97f5969719ba9341a221d7a05d1579f9f177d04d
https://github.com/wesnoth/wesnoth/commit/97f5969719ba9341a221d7a05d1579f9f177d04d
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth/zh_CN.po
Log Message:
-----------
updated Chinese (Simplified) translation
(cherry-picked from commit 5f201e17f0095e111c9b0f7174f1b6d0be20c3b6)
Commit: 9eb6950ed545b48ccbdf53543eb12ad5489a6c8c
https://github.com/wesnoth/wesnoth/commit/9eb6950ed545b48ccbdf53543eb12ad5489a6c8c
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
R doc/manual/images/gl/game-screen-1.11.9.jpg
A doc/manual/images/gl/game-screen-1.13.13+dev.jpg
R doc/manual/images/gl/main-menu-1.11.9.jpg
A doc/manual/images/gl/main-menu-1.13.13+dev.jpg
R doc/manual/images/gl/multiplayer-1.11.9.jpg
A doc/manual/images/gl/multiplayer-1.13.13+dev.jpg
R doc/manual/images/gl/recruit-1.11.9.jpg
A doc/manual/images/gl/recruit-1.13.13+dev.jpg
R doc/manual/images/gl/right_pane-1.11.9.jpg
A doc/manual/images/gl/right_pane-1.13.13+dev.jpg
R doc/manual/images/gl/top_pane-1.11.9.jpg
A doc/manual/images/gl/top_pane-1.13.13+dev.jpg
M players_changelog.md
M po/wesnoth-ai/gl.po
M po/wesnoth-anl/gl.po
M po/wesnoth-aoi/gl.po
M po/wesnoth-did/gl.po
M po/wesnoth-dm/gl.po
M po/wesnoth-dw/gl.po
M po/wesnoth-editor/gl.po
M po/wesnoth-ei/gl.po
M po/wesnoth-help/gl.po
M po/wesnoth-httt/gl.po
M po/wesnoth-l/gl.po
M po/wesnoth-lib/gl.po
M po/wesnoth-low/gl.po
M po/wesnoth-manpages/gl.po
M po/wesnoth-manual/gl.po
M po/wesnoth-multiplayer/gl.po
M po/wesnoth-nr/gl.po
M po/wesnoth-sof/gl.po
M po/wesnoth-sota/gl.po
M po/wesnoth-tb/gl.po
M po/wesnoth-thot/gl.po
M po/wesnoth-tsg/gl.po
M po/wesnoth-tutorial/gl.po
M po/wesnoth-units/gl.po
M po/wesnoth-utbs/gl.po
M po/wesnoth/gl.po
Log Message:
-----------
updated Galician translation
(cherry-picked from commit 7ab1da24a52d5842c0c3aaf18220f692ce000295)
Commit: bf83fdf6492b73aedfdb7e3ffb9be455fabddc69
https://github.com/wesnoth/wesnoth/commit/bf83fdf6492b73aedfdb7e3ffb9be455fabddc69
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-aoi/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-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-utbs/cs.po
M po/wesnoth/cs.po
Log Message:
-----------
updated Czech translation
(cherry-picked from commit 90dba93784d525be7007edffc6e3cbb66422157f)
Commit: 5eac05ac4cf655241e8b23add58d552100980b18
https://github.com/wesnoth/wesnoth/commit/5eac05ac4cf655241e8b23add58d552100980b18
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M src/help/help_topic_generators.cpp
Log Message:
-----------
help: Use new attack stats separator in unit descriptions
Closes #2873.
(This is part of a commented-out block in master because Vultraz hasn't
updated the code yet. He said I could forward-port the patch into it
anyway. For the time being unit descriptions are just completely missing
because of this.)
(cherry-picked from commit 7f8cb13bd309eabe960a975a0ec0b5cbdd7f0719)
Commit: 402b6d4cec57264e956146df16cdc01eb43e9705
https://github.com/wesnoth/wesnoth/commit/402b6d4cec57264e956146df16cdc01eb43e9705
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg
Log Message:
-----------
Fix #2875
(cherry-picked from commit bf70d50b80857b01b70357bf8e6d62b55c34b6ec)
Commit: cdef87e87522d46dfe644231d1f682f5cbe88340
https://github.com/wesnoth/wesnoth/commit/cdef87e87522d46dfe644231d1f682f5cbe88340
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/preferences/credentials.cpp
Log Message:
-----------
Fix #2745
(cherry-picked from commit 8f6613ea09ba5740c9b9d4d50d4ebb1215605f82)
Commit: de8313a39838d0f96237ccfcf4f44fbc9ec63031
https://github.com/wesnoth/wesnoth/commit/de8313a39838d0f96237ccfcf4f44fbc9ec63031
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/scenario-test.cfg
Log Message:
-----------
Fix test scenario references to Kaleh's WML
This is required after commit cbedd09ec2bd0d121e1deb38e3600f1e042032b7.
(cherry-picked from commit 0610b48d7e150a319ac55bb348d44d569712cc0d)
Commit: f46c4e9048d3e2e43fa1f512467b2c0f38504783
https://github.com/wesnoth/wesnoth/commit/f46c4e9048d3e2e43fa1f512467b2c0f38504783
Author: ln-zookeeper <lari.nieminen at iki.fi>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M data/campaigns/The_Rise_Of_Wesnoth/_main.cfg
A data/campaigns/The_Rise_Of_Wesnoth/images/story/trow_intro_01.jpg
A data/campaigns/The_Rise_Of_Wesnoth/images/story/trow_intro_02.jpg
A data/campaigns/The_Rise_Of_Wesnoth/images/story/trow_intro_03.jpg
A data/campaigns/The_Rise_Of_Wesnoth/images/story/trow_intro_04.jpg
A data/campaigns/The_Rise_Of_Wesnoth/images/story/trow_intro_05.jpg
A data/campaigns/The_Rise_Of_Wesnoth/images/story/trow_intro_06.jpg
A data/campaigns/The_Rise_Of_Wesnoth/images/story/trow_intro_07.jpg
A data/campaigns/The_Rise_Of_Wesnoth/images/story/trow_intro_08.jpg
A data/campaigns/The_Rise_Of_Wesnoth/images/story/trow_intro_09.jpg
A data/campaigns/The_Rise_Of_Wesnoth/images/story/trow_intro_10.jpg
A data/campaigns/The_Rise_Of_Wesnoth/images/story/trow_story_01-A_Summer_of_Storms.jpg
A data/campaigns/The_Rise_Of_Wesnoth/images/story/trow_story_02-The_Fall.jpg
A data/campaigns/The_Rise_Of_Wesnoth/images/story/trow_story_03-A_Harrowing_Escape.jpg
A data/campaigns/The_Rise_Of_Wesnoth/images/story/trow_story_04-Fall_of_Eldaric.jpg
A data/campaigns/The_Rise_Of_Wesnoth/images/story/trow_story_04a-The_Swamp_of_Esten.jpg
A data/campaigns/The_Rise_Of_Wesnoth/images/story/trow_story_04b-The_Midlands.jpg
A data/campaigns/The_Rise_Of_Wesnoth/images/story/trow_story_06-Temple_in_the_Deep.jpg
A data/campaigns/The_Rise_Of_Wesnoth/images/story/trow_story_13-Peoples_in_Decline.jpg
A data/campaigns/The_Rise_Of_Wesnoth/images/story/trow_story_15-A_New_Land.jpg
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/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/06_Temple_in_the_Deep.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/15_A_New_Land.cfg
M players_changelog.md
Log Message:
-----------
TRoW: New set of story art by LordBob
In scenarios 06 and 14 I turned the opening narrator message into story text instead. The image for 03 isn't used yet as there's no text to accompany it.
(cherry-picked from commit eaf186e021d885d5fb39c0ff5c89413d769f0fdd)
Commit: 9686d2030f86ffe910f262cf91e995d586e0f85a
https://github.com/wesnoth/wesnoth/commit/9686d2030f86ffe910f262cf91e995d586e0f85a
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
R data/campaigns/The_Rise_Of_Wesnoth/images/story/fall_of_eldaric.png
R data/campaigns/The_Rise_Of_Wesnoth/images/story/prince_finds_wesnoth.png
R data/campaigns/The_Rise_Of_Wesnoth/images/story/rough_landing.png
R data/campaigns/The_Rise_Of_Wesnoth/images/story/story1.png
Log Message:
-----------
TRoW: removed old, now-unused story art
[ci skip]
(cherry-picked from commit 3d71caff38d1261cfa3572e61b1b108c86adc06f)
Commit: 4ce00c6b6c6d7bfb10cc28e0b1748a26453e899f
https://github.com/wesnoth/wesnoth/commit/4ce00c6b6c6d7bfb10cc28e0b1748a26453e899f
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/lua/wml/move_unit.lua
Log Message:
-----------
Allow [move_unit]to_location to take a list of waypoints
(cherry-picked from commit 622db9d08b1e15ba99ccb797b4785ac9df4f49fe)
Commit: c5b5bdda708da9e2e3767e8cd0999a9e8a037cb8
https://github.com/wesnoth/wesnoth/commit/c5b5bdda708da9e2e3767e8cd0999a9e8a037cb8
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M data/lua/wml/move_unit.lua
Log Message:
-----------
Allow [move_unit]dir= to perform relative movements
(cherry-picked from commit 68b33cf6bd8a44470c7ba8069b6b3502e117b5bd)
Commit: 3735b9c4f2919356ddfd4d4daa04f775c69edf5e
https://github.com/wesnoth/wesnoth/commit/3735b9c4f2919356ddfd4d4daa04f775c69edf5e
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/lua/wml/move_unit.lua
Log Message:
-----------
Add [move_unit]clear_shroud= as an attempt to clear shroud as the unit moves (untested)
(cherry-picked from commit b062b19e10c85faecf65246e94ec8dbbad0ad4ed)
Commit: 9c626fc4f784a20c7e92e797857d7536ed7a845f
https://github.com/wesnoth/wesnoth/commit/9c626fc4f784a20c7e92e797857d7536ed7a845f
Author: Celtic Minstrel <CelticMinstrel at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Update changelog.md
(cherry-picked from commit 191c23c194bedf13e1eb6e27eb469d43da965af5)
Commit: d7db76308e9f717e316877c606c80f00518b8050
https://github.com/wesnoth/wesnoth/commit/d7db76308e9f717e316877c606c80f00518b8050
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/multiplayer/scenarios/2p_Aethermaw.cfg
Log Message:
-----------
Add team colouring to some Aethermaw props missing it
[ci skip]
(cherry-picked from commit 8c97458a76b1a7303e23c2008cb069b0ffdd6724)
Commit: 368e5cb7a790e1ad1975a8a8794271f6baa3a5ed
https://github.com/wesnoth/wesnoth/commit/368e5cb7a790e1ad1975a8a8794271f6baa3a5ed
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Update changelog
[ci skip]
(cherry-picked from commit cfd5d5289d94aad69b5ef6ed3433e001ef224b49)
Commit: 99da3421abcf21d405a3c42bce3b88cdf3166cac
https://github.com/wesnoth/wesnoth/commit/99da3421abcf21d405a3c42bce3b88cdf3166cac
Author: loonycyborg <loonycyborg at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/server/server.cpp
Log Message:
-----------
Fix issue #1757: prevent abnormal termination if failed to bind address
(cherry-picked from commit 19d9e150e15ef811a2a395dbce874086c5efe216)
Commit: cb3ddc368b090c038f89e74ce3d3be74929a8f30
https://github.com/wesnoth/wesnoth/commit/cb3ddc368b090c038f89e74ce3d3be74929a8f30
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M players_changelog.md
M src/controller_base.cpp
M src/controller_base.hpp
M src/hotkey/command_executor.cpp
M src/hotkey/command_executor.hpp
Log Message:
-----------
Hotkey manager: drop duplicate commands
We use both SDL_KEYDOWN and SDL_TEXTINPUT events for hotkeys. It's possible
for both events (caused by the same keypress) to trigger the hotkey command
and we don't want that. Hence, let's drop duplicate commands.
Fixes #1736.
(cherry-picked from commit 8667e5bbdd3d2a92e966a15f12a3753b9e3c283f)
Commit: b9ea1961b13caa06305c0f106fa24b59339d0cbf
https://github.com/wesnoth/wesnoth/commit/b9ea1961b13caa06305c0f106fa24b59339d0cbf
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M README.md
Log Message:
-----------
INSTALL had been renamed to INSTALL.md
[ci skip]
(cherry-picked from commit 7d427aedee8ff5e8cec2866e3aee2d041ecc1a50)
Commit: 28c58d0e219bb3f7fed4355f00489f05f4631cbd
https://github.com/wesnoth/wesnoth/commit/28c58d0e219bb3f7fed4355f00489f05f4631cbd
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/multiplayer/scenarios/2p_Dark_Forecast.cfg
M data/multiplayer/scenarios/4p_A_New_Land.cfg
Log Message:
-----------
remove unneded keys
[ci skip]
(cherry-picked from commit 533c7e9822b097fd8cc7502d8362d0345b29d022)
Commit: 98c61118d57e00a644a5e5d9d00365dddb088ec2
https://github.com/wesnoth/wesnoth/commit/98c61118d57e00a644a5e5d9d00365dddb088ec2
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/game_initialization/multiplayer.cpp
M src/wesnothd_connection.cpp
M src/wesnothd_connection.hpp
Log Message:
-----------
Refactor out custom wesnothd_connection_ptr class again
I originally did this in 699047766a8852014df20c44d5ed84dadb37015e and then reverted it in
08a866dc20e678602f65f0cdedb21fb28a0bfa8c due to @gfgtdf pointing out the object was never
actually destroyed since io_service::stop was never called (issue #1927).
This new method foregoes the custom wrapper class and instead waits for the worker thread
to terminate in the wesnothd_connection dtor. The use of the wrapper class is also why using
thread::detach alone worked (@jyrkive) and using join did not.
Additionally, the ptr alias is now of a unique_ptr instead of a shared_ptr.
I have verified that the connection dtor is actually called. This new method makes it clearer
what's actually going on.
(cherry-picked from commit acc3fe890611b54c8493acafc33f1e78832b65dc)
Commit: 20493dc07c117bc197f4830d37739bb12483d63a
https://github.com/wesnoth/wesnoth/commit/20493dc07c117bc197f4830d37739bb12483d63a
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/multiplayer/scenarios/ANL_utils/ANL_general_macros.cfg
Log Message:
-----------
ANL: removed unused macro (closes #2878)
[ci skip]
(cherry-picked from commit 90d45dcf074aaf6e2f118abba81103999a17521a)
Commit: 0c6322230a4c98300fca2e57f7f5048855ae3142
https://github.com/wesnoth/wesnoth/commit/0c6322230a4c98300fca2e57f7f5048855ae3142
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Dead_Water/units/Brawler.cfg
Log Message:
-----------
update 2nd stunned event as well with additions from 1.13.2
[ci skip]
(cherry-picked from commit 469488d9815a1dc243512396b5c644918dc77d60)
Commit: 1dd00c34419ab771d8d288367c0d4dc9af6a718d
https://github.com/wesnoth/wesnoth/commit/1dd00c34419ab771d8d288367c0d4dc9af6a718d
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M data/gui/window/game_load.cfg
M src/gui/dialogs/game_load.cpp
Log Message:
-----------
Game Load: added a convenient button in Load Game to open your saves folder
(cherry-picked from commit 802bbe8cdccacb225ea02a8f8b4240b7172549ed)
Commit: b6c843757b954f9abe49b35123720e6329c9352c
https://github.com/wesnoth/wesnoth/commit/b6c843757b954f9abe49b35123720e6329c9352c
Author: loonycyborg <loonycyborg at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/desktop/open.cpp
M src/wesnoth.cpp
Log Message:
-----------
Fix "host networked game" option
It was broken by b95c9996bf435daa4d7e64fd1ef41425ac182b95 because
ignoring SIGCHLD makes it impossible to query exit status of wesnothd
subprocess. Fix this by spawning a thread to wait for the browser
instead of ignoring SIGCHLD.
(cherry-picked from commit 846bf8f208ae41381e133e96b24e6b9876ea2a01)
Commit: e22a48046a57ef39ca5cef94dcc79d1d83a042a7
https://github.com/wesnoth/wesnoth/commit/e22a48046a57ef39ca5cef94dcc79d1d83a042a7
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gettext_boost.cpp
Log Message:
-----------
Removed last boost/thread.hpp include
Locale doesn't rely on boost, so it must have been some other issue in Boost 1.60
that was incidentally fixed by including that file. If anyone ever happens to build
with 1.60 again we can revisit this.
For the record, there are no issues with VS 2017 and Boost 1.66.
(cherry-picked from commit 7cf93413797c73e6ca33e22a615897ffbec42cdb)
Commit: 32da54b0592fe1f5fe715182b8f835e0688f7014
https://github.com/wesnoth/wesnoth/commit/32da54b0592fe1f5fe715182b8f835e0688f7014
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M CMakeLists.txt
M INSTALL.md
M SConstruct
M changelog.md
Log Message:
-----------
Removed Boost Thread as a built-time dependency
We use std::thread now.
(cherry-picked from commit 9de7aff9044b1aae7fc56c4b78a400d93c0f6750)
Commit: c6b7586f6fb05f915bd99a5c03a240a1215d71b9
https://github.com/wesnoth/wesnoth/commit/c6b7586f6fb05f915bd99a5c03a240a1215d71b9
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/team.hpp
Log Message:
-----------
Fix #2850: [modify_side] share_vision=yes doesn't do anything
Thanks to @gfgtdf for the suggested fix that works well.
(cherry-picked from commit 82e04ab7611b8c8458e70f66c49a8032e1c8469c)
Commit: 00dff3f1d3ee939047a9c7f8a3046731a91ab39e
https://github.com/wesnoth/wesnoth/commit/00dff3f1d3ee939047a9c7f8a3046731a91ab39e
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Changelog entry for commit 82e04ab7611b8c8458e70f66c49a8032e1c8469c
(cherry-picked from commit c5802cdcda42f068aa2a7372f864cc8f1522568a)
Commit: 87bf4e3fd640c0e3bc7b21782aff0b0433dcb185
https://github.com/wesnoth/wesnoth/commit/87bf4e3fd640c0e3bc7b21782aff0b0433dcb185
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M players_changelog.md
M po/wesnoth-anl/it.po
M po/wesnoth-did/it.po
M po/wesnoth-dm/it.po
M po/wesnoth-editor/it.po
M po/wesnoth-lib/it.po
M po/wesnoth-manpages/it.po
M po/wesnoth-multiplayer/it.po
M po/wesnoth-nr/it.po
M po/wesnoth-sof/it.po
M po/wesnoth-sota/it.po
M po/wesnoth-tutorial/it.po
M po/wesnoth-utbs/it.po
Log Message:
-----------
updated Italian translation
(cherry-picked from commit 6034cc50d1559a9776be9e4b4882c449b7c64afe)
Commit: 7969aaaf00cb27039fd5edd3c48d3558fbe071c6
https://github.com/wesnoth/wesnoth/commit/7969aaaf00cb27039fd5edd3c48d3558fbe071c6
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-lib/pl.po
M po/wesnoth-units/pl.po
M po/wesnoth/pl.po
Log Message:
-----------
updated Polish translation
(cherry-picked from commit cff478f9d386afcb18e3bd5ed06149c29c4b356e)
Commit: 116a897163a7f541aeb69b84bead2d6f8890d6f3
https://github.com/wesnoth/wesnoth/commit/116a897163a7f541aeb69b84bead2d6f8890d6f3
Author: Martin Hrubý (hrubymar10) <hrubymar10 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/Xcode/README.md
Log Message:
-----------
Update link to new MacCompileStuff repo
(cherry-picked from commit 68c1dbeab2453f41cfc06742becf149a2487694b)
Commit: 13e402e031bedb9c34041d680ce10f489e5a7c42
https://github.com/wesnoth/wesnoth/commit/13e402e031bedb9c34041d680ce10f489e5a7c42
Author: Martin Hrubý (hrubymar10) <hrubymar10 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/Xcode/Fix_Xcode_Dependencies
M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
Log Message:
-----------
Remove Boost thread from Xcode project
(cherry-picked from commit 6314c6ab05a2ac89efac2313c285c7aa5c4b2b29)
Commit: 34a18a7692d2bf186994a4b24db0ced79986623e
https://github.com/wesnoth/wesnoth/commit/34a18a7692d2bf186994a4b24db0ced79986623e
Author: pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M docker/Dockerfile-base-1604-master
Log Message:
-----------
Remove boost-thread from dockerfile.
(cherry-picked from commit 52f8e8233c99c214d7409fd9f0b2cd4056590255)
Commit: 68f066d94a5b2052aac6c57027e82e96adcbc908
https://github.com/wesnoth/wesnoth/commit/68f066d94a5b2052aac6c57027e82e96adcbc908
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/auxiliary/iterator/walker_grid.cpp
M src/gui/auxiliary/iterator/walker_tree_node.cpp
M src/gui/auxiliary/iterator/walker_widget.cpp
M src/gui/dialogs/preferences_dialog.cpp
M src/gui/dialogs/screenshot_notification.cpp
M src/utils/functional.hpp
Log Message:
-----------
Removed bind_void
This is no longer needed with the compilers we support. It is needed on VS 2013, but
we dropped that. Don't know when GCC or Clang stopped needed it (if they ever did).
I'm guessing the "function that returns a value cannot be bound in a function type
that returns void" behavior wasn't an intentional design. Additionally, I don't believe
point 1 raised in the accompanying comment has ever been true... if so, pretty sure
we wouldn't have been able to build at all.
Also removed unnecessary global.hpp include from functional.hpp.
(cherry-picked from commit 17fc9d71dbd933fa2e37c8fd9aed52a4e2fb5735)
Commit: 1f8ba287dd429c58827dcebf8b755d65d5e70347
https://github.com/wesnoth/wesnoth/commit/1f8ba287dd429c58827dcebf8b755d65d5e70347
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gettext_boost.cpp
M src/global.hpp
M src/wml_exception.hpp
Log Message:
-----------
Expand NORETURN, enable C99 unconditionally on MSVC
[[noreturn]] is supported on all the compilers we support. Still need to decide
the exact minimum versions and figure out what to do with DEPRECATED and FALLTHROUGH,
so leaving those for now.
And since we require VS 2015 and up we can enable C99 unconditionally.
(cherry-picked from commit 96681151f083bb25a3ddb3301083241e36fd6789)
Commit: 58a61af5f93f1616f237f028bfeb9ebcae43ba58
https://github.com/wesnoth/wesnoth/commit/58a61af5f93f1616f237f028bfeb9ebcae43ba58
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/config_attribute_value.hpp
Log Message:
-----------
Removed duplicate config_key_type alias
This isn't used in config_attribute_value.*pp but rather in config.*pp.
(cherry-picked from commit 9977addd64505b3042cd2a2a9e26f2a7a84acd5c)
Commit: 4bb16f25a7b263f1545e0e4f3cad91f6f9430fd1
https://github.com/wesnoth/wesnoth/commit/4bb16f25a7b263f1545e0e4f3cad91f6f9430fd1
Author: pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M utils/travis/steps/install.sh
Log Message:
-----------
Make LTO controllable via travis env variable.
(cherry-picked from commit 66caa190f6dcde039cc5cb73e4f43a061aef43b8)
Commit: a07b8471819d4e5747edbf18352c1b591cbc8aed
https://github.com/wesnoth/wesnoth/commit/a07b8471819d4e5747edbf18352c1b591cbc8aed
Author: pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M utils/travis/steps/install.sh
Log Message:
-----------
Allow setting EXTRA_FLAGS_RELEASE to something other than -O0.
(cherry-picked from commit 2ed9d2c0c4d1d079190ff5bd2a8a287f9076d198)
Commit: b2cca0825757af2ae485c732144e185d7bcafde5
https://github.com/wesnoth/wesnoth/commit/b2cca0825757af2ae485c732144e185d7bcafde5
Author: pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M utils/travis/docker_run.sh
M utils/travis/steps/script.sh
Log Message:
-----------
Allow setting a sanitizer to use.
Note: UBSan at least does seem to take a fairly significant amount of extra time to compile and run the WML tests with.
(cherry-picked from commit 92f74c39f6aedc10bd04f1cf6dc9144fb35e3a19)
Commit: 83a2457dd869b4ad7a11e566f9de550c9bd33c71
https://github.com/wesnoth/wesnoth/commit/83a2457dd869b4ad7a11e566f9de550c9bd33c71
Author: pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M utils/travis/docker_run.sh
Log Message:
-----------
Add a check to fail the job if compiling takes too long.
The intent behind this is that, if there most likely wouldn't be enough time left to complete the unit tests anyway, then just fail the job after compiling so the cache can be updated. Otherwise, if the unit tests were run and the job timed out, then the cache would not be uploaded at all and the next time the job ran it would be from scratch again.
(cherry-picked from commit 5d970e40cd43a23a8d1b8198e962f198fc9282b0)
Commit: b32ce37de5dd5ecdc5d28613a5a239fc26a62b28
https://github.com/wesnoth/wesnoth/commit/b32ce37de5dd5ecdc5d28613a5a239fc26a62b28
Author: pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M SConstruct
Log Message:
-----------
Allow setting c++17 in scons.
(cherry-picked from commit 7aeca70cb04f1990aeef0213b88ec80b0f4d24f8)
Commit: 2a6d9454de609a02d7863f8335ffd97fad31cd97
https://github.com/wesnoth/wesnoth/commit/2a6d9454de609a02d7863f8335ffd97fad31cd97
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/ai/default/recruitment.cpp
M src/controller_base.cpp
M src/display.cpp
M src/formula/variant.cpp
M src/joystick.cpp
M src/statistics.cpp
M src/utils/math.hpp
Log Message:
-----------
Replaced round_double and round_portable with std::round
std::round(double) uses the desired half-away-from-0 method.
(cherry-picked from commit 29fcbd053da63b790eb3b4fac32e204b054929d4)
Commit: 3b3887d2e93b0bfc2e801ad02e58cb089dad2ae9
https://github.com/wesnoth/wesnoth/commit/3b3887d2e93b0bfc2e801ad02e58cb089dad2ae9
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/game_initialization/lobby_data.cpp
Log Message:
-----------
Attempt to fix non-required era being flagged for download
See #2747.
(cherry-picked from commit ab54b62553d5e6b3224ecf34c0e448eb58a972e9)
Commit: c815fa1d25027a636fabb7debdb26d79fefc08af
https://github.com/wesnoth/wesnoth/commit/c815fa1d25027a636fabb7debdb26d79fefc08af
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Changelog entry for ab54b62
[ci skip]
(cherry-picked from commit 227c8ba20c24260a26c013d6f66f924af0c49632)
Commit: f977cdc6cb4efd40398fa77f96cf8bbc05cac654
https://github.com/wesnoth/wesnoth/commit/f977cdc6cb4efd40398fa77f96cf8bbc05cac654
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/game_initialization/lobby_data.cpp
Log Message:
-----------
Lobby Info: filter on game name first
It's more common to want a name.
(cherry-picked from commit 35590fd842ccaf6ff43769c88738813e0f06c1f5)
Commit: dde49f05ea85ceb1eb8d9e255411abccb825b439
https://github.com/wesnoth/wesnoth/commit/dde49f05ea85ceb1eb8d9e255411abccb825b439
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M src/editor/controller/editor_controller.cpp
M src/editor/map/context_manager.cpp
M src/editor/map/context_manager.hpp
M src/editor/palette/location_palette.cpp
Log Message:
-----------
Editor: Refresh named locations list when map context changes (fixes #1023)
This solution is a bit of a hack, but odds are this code will be
majorly refactored in 1.15 anyway. The important thing is that
this works.
(cherry-picked from commit 8e4de9db67f533e98cd11235567b95a03cb9889a)
Commit: 2c2b4da6002186533c2e8580e1b2d692df3109c2
https://github.com/wesnoth/wesnoth/commit/2c2b4da6002186533c2e8580e1b2d692df3109c2
Author: ln-zookeeper <lari.nieminen at iki.fi>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Updated changelog
[ci skip]
(cherry-picked from commit 33e924dc35fdbc6c32696d08d14beef9cd80893b)
Commit: fb1e7eb45244c892bc91d7a454c8475045bea99d
https://github.com/wesnoth/wesnoth/commit/fb1e7eb45244c892bc91d7a454c8475045bea99d
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/units/units.cfg
R data/campaigns/Under_the_Burning_Suns/utils/kaleh-abilities.cfg
Log Message:
-----------
remove movetypes and abilities only used by old desert elves
[ci skip]
(cherry-picked from commit ea656a8cc795f41fcce41de2f8c5eb805d93cf4b)
Commit: d0709c5ca19c608a22e0c6337c8e84653c4abf89
https://github.com/wesnoth/wesnoth/commit/d0709c5ca19c608a22e0c6337c8e84653c4abf89
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Champion.cfg
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Fighter.cfg
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Flagbearer.cfg
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Flanker.cfg
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Protector.cfg
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Ranger.cfg
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Stalwart.cfg
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Vanguard.cfg
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Warrior.cfg
Log Message:
-----------
utbs: change traits for higher unit types too,
because they are nowadays displayed in the help.
Also keep them sorted the same way as usual.
[ci skip]
(cherry-picked from commit 2e8f6c2a799331c1a1a98a9ee478d40e51e34268)
Commit: 0ec5494b3915216f4ccafb427aa0385ae2486650
https://github.com/wesnoth/wesnoth/commit/0ec5494b3915216f4ccafb427aa0385ae2486650
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/units/monsters/Alien_Body.cfg
M data/campaigns/Under_the_Burning_Suns/units/monsters/Alien_Minion.cfg
M data/campaigns/Under_the_Burning_Suns/units/monsters/Alien_Spire.cfg
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Corrupted_Elf.cfg
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Divine_Avatar.cfg
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Divine_Incarnation.cfg
Log Message:
-----------
utbs: replace true by yes
[ci skip]
(cherry-picked from commit 5e1f6af8dd940e354d19b63963c2e1b851e9ff35)
Commit: ef9c2b7e2c84b2644ccb35dcb04e5822401d2d2b
https://github.com/wesnoth/wesnoth/commit/ef9c2b7e2c84b2644ccb35dcb04e5822401d2d2b
Author: loonycyborg <loonycyborg at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/server/server.cpp
Log Message:
-----------
wesnothd: made server fill in sender when forwarding whispers
(cherry-picked from commit f5ab654760af1e1aba839979018e10ffd9d6ddbd)
Commit: 60d9bc27aee94edd35ea4a8e50da62753535e4a2
https://github.com/wesnoth/wesnoth/commit/60d9bc27aee94edd35ea4a8e50da62753535e4a2
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/editor/time-of-day.cfg
M src/game_initialization/lobby_data.cpp
M src/gui/dialogs/addon/manager.cpp
M src/gui/dialogs/campaign_selection.cpp
M src/gui/dialogs/multiplayer/lobby.cpp
M src/reports.cpp
Log Message:
-----------
Fix #2894
(cherry-picked from commit 0f267d0ede3e8479e1e68a171e74b0cc420da51d)
Commit: b3bf3862c782465fe389ddf15d2de398aceae337
https://github.com/wesnoth/wesnoth/commit/b3bf3862c782465fe389ddf15d2de398aceae337
Author: ln-zookeeper <lari.nieminen at iki.fi>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Scout.cfg
Log Message:
-----------
UtBS: Removed obsolete slows note from Quenoth Scout
[ci skip]
(cherry-picked from commit cc4171e2077fcb086316bceb6a9bd0749f6f735b)
Commit: 04837d9100b77699b78210f597e15e2f9803906e
https://github.com/wesnoth/wesnoth/commit/04837d9100b77699b78210f597e15e2f9803906e
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Better changelog entry for the MP password fix
[ci skip]
(cherry-picked from commit 03d80a0b2b46470e19056fc5f818cf1cfe15bdf4)
Commit: 0cefba70b3b2bf0024c29ca8fb242f8a984e6f2a
https://github.com/wesnoth/wesnoth/commit/0cefba70b3b2bf0024c29ca8fb242f8a984e6f2a
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/server/server.cpp
Log Message:
-----------
wesnothd: Use actual username when sending lobby messages too
(cherry-picked from commit 47b6b7f2a4f3d341415fb66265f902ff1103f3fb)
Commit: c165f005b13914db6b612450a97a717c89916630
https://github.com/wesnoth/wesnoth/commit/c165f005b13914db6b612450a97a717c89916630
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Changelog entry for MP lobby message fixes
[ci skip]
(cherry-picked from commit 529e551d9e1a2f7483da0784e3f9b2fd26e41ac1)
Commit: 60a91c4536786edaa2427ced4b8db73bd8eb5e24
https://github.com/wesnoth/wesnoth/commit/60a91c4536786edaa2427ced4b8db73bd8eb5e24
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/scenario-test.cfg
Log Message:
-----------
Remove stale include in test scenario causing errors
(cherry-picked from commit 0720065d7aa06c7c2f654dbfca5af5f4b8d79ffa)
Commit: d6052862df19ced0c053e030eb52dbe37c520956
https://github.com/wesnoth/wesnoth/commit/d6052862df19ced0c053e030eb52dbe37c520956
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M src/scripting/lua_gui2.cpp
Log Message:
-----------
Fix two of the dialog functions not accepting translatable strings
(cherry-picked from commit 0327085d99cf98442b98c94145af7f91098bba7e)
Commit: aba39b5d3b172dbfa14ac8174efa83452132caf1
https://github.com/wesnoth/wesnoth/commit/aba39b5d3b172dbfa14ac8174efa83452132caf1
Author: loonycyborg <loonycyborg at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/server/server.cpp
Log Message:
-----------
wesnothd: Fix UB caused by incorrect use of simple_wml::set_attr
(cherry-picked from commit 2e24d20236ff25a30cf9e238ee1214d8e4d32989)
Commit: 7a5e11bd3b698b0c7c0323f6e052189ae0ef0ef1
https://github.com/wesnoth/wesnoth/commit/7a5e11bd3b698b0c7c0323f6e052189ae0ef0ef1
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-aoi/gl.po
M po/wesnoth-help/gl.po
M po/wesnoth-lib/gl.po
M po/wesnoth-tb/gl.po
M po/wesnoth-tutorial/gl.po
M po/wesnoth/gl.po
Log Message:
-----------
updated Galician translation
(cherry-picked from commit c359b7a82966a6d4e3b72849479dc1d3e9aaff91)
Commit: 60a45b0f081513110e3e158764fbb7c347ddc694
https://github.com/wesnoth/wesnoth/commit/60a45b0f081513110e3e158764fbb7c347ddc694
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-ai/fr.po
M po/wesnoth-anl/fr.po
M po/wesnoth-aoi/fr.po
M po/wesnoth-dm/fr.po
M po/wesnoth-dw/fr.po
M po/wesnoth-editor/fr.po
M po/wesnoth-lib/fr.po
M po/wesnoth-manual/fr.po
M po/wesnoth/fr.po
Log Message:
-----------
updated French translation
(cherry-picked from commit 6e85da54bcce88b686d9ab791949cce237ee9358)
Commit: 558b9809e9e28269b07dc2afc86153c47b61dff0
https://github.com/wesnoth/wesnoth/commit/558b9809e9e28269b07dc2afc86153c47b61dff0
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/gui/window/statistics_dialog.cfg
Log Message:
-----------
Swap count and name columns in statistics (fixes #2893)
(cherry-picked from commit ddd3222b3da26ec0cf6dd82adcd7d640ddc3b157)
Commit: b3b3a3c53d8136fa859a79e3196639849c2281b9
https://github.com/wesnoth/wesnoth/commit/b3b3a3c53d8136fa859a79e3196639849c2281b9
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/gui/window/statistics_dialog.cfg
Log Message:
-----------
Remove redundant unused column in stats
(cherry-picked from commit ceea173eb488cbb124ff15c4ae19fa7fc00708a1)
Commit: 48123469bc35dcb27e3263593aa9983da1bdd408
https://github.com/wesnoth/wesnoth/commit/48123469bc35dcb27e3263593aa9983da1bdd408
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M data/lua/wml-tags.lua
M src/game_events/action_wml.cpp
Log Message:
-----------
Support location_id in [recall] and [unstore_unit]
(cherry-picked from commit ecc8785edbbcaa814502ccee6b2946da4242f53e)
Commit: 6d322cf63ccb760c91cacd4bfa2f2b6664adb02f
https://github.com/wesnoth/wesnoth/commit/6d322cf63ccb760c91cacd4bfa2f2b6664adb02f
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/game_events/action_wml.cpp
Log Message:
-----------
fixup! Support location_id in [recall] and [unstore_unit]
(cherry-picked from commit ea6578a87a4806500ec482cd179c565019c548fb)
Commit: c6f10ad794a76f199f55826cd0b8ee1fcda758b9
https://github.com/wesnoth/wesnoth/commit/c6f10ad794a76f199f55826cd0b8ee1fcda758b9
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/game_events/action_wml.cpp
Log Message:
-----------
fixup! Support location_id in [recall] and [unstore_unit]
(cherry-picked from commit 7821f470c2c70eb0865f27b3baece9d0ce91afbc)
Commit: 017c3ca9cfc234342e82e3a912193d620353d02b
https://github.com/wesnoth/wesnoth/commit/017c3ca9cfc234342e82e3a912193d620353d02b
Author: Celtic Minstrel <CelticMinstrel at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/lua/wml/heal_unit.lua
Log Message:
-----------
Display amount healed as an integer in [heal_unit]
(cherry-picked from commit 0294bd81b21be27e09f10d812fafa6bae7090002)
Commit: 6ea71cf4081cd7fdea15746a98910563dec4a130
https://github.com/wesnoth/wesnoth/commit/6ea71cf4081cd7fdea15746a98910563dec4a130
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/drop_down_menu.cpp
Log Message:
-----------
Drop Down Menu: allow right clicks to dismiss the window (fixes #2910)
(cherry-picked from commit 30257afd3f9725b1ac54610ef61d14d873057531)
Commit: 078d7662b1c11e1f33d3ca5fac7d704c0ece18fb
https://github.com/wesnoth/wesnoth/commit/078d7662b1c11e1f33d3ca5fac7d704c0ece18fb
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
R data/campaigns/Under_the_Burning_Suns/images/units/quenoth/horseman.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/pathfinder.png
M data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg
R data/campaigns/Under_the_Burning_Suns/units/quenoth/Horseman.cfg
A data/campaigns/Under_the_Burning_Suns/units/quenoth/Pathfinder.cfg
Log Message:
-----------
finish renaming of the Horseman to Pathfinder
forward ported from 1.14, but without unit type alias
[ci skip]
(cherry-picked from commit ae0420108f9730561e0c100f4461ff82e34395b1)
Commit: ef4d9f570d4ed8e2aeb747af117b08f7a9b37a34
https://github.com/wesnoth/wesnoth/commit/ef4d9f570d4ed8e2aeb747af117b08f7a9b37a34
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M src/units/unit.cpp
Log Message:
-----------
Utilized 2x xBRZ scaling for portraitless units in game dialog
(cherry-picked from commit 601c67d970c2eacd2c59b340613502de8e8861fe)
Commit: 167ee61d3466695fedf4bc31f74546c35d18e095
https://github.com/wesnoth/wesnoth/commit/167ee61d3466695fedf4bc31f74546c35d18e095
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/lua/wml/heal_unit.lua
Log Message:
-----------
Revert "Display amount healed as an integer in [heal_unit]"
This reverts commit 0294bd81b21be27e09f10d812fafa6bae7090002.
Changing display is unnecessary when the healed amount itself is forced
to be an integer (next commit).
(cherry-picked from commit f2284e2e79db5432039d0ac0a364d0982c7f9f71)
Commit: d75a752c06ddbc81f1ec5907f9eb3497d9719473
https://github.com/wesnoth/wesnoth/commit/d75a752c06ddbc81f1ec5907f9eb3497d9719473
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/lua/wml/heal_unit.lua
Log Message:
-----------
[heal_unit]: ensure that heal amount is an integer
(cherry-picked from commit 76ed49a45f3679050cf06e2ab6aa5ec072957572)
Commit: 723a8bf0a9a3918085ab3541efb4232ff33982bc
https://github.com/wesnoth/wesnoth/commit/723a8bf0a9a3918085ab3541efb4232ff33982bc
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Changelog entry for 30257af
[ci skip]
(cherry-picked from commit 54cacf815de0923df8673ecb78a9034d09342b86)
Commit: 33be7d5a8c4c82c41b7c3cbe90b5027fc3b81eed
https://github.com/wesnoth/wesnoth/commit/33be7d5a8c4c82c41b7c3cbe90b5027fc3b81eed
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/scripting/lua_unit.cpp
M src/units/unit.cpp
Log Message:
-----------
Fixup 601c67d970c2eac
Turns out that commit broke TC on unit images in messages since it broke the equality
check in lua_unit.cpp. Added the XBRZ IPF as part of the Lua unit portrait attribute
instead.
I *think* this is the proper place to do it.
(cherry-picked from commit 98ed802290fb987fc106300a8b6414420e13ba2a)
Commit: ddb0f29a9979d0d67d6b349f2b66b03101f71135
https://github.com/wesnoth/wesnoth/commit/ddb0f29a9979d0d67d6b349f2b66b03101f71135
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/campaign_server/campaign_server.cpp
M src/campaign_server/campaign_server.hpp
Log Message:
-----------
campaignd: Refactor add-on deletion code into its own method
This changes the order in which the hook_post_erase hook (currently
unused in production and fully untested) is fired so it will be run
*before* displaying the confirmation message to clients. This might need
to be changed at a later point if the hook functionality ever gets used
again, but for now it'll do.
(cherry-picked from commit 957be8b53edbdce7706491bb4dd7f64de27784a9)
Commit: 0ddddc5ee2a3eccc0cd553e1fc6cece6a756f70b
https://github.com/wesnoth/wesnoth/commit/0ddddc5ee2a3eccc0cd553e1fc6cece6a756f70b
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/campaign_server/campaign_server.cpp
Log Message:
-----------
campaignd: Add 'delete' control FIFO command
(cherry-picked from commit 0475c349b801643a18372bb810ab0b6f4fd97fe8)
Commit: 7a76fb9868a02f651bf7df84a901177ff7fa167c
https://github.com/wesnoth/wesnoth/commit/7a76fb9868a02f651bf7df84a901177ff7fa167c
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/campaign_server/campaign_server.cpp
Log Message:
-----------
campaignd: Add 'hide'/'unhide' control FIFO commands and hidden= attribute
These are used to hide an add-on from listings and deny the author the
ability to upload or delete it or change its passphrase. This is
meant to be used when enforcing add-ons server rules that do not justify
deleting all of the add-on's metadata (for example, issues with icons or
descriptions).
(cherry-picked from commit 7d5d7ee7d429a9d650d300311d2bfeb363ca4686)
Commit: 1b94aad4162c4c413233206518878eec0e531aeb
https://github.com/wesnoth/wesnoth/commit/1b94aad4162c4c413233206518878eec0e531aeb
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/campaign_server/campaign_server.cpp
Log Message:
-----------
campaignd: Remove last remaining trace of the master_password functionality
(cherry-picked from commit 6d5f5d4299f41f54c979d2a5b785b4b26b9d2be2)
Commit: a0adab3fcc505ab76567118bc5171ff67e2b66d0
https://github.com/wesnoth/wesnoth/commit/a0adab3fcc505ab76567118bc5171ff67e2b66d0
Author: pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M .travis.yml
A docker/Dockerfile-base-1804-master
M run_wml_tests
M utils/travis/play_test_executor.sh
M utils/travis/test_executor.sh
Log Message:
-----------
Adds a c++17 build using the pre-release Ubuntu 18.04.
Though given 00d87f8fe4078ffd84fcdc0d73fcc2104efef1e7 I would say this is better than nothing.
(cherry-picked from commit 33ad6be326c234b173d680ce34589464f88f8418)
Commit: 78c957d5eef7b420f7578d237394b55d5f47c292
https://github.com/wesnoth/wesnoth/commit/78c957d5eef7b420f7578d237394b55d5f47c292
Author: pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/serialization/base64.cpp
Log Message:
-----------
Attempt to fix travis error.
(cherry-picked from commit 5dd5b6ec0b5d8272416ef7dea40a93b5fcccba5d)
Commit: ada55a02e1e1f5305bfdcc19ff0e2d2f903ab88a
https://github.com/wesnoth/wesnoth/commit/ada55a02e1e1f5305bfdcc19ff0e2d2f903ab88a
Author: pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gettext.hpp
Log Message:
-----------
Attempt to fix UNUSEDNOWARN travis+gcc warnings.
(cherry-picked from commit 298f1dc9c1615196f73827e652ec2ea5f5ae5d9b)
Commit: 17d921f4344831226b37bcfd521215268aaa6cdc
https://github.com/wesnoth/wesnoth/commit/17d921f4344831226b37bcfd521215268aaa6cdc
Author: pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M utils/travis/docker_run.sh
Log Message:
-----------
Make the C++17 build fail on warnings.
(cherry-picked from commit dd4b525c402879c9b67f799e634c5c172b49ee97)
Commit: 16643649ee2dd65fcdbeca694bd9a9cbaba53fa3
https://github.com/wesnoth/wesnoth/commit/16643649ee2dd65fcdbeca694bd9a9cbaba53fa3
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/lexical_cast.hpp
Log Message:
-----------
Lexical Cast: remove use of boost::mpl
The code was checking that the From type was either char* or const char*. Replaced it
with an equality check against char* with the const stripped from From so both match.
(cherry-picked from commit c57a175fee701b4d19c09653a5c9445b778d139e)
Commit: 6092803222aecb209a1efe91b942f4f547a9f20a
https://github.com/wesnoth/wesnoth/commit/6092803222aecb209a1efe91b942f4f547a9f20a
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M src/scripting/lua_unit.cpp
Log Message:
-----------
Revert "Utilized 2x xBRZ scaling for portraitless units in game dialog"
This reverts commit 601c67d970c2eacd2c59b340613502de8e8861fe and 98ed802290fb987fc106300a8b6414420e13ba2a.
(cherry-picked from commit 28b1ab286123a415398a3626601642bed51027f0)
Commit: 4b84091c8b8c161215000b353e8eb797548cda56
https://github.com/wesnoth/wesnoth/commit/4b84091c8b8c161215000b353e8eb797548cda56
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/VC14/wesnoth.vcxproj
M projectfiles/VC14/wesnoth.vcxproj.filters
M source_lists/wesnoth
A src/chat_log.cpp
A src/chat_log.hpp
M src/gui/dialogs/multiplayer/lobby.cpp
M src/gui/dialogs/multiplayer/mp_staging.cpp
M src/gui/widgets/chatbox.cpp
M src/gui/widgets/chatbox.hpp
Log Message:
-----------
Implement saving MP chat message history (#1194, #2802)
(cherry-picked from commit a02100a0f15bd015c2322b7b528b0b9b60a1c678)
Commit: 872d1a9003c0a2a879840952d05ecd693dc76f23
https://github.com/wesnoth/wesnoth/commit/872d1a9003c0a2a879840952d05ecd693dc76f23
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M players_changelog.md
Log Message:
-----------
Changelog entry for commit a02100a0f1
(cherry-picked from commit fc3ca7a78371dd552f937091bf8929c434b3b8de)
Commit: 1a41e8f7f4ecf15b69df32ad9e7db3777da0f1aa
https://github.com/wesnoth/wesnoth/commit/1a41e8f7f4ecf15b69df32ad9e7db3777da0f1aa
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/lexical_cast.hpp
Log Message:
-----------
Fixup c57a175fee701b4d19c09653a5c9445b778d139e
Turns out remove_const alone only removes the const from the pointer, not from the type
itself, so the expression wasn't returning true. This strips the pointer out before removing
const and matches against char instead of char*
(cherry-picked from commit a7e1ff85ed10fa56512583648727155a54a2b0cd)
Commit: c35ab93ff58342b3ce1dfaab20939da9d4ba32af
https://github.com/wesnoth/wesnoth/commit/c35ab93ff58342b3ce1dfaab20939da9d4ba32af
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/lexical_cast.hpp
Log Message:
-----------
Revert "Fixup c57a175fee701b4d19c09653a5c9445b778d139e"
This reverts commit 9d0c70fb4861cec7a9f46443f1e59c5ace6ada5d.
That commit was wrong.
std::is_same<char, std::remove_const_t<std::remove_pointer_t<From>>>::value
is not equivalent to
boost::mpl::has_key<boost::mpl::set<char*, const char*> , From>::value
because the former is true not just for 'char*' and 'const char*' but
also for 'char'.
(cherry-picked from commit eacbc5f6959f57ff05451a2874a8e494ac3cb8db)
Commit: 0228706f31faf770493a711328013cccb33abed6
https://github.com/wesnoth/wesnoth/commit/0228706f31faf770493a711328013cccb33abed6
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/lexical_cast.hpp
Log Message:
-----------
Revert "Lexical Cast: remove use of boost::mpl"
This reverts commit 88299f13869a8c32d859ec314356db6cb7e204a6.
(cherry-picked from commit 56e7b01ac4cdfd6cf51c36cc7bf1cac33391cc58)
Commit: e7c0a69420f59abbaf914db2a06b610b55726d4b
https://github.com/wesnoth/wesnoth/commit/e7c0a69420f59abbaf914db2a06b610b55726d4b
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/preferences/credentials.cpp
Log Message:
-----------
Fix segfault when trying to log into the MP server with an empty password
Probable regression introduced in commit
02ab29d2f19800d28fa10476c48261be1083ad2c (1.13.14).
(cherry-picked from commit fc88cdff3b04a77a6de6d3911821cf4e1c7612d6)
Commit: 4959d8f02847b4adf32c0381a0fe8f1a7846dacc
https://github.com/wesnoth/wesnoth/commit/4959d8f02847b4adf32c0381a0fe8f1a7846dacc
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/serialization/binary_or_text.cpp
Log Message:
-----------
Random formatting cleanup I had sitting around
(cherry-picked from commit be4b2c246f50af78f2271937e37685d469535768)
Commit: 577f5410728e2e44abe43703384cbeb7dcbac1e6
https://github.com/wesnoth/wesnoth/commit/577f5410728e2e44abe43703384cbeb7dcbac1e6
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg
Log Message:
-----------
tutorial: add translation note
[ci skip]
(cherry-picked from commit 7a020c31304e1943dc6ed742c5d5ba92b8cadc3c)
Commit: 2a9c3d621e3af61e24efaef060e94677d62b7fa1
https://github.com/wesnoth/wesnoth/commit/2a9c3d621e3af61e24efaef060e94677d62b7fa1
Author: Martin Hrubý (hrubymar10) <hrubymar10 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
Log Message:
-----------
Fix Xcode project after a02100a0f15bd015c2322b7b528b0b9b60a1c678
(cherry-picked from commit 5c8e957355980e50c429da4a4c1290abfd4d66e3)
Commit: a0c91ac41edfc668fded2060387bfb36defe5fe4
https://github.com/wesnoth/wesnoth/commit/a0c91ac41edfc668fded2060387bfb36defe5fe4
Author: loonycyborg <loonycyborg at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M SConstruct
M scons/boost.py
Log Message:
-----------
Fix build against static libboost
(cherry-picked from commit c51065e39c85bfd8e4705cefa381451385c29bf8)
Commit: 2d8bdac9551b39e7bea4f476ed8b00c32b509456
https://github.com/wesnoth/wesnoth/commit/2d8bdac9551b39e7bea4f476ed8b00c32b509456
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M players_changelog.md
M po/wesnoth-anl/sk.po
M po/wesnoth-aoi/sk.po
M po/wesnoth-editor/sk.po
M po/wesnoth-multiplayer/sk.po
M po/wesnoth-sof/sk.po
M po/wesnoth-tsg/sk.po
Log Message:
-----------
updated Slovak translation
(cherry-picked from commit ef7c0a7b64edd73e587c222f54764ce28d44311a)
Commit: 85586adc07ae7e47c30640abeb6d06e639f5c12e
https://github.com/wesnoth/wesnoth/commit/85586adc07ae7e47c30640abeb6d06e639f5c12e
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/images/units/quenoth/flagbearer.png
Log Message:
-----------
UtBS: improved the Quenoth Flagbearer's flag
[ci skip]
(cherry-picked from commit 42e69ee48390fce41d22414bb468d192f2d36b3d)
Commit: ce675dd1db1e6796b9556737b50d49223854fd32
https://github.com/wesnoth/wesnoth/commit/ce675dd1db1e6796b9556737b50d49223854fd32
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M src/gui/dialogs/title_screen.cpp
Log Message:
-----------
gui2/title_screen: Make Version label formatted and translatable
Closes #2914.
This doesn't break the string freeze since it reuses a format string
from the same textdomain required by gui2/game_version for the exact
same purpose.
(cherry-picked from commit fa15142150983162707c7455ae5cc5e917029e96)
Commit: 2d09b17f68a7c9bc83907740171c111c5772c359
https://github.com/wesnoth/wesnoth/commit/2d09b17f68a7c9bc83907740171c111c5772c359
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/images/units/quenoth/rider.png
M data/campaigns/Under_the_Burning_Suns/images/units/quenoth/stalwart.png
M data/campaigns/Under_the_Burning_Suns/images/units/quenoth/vanguard.png
Log Message:
-----------
UtBS: fixed some opaque shadows on rider units due to indexed pngs
[ci skip]
(cherry-picked from commit 9148ce2b995b05be2ee0606b63ffa26cb3da1ccb)
Commit: 08f493213d0fe21506f029063d7e32fb9243771b
https://github.com/wesnoth/wesnoth/commit/08f493213d0fe21506f029063d7e32fb9243771b
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M players_changelog.md
M po/wesnoth/de.po
Log Message:
-----------
updated German translation
(cherry-picked from commit 5bb1089abced303146885983a66263bd1b826f9f)
Commit: 44c8034177d01de83d9c92f97d572f0056e55a2c
https://github.com/wesnoth/wesnoth/commit/44c8034177d01de83d9c92f97d572f0056e55a2c
Author: pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M docker/Dockerfile-base-1604-master
M docker/Dockerfile-base-1804-master
Log Message:
-----------
Re-add boost-thread.
Also add in opengl packages while I'm at it.
(cherry-picked from commit 135921ad10334ccf890dd10b7f086bc98597b9eb)
Commit: 96f8b51383944b2398fd13954f8851c5a8c94459
https://github.com/wesnoth/wesnoth/commit/96f8b51383944b2398fd13954f8851c5a8c94459
Author: pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M INSTALL.md
M changelog.md
Log Message:
-----------
Re-add boost-thread to INSTALL and changelog.
(cherry-picked from commit f4db76fe0f802af38bff36b88119109e7bc82382)
Commit: 31e6c40653ef0c007890cc208e145b6771db807a
https://github.com/wesnoth/wesnoth/commit/31e6c40653ef0c007890cc208e145b6771db807a
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M CMakeLists.txt
M RELEASE_NOTES
M SConstruct
M changelog.md
M projectfiles/VC14/liblua.vcxproj
M projectfiles/VC14/wesnoth.vcxproj
M projectfiles/VC14/wesnothd.vcxproj
M projectfiles/VC14/wesnothlib.vcxproj
M src/build_info.cpp
M src/display.cpp
M src/image.cpp
M src/units/frame.cpp
M src/wesnoth.cpp
Log Message:
-----------
Removed OpenMP-related code
After some discussion, we concluded that this code was unmaintained, not even used in
some places (display.cpp, units/frame.cpp), leaving the only area that really used it
at all the image surface cache. Considering there was never really a conclusive benchmark
of its benefits and because said surface cache will be used a lot less going forward,
we're just removing it and simplifying everything for everyone.
Closes #1260 since it's now irrelevant.
(cherry-picked from commit 3792612fb759942e6eb5de51364c2cca4ed16b40)
Commit: be28326acc91d150e022e3a7c6f871b1cc597e2e
https://github.com/wesnoth/wesnoth/commit/be28326acc91d150e022e3a7c6f871b1cc597e2e
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-httt/gd.po
M po/wesnoth-lib/gd.po
M po/wesnoth-tsg/gd.po
M po/wesnoth-tutorial/gd.po
M po/wesnoth/gd.po
Log Message:
-----------
updated Scottish Gaelic translation
(cherry-picked from commit 767c9aa10178e4a6b31dbe750f5b7ff3fe2e6118)
Commit: f9a2d56437141ee791b0e3e3a0d5c6cdc284b08f
https://github.com/wesnoth/wesnoth/commit/f9a2d56437141ee791b0e3e3a0d5c6cdc284b08f
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg
Log Message:
-----------
Revert "tutorial: add translation note"
This should be addressed another way, not with a translation hint
This reverts commit 7a020c31304e1943dc6ed742c5d5ba92b8cadc3c.
(cherry-picked from commit beaddeee64ff6db897aa00e47b83d50ef8f398b7)
Commit: 04ff36f6e8feda596f2dff22fa2ca6b3d14663ef
https://github.com/wesnoth/wesnoth/commit/04ff36f6e8feda596f2dff22fa2ca6b3d14663ef
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/units/attack_type.cpp
Log Message:
-----------
Fix misplaced </span> tag
(cherry-picked from commit f0f664b636efdaf788b77f15726dbc329b4d8413)
Commit: 2af98f7dd815a7d23f0e17e74697d8bc3fdb6d2f
https://github.com/wesnoth/wesnoth/commit/2af98f7dd815a7d23f0e17e74697d8bc3fdb6d2f
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/display.cpp
M src/display.hpp
M src/editor/editor_display.cpp
M src/editor/editor_display.hpp
M src/editor/map/context_manager.cpp
M src/game_display.cpp
M src/game_display.hpp
Log Message:
-----------
Display: cleaned up overlay map getter interface
Instead of a pointer to a member of a derived class, used a virtual function implemented
in both derived classes (game_display and editor_display) that return an reference to the
appropriate object.
Also removed the overlay.hpp include from display.hpp. We can forward-declare the overlay
struct.
(cherry-picked from commit e583c470be597b486e447d0a0abfea820b1afc43)
Commit: a6e79aba2f0de3afd40b330397313ef42f78a0b0
https://github.com/wesnoth/wesnoth/commit/a6e79aba2f0de3afd40b330397313ef42f78a0b0
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
A data/campaigns/Under_the_Burning_Suns/images/portraits/quenoth/archer.png
A data/campaigns/Under_the_Burning_Suns/images/portraits/quenoth/champion.png
A data/campaigns/Under_the_Burning_Suns/images/portraits/quenoth/druid.png
A data/campaigns/Under_the_Burning_Suns/images/portraits/quenoth/fighter.png
A data/campaigns/Under_the_Burning_Suns/images/portraits/quenoth/flanker.png
A data/campaigns/Under_the_Burning_Suns/images/portraits/quenoth/marksman.png
A data/campaigns/Under_the_Burning_Suns/images/portraits/quenoth/mystic.png
A data/campaigns/Under_the_Burning_Suns/images/portraits/quenoth/outrider.png
A data/campaigns/Under_the_Burning_Suns/images/portraits/quenoth/pathfinder.png
A data/campaigns/Under_the_Burning_Suns/images/portraits/quenoth/ranger.png
A data/campaigns/Under_the_Burning_Suns/images/portraits/quenoth/scout.png
A data/campaigns/Under_the_Burning_Suns/images/portraits/quenoth/shaman.png
A data/campaigns/Under_the_Burning_Suns/images/portraits/quenoth/shyde.png
A data/campaigns/Under_the_Burning_Suns/images/portraits/quenoth/sun_singer.png
A data/campaigns/Under_the_Burning_Suns/images/portraits/quenoth/sun_sylph.png
A data/campaigns/Under_the_Burning_Suns/images/portraits/quenoth/tauroch_flagbearer.png
A data/campaigns/Under_the_Burning_Suns/images/portraits/quenoth/tauroch_protector.png
A data/campaigns/Under_the_Burning_Suns/images/portraits/quenoth/tauroch_rider.png
A data/campaigns/Under_the_Burning_Suns/images/portraits/quenoth/tauroch_stalwart.png
A data/campaigns/Under_the_Burning_Suns/images/portraits/quenoth/tauroch_vanguard.png
A data/campaigns/Under_the_Burning_Suns/images/portraits/quenoth/warrior.png
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Archer.cfg
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Champion.cfg
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Druid.cfg
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Fighter.cfg
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Flagbearer.cfg
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Flanker.cfg
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Marksman.cfg
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Mystic.cfg
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Outrider.cfg
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Pathfinder.cfg
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Protector.cfg
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Ranger.cfg
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Rider.cfg
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Scout.cfg
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Shaman.cfg
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Shyde.cfg
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Stalwart.cfg
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Sun_Shyde.cfg
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Sun_Singer.cfg
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Vanguard.cfg
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Warrior.cfg
Log Message:
-----------
UtBS: added new Quenoth faction portraits by LordBob
(cherry-picked from commit eec212e155f572194c3ba8034f57c93d0f73cd07)
Commit: e496c9b451c533961ba082aad27a914e0ec988e2
https://github.com/wesnoth/wesnoth/commit/e496c9b451c533961ba082aad27a914e0ec988e2
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
R data/campaigns/Under_the_Burning_Suns/images/units/quenoth/moon-shyde.png
R data/campaigns/Under_the_Burning_Suns/images/units/quenoth/moon-singer.png
M data/campaigns/Under_the_Burning_Suns/scenarios/06a_In_the_Tunnels_of_Trolls.cfg
M data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg
R data/campaigns/Under_the_Burning_Suns/units/quenoth/Moon_Shyde.cfg
R data/campaigns/Under_the_Burning_Suns/units/quenoth/Moon_Singer.cfg
Log Message:
-----------
UtBS: removed unused Quenoth Moon Singer and Quenoth Moon Shyde units
[ci skip]
These were part of an early iteration of the faction design but we decided against
the sun/moon motif.
(cherry-picked from commit 755fe70cc98c666b058d048428a96b7a65abfcb6)
Commit: fd873814b45fdb9336032cac1a1d2338b49fcc0c
https://github.com/wesnoth/wesnoth/commit/fd873814b45fdb9336032cac1a1d2338b49fcc0c
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
R data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-backglow.png
R data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-def-flare.png
R data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-defend1.png
R data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-defend2.png
R data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-fly-defend1.png
R data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-fly-defend2.png
R data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-fly1.png
R data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-fly2.png
R data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-fly3.png
R data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-fly4.png
R data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-fly5.png
R data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-fly6.png
R data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-stand.png
R data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_sylph/sun-sylph-backglow.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_sylph/sun-sylph-def-flare.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_sylph/sun-sylph-defend1.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_sylph/sun-sylph-defend2.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_sylph/sun-sylph-fly-defend1.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_sylph/sun-sylph-fly-defend2.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_sylph/sun-sylph-fly1.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_sylph/sun-sylph-fly2.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_sylph/sun-sylph-fly3.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_sylph/sun-sylph-fly4.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_sylph/sun-sylph-fly5.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_sylph/sun-sylph-fly6.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_sylph/sun-sylph-stand.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_sylph/sun-sylph.png
R data/campaigns/Under_the_Burning_Suns/units/quenoth/Sun_Shyde.cfg
A data/campaigns/Under_the_Burning_Suns/units/quenoth/Sun_Sylph.cfg
Log Message:
-----------
UtBS: renamed the Quenoth Sun Sylph's unit and image files to match her type
[ci skip]
Sun Sylph is the proper name, but some files were labeled Sun Shyde.
(cherry-picked from commit 4153b6e8bc274c50653c7b658199b53d616b150c)
Commit: 041a49ebbc3d7a4576928ca40d0e4afc5d82766f
https://github.com/wesnoth/wesnoth/commit/041a49ebbc3d7a4576928ca40d0e4afc5d82766f
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Sun_Singer.cfg
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Sun_Sylph.cfg
M data/campaigns/Under_the_Burning_Suns/utils/animation_macros.cfg
Log Message:
-----------
UtBS: wmlindent pass
[ci skip]
(cherry-picked from commit efa798c72ee4d08322ec888df9c63638e7e33f46)
Commit: 0b0dbe24ec94089226725e2740ee3a2f9d2313be
https://github.com/wesnoth/wesnoth/commit/0b0dbe24ec94089226725e2740ee3a2f9d2313be
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
changelog entry for the UtBS portraits
[ci skip]
(cherry-picked from commit 6b359268f0b5175cdc596cd7489ac1a96ca2b6ec)
Commit: eadb3c68c303fddefef026b37a808ad33c03890b
https://github.com/wesnoth/wesnoth/commit/eadb3c68c303fddefef026b37a808ad33c03890b
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/advanced_preferences.cfg
M src/game_initialization/multiplayer.cpp
M src/preferences/game.cpp
M src/preferences/game.hpp
Log Message:
-----------
Removed unused Ping Timeout preference
It no longer had any effect. The selective_ping flag is set was ignored by the
server since it now utilizes TCP keepalive.
(cherry-picked from commit b81a702cfa1465802b0bf299473d9c4559190122)
Commit: e17bfe395f6dd0dff1a374205de1d1d29dd4c5d1
https://github.com/wesnoth/wesnoth/commit/e17bfe395f6dd0dff1a374205de1d1d29dd4c5d1
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/server/player.cpp
M src/server/player.hpp
M src/server/server.cpp
Log Message:
-----------
Wesnothd/Player: removed unused selective_ping member
(cherry-picked from commit dab8498f97b0903f9ebb85ab5b1fc14bc09b5d97)
Commit: baf02ebf1d5624f5cd7def4ffa6241819bc274ac
https://github.com/wesnoth/wesnoth/commit/baf02ebf1d5624f5cd7def4ffa6241819bc274ac
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/units/udisplay.cpp
Log Message:
-----------
Units/Display: minor code cleanup
(cherry-picked from commit 882aba3349f500f761091413a4dc33d888d6dca0)
Commit: 2b65a8c5c8dfa0e58061d78f208499304805078a
https://github.com/wesnoth/wesnoth/commit/2b65a8c5c8dfa0e58061d78f208499304805078a
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/actions/create.cpp
M src/actions/heal.cpp
M src/actions/move.cpp
M src/actions/vision.cpp
M src/ai/composite/goal.cpp
M src/ai/contexts.cpp
M src/ai/default/aspect_attacks.cpp
M src/ai/default/ca.cpp
M src/ai/default/contexts.cpp
M src/ai/formula/callable_objects.cpp
M src/ai/formula/candidates.cpp
M src/display.cpp
M src/display_context.cpp
M src/game_board.cpp
M src/gui/dialogs/unit_list.cpp
M src/menu_events.cpp
M src/mouse_events.cpp
M src/pathfind/pathfind.cpp
M src/pathfind/teleport.cpp
M src/play_controller.cpp
M src/reports.cpp
M src/scripting/game_lua_kernel.cpp
M src/tod_manager.cpp
M src/units/abilities.cpp
M src/units/drawer.cpp
M src/units/filter.cpp
M src/units/udisplay.cpp
M src/units/unit.cpp
M src/units/unit.hpp
M src/whiteboard/mapbuilder.cpp
Log Message:
-----------
Units: refactor display_context parameter out of ability functions
This was essentially only needed for the affects_side() helper. THAT'S IT. All this code just for
one single line... Anyway...
Utilized the display singleton's display_context getter instead. This also means fewer explicit
uses of resources::gameboard as the display_context object, meaning more compatibility with the
editor (not that that's relevant for most of the changed usecases, such as the AI, but it does
affect unit::get_abilities, which might be useful there in the future).
This also removes the display_context parameter from unit::invisible() since it was only passed to
unit::get_ability_bool().
unit::is_visible_to_team() also had its display_context parameter removed. It was used once as an
argument for invisible() and the other case was replaced with display::get_map().
(cherry-picked from commit 7e442cbb541b0bfbc5f3511fd1510fea80a4d34e)
Commit: 9b0ddca7161c943f281ecb95d843d245c3c83841
https://github.com/wesnoth/wesnoth/commit/9b0ddca7161c943f281ecb95d843d245c3c83841
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/side_filter.cpp
Log Message:
-----------
Used display_context::get_team in a few places I missed
(cherry-picked from commit e05b1368ade498f141475119da4b0d16c128ed23)
Commit: 1f2fa0d67f0ce5a19847deb75ae9751e4768721f
https://github.com/wesnoth/wesnoth/commit/1f2fa0d67f0ce5a19847deb75ae9751e4768721f
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-lib/cs.po
M po/wesnoth-tutorial/cs.po
Log Message:
-----------
updated Czech translation
(cherry-picked from commit 7174b8e97dc19e4e56dceb5fcd275a1e13be0ceb)
Commit: ce9abbebe0b5d0a041392409fc9124ecb4096f26
https://github.com/wesnoth/wesnoth/commit/ce9abbebe0b5d0a041392409fc9124ecb4096f26
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-editor/de.po
M po/wesnoth-help/de.po
M po/wesnoth-lib/de.po
M po/wesnoth/de.po
Log Message:
-----------
updated German translation
(cherry-picked from commit a8bc181b2b4fece27f49954491837867d4aad578)
Commit: 57f5463482d8fd44e087e04420dbe929ba07cbef
https://github.com/wesnoth/wesnoth/commit/57f5463482d8fd44e087e04420dbe929ba07cbef
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg
Log Message:
-----------
Tutorial: Button was renamed, update text accordingly
[ci skip]
(cherry-picked from commit 8b492a3ab424fb86bbf17a7e5ec0a39ac7fa1b29)
Commit: 3d95d04461d759b8976dffb1fe627f71be5fd3f6
https://github.com/wesnoth/wesnoth/commit/3d95d04461d759b8976dffb1fe627f71be5fd3f6
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/game_config_manager.cpp
M src/game_initialization/connect_engine.cpp
M src/game_initialization/flg_manager.cpp
M src/saved_game.cpp
M src/tests/test_mp_connect.cpp
Log Message:
-----------
fix handling of no_leader= (again)
previously, if people wanted to make use of mp leader selection in mp
campaign they had to sxplicitly set no_leader=no and faction_lock=no,
with the new code its clear that no_leader= is just an alias for
faction_lock with type
(cherry-picked from commit 3797837c746b4cd371d83f5eaed94b57f1b1cd01)
Commit: 1ef1704fd9a2556b825b02309111421d61fa34e6
https://github.com/wesnoth/wesnoth/commit/1ef1704fd9a2556b825b02309111421d61fa34e6
Author: pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M CMakeLists.txt
M SConstruct
M utils/travis/docker_run.sh
M utils/travis/steps/install.sh
M utils/travis/steps/script.sh
Log Message:
-----------
Adds the opt/OPT option to scons/cmake.
Travis now also makes use of this to set the optimization level for the -O0 builds, rather than extra_flags_*. This additionally fixes an issue where using -O0 in the release build with LTO resulted in the individual *.o files being compiled with -O0, but LTO then still linked with release's default -O3.
(cherry-picked from commit 63ff641662d4192401a49f9a002d7872000a3f02)
Commit: 754b8a62215642b8eba829450c2e0a8391e5cf2b
https://github.com/wesnoth/wesnoth/commit/754b8a62215642b8eba829450c2e0a8391e5cf2b
Author: pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M SConstruct
M utils/travis/docker_run.sh
Log Message:
-----------
Print the value of STRICT and build_timeout.
(cherry-picked from commit 96c41271d80937da778d05477b0e1caadc6def10)
Commit: c07b8ca79886915e52e4a5cf7e0af4e4cf847632
https://github.com/wesnoth/wesnoth/commit/c07b8ca79886915e52e4a5cf7e0af4e4cf847632
Author: pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M docker/Dockerfile-base-1604-master
M docker/Dockerfile-base-1804-master
M utils/travis/docker_run.sh
Log Message:
-----------
Enable building with mysql support on travis.
(cherry-picked from commit 4157251f11a5669c64a3941462615dad0da65c96)
Commit: 75d6df374def043a2357ae95ad541a923f0d7d11
https://github.com/wesnoth/wesnoth/commit/75d6df374def043a2357ae95ad541a923f0d7d11
Author: Martin Hrubý (hrubymar10) <hrubymar10 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M SConstruct
M src/desktop/apple_notification.mm
M src/desktop/notifications.cpp
M src/desktop/notifications.hpp
Log Message:
-----------
Remove rest of Growl things which I forgot before
(cherry-picked from commit 783738b2f52f12c998a94ae9483803eeace89b38)
Commit: 90ff4efd3cbb0f33ee4f2a6a7a0af5740c782142
https://github.com/wesnoth/wesnoth/commit/90ff4efd3cbb0f33ee4f2a6a7a0af5740c782142
Author: loonycyborg <loonycyborg at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/server/server.cpp
M src/server/server.hpp
Log Message:
-----------
wesnothd: always wait for next login attempt after login fail
(cherry-picked from commit 99372123da53990466b4a52bb1f206f2a1a73c75)
Commit: d742afc2ae6ed8c4bcfd7d247738b5a0cf66b5d0
https://github.com/wesnoth/wesnoth/commit/d742afc2ae6ed8c4bcfd7d247738b5a0cf66b5d0
Author: Gunter Labes <soliton at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/wesnothd_connection.cpp
Log Message:
-----------
Fix debug message
This outputs the config not the number of read bytes.
The recv_queue_.back() call was also missing lock protection.
(cherry-picked from commit 6dd32232496678f75f582b785bcb83e8a8d36352)
Commit: f54bf23a2a0fbd04e62f7127c4bd11eb042accbb
https://github.com/wesnoth/wesnoth/commit/f54bf23a2a0fbd04e62f7127c4bd11eb042accbb
Author: Gunter Labes <soliton at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/wesnothd_connection.cpp
Log Message:
-----------
Detect disconnect when waiting on data from server
Fixes issue #2927.
Also shows that issue #2925 still results in a disconnect but the client
does not get stuck anymore at least.
(cherry-picked from commit 616fdf34982bd02ff53e20e66287e245269b8145)
Commit: 07e654510f7646776a81afea88d1a1b4d5b06ffc
https://github.com/wesnoth/wesnoth/commit/07e654510f7646776a81afea88d1a1b4d5b06ffc
Author: Victor Sergienko <singalen at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/core/event/handler.cpp
M src/gui/widgets/chatbox.cpp
M src/gui/widgets/text_box_base.cpp
M src/gui/widgets/text_box_base.hpp
Log Message:
-----------
#2782 Crash when using composing like ˇ and ' in lobby on macOS.
Some backstory: https://github.com/wesnoth/wesnoth/pull/2644#issuecomment-382298822
(cherry-picked from commit 16cd19873db9686c54b1c5d3ba2d5a17d431d145)
Commit: c75a08354182331a1fd89f387a3f8615d8cf0996
https://github.com/wesnoth/wesnoth/commit/c75a08354182331a1fd89f387a3f8615d8cf0996
Author: pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M CMakeLists.txt
M utils/travis/docker_run.sh
Log Message:
-----------
Allow specifying a sanitizer with cmake.
(cherry-picked from commit 5b94101975abd1ab81cc79bc18710478129446af)
Commit: 6c1027e2fa08a496523b60e50506ad5db9f994e7
https://github.com/wesnoth/wesnoth/commit/6c1027e2fa08a496523b60e50506ad5db9f994e7
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-lib/cs.po
M po/wesnoth/cs.po
Log Message:
-----------
updated Czech translation
(cherry-picked from commit 25e3526a1f30cd88367359154cd5494f4ced7fa5)
Commit: f525f74b2f8efbd677be1650f7bb5fb5d74fd2b2
https://github.com/wesnoth/wesnoth/commit/f525f74b2f8efbd677be1650f7bb5fb5d74fd2b2
Author: Celtic Minstrel <CelticMinstrel at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/english.cfg
Log Message:
-----------
Add translation hints for the village and terrain feature name generators
(cherry-picked from commit 59e734615dab3920c8eb993169f0fbba697d6621)
Commit: b884c143ab4deec4f0e49ec3c7756c348d7ccd47
https://github.com/wesnoth/wesnoth/commit/b884c143ab4deec4f0e49ec3c7756c348d7ccd47
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg
Log Message:
-----------
Tutorial: remove forgotten bracket and superfluous space
[ci skip]
(cherry-picked from commit 3456b0a9cb0ebc863b1307652ffc5ffb065ca231)
Commit: 710ab61994841c186b2621a66401e2ce8c0585a5
https://github.com/wesnoth/wesnoth/commit/710ab61994841c186b2621a66401e2ce8c0585a5
Author: Steve Cotton <steve at octalot.co.uk>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg
Log Message:
-----------
Tutorial: fix the overall translation hint comment
The comment at the start of 01_Tutorial_part_1.cfg wasn't immediately
before a string, so the hint for translators wasn't in the file that
goes to the translators. Fix it so that the tutorial shows working
usage of "# po:" style comments; this is probably more help to people
using the tutorial as a reference for WML, rather than the translators
themselves.
(cherry-picked from commit eab86c30163e2a2364d0abc9683cf4864fb3328b)
Commit: 60c356112c1d4e3e14244bf9203ef1268d359dfe
https://github.com/wesnoth/wesnoth/commit/60c356112c1d4e3e14244bf9203ef1268d359dfe
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M data/core/units.cfg
Log Message:
-----------
Change the plural race name for merfolk to Merfolk
See issue #2940.
[ci skip]
(cherry-picked from commit 296894c5155ca6c2e77bfa92dee65a98e6797318)
Commit: 2d7f6cd4c742fe8fe54c9f7f446bb886246da656
https://github.com/wesnoth/wesnoth/commit/2d7f6cd4c742fe8fe54c9f7f446bb886246da656
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M data/core/terrain.cfg
M data/core/units.cfg
M data/core/units/merfolk/Priestess.cfg
Log Message:
-----------
Replace a few instances of "mermen" with "merfolk" in core descriptions
These are only the ones were it's sufficiently unambiguous that the
description is referring to the merfolk race at whole. There are a few
instances I didn't touch were it's possible that the text refers
exclusively to mermen fighters (e.g. "the mermen armies").
See issue #2940.
[ci skip]
(cherry-picked from commit 14ec9954f1c322d47d172e2e2572f2ece308d047)
Commit: 85dfe7499da9870275c1a00f104d4ab2ce81e03a
https://github.com/wesnoth/wesnoth/commit/85dfe7499da9870275c1a00f104d4ab2ce81e03a
Author: ln-zookeeper <lari.nieminen at iki.fi>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/utils/abilities.cfg
Log Message:
-----------
UtBS: Removed a remaining [on_redo]
Resulting problems reported on the forums, removal was apparently missed in df058356df8a.
[ci skip]
(cherry-picked from commit 221fe72dcb08929103516d98ad052654880748f3)
Commit: 50f2e1f4740bc32ef7f46edf2de3069afa98e5ad
https://github.com/wesnoth/wesnoth/commit/50f2e1f4740bc32ef7f46edf2de3069afa98e5ad
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg
Log Message:
-----------
Tutorial: fix two strings
This is one of the white on map messages
they never use punctuation characters for ending the instructions
Can't be pofixed.
[ci skip]
(cherry-picked from commit b8fe22877b60fa4a7638a99ce8e23f25d5bf87c1)
Commit: 565838ac3f2f91498a70d0fc9e0987c47c42c649
https://github.com/wesnoth/wesnoth/commit/565838ac3f2f91498a70d0fc9e0987c47c42c649
Author: doofus-01 <doofus-01 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/images/units/quenoth/corrupted-elf.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/nym-bow-defend-1.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/nym-bow-defend-2.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/nym-bow.png
M data/campaigns/Under_the_Burning_Suns/images/units/quenoth/nym-defend-1.png
M data/campaigns/Under_the_Burning_Suns/images/units/quenoth/nym-defend-2.png
M data/campaigns/Under_the_Burning_Suns/images/units/quenoth/nym.png
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Youth.cfg
Log Message:
-----------
updates to Nym sprite and basic animations, and corrupt-elf sprite
(cherry-picked from commit 515af2f504d93f077f8c048cdf52e664e584e89d)
Commit: 6ad78f92607e245096a2cb155090c863a2e74a0e
https://github.com/wesnoth/wesnoth/commit/6ad78f92607e245096a2cb155090c863a2e74a0e
Author: doofus-01 <doofus-01 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-defend-1.png
M data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-defend-2.png
M data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh.png
Log Message:
-----------
Kaleh base and two defense sprites
(cherry-picked from commit f871040a9d55c776de9227f806558245497c68bb)
Commit: 24d4e2b7eecd66aa5e1fb2d36266e2f529270be6
https://github.com/wesnoth/wesnoth/commit/24d4e2b7eecd66aa5e1fb2d36266e2f529270be6
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/_main.cfg
Log Message:
-----------
UtBS: set campaign icon TC back to red
[ci skip]
Brown just didn't look great.
(cherry-picked from commit cb41d21423f173922515e11f8433e0514007fcd5)
Commit: 61b25644b3e4d2cfe5467c795dcf9edd7f50a2ed
https://github.com/wesnoth/wesnoth/commit/61b25644b3e4d2cfe5467c795dcf9edd7f50a2ed
Author: loonycyborg <loonycyborg at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/server/server.cpp
Log Message:
-----------
wesnothd: refuse to send whispers from observers to players in same game
wesnothd <= 1.12 did this too, this restores old behavior
(cherry-picked from commit 10122057e6886b2c52066783fa9b5edc60196c09)
Commit: 5621fbb643225fdf851771dd90aee55d8eaf9605
https://github.com/wesnoth/wesnoth/commit/5621fbb643225fdf851771dd90aee55d8eaf9605
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/multiplayer/scenarios/2p_Dark_Forecast.cfg
Log Message:
-----------
Dark Forecast: fix untranslatable string by
reusing the one from the Campaign Selection Menu
[ci skip]
(cherry-picked from commit 8657fdb9a39f6556fb236d45e451a91c547852af)
Commit: fe19bdaf446f5ea98c5a6ada124fc238cdf02314
https://github.com/wesnoth/wesnoth/commit/fe19bdaf446f5ea98c5a6ada124fc238cdf02314
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/actions/attack.cpp
Log Message:
-----------
Fix rare crash in AI code
Reported in https://forums.wesnoth.org/viewtopic.php?p=626344#p626344
Regression from commit a3d5b9d603083ab0f3afcfbc9fc4c2432bb1623e.
The crash occurred when
* the attacker had only one weapon
* the said weapon was disabled, and
- the defender had no weapons
- the defender had only one weapon, or
- all defender's weapons were disabled
(cherry-picked from commit 4d569815d00fc0bb7be9fcc83705ebbf9a680bd8)
Commit: a688ab77b9f18db7fd34118267a3c59e9cf5584c
https://github.com/wesnoth/wesnoth/commit/a688ab77b9f18db7fd34118267a3c59e9cf5584c
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/preferences_dialog.cpp
M src/gui/dialogs/preferences_dialog.hpp
M src/hotkey/hotkey_command.cpp
M src/hotkey/hotkey_command.hpp
Log Message:
-----------
Some refactoring of preferences-related hotkey info storage (fixes #2953)
This commit does a few things:
First, it moves the hotkey category names out of the preferences dialog and into
the more appropriate hotkey file. Each name is now properly mapped to its corresponding
category enum, so we don't have to worry about that anymore.
Second, it adds a new mapping of hotkey categories to commands so one can easily fetch
a list of hotkeys in a given category.
Third, it excludes categories with no hotkeys from the filter dropdown in the Prefs
dialog (this is the part that actually fixes the bug above).
This also includes a slight behavior change to hotkey type filtering. Previously, if a
hotkey's category didn't match any of the ones listed in the dropdown, that hotkey's
row visibility would be set to the toggle state of the first row in the filter dropdown.
Now it gets set to false.
(cherry-picked from commit 1942627052298aca366147fbf59ee0e268810875)
Commit: 964a2804f571bb1120e23be52ddd95f3abdf8b8b
https://github.com/wesnoth/wesnoth/commit/964a2804f571bb1120e23be52ddd95f3abdf8b8b
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/preferences_dialog.cpp
Log Message:
-----------
Fixup 1942627
(cherry-picked from commit 17da211d1f0243297698590961c4587366e98799)
Commit: dbf0617afa4c76a624535bae93017c8dd5c28aea
https://github.com/wesnoth/wesnoth/commit/dbf0617afa4c76a624535bae93017c8dd5c28aea
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-lib/pl.po
M po/wesnoth-multiplayer/pl.po
M po/wesnoth-tutorial/pl.po
M po/wesnoth/pl.po
Log Message:
-----------
updated Polish translation
(cherry-picked from commit f3737d44ac75350e709d84d2da0244931139f140)
Commit: 078d9cde820d7855e13c504c9993f500639db357
https://github.com/wesnoth/wesnoth/commit/078d9cde820d7855e13c504c9993f500639db357
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-aoi/es.po
M po/wesnoth-ei/es.po
M po/wesnoth-help/es.po
M po/wesnoth-l/es.po
M po/wesnoth-low/es.po
M po/wesnoth-sota/es.po
M po/wesnoth-tb/es.po
M po/wesnoth-trow/es.po
M po/wesnoth-units/es.po
Log Message:
-----------
updated Spanish translation
(cherry-picked from commit ce4d6bfea9bbbdbf8cd1894ebe6276c8dcef25f9)
Commit: cd197f5dd91fd784f1c2bb79135c9496b94de2d3
https://github.com/wesnoth/wesnoth/commit/cd197f5dd91fd784f1c2bb79135c9496b94de2d3
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-help/gd.po
M po/wesnoth-tb/gd.po
M po/wesnoth/gd.po
Log Message:
-----------
updated Scottish Gaelic translation
(cherry-picked from commit ff6aa075e54888e6ea7d1b081942615a027b8db6)
Commit: bc641501a933e61334bfbcc54133e73c55b6bf67
https://github.com/wesnoth/wesnoth/commit/bc641501a933e61334bfbcc54133e73c55b6bf67
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M data/core/about_i18n.cfg
M players_changelog.md
Log Message:
-----------
updated Japanese translation
(cherry-picked from commit b0f76a7d4dd40f074198b6a1a9153dab5a62993c)
Commit: 10e56e643100cbace613ea518ec94d5ff7d32beb
https://github.com/wesnoth/wesnoth/commit/10e56e643100cbace613ea518ec94d5ff7d32beb
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-ai/ja.po
M po/wesnoth-anl/ja.po
M po/wesnoth-aoi/ja.po
M po/wesnoth-did/ja.po
M po/wesnoth-dm/ja.po
M po/wesnoth-dw/ja.po
M po/wesnoth-editor/ja.po
M po/wesnoth-ei/ja.po
M po/wesnoth-help/ja.po
M po/wesnoth-httt/ja.po
M po/wesnoth-l/ja.po
M po/wesnoth-lib/ja.po
M po/wesnoth-low/ja.po
M po/wesnoth-manpages/ja.po
M po/wesnoth-manual/ja.po
M po/wesnoth-multiplayer/ja.po
M po/wesnoth-nr/ja.po
M po/wesnoth-sof/ja.po
M po/wesnoth-sota/ja.po
M po/wesnoth-sotbe/ja.po
M po/wesnoth-tb/ja.po
M po/wesnoth-test/ja.po
M po/wesnoth-thot/ja.po
M po/wesnoth-trow/ja.po
M po/wesnoth-tsg/ja.po
M po/wesnoth-tutorial/ja.po
M po/wesnoth-units/ja.po
M po/wesnoth-utbs/ja.po
M po/wesnoth/ja.po
Log Message:
-----------
updated Japanese translation
(cherry-picked from commit b6f412fba1b85b4ae877d489906dbf67f8856b29)
Commit: 80d44a4d9666afa35d6fae9ffbd80d0863454f00
https://github.com/wesnoth/wesnoth/commit/80d44a4d9666afa35d6fae9ffbd80d0863454f00
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/units/animation.cpp
Log Message:
-----------
Unit/Animation: emplace_back (mostly) ahoy
Three cases could not use emplace_back since the ctor they use is private... :(
Which sucks since unit_animation looks like it'd be a bit expensive to copy.
(cherry-picked from commit 0cdcfac5d3cb348e2785e62cb2979f16b8133338)
Commit: 151ea623e3ba67a8ba67d3551617bdcdc1ebb36b
https://github.com/wesnoth/wesnoth/commit/151ea623e3ba67a8ba67d3551617bdcdc1ebb36b
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/units/abilities.cpp
M src/units/types.cpp
M src/units/unit.hpp
Log Message:
-----------
Unit: replace unit_ability_list::push_back with an emplace_back impl
(cherry-picked from commit c7b8694370046426488e475c37d77349095a7eb1)
Commit: 1af3bcba81a3d5c20dcfd11b4727977095327865
https://github.com/wesnoth/wesnoth/commit/1af3bcba81a3d5c20dcfd11b4727977095327865
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/units/race.cpp
M src/units/race.hpp
Log Message:
-----------
Unit/Race: made use of std::array
(cherry-picked from commit 098bc1c0e80363087d13e45da3874ab624f3a700)
Commit: cb652f775e2f7fc581f2e40a34540d96826560ce
https://github.com/wesnoth/wesnoth/commit/cb652f775e2f7fc581f2e40a34540d96826560ce
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-low/sk.po
M po/wesnoth/sk.po
Log Message:
-----------
updated Slovak translation
(cherry-picked from commit 28fc12ebd0aedec53ba577aedfab19d3fcde0495)
Commit: fa6e07702b7f8b6c917cf997cf8ff5874ed6d9de
https://github.com/wesnoth/wesnoth/commit/fa6e07702b7f8b6c917cf997cf8ff5874ed6d9de
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/images/campaign_image.png
M data/campaigns/Under_the_Burning_Suns/images/portraits/cloaked.png
M data/campaigns/Under_the_Burning_Suns/images/portraits/eloh.png
M data/campaigns/Under_the_Burning_Suns/images/portraits/eloh_rage.png
M data/campaigns/Under_the_Burning_Suns/images/portraits/garak.png
M data/campaigns/Under_the_Burning_Suns/images/portraits/kaleh.png
M data/campaigns/Under_the_Burning_Suns/images/portraits/nym.png
A data/campaigns/Under_the_Burning_Suns/images/portraits/nym_moody.png
M data/campaigns/Under_the_Burning_Suns/images/portraits/uncloaked.png
M data/campaigns/Under_the_Burning_Suns/images/portraits/zhul.png
A data/campaigns/Under_the_Burning_Suns/images/portraits/zhul_shyde.png
Log Message:
-----------
UtBS: initial set of new character portraits by LordBob (more to come)
[ci skip]
Nym's moody variant and Zhul's Shyde variant aren't wired in yet.
(cherry-picked from commit f17703a76fc8c5d74e10198551946fb578818285)
Commit: 3cca6e5dc8df02f8262af3428259a00753de0495
https://github.com/wesnoth/wesnoth/commit/3cca6e5dc8df02f8262af3428259a00753de0495
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Various changelog updates
[ci skip]
(cherry-picked from commit a85b14cfb7bea97cd785df938bdbecd602afb1dc)
Commit: 00e7974cf9e7657dd40e49c6969daed5f82adf69
https://github.com/wesnoth/wesnoth/commit/00e7974cf9e7657dd40e49c6969daed5f82adf69
Author: ln-zookeeper <lari.nieminen at iki.fi>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Marksman.cfg
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Sun_Singer.cfg
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Sun_Sylph.cfg
Log Message:
-----------
UtBS: Fixed some missing/erroneous special notes
(cherry-picked from commit ec63cff8fbddd353bc54e6bb9fbce20d55b154ff)
Commit: 4356e2794fac8ac28e656eec137e8db3b8ad4330
https://github.com/wesnoth/wesnoth/commit/4356e2794fac8ac28e656eec137e8db3b8ad4330
Author: ln-zookeeper <lari.nieminen at iki.fi>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/scenarios/13_Epilogue.cfg
M data/campaigns/Under_the_Burning_Suns/utils/character-definitions.cfg
Log Message:
-----------
UtBS: Wire in Zhul's winged portrait variation
(cherry-picked from commit 71178e99f83d87361e45a2d52cff79dc57655e8e)
Commit: 6a4c3a553dbe65c8a743f22aa200d57439cef49a
https://github.com/wesnoth/wesnoth/commit/6a4c3a553dbe65c8a743f22aa200d57439cef49a
Author: ln-zookeeper <lari.nieminen at iki.fi>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg
M data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg
M data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg
M data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.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/scenarios/10_Speaking_with_the_Fishes.cfg
M data/campaigns/Under_the_Burning_Suns/scenarios/11_Battle_for_Zocthanol_Isle.cfg
M data/campaigns/Under_the_Burning_Suns/scenarios/12_The_Final_Confrontation.cfg
M data/campaigns/Under_the_Burning_Suns/utils/deaths.cfg
Log Message:
-----------
UtBS: Wire in Nym's moody portrait variation
(cherry-picked from commit 8c2df1f18cabf943b358998e59cce6c089678b67)
Commit: 30d0ccafcea5fbc0c595fc369ab4f18d51beaf9f
https://github.com/wesnoth/wesnoth/commit/30d0ccafcea5fbc0c595fc369ab4f18d51beaf9f
Author: ln-zookeeper <lari.nieminen at iki.fi>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
Log Message:
-----------
UtBS S08: Use Eloh's raged portrait variation when she gets angry
(cherry-picked from commit 2bb16149af7847a4f790baeb7f47d50edc3f61a6)
Commit: 40c29241fb8a77df1c317e148bd4924e11d7c011
https://github.com/wesnoth/wesnoth/commit/40c29241fb8a77df1c317e148bd4924e11d7c011
Author: ln-zookeeper <lari.nieminen at iki.fi>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
R data/campaigns/Under_the_Burning_Suns/images/portraits/naga-with-bow.png
M data/campaigns/Under_the_Burning_Suns/units/nagas/Naga_Hunter.cfg
Log Message:
-----------
UtBS: Remove old Naga Hunter portrait and use core Naga Fighter instead
(cherry-picked from commit 02ef3a6a99f089acef891654d0c6877806e7ad60)
Commit: c44aced549c7b3cb2306b81f1acd23690709eac4
https://github.com/wesnoth/wesnoth/commit/c44aced549c7b3cb2306b81f1acd23690709eac4
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Sentinel.cfg
Log Message:
-----------
THoT: Port prose punctuation fix from core
This is from commit 1340c005b3beb992aef09a86bf2c7d62862bcef7.
[ci skip]
(cherry-picked from commit f6a369a1d0bbed9e8cdba982cc2605258f0c1380)
Commit: c23801cebd02566c96bc03146f83e2749cc1b49c
https://github.com/wesnoth/wesnoth/commit/c23801cebd02566c96bc03146f83e2749cc1b49c
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/scenarios/10_Speaking_with_the_Fishes.cfg
Log Message:
-----------
UtBS S10: Fix typo reported by zookeeper
[ci skip]
(cherry-picked from commit 70257c9af777da0ae9b6df697c5fa552797c161d)
Commit: 85bf47990adc5caae065e8d308a5005287f57901
https://github.com/wesnoth/wesnoth/commit/85bf47990adc5caae065e8d308a5005287f57901
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/units.cfg
M utils/pofix.py
Log Message:
-----------
Revert "'moreso' isn't a word in any dialect of English."
This reverts commit fb866c6d1310d8398f0f481a8ab16b1606286cdd.
This fix is specific to master and translators aren't supposed to be
touching master at this time. There is no point to its existence.
(cherry-picked from commit 4d5a3de4e63ebaac4a853b0f724d1d342d451dd0)
Commit: a9ebd3f19a7d2065fa455d506e4113c31d06a1f7
https://github.com/wesnoth/wesnoth/commit/a9ebd3f19a7d2065fa455d506e4113c31d06a1f7
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M utils/pofix.py
Log Message:
-----------
Pofix entry for ab9f29a7a44372a3e3703fd842740a9b425b6f5f
[ci skip]
(cherry-picked from commit 9531e29b5d71965af8b4f7ec3991060056ca8296)
Commit: 1fabe23ab4aac9ba3625e8817dd409d0b26dbcae
https://github.com/wesnoth/wesnoth/commit/1fabe23ab4aac9ba3625e8817dd409d0b26dbcae
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M utils/pofix.py
Log Message:
-----------
Pofix entry for b86a2968fe87a7e4112e900070446d4a83808202
[ci skip]
(cherry-picked from commit c638d71bf9f1d08fb885a3915298b7008a6b4481)
Commit: 568b351ccb146f9a150dd61ada8be9c806d6a333
https://github.com/wesnoth/wesnoth/commit/568b351ccb146f9a150dd61ada8be9c806d6a333
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M utils/pofix.py
Log Message:
-----------
Pofix entry for fc6c3ac04b899b4c7f629a1cd8d80101c7cbb20c
[ci skip]
(cherry-picked from commit 087d9bb5afd79aca926ed3f752d700a724e60a0e)
Commit: d2bc5eb2f1871c40507cc7f5793d0ba9165fd0ad
https://github.com/wesnoth/wesnoth/commit/d2bc5eb2f1871c40507cc7f5793d0ba9165fd0ad
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M utils/pofix.py
Log Message:
-----------
Fix pofix
Two of these strings were not a fix, just a removed string, so no need for pofix.
The other was not specific enough for pofix to match unambiguously.
Also, someone forgot a comma somewhere, causing a syntax error.
(cherry-picked from commit 3768dc687d9f8a709243912f7388f2917d20e2db)
Commit: 583e74b7d0f91e46553c75415045f3b9542e5ea4
https://github.com/wesnoth/wesnoth/commit/583e74b7d0f91e46553c75415045f3b9542e5ea4
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-sota/af.po
M po/wesnoth-sota/ang.po
M po/wesnoth-sota/ang at latin.po
M po/wesnoth-sota/ar.po
M po/wesnoth-sota/ast.po
M po/wesnoth-sota/bg.po
M po/wesnoth-sota/ca.po
M po/wesnoth-sota/ca_ES at valencia.po
M po/wesnoth-sota/cs.po
M po/wesnoth-sota/da.po
M po/wesnoth-sota/de.po
M po/wesnoth-sota/el.po
M po/wesnoth-sota/en at shaw.po
M po/wesnoth-sota/en_GB.po
M po/wesnoth-sota/eo.po
M po/wesnoth-sota/es.po
M po/wesnoth-sota/et.po
M po/wesnoth-sota/eu.po
M po/wesnoth-sota/fi.po
M po/wesnoth-sota/fr.po
M po/wesnoth-sota/fur.po
M po/wesnoth-sota/fur_IT.po
M po/wesnoth-sota/ga.po
M po/wesnoth-sota/gd.po
M po/wesnoth-sota/gl.po
M po/wesnoth-sota/he.po
M po/wesnoth-sota/hr.po
M po/wesnoth-sota/hu.po
M po/wesnoth-sota/id.po
M po/wesnoth-sota/is.po
M po/wesnoth-sota/it.po
M po/wesnoth-sota/ja.po
M po/wesnoth-sota/ko.po
M po/wesnoth-sota/la.po
M po/wesnoth-sota/lt.po
M po/wesnoth-sota/lv.po
M po/wesnoth-sota/mk.po
M po/wesnoth-sota/mr.po
M po/wesnoth-sota/nb.po
M po/wesnoth-sota/nb_NO.po
M po/wesnoth-sota/nl.po
M po/wesnoth-sota/pl.po
M po/wesnoth-sota/pt.po
M po/wesnoth-sota/pt_BR.po
M po/wesnoth-sota/racv.po
M po/wesnoth-sota/ro.po
M po/wesnoth-sota/ru.po
M po/wesnoth-sota/sk.po
M po/wesnoth-sota/sl.po
M po/wesnoth-sota/sr.po
M po/wesnoth-sota/sr at ijekavian.po
M po/wesnoth-sota/sr at ijekavianlatin.po
M po/wesnoth-sota/sr at latin.po
M po/wesnoth-sota/sv.po
M po/wesnoth-sota/tl.po
M po/wesnoth-sota/tr.po
M po/wesnoth-sota/uk.po
M po/wesnoth-sota/vi.po
M po/wesnoth-sota/wesnoth-sota.pot
M po/wesnoth-sota/zh_CN.po
M po/wesnoth-sota/zh_TW.po
Log Message:
-----------
Run pofix for wesnoth-sota changes that were just fwd-ported to master
[ci skip]
(cherry-picked from commit a2cfb3cf4c5ca5e94ec1ef4678d58608c7f686ed)
Commit: 456ddb8770119c5750781d9b7482c2a6c55ca2c9
https://github.com/wesnoth/wesnoth/commit/456ddb8770119c5750781d9b7482c2a6c55ca2c9
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-utbs/af.po
M po/wesnoth-utbs/ang.po
M po/wesnoth-utbs/ang at latin.po
M po/wesnoth-utbs/ar.po
M po/wesnoth-utbs/ast.po
M po/wesnoth-utbs/bg.po
M po/wesnoth-utbs/ca.po
M po/wesnoth-utbs/ca_ES at valencia.po
M po/wesnoth-utbs/cs.po
M po/wesnoth-utbs/da.po
M po/wesnoth-utbs/de.po
M po/wesnoth-utbs/el.po
M po/wesnoth-utbs/en at shaw.po
M po/wesnoth-utbs/en_GB.po
M po/wesnoth-utbs/eo.po
M po/wesnoth-utbs/es.po
M po/wesnoth-utbs/et.po
M po/wesnoth-utbs/eu.po
M po/wesnoth-utbs/fi.po
M po/wesnoth-utbs/fr.po
M po/wesnoth-utbs/fur_IT.po
M po/wesnoth-utbs/ga.po
M po/wesnoth-utbs/gd.po
M po/wesnoth-utbs/gl.po
M po/wesnoth-utbs/he.po
M po/wesnoth-utbs/hr.po
M po/wesnoth-utbs/hu.po
M po/wesnoth-utbs/id.po
M po/wesnoth-utbs/is.po
M po/wesnoth-utbs/it.po
M po/wesnoth-utbs/ja.po
M po/wesnoth-utbs/ko.po
M po/wesnoth-utbs/la.po
M po/wesnoth-utbs/lt.po
M po/wesnoth-utbs/lv.po
M po/wesnoth-utbs/mk.po
M po/wesnoth-utbs/mr.po
M po/wesnoth-utbs/nb_NO.po
M po/wesnoth-utbs/nl.po
M po/wesnoth-utbs/pl.po
M po/wesnoth-utbs/pt.po
M po/wesnoth-utbs/pt_BR.po
M po/wesnoth-utbs/racv.po
M po/wesnoth-utbs/ro.po
M po/wesnoth-utbs/ru.po
M po/wesnoth-utbs/sk.po
M po/wesnoth-utbs/sl.po
M po/wesnoth-utbs/sr.po
M po/wesnoth-utbs/sr at ijekavian.po
M po/wesnoth-utbs/sr at ijekavianlatin.po
M po/wesnoth-utbs/sr at latin.po
M po/wesnoth-utbs/sv.po
M po/wesnoth-utbs/tl.po
M po/wesnoth-utbs/tr.po
M po/wesnoth-utbs/uk.po
M po/wesnoth-utbs/vi.po
M po/wesnoth-utbs/wesnoth-utbs.pot
M po/wesnoth-utbs/zh_CN.po
M po/wesnoth-utbs/zh_TW.po
M utils/pofix.py
Log Message:
-----------
pofix changes for UtBS S10 typo fix
[ci skip]
(cherry-picked from commit f52828db88a5d1b20c4bd8225211533ac5b694df)
Commit: 286a592c661fc8dc11c72d14275dd97963cda934
https://github.com/wesnoth/wesnoth/commit/286a592c661fc8dc11c72d14275dd97963cda934
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/multiplayer/lobby.cpp
M src/gui/dialogs/multiplayer/mp_staging.cpp
M src/gui/widgets/chatbox.cpp
M src/gui/widgets/chatbox.hpp
Log Message:
-----------
Hide lobby chat log in MP staging screen
Because updating and sending messages to lobby in staging screen hasn't
been implemented, showing lobby history there would be confusing
(it would look as if everyone had stopped talking).
(cherry-picked from commit d628a73fab4a03a829c8790e2a97ea0a7d150619)
Commit: 2e7bb8ad0328dafb2c6694c2a385e609503233f8
https://github.com/wesnoth/wesnoth/commit/2e7bb8ad0328dafb2c6694c2a385e609503233f8
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/multiplayer/mp_join_game.cpp
Log Message:
-----------
Show chat logs (excluding lobby) also in MP Join Game
(cherry-picked from commit 4c258ff55071df5de9adfc7bd41a50f4775f1dca)
Commit: bbe817086ce1361b1fbf4fa9664a12cc080f84c8
https://github.com/wesnoth/wesnoth/commit/bbe817086ce1361b1fbf4fa9664a12cc080f84c8
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/multiplayer/scenarios/2p_Dark_Forecast.lua
Log Message:
-----------
fix lua error in 2p_Dark_Forecast 2
(cherry-picked from commit 438ca7bc1ee0e2c6e6b1dd6c97e409b2785f380b)
Commit: d504769240b5ba6077e487067fa7679dfe664d37
https://github.com/wesnoth/wesnoth/commit/d504769240b5ba6077e487067fa7679dfe664d37
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/images/units/quenoth/shyde.png
Log Message:
-----------
UtBS: new Quenoth Shyde sprite by Jetrel
[ci skip]
(cherry-picked from commit d3e35f6c1fd988688dd779e2992a634d7dc23be9)
Commit: e2cbd13a32669dfe4172fd5a296cd7c9924074a1
https://github.com/wesnoth/wesnoth/commit/e2cbd13a32669dfe4172fd5a296cd7c9924074a1
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Changelog entry for the Dark Forecast fix
[ci skip]
(cherry-picked from commit 4219e13ac56ee9bccfcd1d6a726f60ea23eb26a0)
Commit: 5cac72b91f289649c73d5a1a0a5c4af8054f312b
https://github.com/wesnoth/wesnoth/commit/5cac72b91f289649c73d5a1a0a5c4af8054f312b
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
More changelog updates
[ci skip]
(cherry-picked from commit f3a77bf310c9e4526ecdf41132b0fb012b29f69a)
Commit: 8e323e8f6e7cd18c4b3b914c1fc0c04a1db7dfbb
https://github.com/wesnoth/wesnoth/commit/8e323e8f6e7cd18c4b3b914c1fc0c04a1db7dfbb
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/actions/attack.hpp
M src/mouse_events.cpp
M src/reports.cpp
Log Message:
-----------
Added and made use of a move ctor in battle_context
(and emplace_back). No reason to use the copy ctor in these cases.
(cherry-picked from commit 6eab44c4f3b0eabd7fb3fc8e83dc388fc6338bd4)
Commit: e7a20bd9ab69f7fecb94bb90aefaa7f7524c401d
https://github.com/wesnoth/wesnoth/commit/e7a20bd9ab69f7fecb94bb90aefaa7f7524c401d
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/language.cpp
Log Message:
-----------
Cleaned up language completion filtering, but left it disabled here
We don't want this enabled on the dev branch.
(cherry-picked from commit 301fb933ac8d9713d9dd44fcfb0791b4b06ca585)
Commit: 5a7fbf350a91a929f9bc1a7406dded6f34c0e00b
https://github.com/wesnoth/wesnoth/commit/5a7fbf350a91a929f9bc1a7406dded6f34c0e00b
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/language.cpp
Log Message:
-----------
Fixup 301fb93
(cherry-picked from commit 6d09f702a5d8745b3b182ad691b96559e0183347)
Commit: 48789ee48defd26bf06945400f296c4299e9ecb0
https://github.com/wesnoth/wesnoth/commit/48789ee48defd26bf06945400f296c4299e9ecb0
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/language.cpp
Log Message:
-----------
Better cordoning off of translation completion filtering
(cherry-picked from commit 9c5ec1c3b7099f18984014f447f9ff5a22e78750)
Commit: 39a0ff6ae89241bb227e96b605707b6453bca8ed
https://github.com/wesnoth/wesnoth/commit/39a0ff6ae89241bb227e96b605707b6453bca8ed
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/images/portraits/elyssa.png
R data/campaigns/Under_the_Burning_Suns/images/portraits/elyssa_silver.png
M data/campaigns/Under_the_Burning_Suns/images/portraits/melusand.png
A data/campaigns/Under_the_Burning_Suns/images/portraits/naga-hunter.png
M data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg
M data/campaigns/Under_the_Burning_Suns/units/nagas/Naga_Hunter.cfg
Log Message:
-----------
UtBS: final set of updated character portraits by LordBob
Elyssa no longer has a Silver Mage portrait variant.
(cherry-picked from commit 45b4bb5b27b183ed719e4d64c1fe6bdb100d8653)
Commit: ea91d24059f6eda50c684baa5f5aa787bf1222a7
https://github.com/wesnoth/wesnoth/commit/ea91d24059f6eda50c684baa5f5aa787bf1222a7
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Liberty/scenarios/01_The_Raid.cfg
Log Message:
-----------
Adjust the weapon names of the heroes to better fit their portraits
[ci skip]
(cherry-picked from commit f1e2e8ce7fd6f489965feac3e3813760d03c9872)
Commit: bf8b0220e5dae2a33c8baa72c38a26d5f839008b
https://github.com/wesnoth/wesnoth/commit/bf8b0220e5dae2a33c8baa72c38a26d5f839008b
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
R data/campaigns/Under_the_Burning_Suns/images/misc/kaleh_story.jpg
R data/campaigns/Under_the_Burning_Suns/images/misc/night_of_fallen_stars.jpg
M data/campaigns/Under_the_Burning_Suns/utils/storytxt.cfg
Log Message:
-----------
UtBS: removed existing story images
[ci skip]
Not up to current standards, and besides, one of them uses the old Kaleh portrait.
(cherry-picked from commit 23c2c2e2ae5ede021c96ab7547b36073424f5592)
Commit: 4c5e74b2dad717831cb38a323d39879241c28a33
https://github.com/wesnoth/wesnoth/commit/4c5e74b2dad717831cb38a323d39879241c28a33
Author: Matthias Krüger <matthias.krueger at famsik.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M CMakeLists.txt
M SConstruct
Log Message:
-----------
cmake/scons: if sanitizers are enabled, also add -fno-omit-frame-pointer and -fno-optimize-sibling-calls.
Otherwise, if we build with sanitizers and optimizations, the sanitizer stacktraces can become quite hard to read.
(cherry-picked from commit 29089a47369c32d4eabb93ac7f5b33222c047670)
Commit: 2e31e464ec93121f6cbefe9367450a2857cf933c
https://github.com/wesnoth/wesnoth/commit/2e31e464ec93121f6cbefe9367450a2857cf933c
Author: Wedge009 <wedge009 at wedge009.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/VC14/wesnoth.vcxproj
M projectfiles/VC14/wesnoth.vcxproj.filters
Log Message:
-----------
Update VC project files.
* Add missing project configurations.
* Remove remaining OpenMP support.
* Tidy filters.
[ci skip]
(cherry-picked from commit 817f612f298a2be33fc3d5277c99ee2a93997e65)
Commit: 9dab7ec5128d19b65e9fea9b258c9f286216e4fc
https://github.com/wesnoth/wesnoth/commit/9dab7ec5128d19b65e9fea9b258c9f286216e4fc
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/campaign_server/control.hpp
Log Message:
-----------
Campaignd: made use of vector::at
This work since vector::at throws if i < size(), and the current check was for
> size() - 1, which equated to >= size(), which is equivalent to not < size().
It does lose the error message, though.
(cherry-picked from commit f5626ddc301f4762b488d1006b20123fe9c8edcd)
Commit: aa93a401ec691490607f4b1f0a19e46452f2be42
https://github.com/wesnoth/wesnoth/commit/aa93a401ec691490607f4b1f0a19e46452f2be42
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-help/it.po
M po/wesnoth-httt/it.po
M po/wesnoth-manual/it.po
M po/wesnoth-tb/it.po
M po/wesnoth-tsg/it.po
M po/wesnoth-units/it.po
M po/wesnoth/it.po
Log Message:
-----------
updated Italian translation
(cherry-picked from commit c1f3cffa1c85670ca0a12764f039a126b2d2ca5c)
Commit: e2a64541002f0b4ee885f699c4f0901e441f938a
https://github.com/wesnoth/wesnoth/commit/e2a64541002f0b4ee885f699c4f0901e441f938a
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/campaign_server/campaign_server.cpp
M src/save_index.cpp
M src/server/ban.cpp
M src/server/server.cpp
Log Message:
-----------
Made use of config_attribute_value::to_time_t
(cherry-picked from commit 6dfb87103c629cd91d57fc87934a3fb2d1177834)
Commit: da4d4a1be6a04543745c3160bd58604c8901c9de
https://github.com/wesnoth/wesnoth/commit/da4d4a1be6a04543745c3160bd58604c8901c9de
Author: pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M docker/Dockerfile-base-1804-master
Log Message:
-----------
Adds lld to the 1804 docker image.
The gold linker is available already, but lld is not installed along with clang.
(cherry-picked from commit 2aed8af606b00a2e989991b604037a816675ce4a)
Commit: 450092033a4c159fc465901569f8a3fc813928ac
https://github.com/wesnoth/wesnoth/commit/450092033a4c159fc465901569f8a3fc813928ac
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M data/gui/window/logging.cfg
M src/gui/dialogs/log_settings.cpp
Log Message:
-----------
gui2/log_settings: Permit disabling logdomains (log level -1)
(cherry-picked from commit ae5ab22b1a1652aa22cc53077cc32967c45a8d64)
Commit: 40230ca344744986d3df89cd8d32b5ce8418020a
https://github.com/wesnoth/wesnoth/commit/40230ca344744986d3df89cd8d32b5ce8418020a
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/editor/map/map_context.cpp
Log Message:
-----------
editor: don't write default values when saving a scenario
(cherry-picked from commit 15c331281f35284dae9fdbb35a6b050b0d45380e)
Commit: 107da0f0c8721a491b31b772f714f12715b35b4c
https://github.com/wesnoth/wesnoth/commit/107da0f0c8721a491b31b772f714f12715b35b4c
Author: Steve Cotton <steve at octalot.co.uk>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M cmake/FindCrypto.cmake
M cmake/FindHistory.cmake
M cmake/FindVorbisFile.cmake
Log Message:
-----------
Make CMake error-out if required libraries aren't found
It seems that FIND_PACKAGE_HANDLE_STANDARD_ARGS is doing a case-sensitive
search for whether the find_package flags included REQUIRED.
(cherry-picked from commit f25997665907af3586d99120d5b01db6eaf9f4fd)
Commit: 5045c09fd53eb865ea9935a524d9480193a9b339
https://github.com/wesnoth/wesnoth/commit/5045c09fd53eb865ea9935a524d9480193a9b339
Author: pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M utils/travis/steps/script.sh
Log Message:
-----------
Put the docker image on its own line.
(cherry-picked from commit eb0a290ca16080e615b4e538616dbaacc36579f0)
Commit: 6da9f62685d2ff6847ea85b7f7cbe574eda4264a
https://github.com/wesnoth/wesnoth/commit/6da9f62685d2ff6847ea85b7f7cbe574eda4264a
Author: pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M .travis.yml
M utils/travis/docker_run.sh
Log Message:
-----------
Running the translations is short, so do them through scons and cmake.
(cherry-picked from commit ea4d85a06e6815b398cb4b33dd334fb025d59ca4)
Commit: ff0009aa521ef1f40204eec45c8b234ba88ac282
https://github.com/wesnoth/wesnoth/commit/ff0009aa521ef1f40204eec45c8b234ba88ac282
Author: pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M CMakeLists.txt
M utils/travis/steps/install.sh
Log Message:
-----------
Don't copy the po/ directory into the docker image for non-NLS jobs.
(cherry-picked from commit 3effecdb069dad3036011ddb47f07d56e8ded121)
Commit: c23808a92f64795a0395e089be9f17dc68f9b471
https://github.com/wesnoth/wesnoth/commit/c23808a92f64795a0395e089be9f17dc68f9b471
Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/widgets/text_box_base.cpp
Log Message:
-----------
Fix doccomment error
Remove lame doccomments.
(cherry-picked from commit 092f8f325c28aa34b1385c042132ec6cc5a40f1d)
Commit: cf63206d3c00624233acdf7500f947f3cac819ed
https://github.com/wesnoth/wesnoth/commit/cf63206d3c00624233acdf7500f947f3cac819ed
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/tod_manager.cpp
Log Message:
-----------
fix segfault on area= filter.
areas_ might be empty, so areas_[0] might crash, also returning areas_[0].hexes didn't really make sense in the first place
(cherry-picked from commit 41d7df970c43cd74413a93b635058e494dd67d78)
Commit: aba6378d06c31b3e1757cc4beaefd1ba5def6613
https://github.com/wesnoth/wesnoth/commit/aba6378d06c31b3e1757cc4beaefd1ba5def6613
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-lib/de.po
Log Message:
-----------
fix a %->$ in german translation
(cherry-picked from commit 6c802b5016047f80453696654ef6d4430df4584d)
Commit: 3028af890c47563fa040522ac0cccbba1a9f64ac
https://github.com/wesnoth/wesnoth/commit/3028af890c47563fa040522ac0cccbba1a9f64ac
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/ai/game_info.hpp
Log Message:
-----------
AI/Game Info: formatting/forward declaration cleanup
(cherry-picked from commit 1af08fb58ea57055c15c5a9da750ce17d99873a8)
Commit: acb50b25aa80c4c7d2941f76e24785e138d083f6
https://github.com/wesnoth/wesnoth/commit/acb50b25aa80c4c7d2941f76e24785e138d083f6
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/preferences_dialog.cpp
M src/gui/widgets/slider.cpp
M src/preferences/display.cpp
Log Message:
-----------
Fixed Boost header deprecation warning on 1.67 and later
Also removed one unnecessary inclusion of the header of the same.
(cherry-picked from commit 78e8ac51d7ef0b70c28c279b4a0a292d23fc4fbb)
Commit: fcf35841f5fe6089fa4f15a9d47eb21230535f64
https://github.com/wesnoth/wesnoth/commit/fcf35841f5fe6089fa4f15a9d47eb21230535f64
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/ai/composite/aspect.hpp
M src/ai/contexts.cpp
M src/ai/contexts.hpp
M src/ai/game_info.hpp
Log Message:
-----------
AI: simplify some typedefs with template aliases
(cherry-picked from commit 1b8bfa6ab4859db68865597ba21573e67107e3d0)
Commit: 2417af262688d1eca00c6dce972de6cae0563518
https://github.com/wesnoth/wesnoth/commit/2417af262688d1eca00c6dce972de6cae0563518
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/ai/composite/aspect.hpp
M src/ai/contexts.cpp
M src/ai/contexts.hpp
Log Message:
-----------
AI: deployed typesafe_aspect_ptr consistently
No reason this couldn't have used aspect_type<t>typesafe_ptr before, so this just
makes uses of this specific type easier to find.
(cherry-picked from commit 1e846aced28b5b1d1b0ae9890d326ed3a875b96d)
Commit: c80e506ca90704241bcc5cc37c3736ae772e0b63
https://github.com/wesnoth/wesnoth/commit/c80e506ca90704241bcc5cc37c3736ae772e0b63
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/ai/composite/aspect.hpp
M src/ai/composite/engine.hpp
M src/ai/composite/property_handler.hpp
M src/ai/composite/rca.hpp
M src/ai/formula/engine_fai.cpp
M src/ai/formula/function_table.cpp
Log Message:
-----------
AI: deployed std::make_shared in a whole bunch of places
Also simplified a few instance of shared_ptr assignment. No need to create a temp ptr
just to immediately assign them.
(cherry-picked from commit ba150c02981fd07bdbc9c3ebf305600754d89aba)
Commit: d7194707842d8dc59a1d46fc34a35c538ea11dda
https://github.com/wesnoth/wesnoth/commit/d7194707842d8dc59a1d46fc34a35c538ea11dda
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/game_version.hpp
M src/gui/dialogs/help_browser.hpp
M src/gui/dialogs/preferences_dialog.hpp
M src/gui/dialogs/story_viewer.hpp
M src/gui/dialogs/unit_recall.hpp
Log Message:
-----------
GUI2/Dialogs: cleaned up a bunch of unnecessary forward declarations
(cherry-picked from commit b47837b3c06538db8560db1da9cd642f5158e4fb)
Commit: 25247eb84de1951079add9da94d2510328c03b61
https://github.com/wesnoth/wesnoth/commit/25247eb84de1951079add9da94d2510328c03b61
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/synced_user_choice.cpp
Log Message:
-----------
improve mp sync waiting message
(cherry-picked from commit d31e74aee0028bdb0c7d7dbc74d4ec05389a9298)
Commit: 2708efa93c17b3d32d994be49cb880f3c3c9fb79
https://github.com/wesnoth/wesnoth/commit/2708efa93c17b3d32d994be49cb880f3c3c9fb79
Author: ln-zookeeper <lari.nieminen at iki.fi>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
R data/campaigns/Under_the_Burning_Suns/images/portraits/esanoo.png
R data/campaigns/Under_the_Burning_Suns/images/portraits/grog.png
R data/campaigns/Under_the_Burning_Suns/images/portraits/rogrimir.png
M data/campaigns/Under_the_Burning_Suns/scenarios/06a_In_the_Tunnels_of_Trolls.cfg
M data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg
M data/campaigns/Under_the_Burning_Suns/scenarios/07a_Dealing_with_Dwarves.cfg
M data/campaigns/Under_the_Burning_Suns/scenarios/07b_Talking_with_Trolls.cfg
M data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
M data/campaigns/Under_the_Burning_Suns/scenarios/13_Epilogue.cfg
Log Message:
-----------
UtBS: Use core portraits for Esanoo, Rogrimir and Grog
These were the only remaining character portraits in the old style, so they would stick out among the new ones.
(cherry-picked from commit 911347869053b993496ff60002cab169f3bda398)
Commit: a797ecb1cb46269422d6388eff9d3bcae0415c1b
https://github.com/wesnoth/wesnoth/commit/a797ecb1cb46269422d6388eff9d3bcae0415c1b
Author: ln-zookeeper <lari.nieminen at iki.fi>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
M data/campaigns/Under_the_Burning_Suns/scenarios/11_Battle_for_Zocthanol_Isle.cfg
Log Message:
-----------
UtBS: Avoid random traits for Eloh's appearances
(cherry-picked from commit 4956bfcbbab01c94ea0242421d2ce826912ccbaf)
Commit: bbd2de37eaa4651fa386c5e0d7008fa2ef3219d5
https://github.com/wesnoth/wesnoth/commit/bbd2de37eaa4651fa386c5e0d7008fa2ef3219d5
Author: ln-zookeeper <lari.nieminen at iki.fi>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg
Log Message:
-----------
UtBS S09: Avoid random gender and traits for Hekuba
The simplest if not the most elegant fix.
(cherry-picked from commit cd00b55d2af938b908a09e213ad7d2b46a046d98)
Commit: ef0ed0cc526ae9738d1095e7d021afcc4b41e3a1
https://github.com/wesnoth/wesnoth/commit/ef0ed0cc526ae9738d1095e7d021afcc4b41e3a1
Author: ln-zookeeper <lari.nieminen at iki.fi>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Youth.cfg
Log Message:
-----------
UtBS: Include both Kaleh and Nym in Quenoth Youth unit description
(cherry-picked from commit ab1de53b4ae16b579690ef00caef29da4b316307)
Commit: 131019c18b1da64214b882d2f79a8e138496c862
https://github.com/wesnoth/wesnoth/commit/131019c18b1da64214b882d2f79a8e138496c862
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/lua/wml/message.lua
Log Message:
-----------
Support male_voice and female_voice in [message]
(cherry-picked from commit 07e465e57b389f7ebacecbc7511411bb5685614a)
Commit: f8df22f7d96e63a38feb8167a333b087075c3fcd
https://github.com/wesnoth/wesnoth/commit/f8df22f7d96e63a38feb8167a333b087075c3fcd
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M CMakeLists.txt
Log Message:
-----------
fixed issues with building translation via cmake
commit 3effecd added an "if" block in CMakeLists with a variable that
does not exist ("NLS"). This breaks running translation updates for
every cmake user. Changed the variable to the existing "ENABLE_NLS".
@Pentarctagon I don't know if the travis script has to be adjusted as
well. Please test.
(cherry-picked from commit 64fe3988d87b61e40199297d710c035d85dedd49)
Commit: 5a63c5a2233ee1582cacc3e15c6c17d76f3407b0
https://github.com/wesnoth/wesnoth/commit/5a63c5a2233ee1582cacc3e15c6c17d76f3407b0
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-help/it.po
M po/wesnoth/it.po
Log Message:
-----------
updated Italian translation
(cherry-picked from commit f677e3f2ad5fc5a222a75d86e9d2595fca68a970)
Commit: ba3b79a6ab4e745d9e495cc0c715125f404a4c94
https://github.com/wesnoth/wesnoth/commit/ba3b79a6ab4e745d9e495cc0c715125f404a4c94
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-thot/sk.po
Log Message:
-----------
update Slovak translation
(cherry-picked from commit ce35c7b7bf252e57ce30ff75b6c8410a60d11d8c)
Commit: 9888bd2f161e10a0f031c013951dda4aebd7640e
https://github.com/wesnoth/wesnoth/commit/9888bd2f161e10a0f031c013951dda4aebd7640e
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/playturn.cpp
Log Message:
-----------
improve side drop message fixes #2820
(cherry-picked from commit 06ebcebed5c7c31f8e6c0b287338ab1e3f7cb6ca)
Commit: ec207923e40c1f39f5cf570c7aade6e1ee538fd5
https://github.com/wesnoth/wesnoth/commit/ec207923e40c1f39f5cf570c7aade6e1ee538fd5
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/tools/GUI.pyw
Log Message:
-----------
GUI.pyw: Fix wmlxgettext run failing if the output file already exists
(cherry-picked from commit 579589264930d18d5ff69a250a31d95bd0e72e42)
Commit: 9ac25a8f999f1515d172927336cd730fc73133bb
https://github.com/wesnoth/wesnoth/commit/9ac25a8f999f1515d172927336cd730fc73133bb
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/actions/undo.cpp
M src/actions/undo_action.hpp
M src/synced_commands.cpp
Log Message:
-----------
fix [on_undo] in menu items and custom_command
also fixes menu items beeing marked as undoabel even if they used the
synced rng.
#2979
(cherry-picked from commit 7751b790ebd84ccdaa291246784ed648d5faa88f)
Commit: 6abb5693eb5100a042b16ec5ca949728c60e060d
https://github.com/wesnoth/wesnoth/commit/6abb5693eb5100a042b16ec5ca949728c60e060d
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/actions/undo.cpp
Log Message:
-----------
fixup
(cherry-picked from commit 2e5d7139b974dd4f7ec30993beee42e253ad2587)
Commit: f0e8fb0fb2b212719ee31ba1490d15cdf6ebc4e6
https://github.com/wesnoth/wesnoth/commit/f0e8fb0fb2b212719ee31ba1490d15cdf6ebc4e6
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_Rise_Of_Wesnoth/images/units/kalian-elvish-champion.png
Log Message:
-----------
TRoW: new Lord Logalmier sprite by Kasdel with minor tweeks by @doofus-01
[ci skip]
See https://forums.wesnoth.org/viewtopic.php?p=625519#p625519
Resolves #2985.
(cherry-picked from commit 71d7f6a237ed99ae149461004058909fc78e3033)
Commit: 71a4e2b06f4e2af77bba902820037b0bb1e4f2a6
https://github.com/wesnoth/wesnoth/commit/71a4e2b06f4e2af77bba902820037b0bb1e4f2a6
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/images/units/monsters/skeletal-dragon/skeletal-dragon.png
Log Message:
-----------
Skeletal Dragon: discarded colored background full-alpha pixels I noticed
[ci skip]
(cherry-picked from commit 09f72376318f258fc6169edc94552d0531e581fb)
Commit: 2924495299ae4463d4ef242585207edd0e7d1d0c
https://github.com/wesnoth/wesnoth/commit/2924495299ae4463d4ef242585207edd0e7d1d0c
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/gui/window/mp_create_game.cfg
Log Message:
-----------
MP Create Game: keep background image width proportional to its height
[ci skip]
(cherry-picked from commit 604dcd80081b87c16ea7b84eb3e4e5b68d1f4c50)
Commit: e2592c9d6a0780da32abf0adad65e0e99cf72118
https://github.com/wesnoth/wesnoth/commit/e2592c9d6a0780da32abf0adad65e0e99cf72118
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/gui/macros/_initial.cfg
Log Message:
-----------
GUI2: removed unnecessary spaces and newlines from color macros
[ci skip]
Since these are usually used inline or as key values, we don't need the extra padding.
(cherry-picked from commit 7db83e3a0e5de45b3e64eb1da784a8ce334a49c6)
Commit: 8c93e152b87b82f577045e1ef1eb3376bf6575a6
https://github.com/wesnoth/wesnoth/commit/8c93e152b87b82f577045e1ef1eb3376bf6575a6
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-ai/fr.po
M po/wesnoth-utbs/fr.po
M po/wesnoth/fr.po
Log Message:
-----------
updated French translation
(cherry-picked from commit 9db34c2170d96a72ff75211669ebc847fe0b89a7)
Commit: a040d521a4095504780c240a89a5c3a20af7bf56
https://github.com/wesnoth/wesnoth/commit/a040d521a4095504780c240a89a5c3a20af7bf56
Author: pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M CMakeLists.txt
M SConstruct
A cmake/FindGLEW.make
A cmake/FindOpenGL.cmake
A cmake/FindPackageHandleStandardArgs.cmake
A cmake/FindPackageMessage.cmake
A scons/gl.py
M src/CMakeLists.txt
M utils/travis/steps/install.sh
Log Message:
-----------
Updates cmake and scons to be able to compile with OGL.
Scons OpenGL/GLEW test taken mostly verbatim from 3e2eba22a96cb2c6c69ee5109059b806f22a372f
(cherry-picked from commit 5e36a90039ddde3625690ace5259198e1932a7f8)
Commit: 5aecd58b8f752052f797aeb50ac7f770f92c7bd0
https://github.com/wesnoth/wesnoth/commit/5aecd58b8f752052f797aeb50ac7f770f92c7bd0
Author: Victor Sergienko <singalen at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/hotkey/command_executor.cpp
Log Message:
-----------
#2971 Scrolling with arrow keys can get stuck
(cherry-picked from commit dbffb513947fd36815b46ea0a01a91f7cf17a632)
Commit: bd5010aa782011e47795e2889ad8f8f3a3171658
https://github.com/wesnoth/wesnoth/commit/bd5010aa782011e47795e2889ad8f8f3a3171658
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/ai/game_info.hpp
M src/ai/manager.hpp
Log Message:
-----------
AI: removed duplicate composite AI typedef used a unique_ptr for it
(cherry-picked from commit 691276a0b737f66eff2dfdedc2e8ea5b25cd4432)
Commit: 53fb426f4d66432c6736c1d53f2f926df2601034
https://github.com/wesnoth/wesnoth/commit/53fb426f4d66432c6736c1d53f2f926df2601034
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/ai/contexts.cpp
Log Message:
-----------
AI/Contexts: deployed std::make_shared in a place I missed
(cherry-picked from commit 18d597e374747868cc9295485f0ddf2feba17463)
Commit: c49917c747030971b8448541f44234e81408e8f5
https://github.com/wesnoth/wesnoth/commit/c49917c747030971b8448541f44234e81408e8f5
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/ai/actions.cpp
Log Message:
-----------
AI/Actions: avoid inline ternaries in place of if blocks
(cherry-picked from commit 1c744875d3b689d78317c74ee07e707010dbaab9)
Commit: 7b9688fbb6701bfd82018d707067fdccfa445969
https://github.com/wesnoth/wesnoth/commit/7b9688fbb6701bfd82018d707067fdccfa445969
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/serialization/string_utils.cpp
Log Message:
-----------
Clean up utils::parse_ranges
(cherry-picked from commit c06810876df2590a076add6a1115ec9eb72f1c98)
Commit: 018a4f257108d07ab6f3c6e10c2e5b1b41900dad
https://github.com/wesnoth/wesnoth/commit/018a4f257108d07ab6f3c6e10c2e5b1b41900dad
Author: Martin Hrubý (hrubymar10) <hrubymar10 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/Xcode/Fix_Xcode_Dependencies
Log Message:
-----------
Use pango and cairo from MCS until #2859 will be fixed
(cherry-picked from commit f217062116ede18a58ec8f27935558de32e81395)
Commit: 2740ccbf75a8ff7b3db526281dbd56856ba7d565
https://github.com/wesnoth/wesnoth/commit/2740ccbf75a8ff7b3db526281dbd56856ba7d565
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-httt/es.po
Log Message:
-----------
updated Spanish translation
(cherry-picked from commit 4f85e158c64ea25d143fc57d31390686b614c310)
Commit: 129218b03a95ec0e2ec8019769214d8f9e5dcd09
https://github.com/wesnoth/wesnoth/commit/129218b03a95ec0e2ec8019769214d8f9e5dcd09
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/about.cfg
Log Message:
-----------
Added trailers credits section
[ci skip]
(cherry-picked from commit 7d3d9daf0ce484a15d732e103d211b96bb98e28e)
Commit: 324588e48428a8422af31881e4f0c36611169aa7
https://github.com/wesnoth/wesnoth/commit/324588e48428a8422af31881e4f0c36611169aa7
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/gui/window/mp_method_selection.cfg
Log Message:
-----------
MP Method Selection: removed text saying registered nicknames are optional
[ci skip]
This is currently only the case on the 1.14 server, but it's easiest just to
remove the line completely rather than constantly adding or re-adding it based
on whether you're using a or dev series.
(cherry-picked from commit 6f057d8b02572172209afdf718cbd1bfe50d1016)
Commit: a7cf81508fc7d1a58b6d3dccf99a95247205afa8
https://github.com/wesnoth/wesnoth/commit/a7cf81508fc7d1a58b6d3dccf99a95247205afa8
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/cores.cfg
Log Message:
-----------
Threw out the extraneous default core description
[ci skip]
(cherry-picked from commit 2064e1e16c42f160914596e6242c84d2cfd4f4ab)
Commit: e9d0efc86fa5ce68b22867f0953fefa2cc88dff3
https://github.com/wesnoth/wesnoth/commit/e9d0efc86fa5ce68b22867f0953fefa2cc88dff3
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/units/undead/Undead_Horseman.cfg
Log Message:
-----------
UtBS: remove submerge ability from Skeleton Rider
since he can't move onto deep water.
(and there is no deep water in the relevant scenario either)
Supposed to look better in the help.
[ci skip]
(cherry-picked from commit be221b5ef0f281dc491d6858c35a80abb352840d)
Commit: 2b189d331a384b325cd7db6132cd9814212d3310
https://github.com/wesnoth/wesnoth/commit/2b189d331a384b325cd7db6132cd9814212d3310
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Outcast.cfg
Log Message:
-----------
TRoW: Remove leadership from Lvl. 1 Wesfolk leader
as there are no Lvl. 0 units.
(cherry-picked from commit a96c9ac7aab3243846564e0ebf1f18978451ce3f)
Commit: 448353d2bdab1ff810f4868d372c008ab0edbce1
https://github.com/wesnoth/wesnoth/commit/448353d2bdab1ff810f4868d372c008ab0edbce1
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Outcast.cfg
Log Message:
-----------
TRoW: readd leaderhip
(as 1st ability)
[ci skip]
(cherry-picked from commit c8e3856f51fb45721e63ca4e44178526967c34a9)
Commit: 066894c188a043afe75ee7dbb7f787324af0dfbd
https://github.com/wesnoth/wesnoth/commit/066894c188a043afe75ee7dbb7f787324af0dfbd
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Changelog entry for the misleading tooltip text fix
[ci skip]
(cherry-picked from commit f33111e86b9c7374e26fb85fdb549147990ee2a8)
Commit: e20e84070090e8b6fa858c2294f1f337aaa5bcb1
https://github.com/wesnoth/wesnoth/commit/e20e84070090e8b6fa858c2294f1f337aaa5bcb1
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/editor/controller/editor_controller.cpp
M src/game_launcher.cpp
M src/gui/dialogs/screenshot_notification.cpp
M src/image.cpp
M src/image.hpp
Log Message:
-----------
Error message when trying to save a screenshot in an unsupported format
(cherry-picked from commit 93f956ed4cb8b182c7e150ef15f99f837044cf69)
Commit: d8fa1b945c9c1f074f230e4ca978ce016433924e
https://github.com/wesnoth/wesnoth/commit/d8fa1b945c9c1f074f230e4ca978ce016433924e
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M players_changelog.md
Log Message:
-----------
Changelog entry for commit 93f956ed4cb8b182c7e150ef15f99f837044cf69
(cherry-picked from commit f074f812cadc4093e51851504d899f796d76099c)
Commit: 015b1891cf5cb38a70e6cb23c5f6acea21fb6994
https://github.com/wesnoth/wesnoth/commit/015b1891cf5cb38a70e6cb23c5f6acea21fb6994
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/gui/window/preferences/02_hotkeys.cfg
M data/gui/window/title_screen.cfg
M src/hotkey/hotkey_command.cpp
Log Message:
-----------
Ditch the "titlescreen" nomenclature for player-visible strings
(cherry-picked from commit eacc1e0f6b1f0ef372a34f65be137c2f1f527aa6)
Commit: f13906e51c577bb0f75faa1dcfb52a0b17f1938d
https://github.com/wesnoth/wesnoth/commit/f13906e51c577bb0f75faa1dcfb52a0b17f1938d
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/map/map.cpp
Log Message:
-----------
Slightly less harsh unknown map terrain code error message
(cherry-picked from commit 8582240d7985b5868590e03cf8e86e1fc53ab752)
Commit: 5b5442b1af1f3e4915622dad281074cd8d13df99
https://github.com/wesnoth/wesnoth/commit/5b5442b1af1f3e4915622dad281074cd8d13df99
Author: galegosimpatico <galegosimpatico at outlook.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/tools/GUI.pyw
Log Message:
-----------
Bump program version.
(cherry-picked from commit bbd83f17ed238616e9365a6ff5835021a63b32d2)
Commit: 671a27c793b76d54d08954cee94c71fb6280d3ee
https://github.com/wesnoth/wesnoth/commit/671a27c793b76d54d08954cee94c71fb6280d3ee
Author: doofus-01 <doofus-01 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/images/items/orcish-flag2.png
Log Message:
-----------
minor orcish flag update
(cherry-picked from commit 9fd0286a6506d1905a6a23b76831bcb9fd974364)
Commit: 1c42af658be1f4e399d928d59ac75836732479ed
https://github.com/wesnoth/wesnoth/commit/1c42af658be1f4e399d928d59ac75836732479ed
Author: doofus-01 <doofus-01 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-bow-defend-1.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-bow-defend-2.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-bow.png
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Youth.cfg
Log Message:
-----------
adding minimal bow frames for quenoth youth Kaleh
(cherry-picked from commit 966c2205c815593730bda11de26d6bebf060699b)
Commit: 17589d9647a4f4ac8b9e648a460a024f3a6ed1d3
https://github.com/wesnoth/wesnoth/commit/17589d9647a4f4ac8b9e648a460a024f3a6ed1d3
Author: doofus-01 <doofus-01 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/images/items/kaleh-dead.png
Log Message:
-----------
dead elf image requested in issue #2962
(cherry-picked from commit 2e62fc22ec9ff66ce5df6a9dfa4ece509e888c5f)
Commit: 25c37c82d12a95dd5d7cf08aff823fac10aeb791
https://github.com/wesnoth/wesnoth/commit/25c37c82d12a95dd5d7cf08aff823fac10aeb791
Author: doofus-01 <doofus-01 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
A data/campaigns/Under_the_Burning_Suns/images/terrain/great-tree-smashed.png
M data/campaigns/Under_the_Burning_Suns/maps/01_The_Morning_After.map
M data/campaigns/Under_the_Burning_Suns/utils/terrain.cfg
M data/campaigns/Under_the_Burning_Suns/utils/terrain_graphics.cfg
Log Message:
-----------
adding smashed tree terrain for first scenario
(cherry-picked from commit 23e6481389415f233af425d0a4b8ba94a82b82a0)
Commit: 73839d2a1b0b726139664ac771dfcf94a6563569
https://github.com/wesnoth/wesnoth/commit/73839d2a1b0b726139664ac771dfcf94a6563569
Author: doofus-01 <doofus-01 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/images/terrain/great-tree-smashed.png
M data/campaigns/Under_the_Burning_Suns/maps/01_The_Morning_After.map
M data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg
M data/campaigns/Under_the_Burning_Suns/utils/terrain.cfg
M data/campaigns/Under_the_Burning_Suns/utils/terrain_graphics.cfg
Log Message:
-----------
smashed tree is no longer a terrain, just a scenario graphic
(cherry-picked from commit faee9b7f3f939b3265cb1d99e0e12446b3b00986)
Commit: ea410a39b7465dc5530813a128d3a9ede2fa47e2
https://github.com/wesnoth/wesnoth/commit/ea410a39b7465dc5530813a128d3a9ede2fa47e2
Author: doofus-01 <doofus-01 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg
Log Message:
-----------
edit first scenario to remove female gender specifications for units that have no such variation.
(cherry-picked from commit 961bcb861df35d2464d546283bc08c5932b9409e)
Commit: ee8e82a402eeec0ab46374e97d99a36889299443
https://github.com/wesnoth/wesnoth/commit/ee8e82a402eeec0ab46374e97d99a36889299443
Author: doofus-01 <doofus-01 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/images/units/quenoth/druid.png
M data/campaigns/Under_the_Burning_Suns/images/units/quenoth/shaman.png
Log Message:
-----------
quenoth shaman and druid sprites
(cherry-picked from commit 6ceedb40534cf3bdbcbb5493fffc4404cdda94e5)
Commit: 6965586d8327f7b1d4ee8e894be4a98a43332d39
https://github.com/wesnoth/wesnoth/commit/6965586d8327f7b1d4ee8e894be4a98a43332d39
Author: doofus-01 <doofus-01 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/images/units/quenoth/flanker.png
M data/campaigns/Under_the_Burning_Suns/images/units/quenoth/ranger.png
Log Message:
-----------
update to flanker and ranger base sprites
(cherry-picked from commit ad8bc761442a0be43fd8547d19aa816c028a1462)
Commit: 8b70014fc919c4ff17e0f6f35a1c326f8c83cb20
https://github.com/wesnoth/wesnoth/commit/8b70014fc919c4ff17e0f6f35a1c326f8c83cb20
Author: doofus-01 <doofus-01 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/shaman-defend1.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/shaman-defend2.png
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Shaman.cfg
Log Message:
-----------
defense animations for shaman
(cherry-picked from commit de25b879245860469c88a8f491862a1a26688a80)
Commit: f0208e003b0b65fab3b03ebecb447097984c02a6
https://github.com/wesnoth/wesnoth/commit/f0208e003b0b65fab3b03ebecb447097984c02a6
Author: doofus-01 <doofus-01 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/nym-bolas1.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/nym-bolas2.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/nym-bolas3.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/nym-bolas4.png
M data/campaigns/Under_the_Burning_Suns/images/units/quenoth/nym.png
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Youth.cfg
Log Message:
-----------
Bolas animations for Nym
(cherry-picked from commit ee04db61ebacc2906d6b2def1836016e89d3a0f0)
Commit: 3477893e4921e523b968116aba7f84e81460df54
https://github.com/wesnoth/wesnoth/commit/3477893e4921e523b968116aba7f84e81460df54
Author: doofus-01 <doofus-01 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/scenarios/12_The_Final_Confrontation.cfg
Log Message:
-----------
fix TOD lighting for sleeping Kaleh, and make sure Zhul is facing the right way in opening scene
(cherry-picked from commit f880f402543b0d2d2239f154cf2619b926cf4e1f)
Commit: 1767f81576e6e365d26f8145290eb1c797431bf4
https://github.com/wesnoth/wesnoth/commit/1767f81576e6e365d26f8145290eb1c797431bf4
Author: loonycyborg <loonycyborg at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/server/game.cpp
Log Message:
-----------
wesnothd: Fix remaining incorrect uses of simple_wml::get_attr instead of get_attr_dup
(cherry-picked from commit 688ae150ccb221a5d8d2e93421c8b165ec86a247)
Commit: bd75565c7e73e79128b32b6f72a4825e0c0e41d4
https://github.com/wesnoth/wesnoth/commit/bd75565c7e73e79128b32b6f72a4825e0c0e41d4
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M doc/man/wesnoth.6
Log Message:
-----------
Fix wesnoth(6) claiming the default log level is error
It's been warning since version 1.9.0.
[ci skip]
(cherry-picked from commit 006bd4d099f62a47ff548ecf4736a5f3a5322ea6)
Commit: 42cdcbcf93edfb52452476909112b3e2b4228b40
https://github.com/wesnoth/wesnoth/commit/42cdcbcf93edfb52452476909112b3e2b4228b40
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-tsg/gl.po
Log Message:
-----------
updated Galician translation
(cherry-picked from commit c19590fc453c2ca1c3c68abe734a99d297db2ef6)
Commit: 6e943d6cb4fa197eab35578962509a4cdf2571b5
https://github.com/wesnoth/wesnoth/commit/6e943d6cb4fa197eab35578962509a4cdf2571b5
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/fake_unit_ptr.cpp
M src/fake_unit_ptr.hpp
M src/whiteboard/attack.cpp
M src/whiteboard/manager.cpp
M src/whiteboard/move.cpp
M src/whiteboard/side_actions.cpp
Log Message:
-----------
wb: fix future unit sprite missing
fixes #2124
(cherry-picked from commit 9277a6cf537863f9236e1d09b11c64903f50cecc)
Commit: 9b2758531569ad2911c6c28d401570a58f15a053
https://github.com/wesnoth/wesnoth/commit/9b2758531569ad2911c6c28d401570a58f15a053
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/whiteboard/side_actions.cpp
Log Message:
-----------
wb: more robust side_actions_container::get_turn
the assumption
(turn_beginnings_[num] == it) => (get_turn(it) == num)
might be wrong in case that we have a turn with no actions, in which
case turn_beginnings_ contains duplicates and we actually want the upper
bound of (x <= it) in turn_beginnings_
(cherry-picked from commit ba6495c96addbc8279d580e261acce6b589a6eeb)
Commit: 5e9595e109844d668171193590b17343c6349ab5
https://github.com/wesnoth/wesnoth/commit/5e9595e109844d668171193590b17343c6349ab5
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/whiteboard/side_actions.cpp
Log Message:
-----------
wb: more robust side_actions_container::erase
i don't really know why the old code had a special case for
`get_turn(next) != turn_of_position`, from what i see `turn_end(0)`
would basicially return the same value as `next`. The new code removes
that special case which resulted in assertion failures before (#1841)
and also consiers the case where `position` appears multiple times in
`turn_beginnings_`
(cherry-picked from commit 195913fc4be356bce2aa5d9b99bc2f64a4c3048b)
Commit: b999a1dc9123d67633b4be20de3f3e7092ec91f9
https://github.com/wesnoth/wesnoth/commit/b999a1dc9123d67633b4be20de3f3e7092ec91f9
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/whiteboard/move.cpp
Log Message:
-----------
wb: fix nullptr assertion when log is enabled
(cherry-picked from commit 00f90eabe68dd2e41f7623bd759de8755d255105)
Commit: db62bdb7acbc6ef2225dc408f44f410bfa0f19b7
https://github.com/wesnoth/wesnoth/commit/db62bdb7acbc6ef2225dc408f44f410bfa0f19b7
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/whiteboard/attack.cpp
M src/whiteboard/move.cpp
M src/whiteboard/move.hpp
M src/whiteboard/side_actions.cpp
M src/whiteboard/side_actions.hpp
Log Message:
-----------
wb: refactor out get_unit() calls
there have been reported many assertion failures due to get_unit()
returning nullptr, so we try not to rely on get_unit() whenever
possible.
(cherry-picked from commit 5847615a774d8fa7f78be8fbef0ce8ca67fcd909)
Commit: 7b1a76a9a720bb3acb05122eb8defc0c94a012fb
https://github.com/wesnoth/wesnoth/commit/7b1a76a9a720bb3acb05122eb8defc0c94a012fb
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/menu_events.cpp
M src/menu_events.hpp
M src/whiteboard/move.cpp
M src/whiteboard/move.hpp
M src/whiteboard/recruit.cpp
M src/whiteboard/side_actions.cpp
M src/whiteboard/side_actions.hpp
Log Message:
-----------
wb: update following moves when a recruit is executed
After a recruit action was executed the id of the unit was changed so we
need to update the unitid of all following actions on that unit
(cherry-picked from commit 2174bfc2156fd3af6ceb76e6bb939bc04c27c503)
Commit: 1cd9894a24186450f5f8eb2f48ba5732ae2d53ae
https://github.com/wesnoth/wesnoth/commit/1cd9894a24186450f5f8eb2f48ba5732ae2d53ae
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/whiteboard/manager.cpp
Log Message:
-----------
wb: fix crash when using planning mode mode with dsu
fixes #1599 . we now automaticllay disable dsu when enabling planning mode
(cherry-picked from commit 4f161d889c87f610a565347656fd1695b60b1208)
Commit: c91b509be9cd7123371f7e73fa4f47fc662731ab
https://github.com/wesnoth/wesnoth/commit/c91b509be9cd7123371f7e73fa4f47fc662731ab
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/whiteboard/manager.cpp
Log Message:
-----------
wb: cleanups & add debug message
(cherry-picked from commit 6cfe64e4da1b1b5ae0082befa2a31281ad480fee)
Commit: 620cb0351faa62a3a08e7a4eb4fd007bc4873145
https://github.com/wesnoth/wesnoth/commit/620cb0351faa62a3a08e7a4eb4fd007bc4873145
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/whiteboard/attack.cpp
Log Message:
-----------
wb: add debug info
(cherry-picked from commit c9df4bf02a4c5db66b4a29e0174ce1744a0088a6)
Commit: 7c2df137be865e13b441029cc6bceb72288f31ef
https://github.com/wesnoth/wesnoth/commit/7c2df137be865e13b441029cc6bceb72288f31ef
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/whiteboard/action.hpp
M src/whiteboard/highlighter.cpp
M src/whiteboard/manager.cpp
M src/whiteboard/move.hpp
Log Message:
-----------
wb: fix moves for planned recruits
the for those moves get_unit() might return nullptr when it is
when the future map is not applied and some codes deduced from
that that the action is invalid. So we make sure that code does
not rely on get_unit().
(cherry-picked from commit 04d0dcdf655beefeda3a79d575669789ddc14e3b)
Commit: e53876067d9890867800c0c320179f1754e4fd2b
https://github.com/wesnoth/wesnoth/commit/e53876067d9890867800c0c320179f1754e4fd2b
Author: loonycyborg <loonycyborg at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/server/server.cpp
Log Message:
-----------
wesnothd: fix crash from using reference to deleted object
(cherry-picked from commit b0cbe3adf75a366c6887c6318d40cb55bf02fceb)
Commit: 577fa7c0ddb12c0ec04c7601cd834f0f03b396fc
https://github.com/wesnoth/wesnoth/commit/577fa7c0ddb12c0ec04c7601cd834f0f03b396fc
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M data/gui/window/lobby_main.cfg
M src/gui/dialogs/multiplayer/lobby.cpp
Log Message:
-----------
MP Lobby: removed individual Join/Observe buttons for each game
(cherry-picked from commit ffe71c5157c2df1f857b3ea999efdd533a514ecc)
Commit: 2445e295e5a0ab72c903203e679a7bbe5fd398de
https://github.com/wesnoth/wesnoth/commit/2445e295e5a0ab72c903203e679a7bbe5fd398de
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/widgets/chatbox.cpp
Log Message:
-----------
GUI2/Chatbox: fixed close button being shown for lobby tab when reloading log
Fixes #2992.
(cherry-picked from commit 65a554f41d39aa89e6e37b8cd73e1ae3063d6107)
Commit: ce799348101ea625e8208e62a3b5195135852c91
https://github.com/wesnoth/wesnoth/commit/ce799348101ea625e8208e62a3b5195135852c91
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/multiplayer/lobby.cpp
Log Message:
-----------
MP Lobby: used specific colors instead of pango presets
The Pango presets are usually a little darker than we want, so this makes the colors POP.
(cherry-picked from commit 3d158130f4f33b518a5e562f85ebc5c182819743)
Commit: 00b908c368a1eaee5c0297f792afdb44b2f6e330
https://github.com/wesnoth/wesnoth/commit/00b908c368a1eaee5c0297f792afdb44b2f6e330
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M src/gui/dialogs/multiplayer/lobby.cpp
Log Message:
-----------
MP Lobby: highlight the titles of MP games with vacant slots
(cherry-picked from commit 3e27ccaf1875408552e7aa32058e83b7a47adec5)
Commit: e335e394eaeee194d8e973955abfb10277ecf3ee
https://github.com/wesnoth/wesnoth/commit/e335e394eaeee194d8e973955abfb10277ecf3ee
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/multiplayer/lobby.cpp
Log Message:
-----------
Lobby mouseover: rename Gold to Gold per Village
(cherry-picked from commit 774471ba29161e390925388b8258bd04bc701fb2)
Commit: b0b150cb5aa75dd36ea1410db44b0c1006b3c74c
https://github.com/wesnoth/wesnoth/commit/b0b150cb5aa75dd36ea1410db44b0c1006b3c74c
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M data/gui/window/lobby_main.cfg
Log Message:
-----------
MP Lobby: improved low-resolution layout
[ci skip]
* Removed unnecessary spacer line.
* Increased chat area height by 10% .
(cherry-picked from commit 195eb0ce73299489551e28024b6ae5f58a4d2025)
Commit: c2f011e0da6cb388696160bf85d8472a22b0dc55
https://github.com/wesnoth/wesnoth/commit/c2f011e0da6cb388696160bf85d8472a22b0dc55
Author: Pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/CMakeLists.txt
Log Message:
-----------
Fix cmake compiling with spaces in directory names.
(cherry-picked from commit 5fed276ad76d3ed14136ea3b40fd300daadfc541)
Commit: 8575d8939bae7b4828165cf5ba2acc5db8530bea
https://github.com/wesnoth/wesnoth/commit/8575d8939bae7b4828165cf5ba2acc5db8530bea
Author: ln-zookeeper <lari.nieminen at iki.fi>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M data/campaigns/Eastern_Invasion/scenarios/11_Captured.cfg
Log Message:
-----------
EI S11: Fixed units incorrectly costing upkeep after leveling up
(cherry-picked from commit d217dfc13c7c763e5a4812a6b731cdbfca2c483d)
Commit: 2a7aa40403c2ef5a70dd988e5c5b06cceb738c76
https://github.com/wesnoth/wesnoth/commit/2a7aa40403c2ef5a70dd988e5c5b06cceb738c76
Author: loonycyborg <loonycyborg at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/server/server.cpp
Log Message:
-----------
wesnothd: fix game host kick command kicking host itself instead of intended target
(cherry-picked from commit 40ae6c535615598d047d6682a81f0f8654b77b88)
Commit: 2dca2131b6c9e2c7a0b7adb961fbce0a262fd000
https://github.com/wesnoth/wesnoth/commit/2dca2131b6c9e2c7a0b7adb961fbce0a262fd000
Author: ln-zookeeper <lari.nieminen at iki.fi>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg
M data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg
M data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg
M data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
Log Message:
-----------
UtBS: Fixed some obsolete references to old elf units, weapons and hair
In S03, also removed one extra instance of the word "champion" from the same string.
(cherry-picked from commit 195d5a93db6fbd13f7bc2d41266652fb89549ef8)
Commit: bd8176dc42bcb5b4f478a28198da9cd6f362c125
https://github.com/wesnoth/wesnoth/commit/bd8176dc42bcb5b4f478a28198da9cd6f362c125
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M players_changelog.md
M src/game_launcher.cpp
M src/wesnothd_connection.cpp
M src/wesnothd_connection_error.hpp
Log Message:
-----------
mp: Improve display of wesnothd client errors in general
Besides replacing the "End of file" error when getting disconnected from
the server under unexpected circumstances (e.g. because the server died)
with a translatable and more intuitive message, this also makes it so
other network error messages ("Connection refused", "Host not found",
etcetera) are displayed in the UI in a slightly clearer fashion, and in
an error dialog that must be dismissed with a click on a button, instead
of a transient message that can be easily missed due to an accidental
misclick.
Closes #3005.
(cherry-picked from commit c503c2ce35bc7d70fddc71daff70e31389615cf0)
Commit: 71f2c37b25f4c5e8b84c2fce6e6c9894ec5467fb
https://github.com/wesnoth/wesnoth/commit/71f2c37b25f4c5e8b84c2fce6e6c9894ec5467fb
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M players_changelog.md
Log Message:
-----------
Fixed some issues with desynced changelogs and incorrect capitalization/order
[ci skip]
(cherry-picked from commit 3259ef75b935b0b1cfdb594d34435affcd546c35)
Commit: 6bb4d43c3775ab5ace436184eca7bbb24db12df5
https://github.com/wesnoth/wesnoth/commit/6bb4d43c3775ab5ace436184eca7bbb24db12df5
Author: loonycyborg <loonycyborg at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/server/server.cpp
Log Message:
-----------
wesnothd: process wml commands one at a time in handle_read_from_player
as is done in rest of wesnothd. This also fixes crash from self-kick
due to it trying to continue processing looking for further tags
after /query kick kicked the user in quesion.
(cherry-picked from commit 6a310f0c79d002cbe53d9ee4f12b95a3b31c721b)
Commit: 181cba88a52e2f033257ad3239119f49e886432f
https://github.com/wesnoth/wesnoth/commit/181cba88a52e2f033257ad3239119f49e886432f
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M src/gui/widgets/size_lock.cpp
M src/gui/widgets/size_lock.hpp
Log Message:
-----------
GUI2/Size Lock: ensure formula sizes are recalculated as necessary.
This is similar to the change made for spacers in da5f00c2b671b79fcec8c36aa5316e1c7663a355.
It also fixes an issue with the MP Lobby chat box (and other such widgets that use formulas
for their fixed dimensions) where it would stay too small after a window resize (the chat
box formulas in all three dialogs it appears in are a percentage of window height).
(cherry-picked from commit 18afe08a7b0646aefdf30bebdabc46d2007208f4)
Commit: 74d5891ad0aaeb2b5d9ac04d09f76fb3ce834366
https://github.com/wesnoth/wesnoth/commit/74d5891ad0aaeb2b5d9ac04d09f76fb3ce834366
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M data/gui/window/mp_create_game.cfg
Log Message:
-----------
MP Create Game: cap custom game names at 50 characters
[ci skip]
(cherry-picked from commit d9e3983e976b7b3ace600a48e79342f5b80a05d5)
Commit: 5129b2c42a9ee298c3a4145dab3e9f2150614e37
https://github.com/wesnoth/wesnoth/commit/5129b2c42a9ee298c3a4145dab3e9f2150614e37
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Added some changelog entries for UtBS
[ci skip]
(cherry-picked from commit b947e7f63d4006119a7907c9e825b35855ff002f)
Commit: e9bc7c95863003bed2b9eee3e2cea532ebeebd47
https://github.com/wesnoth/wesnoth/commit/e9bc7c95863003bed2b9eee3e2cea532ebeebd47
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M data/gui/window/lobby_main.cfg
M src/game_initialization/lobby_data.cpp
M src/gui/dialogs/multiplayer/lobby.cpp
Log Message:
-----------
MP Lobby: restored Era info to main game display
Includes some slight spacing tweaks.
(cherry-picked from commit b17e9fa9b127110bf8b97a70d96e512ff64fdf2f)
Commit: a1f3c4f5811ca11485a5b25c25523dd49ff7842d
https://github.com/wesnoth/wesnoth/commit/a1f3c4f5811ca11485a5b25c25523dd49ff7842d
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/game_initialization/lobby_data.cpp
Log Message:
-----------
MP Lobby: added status text for full games
(cherry-picked from commit 819947f95f929516ea5ad9eb3ddcb3159e88cec1)
Commit: f464cd20c765d7d2879488b8a96965000b1edc16
https://github.com/wesnoth/wesnoth/commit/f464cd20c765d7d2879488b8a96965000b1edc16
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/gui/window/lobby_main.cfg
Log Message:
-----------
MP Lobby: shifted game info icon to the left
[ci skip]
(cherry-picked from commit 0db17bbcf18ca3410ddfa162bb6d0ca656f97f80)
Commit: 5c66a97f3c047594b1e9e9b5c44314f2fbc139a0
https://github.com/wesnoth/wesnoth/commit/5c66a97f3c047594b1e9e9b5c44314f2fbc139a0
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/gui/window/lobby_main.cfg
Log Message:
-----------
MP Lobby: decreased size of scenario/era name label
[ci skip]
Will slightly mitigate the issue of it potentially getting too long...
(cherry-picked from commit 08d0f6983fa6ac23d2335b8776d88715e5c073e2)
Commit: 0b0a4d97c0b84cb7634a8262897c62afc1942763
https://github.com/wesnoth/wesnoth/commit/0b0a4d97c0b84cb7634a8262897c62afc1942763
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/multiplayer/lobby.cpp
Log Message:
-----------
MP Lobby: fixed every single user name being bold
If everyone's registered... no one is. :P
(cherry-picked from commit d789c2e7738e6c47c171660ffd43abcb3fc038a8)
Commit: 9e2918d68eda89c5a7caab215733c0b3ecc227b5
https://github.com/wesnoth/wesnoth/commit/9e2918d68eda89c5a7caab215733c0b3ecc227b5
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M data/gui/window/lobby_main.cfg
Log Message:
-----------
MP Lobby: base resolution selection on window width not height
[ci skip]
Height isn't the problem. The default lobby can display fine even at 600 px h. Width is
the problem the default layout faces at low resolutions, and it was quite odd to have a
really wide window use the low resolution layout, despite there obviously being enough
horizontal space to fit the sidebar.
(cherry-picked from commit 2f565b8e90e9b49a49635034524eb79d29e5f80d)
Commit: ebd2ea712a9d7321bd570cf54854d876d6839912
https://github.com/wesnoth/wesnoth/commit/ebd2ea712a9d7321bd570cf54854d876d6839912
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Secrets_of_the_Ancients/scenarios/09_Training_Session.cfg
M data/campaigns/Secrets_of_the_Ancients/scenarios/10_Merfolk_Revenge.cfg
Log Message:
-----------
SotA: Avoid use of 'kids' to address Carcyn and Shynal
This is intended to address concerns raised by @beetlenaut that the two are not young enough to be referred to as 'kids'.
(cherry-picked from commit acb48da5d2115b086f436279dccdef482c89401d)
Commit: a681d3b3ea0a59696d933e4a6bb22e47af9acb18
https://github.com/wesnoth/wesnoth/commit/a681d3b3ea0a59696d933e4a6bb22e47af9acb18
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/widgets/size_lock.cpp
Log Message:
-----------
Fixup 18afe08
(cherry-picked from commit 77922e54506a565eace2e0787444851f7e703522)
Commit: 30147885a5effa6d4b23699cc3983e073cd8d263
https://github.com/wesnoth/wesnoth/commit/30147885a5effa6d4b23699cc3983e073cd8d263
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/widgets/size_lock.cpp
Log Message:
-----------
Yet even more additional supplementary additive fixup
(cherry-picked from commit 7983b283ced47444fe4d012d923b97ea88eb34ba)
Commit: 5e65148c497f545866674f4424ebf2b091b44a4f
https://github.com/wesnoth/wesnoth/commit/5e65148c497f545866674f4424ebf2b091b44a4f
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/multiplayer/lobby.cpp
Log Message:
-----------
MP Lobby: kept the titles of reloaded games with vacant slots yellow
(cherry-picked from commit 717578b8a3a01242a9e9f8bf2363a1026c52cbae)
Commit: ddd0a2e1b0398b9e0cb07f2d12536b9b0117f0cf
https://github.com/wesnoth/wesnoth/commit/ddd0a2e1b0398b9e0cb07f2d12536b9b0117f0cf
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/whiteboard/recruit.cpp
Log Message:
-----------
wb: fix moved becoming invalid after recruit is executed
(cherry-picked from commit 8bdccca7e373f805d1f2ecfe772151141a7015a9)
Commit: 41aea16fb2563537b985c85df0a549baf2860a88
https://github.com/wesnoth/wesnoth/commit/41aea16fb2563537b985c85df0a549baf2860a88
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/units/unit.cpp
Log Message:
-----------
remvoe spammy debug message.
(cherry-picked from commit c58015671687c0b4a82e9bed36083df265aa85a8)
Commit: 0b9a41cf1cd141a36192d9080ed66755748e5c56
https://github.com/wesnoth/wesnoth/commit/0b9a41cf1cd141a36192d9080ed66755748e5c56
Author: loonycyborg <loonycyborg at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/server/game.cpp
Log Message:
-----------
wesnothd: add a check to prevent crash from accessing game owner not in player_connections_
(cherry-picked from commit 10ee2b2d29add3f45bcd06def0f41913dda47cfe)
Commit: 36eae8c77197f23da7057ca77a4bde7f584753e7
https://github.com/wesnoth/wesnoth/commit/36eae8c77197f23da7057ca77a4bde7f584753e7
Author: pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M CMakeLists.txt
M SConstruct
Log Message:
-----------
Add option to build wesnoth with hardening options.
(cherry-picked from commit 6c5fc82b1baa0fc7b40beaccd975d595c5db728f)
Commit: 554eebde2f7b6fba32f367ea3e1fbe53080c5128
https://github.com/wesnoth/wesnoth/commit/554eebde2f7b6fba32f367ea3e1fbe53080c5128
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/whiteboard/action.hpp
M src/whiteboard/mapbuilder.cpp
M src/whiteboard/recall.cpp
M src/whiteboard/recall.hpp
M src/whiteboard/recruit.cpp
M src/whiteboard/recruit.hpp
Log Message:
-----------
wb: fix moved becoming invalid after recruit is executed 2
turned out 8bdccca7 was not enough because the mapbuilder erroneously
reset the units movement to full directly before it was applied. Since
the `resetters_` code in mapbuilder.cpp does not apply to
recruited/recalled units, we also have to reset the units mp in
remove_temp_modifier.
(cherry-picked from commit 97a5810f2d048b3da4dc2e5ab656d94a41b0e106)
Commit: 0df29400ee3f8b0cb9be87bc753b02fd58b8a547
https://github.com/wesnoth/wesnoth/commit/0df29400ee3f8b0cb9be87bc753b02fd58b8a547
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/units/unit.hpp
M src/whiteboard/recall.cpp
M src/whiteboard/recall.hpp
Log Message:
-----------
wb: fix recall actions changing gamestate
The firstproblem was that:
apply_temp_modifier adds the temp_unit_ to the map, then
remove_temp_modifier adds the temp_unit_ from the map to the recall
list, which resulted in the original recall unit beeing replaced by the
temp_unit_ of the recall_action We fix that by making sure that
temp_unit_ is always the same as athe recall unti not just a copy.
The second problem was that remove_temp_modifier reset the unit mp/ap to
a value differnt form the original mp/ap which could casue OOS later
since the ap/mp might be changed form that unsynced context, we fix that
by resetting the mp/ap in remove_temp_modifier
(cherry-picked from commit 19e123e38b804f052648f1e2dbe8f534ae0978cf)
Commit: 3d08811c977aaf4d65fa7c840ffc42f50efbe445
https://github.com/wesnoth/wesnoth/commit/3d08811c977aaf4d65fa7c840ffc42f50efbe445
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/recall_list_manager.cpp
M src/recall_list_manager.hpp
M src/whiteboard/recall.cpp
M src/whiteboard/recall.hpp
Log Message:
-----------
wb: fix rare OOS caused by recall action
previously having a planned recall action could change the order of
units in the recall list, which might for example change which unit is
recalled by a [recall].
(cherry-picked from commit 14a0e3744fb887e58ac75d378666f834ead6c30f)
Commit: 92c835c6046ffd65ad6affc40404299e82b09ee7
https://github.com/wesnoth/wesnoth/commit/92c835c6046ffd65ad6affc40404299e82b09ee7
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/units/unit.hpp
Log Message:
-----------
fix comment
(cherry-picked from commit 5a3eec539877bef661cca91223770baae28829f5)
Commit: a97b939aff101162ae1ec57125e56fe27835e5c2
https://github.com/wesnoth/wesnoth/commit/a97b939aff101162ae1ec57125e56fe27835e5c2
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/whiteboard/manager.cpp
Log Message:
-----------
wb: silence "Unable to build future map" warning
(cherry-picked from commit 51189881dc41ea1058e9b20fef59e8b040a65c37)
Commit: 8398cd90e9741fef0f462d658bc6e0617fe4889f
https://github.com/wesnoth/wesnoth/commit/8398cd90e9741fef0f462d658bc6e0617fe4889f
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/units/unit.cpp
Log Message:
-----------
wb: fix planned units under fog cannot be selected
(cherry-picked from commit aa3a357bfce3dd59cfea9dc1d0e7eee55764cf1c)
Commit: 13f244e8c5cb7e92b877283c98206cead078daa1
https://github.com/wesnoth/wesnoth/commit/13f244e8c5cb7e92b877283c98206cead078daa1
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/mouse_events.cpp
Log Message:
-----------
add todo
(cherry-picked from commit 4725ba9f353ea431fe453016b41493c093ffcbf7)
Commit: 49fbcce2cc8dd1682cfe08a9da65cddd4b66dbf8
https://github.com/wesnoth/wesnoth/commit/49fbcce2cc8dd1682cfe08a9da65cddd4b66dbf8
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/whiteboard/move.cpp
Log Message:
-----------
wb: more detailed error message
(cherry-picked from commit 2635c7014fa754def5e6d3263781084880316fc4)
Commit: c6ab8eb59a38ff9b0667f821ca0a8e6f1ebd0191
https://github.com/wesnoth/wesnoth/commit/c6ab8eb59a38ff9b0667f821ca0a8e6f1ebd0191
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/pathfind/pathfind.cpp
M src/pathfind/pathfind.hpp
M src/whiteboard/move.cpp
Log Message:
-----------
wb: fix 'insufficient movement' wanring when a move is interrupted
(cherry-picked from commit cdb98f75a471698e5138dccd427556a9c348ed75)
Commit: 2b118b04556a716a2d1c87a5f394b87414ccf12c
https://github.com/wesnoth/wesnoth/commit/2b118b04556a716a2d1c87a5f394b87414ccf12c
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/whiteboard/side_actions.cpp
Log Message:
-----------
add a comment
(cherry-picked from commit 8b745095aba977d51218cd95b80168f40fb0b870)
Commit: 1d5a6bf5330eaafae189d6e0d974e4e5664b9e96
https://github.com/wesnoth/wesnoth/commit/1d5a6bf5330eaafae189d6e0d974e4e5664b9e96
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/play_controller.cpp
Log Message:
-----------
wb: prevent unit id conflics
the wb recruit actions store temp units with fake ids and live longer
than a turn, so resetting the underlying id counter between turns might
result in dublicate id errors in wb recruit actions ( #1517 ), which
might lead to errors later.
With this it is of course possible to get erros when more than 2^31 (or
2^63 on a 64 bit wesnoth version.) fake units are generated during a
game, but that is less likely.
(cherry-picked from commit 775f3ec995943285109596c988f4735b251584d9)
Commit: a3a225592c57eeac5d1cc729183a918109b64fae
https://github.com/wesnoth/wesnoth/commit/a3a225592c57eeac5d1cc729183a918109b64fae
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg
M data/campaigns/Under_the_Burning_Suns/scenarios/12_The_Final_Confrontation.cfg
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Youth.cfg
M data/campaigns/Under_the_Burning_Suns/utils/terrain.cfg
M data/campaigns/Under_the_Burning_Suns/utils/terrain_graphics.cfg
Log Message:
-----------
UtBS: wmlindent pass
[ci skip]
(cherry-picked from commit a8ce08fc231919e6f87277ac939beddd62eb0c9d)
Commit: 8a7ec7a1cb46023f56dacd3e101801bb56a6ea08
https://github.com/wesnoth/wesnoth/commit/8a7ec7a1cb46023f56dacd3e101801bb56a6ea08
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
A data/campaigns/Two_Brothers/lua/muff_toras_move.lua
M data/campaigns/Two_Brothers/scenarios/02_The_Chase.cfg
Log Message:
-----------
AToTB Chase: add custom AI controlling Muff Toras
(cherry-picked from commit bbb151fa713129cc9a1f4ef23c154da72c50ea6e)
Commit: 385f86bdbdea5b409d27f5365e77c199213712e3
https://github.com/wesnoth/wesnoth/commit/385f86bdbdea5b409d27f5365e77c199213712e3
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
changelog entry for custom AI for AToTB S2
(cherry-picked from commit a82971e48da96077c213bd7ca3871263d9c871e8)
Commit: e7bb558479d1cbe87c53a3b1640391dbe041af7e
https://github.com/wesnoth/wesnoth/commit/e7bb558479d1cbe87c53a3b1640391dbe041af7e
Author: Celtic Minstrel <CelticMinstrel at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/about.cfg
Log Message:
-----------
Update credits
* Add @neoedmund, @fujimo-t, and Zoomo
* Add @singalen's alias
* Correct @GregoryLundberg's alias
(cherry-picked from commit ebf38661322ea759acf47360b5dce006c105fa68)
Commit: e2acbffdea990ec7da2f13ae9cf1a4116b506666
https://github.com/wesnoth/wesnoth/commit/e2acbffdea990ec7da2f13ae9cf1a4116b506666
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M src/gui/dialogs/unit_attack.cpp
Log Message:
-----------
gui2/unit_attack: Only display active specials on the weapons list
This fixes issues reported on the forums where the weapons list now
includes weapon specials even when they aren't active, a regression from
1.12.x.
Closes #3033.
(cherry-picked from commit d727cf2c9986f7e867ca39329af84325f49ce734)
Commit: ff61a878c8fbd3f0978a6348af5340799ce4578d
https://github.com/wesnoth/wesnoth/commit/ff61a878c8fbd3f0978a6348af5340799ce4578d
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M utils/pofix.py
Log Message:
-----------
pofix: Add 1.14 announcement typo fix
[ci skip]
(cherry-picked from commit d39d1b87fdfaf7cc463425cff847e28ad0d2c549)
Commit: d90c6d9d34cf759a906b93ea4ee959665af02946
https://github.com/wesnoth/wesnoth/commit/d90c6d9d34cf759a906b93ea4ee959665af02946
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/gui/window/mp_method_selection.cfg
M src/gui/dialogs/multiplayer/mp_method_selection.cpp
Log Message:
-----------
* MP Method Selection: clarified the account requirement for the official server
Also sets the tooltip type for this dialog back to bottom-of-the-screen ones instead
of floating ones. And some formatting cleanup to the C++.
(cherry-picked from commit 851b28e24bfefd068069aa9ac2eaada6593718b4)
Commit: aa8c1793d907493efff447edff0755fa6b0cce38
https://github.com/wesnoth/wesnoth/commit/aa8c1793d907493efff447edff0755fa6b0cce38
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/multiplayer_error_codes.hpp
M src/server/forum_user_handler.cpp
M src/server/forum_user_handler.hpp
M src/server/mysql_prepared_statement.ipp
M src/server/sample_user_handler.cpp
M src/server/sample_user_handler.hpp
M src/server/server.cpp
M src/server/user_handler.hpp
Log Message:
-----------
wesnothd: Initial support for checking forum bans during login
This adds a user_is_banned() method to the user_handler classes that
returns whether a given username (and optionally IP address) is banned
by the user_handler platform. Obviously right now this is only intended
to work with forum_user_handler and phpBB.
Forum bans are checked against entries in the banlist table using
username (actually user id), IP address, and email address where
applicable. A user matching a ban on any of those three items will not
be permitted into the server *unless* they have the moderator flag set.
It might be worth making an exception for board founders as well,
although that is probably orthogonal to this patchset.
Right now there are a few missing items:
* The server sends clients an error that allows them to try again with
a different username/password combination immediately. Nothing stops
them from causing noise in the server logs this way, so we probably
need to ensure this counts as an authentication failure for the
purpose of temporarily and automatically banning the IP address.
* The user handler doesn't allow retrieving details about the ban, so
all that the main server code can do is report back to the client as
their nickname being banned, when this is not necessarily the case
(email or IP address bans). I need to figure out a better API for
retrieving this info.
* Likewise, the server does not log the specifics about the matched ban
yet unless the mp_user_handler log domain is set to the info log
level.
* There's no i18n support on the client side for the error message sent
by the server -- which is going to change anyway.
* Testing this patch uncovered an issue with the MP client not
displaying messages sent during the login sequence, including the mod
authentication notice.
(cherry-picked from commit f2c06f0a4e0d82a8e2a78d4ad25c91c09a6c2b63)
Commit: 3dc31e66f5718208efe345d336d17309d4f47cdb
https://github.com/wesnoth/wesnoth/commit/3dc31e66f5718208efe345d336d17309d4f47cdb
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/multiplayer_error_codes.hpp
M src/server/forum_user_handler.cpp
M src/server/forum_user_handler.hpp
M src/server/sample_user_handler.cpp
M src/server/sample_user_handler.hpp
M src/server/server.cpp
M src/server/user_handler.hpp
Log Message:
-----------
wesnothd: Report different user_handler ban types
This enables reporting back to the client the specific type of ban that
affects the account. This information is already normally provided by
phpBB when trying to view a page while banned, so we are not leaking any
new information here.
There isn't an API to retrieve the (user-visible) ban reason from the
ban list yet. It's probably not worth worrying about it since affected
users can see it when navigating to forums.wesnoth.org anyway.
(cherry-picked from commit 749e684f03982fe268ab15074f28d701d0e55f18)
Commit: 61af81c91480a4d09613a270ec907e43064d115a
https://github.com/wesnoth/wesnoth/commit/61af81c91480a4d09613a270ec907e43064d115a
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/server/forum_user_handler.cpp
Log Message:
-----------
wesnothd/fuh: Check IP address bans before everything else
There isn't much point in doing more expensive ban look ups first.
(Also, yes, I am aware that as it is there's still two SELECT queries
that could be coalesced into a single one -- namely, the ones for the
user_email and user_id columns.)
(cherry-picked from commit d48c84236c17adca9421fe15d0d0666f1c2b96cb)
Commit: 20ad6993dd2321a74c8e6367df6885a5fe1ee700
https://github.com/wesnoth/wesnoth/commit/20ad6993dd2321a74c8e6367df6885a5fe1ee700
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/game_initialization/multiplayer.cpp
Log Message:
-----------
mp: Add client-side localization support for user_handler bans
(cherry-picked from commit 80d6dbbaf94e17658a9bf05a28846d227e5d3259)
Commit: 135fc575bc260a5ec0396140f18287bdb15b23c2
https://github.com/wesnoth/wesnoth/commit/135fc575bc260a5ec0396140f18287bdb15b23c2
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/server/forum_user_handler.cpp
Log Message:
-----------
fuh: Add NOTE on the status of glob bans
[ci skip]
(cherry-picked from commit c0f160b35150d1893b77da43de3279dfe54fc10c)
Commit: 87c19293b7f8a25e9b75f757497397fcf9620cc5
https://github.com/wesnoth/wesnoth/commit/87c19293b7f8a25e9b75f757497397fcf9620cc5
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Update changelog for MP server stuff from me and loonycyborg
[ci skip]
(cherry-picked from commit 622b1936bc47b92cebe5947c51b60afb890b037d)
Commit: 2fbd8f333434c1445fbd2ccb20e00bfbb4d74b10
https://github.com/wesnoth/wesnoth/commit/2fbd8f333434c1445fbd2ccb20e00bfbb4d74b10
Author: Alexander van Gessel <ai0867 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/image.cpp
M src/serialization/base64.cpp
Log Message:
-----------
Reject bad data URIs
(cherry-picked from commit 6444ebde60c5eef7923fde325b49ee1a26d1b272)
Commit: c92dd096c5f0fce53fa00725f7ceb4f36990b6ed
https://github.com/wesnoth/wesnoth/commit/c92dd096c5f0fce53fa00725f7ceb4f36990b6ed
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Update changelog for #3019
[ci skip]
(cherry-picked from commit 9850d3fa9c7f88c5433f054af9c8c6305edfe59b)
Commit: 32f9747188cd0f4d66d729ba3d9d30852586fbec
https://github.com/wesnoth/wesnoth/commit/32f9747188cd0f4d66d729ba3d9d30852586fbec
Author: Lipka Boldizsár <lipkab at zoho.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/multiplayer/lobby.cpp
M src/gui/dialogs/multiplayer/lobby.hpp
Log Message:
-----------
Fix excessive mp lobby refreshing.
(cherry-picked from commit 590fd3c4d5a19e33235bbb9c286ee3532d886944)
Commit: e98b9d79374d006fbc88aaaaef6e0700b42c79cc
https://github.com/wesnoth/wesnoth/commit/e98b9d79374d006fbc88aaaaef6e0700b42c79cc
Author: Lipka Boldizsár <lipkab at zoho.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/multiplayer/lobby.cpp
M src/gui/dialogs/multiplayer/lobby.hpp
Log Message:
-----------
Revert "Fix excessive mp lobby refreshing."
This reverts commit 590fd3c4d5a19e33235bbb9c286ee3532d886944.
(cherry-picked from commit 8bd6646182ca30d0fbf04688e16c44bb1f54a7b5)
Commit: 443feba274d2b6ede88202336349c0ad4df14ab2
https://github.com/wesnoth/wesnoth/commit/443feba274d2b6ede88202336349c0ad4df14ab2
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-editor/cs.po
M po/wesnoth-help/cs.po
M po/wesnoth-lib/cs.po
M po/wesnoth-manpages/cs.po
M po/wesnoth-sof/cs.po
M po/wesnoth-sota/cs.po
M po/wesnoth-tutorial/cs.po
M po/wesnoth-units/cs.po
M po/wesnoth-utbs/cs.po
M po/wesnoth/cs.po
Log Message:
-----------
updated Czech translation
(cherry-picked from commit 0dda29b238864e0c9fa272fd466f5f333e5d5e27)
Commit: d28c5f8977d4410ddef8fde2c7c6dcc0d957ffb9
https://github.com/wesnoth/wesnoth/commit/d28c5f8977d4410ddef8fde2c7c6dcc0d957ffb9
Author: Lipka Boldizsár <lipkab at zoho.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/multiplayer/lobby.cpp
M src/gui/dialogs/multiplayer/lobby.hpp
Log Message:
-----------
Fix excessive mp lobby refreshing.
(cherry-picked from commit 7b5cf854614e775f09df5b01f24302e449cd89e9)
Commit: f6c9458b728bba94be276850fdbc7ed5cd3ef405
https://github.com/wesnoth/wesnoth/commit/f6c9458b728bba94be276850fdbc7ed5cd3ef405
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-editor/en_GB.po
M po/wesnoth-help/en_GB.po
M po/wesnoth-lib/en_GB.po
M po/wesnoth-manpages/en_GB.po
M po/wesnoth-sota/en_GB.po
M po/wesnoth-tutorial/en_GB.po
M po/wesnoth-units/en_GB.po
M po/wesnoth-utbs/en_GB.po
M po/wesnoth/en_GB.po
Log Message:
-----------
updated British English translation
(cherry-picked from commit d98d711e24eff8ca5b1ccac907901d432974596f)
Commit: 650121a8de52a95f27d7a210351ffd22ccc0f8b8
https://github.com/wesnoth/wesnoth/commit/650121a8de52a95f27d7a210351ffd22ccc0f8b8
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/gui/window/lobby_main.cfg
M src/gui/dialogs/multiplayer/lobby.cpp
Log Message:
-----------
MP Lobby: removed Refresh button
I'm not 100% sure about this change, but I think its presence was rather confusing and
it (hopefully) shouldn't ever be needed.
(cherry-picked from commit fe10bc0315472b49072a39cd577b9872617d81d3)
Commit: 1f397d78533dd4126fd06d7454a42012a788ede0
https://github.com/wesnoth/wesnoth/commit/1f397d78533dd4126fd06d7454a42012a788ede0
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/display_chat_manager.cpp
Log Message:
-----------
Increased in-game chat size. This makes it render more smoothly
Thanks to @ProditorMagnus for the suggestion. Note that here on master, this code isn't
really used right now, so it's mostly here for completeness if it turns out to be needed.
(cherry-picked from commit 2769345f558fb83b4979bb213ceaac84622ee76b)
Commit: 4e7b53f9fd58cf76143924b08363967388e02500
https://github.com/wesnoth/wesnoth/commit/4e7b53f9fd58cf76143924b08363967388e02500
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/widgets/chatbox.cpp
Log Message:
-----------
GUI2/Chatbox: attempt to send roomless messages to the active room first
Fixes #2775. Server messages in particular are roomless, so now they should appear in
whatever tab (PMs included) you have open.
(cherry-picked from commit be580a1973509f5b1ecf545f5bd17bdcd594b65c)
Commit: 5d4217eac4cc679da81fcc529a44867953c8091b
https://github.com/wesnoth/wesnoth/commit/5d4217eac4cc679da81fcc529a44867953c8091b
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/multiplayer/lobby.cpp
Log Message:
-----------
MP Lobby: rearrange player list nodes and have Selected Game also expanded by default
(cherry-picked from commit 6d84ee70c52c59f27997bc67d9358b96e06cb527)
Commit: 3ea99f917d1d2d149b72f52e14caadb09ca73de0
https://github.com/wesnoth/wesnoth/commit/3ea99f917d1d2d149b72f52e14caadb09ca73de0
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/game_config.cpp
Log Message:
-----------
MP Lobby: reduced frequency of network polls (100ms -> 1000ms)
This also affects MP Staging and MP Join Game.
(cherry-picked from commit 79c98621291e3ee3c274738d4b1ab8a9d62444ee)
Commit: 7e193cbd298caffae8abfe1acc680a996b2f8acb
https://github.com/wesnoth/wesnoth/commit/7e193cbd298caffae8abfe1acc680a996b2f8acb
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-anl/zh_CN.po
M po/wesnoth-editor/zh_CN.po
M po/wesnoth-help/zh_CN.po
M po/wesnoth-lib/zh_CN.po
M po/wesnoth-low/zh_CN.po
M po/wesnoth-manpages/zh_CN.po
M po/wesnoth-manual/zh_CN.po
M po/wesnoth-sota/zh_CN.po
M po/wesnoth-tsg/zh_CN.po
M po/wesnoth-tutorial/zh_CN.po
M po/wesnoth-units/zh_CN.po
M po/wesnoth-utbs/zh_CN.po
M po/wesnoth/zh_CN.po
Log Message:
-----------
updated Chinese (Simplified) translation
(cherry-picked from commit d0ebbbb7c3e7ddb9001c1e432a69fe93aa9a01ba)
Commit: 0b98ddd96b4878fdd7687ebd1444055178e5129a
https://github.com/wesnoth/wesnoth/commit/0b98ddd96b4878fdd7687ebd1444055178e5129a
Author: Wedge009 <wedge009 at wedge009.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/help.cfg
M data/tools/addon_manager/html.py
M doc/man/wesnoth.6
M utils/umc_dev/manual/dev_manual.tex
Log Message:
-----------
Update text to match changes in dialogues (fixes #2882).
[ci skip]
(cherry-picked from commit f1bcdc7f1b6e9c762edd075642954f4850d151f3)
Commit: 8516e1f1e747eb5d0fd57ac834908f805d0b4680
https://github.com/wesnoth/wesnoth/commit/8516e1f1e747eb5d0fd57ac834908f805d0b4680
Author: Wedge009 <wedge009 at wedge009.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg
M data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg
M data/core/help.cfg
Log Message:
-----------
Update text to match game-play changes (fixes #2950).
[ci skip]
(cherry-picked from commit d85e2a2886e1652749376e37c94e404d4b5ace98)
Commit: 179135ee409f9b2371139b8afd02133f01341a4e
https://github.com/wesnoth/wesnoth/commit/179135ee409f9b2371139b8afd02133f01341a4e
Author: sigurdfdragon <jjwcoat at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/units.cfg
Log Message:
-----------
Help: Add falcons race description
>From https://forums.wesnoth.org/viewtopic.php?f=32&t=43721&p=593757#p593757
[ci skip]
(cherry-picked from commit e9ab1ce8d1718fbaf999b1a82ce09526da70bf31)
Commit: 86fbc68bd67a1c11b0b78fc4754fc86779178c86
https://github.com/wesnoth/wesnoth/commit/86fbc68bd67a1c11b0b78fc4754fc86779178c86
Author: sigurdfdragon <jjwcoat at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/units.cfg
Log Message:
-----------
Help: Add wolves race description
>From https://forums.wesnoth.org/viewtopic.php?f=32&t=43721&start=75#p597028
[ci skip]
(cherry-picked from commit a67e068178c8acd3d3c40fd2ef5f63ed04dfb87d)
Commit: edf251c8e24b28d09163419a6603838c3cd5e075
https://github.com/wesnoth/wesnoth/commit/edf251c8e24b28d09163419a6603838c3cd5e075
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-lib/cs.po
Log Message:
-----------
updated Czech translation
(cherry-picked from commit 58bfca286a270acd5ddabdfd92b01cbe14353ca8)
Commit: b8ab3802581d3b94185d9341bb49aa4bb52405d8
https://github.com/wesnoth/wesnoth/commit/b8ab3802581d3b94185d9341bb49aa4bb52405d8
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-lib/sk.po
Log Message:
-----------
updated Slovak translation
(cherry-picked from commit 69bc5b614f4af7e71eea630651dee17023fcb482)
Commit: e40ffec90e107252725ca185007d0c8127252eb4
https://github.com/wesnoth/wesnoth/commit/e40ffec90e107252725ca185007d0c8127252eb4
Author: doofus-01 <doofus-01 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/archer-defend1.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/archer-defend2.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/druid-defend1.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/druid-defend2.png
M data/campaigns/Under_the_Burning_Suns/images/units/quenoth/druid.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/flanker-defend1.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/flanker-defend2.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-bolas1.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-bolas2.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-bolas3.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-bolas4.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-lead1.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-lead2.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/nym-lead1.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/nym-lead2.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/ranger-defend1.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/ranger-defend2.png
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Archer.cfg
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Druid.cfg
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Flanker.cfg
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Ranger.cfg
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Youth.cfg
Log Message:
-----------
[UtBS]-Graphics Update, mostly defense animations (#3035)
* quenoth ranger defense anim
* youth leading animations
* Kaleh bolas anim
* quenoth flanker defense anim
* quenoth druid defense anim
* quenoth archer defense anim
(cherry-picked from commit 21708d8add8059b136645847a4c66c40991b718a)
Commit: 7b4b14eb32906feb41903ebc5e5e1aaac52b16a6
https://github.com/wesnoth/wesnoth/commit/7b4b14eb32906feb41903ebc5e5e1aaac52b16a6
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/gui/window/lobby_main.cfg
M src/gui/dialogs/multiplayer/lobby.cpp
Log Message:
-----------
MP Lobby: bunch of small UI and text formatting tweaks
(cherry-picked from commit 58ebc064e97382eef36aa90bf947cff8f72b6826)
Commit: e0653e7d54d3fd44719b55a2291fc5e8da7c5100
https://github.com/wesnoth/wesnoth/commit/e0653e7d54d3fd44719b55a2291fc5e8da7c5100
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/gui/window/preferences/02_hotkeys.cfg
Log Message:
-----------
Preferences Dialog: fixed inconsistent label sizes in hotkeys list
(cherry-picked from commit 26c8860b6c122b9affeaca870d1c5a1f83ed5613)
Commit: d71fa82acd7f6c9ac996d85a6aa469e92b44a020
https://github.com/wesnoth/wesnoth/commit/d71fa82acd7f6c9ac996d85a6aa469e92b44a020
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gettext_boost.cpp
Log Message:
-----------
i18n: Blind fix attempt for std::bad_cast being thrown on Windows
Several reports on Steam and our forums point at std::bad_cast being
thrown when accessing Preferences and the Multiplayer menu amongst
others. It's possible that the locale configuration on those systems is
not quite right, and compare() and icompare() are able to throw
std::bad_cast when this happens as they both use std::use_facet().
Note that much like the macOS/iOS version of icompare(), this stopgap
patch doesn't attempt to provide any form of case-insensitive fallback
and just uses a case-sensitive comparison instead.
(cherry-picked from commit 871189cc3680880243b0c6b6f1af78ba9819be4d)
Commit: 8f8c936631ff6fe5bd7e54599280ed32f69f1fba
https://github.com/wesnoth/wesnoth/commit/8f8c936631ff6fe5bd7e54599280ed32f69f1fba
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gettext_boost.cpp
Log Message:
-----------
Partial case insensitivity for translation::icompare() fallback
(cherry-picked from commit 057e53a4631fdf0aa90ab2d1c37f74b8b4ed1839)
Commit: d8b5016c5349deb4dba212368a8cd16003fcdd26
https://github.com/wesnoth/wesnoth/commit/d8b5016c5349deb4dba212368a8cd16003fcdd26
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-editor/es.po
M po/wesnoth-help/es.po
M po/wesnoth-lib/es.po
M po/wesnoth-manpages/es.po
M po/wesnoth-sota/es.po
M po/wesnoth-tutorial/es.po
M po/wesnoth-units/es.po
M po/wesnoth-utbs/es.po
M po/wesnoth/es.po
Log Message:
-----------
updated Spanish translation
(cherry-picked from commit 255be2e0030610978a46b4239d991716f94622f8)
Commit: ff6acb6b5f1c14ceb4fe01b75b337d340c66a396
https://github.com/wesnoth/wesnoth/commit/ff6acb6b5f1c14ceb4fe01b75b337d340c66a396
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-ai/gd.po
M po/wesnoth-aoi/gd.po
M po/wesnoth-editor/gd.po
M po/wesnoth-help/gd.po
M po/wesnoth-httt/gd.po
M po/wesnoth-lib/gd.po
M po/wesnoth-multiplayer/gd.po
M po/wesnoth-tb/gd.po
M po/wesnoth-tsg/gd.po
M po/wesnoth-tutorial/gd.po
M po/wesnoth-units/gd.po
M po/wesnoth/gd.po
Log Message:
-----------
updated Scottish Gaelic translation
(cherry-picked from commit 6c01d8494bbef76bc26e4bf730b02d9ee1f59d46)
Commit: 60ca4e7d88dc5f6b90bce1bb4372f38ddf8baf14
https://github.com/wesnoth/wesnoth/commit/60ca4e7d88dc5f6b90bce1bb4372f38ddf8baf14
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-sota/gl.po
M po/wesnoth-tutorial/gl.po
M po/wesnoth-utbs/gl.po
Log Message:
-----------
updated Galician translation
(cherry-picked from commit 7290b1b3ab3c9dcf2e611612dc3a3af70de7a492)
Commit: e1a43d58fa6dbbd8f6fb8c01e603973526a70d33
https://github.com/wesnoth/wesnoth/commit/e1a43d58fa6dbbd8f6fb8c01e603973526a70d33
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-editor/it.po
M po/wesnoth-help/it.po
M po/wesnoth-lib/it.po
M po/wesnoth-manpages/it.po
M po/wesnoth-sota/it.po
M po/wesnoth-tutorial/it.po
M po/wesnoth-units/it.po
M po/wesnoth-utbs/it.po
M po/wesnoth/it.po
Log Message:
-----------
updated Italian translation
(cherry-picked from commit 587c280d412e94cda179641ac24ed8fd5d982ea7)
Commit: eec9ff1bad88dbb56414b0e72db304623ea6f8f0
https://github.com/wesnoth/wesnoth/commit/eec9ff1bad88dbb56414b0e72db304623ea6f8f0
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-ai/ja.po
M po/wesnoth-editor/ja.po
M po/wesnoth-help/ja.po
M po/wesnoth-lib/ja.po
M po/wesnoth-manpages/ja.po
M po/wesnoth-sota/ja.po
M po/wesnoth-tutorial/ja.po
M po/wesnoth-units/ja.po
M po/wesnoth-utbs/ja.po
M po/wesnoth/ja.po
Log Message:
-----------
updated Japanese translation
(cherry-picked from commit 6d0f7c3a62472605a0e81b596818260eb7a1662b)
Commit: 07576d8edc7827496f0d9af361b6caa82543d28a
https://github.com/wesnoth/wesnoth/commit/07576d8edc7827496f0d9af361b6caa82543d28a
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-help/zh_CN.po
M po/wesnoth-units/zh_CN.po
Log Message:
-----------
updated Chinese (Simplified) translation
(cherry-picked from commit de2b3d186ecc80c1d1d62d9288a0856243d1d0c1)
Commit: 22426c3f3c99766ac9bf00e7813f8816ee71e30c
https://github.com/wesnoth/wesnoth/commit/22426c3f3c99766ac9bf00e7813f8816ee71e30c
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-editor/de.po
M po/wesnoth-lib/de.po
M po/wesnoth-sota/de.po
M po/wesnoth/de.po
Log Message:
-----------
updated German translation
(cherry-picked from commit add4ea3d95398b85f3861c48b8075935a37fb98a)
Commit: 4e25e4875fa44a0ed57b981715a421c020a2b71f
https://github.com/wesnoth/wesnoth/commit/4e25e4875fa44a0ed57b981715a421c020a2b71f
Author: ln-zookeeper <lari.nieminen at iki.fi>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/utils/abilities.cfg
Log Message:
-----------
UtBS: Fixed a bug in the formation ability
If a unit had for example 3 other formation units adjacent but only needed 1 to reach 70% defense, it didn't receive any benefit at all (as the corresponding [chance_to_hit] tag remained inactive).
Spotted and fix provided by beetlenaut.
(cherry-picked from commit 083066bff2ce0a875e6216cdd68519bd03aa2121)
Commit: a4cc22f58a83498714f8f13a822db90a44c1bd7f
https://github.com/wesnoth/wesnoth/commit/a4cc22f58a83498714f8f13a822db90a44c1bd7f
Author: ln-zookeeper <lari.nieminen at iki.fi>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Updated changelog
(cherry-picked from commit f8a02e5e6dcba258d1a294f0644a51cb2cc54e7c)
Commit: eb6ee82ae387310415ac084c790e93c3e43ebabd
https://github.com/wesnoth/wesnoth/commit/eb6ee82ae387310415ac084c790e93c3e43ebabd
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Delfadors_Memoirs/_main.cfg
M data/campaigns/Legend_of_Wesmere/_main.cfg
M data/campaigns/The_Rise_Of_Wesnoth/_main.cfg
M data/campaigns/Under_the_Burning_Suns/_main.cfg
M data/core/about.cfg
M data/core/about_i18n.cfg
Log Message:
-----------
Update own credits entries
[ci skip]
(cherry-picked from commit c92b9de1dbda38bff6a8522bfef6a42d78380462)
Commit: a4f7f5c37c2bc7208651527678b56f070327b2c3
https://github.com/wesnoth/wesnoth/commit/a4f7f5c37c2bc7208651527678b56f070327b2c3
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M data/tools/addon_manager/html.py
Log Message:
-----------
wam: Allow using embedded data URIs as add-on icons
[ci skip]
(cherry-picked from commit 4335bedeff9dbf1b147c0ef260171dd3eb83c795)
Commit: dd383688d66442c8b5b253b92059b4f3d429ecc2
https://github.com/wesnoth/wesnoth/commit/dd383688d66442c8b5b253b92059b4f3d429ecc2
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gettext_boost.cpp
Log Message:
-----------
more debug information in icompare
(cherry-picked from commit a3decde67f70701d360f145314948d0612ec78af)
Commit: e2501940a05bff598e1a8650a0ca0253d3dc44c4
https://github.com/wesnoth/wesnoth/commit/e2501940a05bff598e1a8650a0ca0253d3dc44c4
Author: Pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M CMakeLists.txt
M SConstruct
Log Message:
-----------
Warn about use of trampolines for nested functions.
Use of this feature with GCC in particular causes the stack to become marked as executable.
(cherry-picked from commit 96b43a9af4ec76882afe6924e9c3dafb5b8beac5)
Commit: 23167a36348d2a1aaf19f322a9ef3c18d3762087
https://github.com/wesnoth/wesnoth/commit/23167a36348d2a1aaf19f322a9ef3c18d3762087
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M players_changelog.md
Log Message:
-----------
Add changelog entries for the workaround for issue #3050
[ci skip]
(cherry-picked from commit 92812588b3435d1872332955b6c29aabe1ca2ee4)
Commit: ebeda413c456f31ba45f025cff2306a66846e6b0
https://github.com/wesnoth/wesnoth/commit/ebeda413c456f31ba45f025cff2306a66846e6b0
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Youth.cfg
Log Message:
-----------
UtBS: wmlindent run
[ci skip]
(cherry-picked from commit fd86d1ff8c916f00ad367eb3551402cfa955ee8b)
Commit: ce9e0d2caca87e5df049c15aca371b429fb10d62
https://github.com/wesnoth/wesnoth/commit/ce9e0d2caca87e5df049c15aca371b429fb10d62
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/game_config.cpp
Log Message:
-----------
Revert "MP Lobby: reduced frequency of network polls (100ms -> 1000ms)"
This reverts commit 5fd833a91af57df3134e4e87a1d36b23c2811652. It was causing the lobby to
lag up to *three minutes* behind current activity due to multiple data packets being queued
(see #3046). It seems 100 ms was enough to mask this issue.
(cherry-picked from commit 6a7bd052509cb455dbe17911ce8753477acc1d02)
Commit: 3b5a9d2994bee850f983ce3c61af8d13d93c2f37
https://github.com/wesnoth/wesnoth/commit/3b5a9d2994bee850f983ce3c61af8d13d93c2f37
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M src/game_initialization/connect_engine.cpp
Log Message:
-----------
Fixed a crash when using certain invalid color= values
The specific case that brought this to our attention was color=100. In case such values
are used, the color reverts back to the default color for that side, as before.
The new codepath (team::get_side_color_id_from_config) is essentially the same as the old
one but more robust (range checking, for example, the lack of which was causing the crash
before).
(cherry-picked from commit 4c937c10c715616cac8f4778490ef23585309b01)
Commit: c033bffb33c1a15ac04c3c40a019cfd925143822
https://github.com/wesnoth/wesnoth/commit/c033bffb33c1a15ac04c3c40a019cfd925143822
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Changelog: fixed inaccuracy
[ci skip]
(cherry-picked from commit 05774a3df513b3694103894bebeb144adccd0d45)
Commit: a81e06d6fc4fd345913b110d721d917776e349ab
https://github.com/wesnoth/wesnoth/commit/a81e06d6fc4fd345913b110d721d917776e349ab
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/scripting/lua_unit.cpp
M src/units/unit.cpp
Log Message:
-----------
Disallow units with negative HP
Damage calculation code can't tolerate presence of such units.
Fixes #3042.
(cherry-picked from commit ef60deaa2b0d14006a6747c61fdd4fd33562b6f0)
Commit: c4235d0306bb2e27ba06e61b53df9a1ac4cf0ef7
https://github.com/wesnoth/wesnoth/commit/c4235d0306bb2e27ba06e61b53df9a1ac4cf0ef7
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M utils/pofix.py
Log Message:
-----------
pofix: Update with 1.14.0 -> 1.14.1 rules for the website
[ci skip]
(cherry-picked from commit c517abb122a0025099e2592528758bf39e8d03d7)
Commit: a2bbed728dcbbb91527943dd0b865f0e0680d9f0
https://github.com/wesnoth/wesnoth/commit/a2bbed728dcbbb91527943dd0b865f0e0680d9f0
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M utils/pofix.py
Log Message:
-----------
pofix: Update with 1.14.0 -> 1.14.1 file size rules for the website
[ci skip]
(cherry-picked from commit fc002f49a935004633855f57623bc48d734d133a)
Commit: 70fb145f4de55b7bcb1765c34275390e679fe727
https://github.com/wesnoth/wesnoth/commit/70fb145f4de55b7bcb1765c34275390e679fe727
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/actions/undo_recall_action.cpp
Log Message:
-----------
Fix #3065: unit halo remains after undoing a recall
(cherry-picked from commit 8fa3f6a6d4be0796965f343e44fda7f21c95a453)
Commit: 7cefbac1eb905dc254264f37ee0e5b8c192f8843
https://github.com/wesnoth/wesnoth/commit/7cefbac1eb905dc254264f37ee0e5b8c192f8843
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M players_changelog.md
Log Message:
-----------
Changelog entry for commit 8fa3f6a6d4be0796965f343e44fda7f21c95a453
(cherry-picked from commit 9db47334a9774bcdcab46c3669de8ce3563f989b)
Commit: d053a875a4e7d0c6b45c6e9c0ec57d4ace9b441e
https://github.com/wesnoth/wesnoth/commit/d053a875a4e7d0c6b45c6e9c0ec57d4ace9b441e
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/filesystem_boost.cpp
Log Message:
-----------
Convert use of deprecated SHGetFolderPathW to SHGetKnownFolderPath
(cherry-picked from commit 497d58df6f9e17c58aea518ef8ede2c4e19393a8)
Commit: ee2b9d242e4ca9d4229c2a5755094d22522a5545
https://github.com/wesnoth/wesnoth/commit/ee2b9d242e4ca9d4229c2a5755094d22522a5545
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M SConstruct
M changelog.md
M projectfiles/CodeBlocks/wesnoth.cbp
M projectfiles/VC14/campaignd.vcxproj
M projectfiles/VC14/wesnoth.vcxproj
M projectfiles/VC14/wesnothd.vcxproj
M src/desktop/windows_tray_notification.cpp
M src/desktop/windows_tray_notification.hpp
M src/network_asio.hpp
M src/wesnothd_connection.hpp
Log Message:
-----------
Bump min required Windows version to 7
Technically, all this code should work on Vista, (including the recent switch to using
SHGetKnownFolderPath), but since we're also considering requiring Visual Studio 2017
for building, we need Windows 7.
(cherry-picked from commit 2a585118d8b6c4b37d0ff9446a72ca20419ff7f7)
Commit: cbbaceb87d9fd08e54cdbf7fddc8b1c246e6e1b7
https://github.com/wesnoth/wesnoth/commit/cbbaceb87d9fd08e54cdbf7fddc8b1c246e6e1b7
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/filesystem_boost.cpp
Log Message:
-----------
Fixup 497d58d (forgot to free the doc path)
(cherry-picked from commit 41b436abd33bb3cf8f72d63c34f54e4bfa27f423)
Commit: 186490ff1c16ba62d406a48ad9eb25ac993b5a31
https://github.com/wesnoth/wesnoth/commit/186490ff1c16ba62d406a48ad9eb25ac993b5a31
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/filesystem_boost.cpp
Log Message:
-----------
Only redefine VOLUME_NAME_NONE if it's not previously defined
(cherry-picked from commit b89b89abeaf48c825bc2b4b22a035ada3293f4c3)
Commit: 5bd65b3cf5712ba08906ad5dfb1e442f8991a5aa
https://github.com/wesnoth/wesnoth/commit/5bd65b3cf5712ba08906ad5dfb1e442f8991a5aa
Author: David white <davewx7 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/actions/attack.cpp
M src/random.hpp
M src/random_synced.cpp
M src/random_synced.hpp
Log Message:
-----------
added use_prng preference which adds a new experimental pseudo-RNG for casual campaign play
(cherry-picked from commit 388622844781afbbb741e0d03827060dbd3dad2e)
Commit: 4a3173668008a1480325ac88d76ca2ae779e11da
https://github.com/wesnoth/wesnoth/commit/4a3173668008a1480325ac88d76ca2ae779e11da
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/filesystem_boost.cpp
Log Message:
-----------
Filesystem/Boost: formatting cleanup
(cherry-picked from commit f105fa20361afd48ad80eac01e7c2971b82d1097)
Commit: 898e732e5269380a435c1121f31f449c7b159b4d
https://github.com/wesnoth/wesnoth/commit/898e732e5269380a435c1121f31f449c7b159b4d
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/filesystem_boost.cpp
Log Message:
-----------
Filesystem/Boost: made use of std::make_unique
(cherry-picked from commit 32111ae5e9f05cd2e8ce708eed574ce0560c299e)
Commit: db323721abea5f19ab34694f133a7039f680e1b0
https://github.com/wesnoth/wesnoth/commit/db323721abea5f19ab34694f133a7039f680e1b0
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/filesystem_boost.cpp
Log Message:
-----------
Filesystem/Boost: range-for
(cherry-picked from commit c643b765dd78d32983658584a959447e6e96da62)
Commit: 49bd10699422c7b07cd445e9b35ef6a615e8cfe4
https://github.com/wesnoth/wesnoth/commit/49bd10699422c7b07cd445e9b35ef6a615e8cfe4
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/filesystem_boost.cpp
Log Message:
-----------
Filesystem/Boost: don't import boost::fileystem::path class to global namespace
This makes it a *lot* clearer that we're using the bfs class and not some function
or class defined elsewhere in our code.
(cherry-picked from commit 0f9a0fac5eb49c62f99e748842ff1984894c2de4)
Commit: b29c2aca9b36221186d2d00de6c6fc11284c16ca
https://github.com/wesnoth/wesnoth/commit/b29c2aca9b36221186d2d00de6c6fc11284c16ca
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/core/event/dispatcher_private.hpp
Log Message:
-----------
Work around some weird compiler bug with VS using C++17
Without this, I get the error "syntax error: '<'" and a reference to the function's
opening bracket... No idea why. It build fine on VS 15.7.1 with C++14.
(cherry-picked from commit 1c575f59fa16029247c6d05c5e5f7b74cafdc26e)
Commit: d6652039f33def083f1438e7ea74f794b34a4f33
https://github.com/wesnoth/wesnoth/commit/d6652039f33def083f1438e7ea74f794b34a4f33
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/movetype.cpp
M src/whiteboard/manager.cpp
Log Message:
-----------
Whiteboard: avoid the use of a deprecated C++17 function
shared_ptr::unique() is equivalent to use_count() == 1. A few of these checks should probably
be > 1 to account for 0, but this is a direct logical translation.
(cherry-picked from commit f279ad5fc0f83ee946ab75049994fdbbd0ca18d5)
Commit: 106494fdc7d9aa08dc5160daf430ff796cb5f98d
https://github.com/wesnoth/wesnoth/commit/106494fdc7d9aa08dc5160daf430ff796cb5f98d
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/utils/abilities.cfg
Log Message:
-----------
UtBS: add female variations for all ability names
including the ones which do not require it,
to make it easier to reuse them
[ci skip]
(cherry-picked from commit 8ac1518884b9e512b3e4ea626f0f9866685344c8)
Commit: ac0e940342f61371e429aa2dd846e8d6bb42e8a3
https://github.com/wesnoth/wesnoth/commit/ac0e940342f61371e429aa2dd846e8d6bb42e8a3
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/maps/01_The_Morning_After.map
Log Message:
-----------
UtBS S1: change terrain code of the death tree hex
Visually it has no effect since the embelishment is
covered by the tree image.
In the help it is now not only displayed as grass.
[ci skip]
(cherry-picked from commit 4873f1a41e791c021a916b6b96ef27ba605978ec)
Commit: 5d8d6a94e1ebf6b753fc1e5b38be26caa1fea7ae
https://github.com/wesnoth/wesnoth/commit/5d8d6a94e1ebf6b753fc1e5b38be26caa1fea7ae
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Northern_Rebirth/scenarios/02_01_Infested_Caves.cfg
Log Message:
-----------
Northern Rebirth S02_01: keep side 8 leader from wandering off too far
If he ends up on the tiny keep in the south, he can only recruit one
unit per turn, which affects the intended balance of the scenario.
Fixes #3073
(cherry-picked from commit 9b9aa13a3dba40137d8d679fe42d2b679f631ef9)
Commit: b53e875bc64624ebdbe186ef1d04f89d25fc09fe
https://github.com/wesnoth/wesnoth/commit/b53e875bc64624ebdbe186ef1d04f89d25fc09fe
Author: Pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M utils/travis/steps/script.sh
Log Message:
-----------
Add osx+cmake support to travis.
(cherry-picked from commit f53c6b84cd96fa07405ebec699262158fb3311c3)
Commit: f2623218641abe5e06fff5556729cce4b4d70791
https://github.com/wesnoth/wesnoth/commit/f2623218641abe5e06fff5556729cce4b4d70791
Author: Pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/CMakeLists.txt
M utils/travis/steps/install.sh
Log Message:
-----------
Fix building with osx+cmake on travis.
(cherry-picked from commit f5d74cd5ed0991ac02e3476e44ab1d615a6614a0)
Commit: b4e612239ee0d292d7e98d58c417b8c36737a8cd
https://github.com/wesnoth/wesnoth/commit/b4e612239ee0d292d7e98d58c417b8c36737a8cd
Author: Pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/CMakeLists.txt
Log Message:
-----------
Fix missing SDLMain.mm.
(cherry-picked from commit 7a3fb8815bace24a259c2424c1a256ecece2f420)
Commit: bb87cef4844b5dba268d7470a5fa4356cfb50101
https://github.com/wesnoth/wesnoth/commit/bb87cef4844b5dba268d7470a5fa4356cfb50101
Author: Pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M CMakeLists.txt
Log Message:
-----------
Mark OpenGL and GLEW as required in cmake.
(cherry-picked from commit 8582ce10445f1e9d6ecc22621a6265a10c52cdb1)
Commit: dca2c5775d6463de717c14a64238c22e452eabf9
https://github.com/wesnoth/wesnoth/commit/dca2c5775d6463de717c14a64238c22e452eabf9
Author: Pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
A cmake/FindGLEW.cmake
R cmake/FindGLEW.make
A cmake/SelectLibraryConfigurations.cmake
Log Message:
-----------
Fix FindGLEW being incorrectly named.
It was .make, it should be .cmake.
(cherry-picked from commit 34965741bd34da9b0faa905b363b0b8611883a93)
Commit: 970f21a6655c20c1e15608661d6551e0d4addf27
https://github.com/wesnoth/wesnoth/commit/970f21a6655c20c1e15608661d6551e0d4addf27
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Northern_Rebirth/scenarios/02_01_Infested_Caves.cfg
Log Message:
-----------
NR S2: Avoid Tallin talking to himself
(part of #3086)
[ci skip]
(cherry-picked from commit 76134436fc05507a64a09a1fd3b91e166714f8d9)
Commit: 6532cd45ba4a40ba5c390f9de5a2bddb1f94d3ea
https://github.com/wesnoth/wesnoth/commit/6532cd45ba4a40ba5c390f9de5a2bddb1f94d3ea
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Northern_Rebirth/scenarios/02_01_Infested_Caves.cfg
Log Message:
-----------
NR S2: refactor objectives
[ci skip]
(cherry-picked from commit 52d8cef080bc8045351ee472e7047df2cc516dfa)
Commit: abecfd70ecd4c12387fdbd038de5bd622f3efd66
https://github.com/wesnoth/wesnoth/commit/abecfd70ecd4c12387fdbd038de5bd622f3efd66
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Northern_Rebirth/scenarios/02_01_Infested_Caves.cfg
Log Message:
-----------
NR S2: remove second endlevel event for hamels death
This level has it's own event to handle this situation.
closes #3091
[ci skip]
(cherry-picked from commit 1f75c5b14d84bed7afe2944a7a4a0e169ba2b539)
Commit: 4457a02431d3bc4ecfb7607facc4deefde9aceac
https://github.com/wesnoth/wesnoth/commit/4457a02431d3bc4ecfb7607facc4deefde9aceac
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/game_initialization/lobby_data.cpp
M src/game_initialization/lobby_data.hpp
M src/gui/dialogs/multiplayer/lobby.cpp
Log Message:
-----------
MP Lobby: sort mods list alphabetically and color "missing" text
(cherry-picked from commit c20eab0a5ef9aee51336fa7f2ddf2e4bc340ea37)
Commit: eeace5a11d019c4d02f27237ef4f76109cd728f1
https://github.com/wesnoth/wesnoth/commit/eeace5a11d019c4d02f27237ef4f76109cd728f1
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/multiplayer/lobby.cpp
Log Message:
-----------
MP Lobby: removed "Registered Users Only" from settings list in info tooltip
This isn't really relevant anymore since everyone is registered on the official server.
(cherry-picked from commit 36c0b6b648fd774f0fdad18ecb97b270456a2d05)
Commit: 8a2cf9a676bc2bfc59adfe68b7d9a40140194047
https://github.com/wesnoth/wesnoth/commit/8a2cf9a676bc2bfc59adfe68b7d9a40140194047
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/multiplayer/lobby.cpp
Log Message:
-----------
MP lobby: fix player list scrolling to top when it changes
(cherry-picked from commit a3658473c97a32a29f9b3335bddddeca0d51af00)
Commit: 7a80026941e92d26e490332845c7e04f0f168b1f
https://github.com/wesnoth/wesnoth/commit/7a80026941e92d26e490332845c7e04f0f168b1f
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M players_changelog.md
Log Message:
-----------
Changelog entry for commit a3658473c97a32a29f9b3335bddddeca0d51af00
(cherry-picked from commit ab0d3747aa48951aed164f17e330a4665ad05157)
Commit: 11cbb71950de271ebdf50344319f55e6231f7fb6
https://github.com/wesnoth/wesnoth/commit/11cbb71950de271ebdf50344319f55e6231f7fb6
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-help/en_GB.po
M po/wesnoth-lib/en_GB.po
M po/wesnoth-manpages/en_GB.po
M po/wesnoth-sota/en_GB.po
M po/wesnoth-tutorial/en_GB.po
M po/wesnoth-units/en_GB.po
M po/wesnoth-utbs/en_GB.po
M po/wesnoth/en_GB.po
Log Message:
-----------
updated British English translation
(cherry-picked from commit 488c587f8e5a7732bfec9df86b6efd9a4963b695)
Commit: 53cf5959c0ba4e67efe7482fe6206e5389d21753
https://github.com/wesnoth/wesnoth/commit/53cf5959c0ba4e67efe7482fe6206e5389d21753
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-help/it.po
M po/wesnoth-units/it.po
M po/wesnoth/it.po
Log Message:
-----------
updated Italian translation
(cherry-picked from commit ecedf14aa77125cd2092bab0880764eeb4ff374f)
Commit: 49d4ae2bfae31f57af9704adbad17300b7138537
https://github.com/wesnoth/wesnoth/commit/49d4ae2bfae31f57af9704adbad17300b7138537
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-tutorial/uk.po
M po/wesnoth/uk.po
Log Message:
-----------
updated Ukrainian translation
(cherry-picked from commit 0b8c90e752167257ce32129c81f5d83ea7247274)
Commit: 08e4108aa22412d8b16d9e76bdb94b6eab856c65
https://github.com/wesnoth/wesnoth/commit/08e4108aa22412d8b16d9e76bdb94b6eab856c65
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/VC14/wesnothlib.vcxproj
M projectfiles/VC14/wesnothlib.vcxproj.filters
M source_lists/libwesnoth_core
A src/filesystem.cpp
R src/filesystem_boost.cpp
Log Message:
-----------
Renamed filesystem_boost.cpp to filesystem.cpp
(cherry-picked from commit e0192b1b1fe71b98403bad6f0df3c115adbb2291)
Commit: 1553f82f87edb0f914dae03a06f0aca8cec2e616
https://github.com/wesnoth/wesnoth/commit/1553f82f87edb0f914dae03a06f0aca8cec2e616
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Northern_Rebirth/scenarios/02_01_Infested_Caves.cfg
Log Message:
-----------
NR S2: show message for northern border too
[ci skip]
(cherry-picked from commit 401eba49e238fd4f42c0f2fc35a00966416f2143)
Commit: f2f46aeb51a34f2dae97f8b7e14f724b4a3bf93f
https://github.com/wesnoth/wesnoth/commit/f2f46aeb51a34f2dae97f8b7e14f724b4a3bf93f
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Northern_Rebirth/maps/02_01_Infested_Caves.map
M data/campaigns/Northern_Rebirth/scenarios/02_01_Infested_Caves.cfg
Log Message:
-----------
Nr S2: edited map:
* make north gate obvious to players
* mitigate bridges transition
* use less human castles
* don't break northern train line
* move the bridges in the Trolls keep farther behind, to be less
vulnerabe to the northern leader
[ci skip]
(cherry-picked from commit 255e77115d46bea0054ca233e0b9d207bf26b349)
Commit: b1c8ef6f6a263ab71be6e780868edb481bcf8804
https://github.com/wesnoth/wesnoth/commit/b1c8ef6f6a263ab71be6e780868edb481bcf8804
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Northern_Rebirth/scenarios/02_01_Infested_Caves.cfg
Log Message:
-----------
NR S2: flavor event: fix coordinates
[ci skip]
(cherry-picked from commit 0ad223ab85b3e974dc8df39124052039d1224acc)
Commit: e9821b316f3f9e1a554092bf611937f22c23d13d
https://github.com/wesnoth/wesnoth/commit/e9821b316f3f9e1a554092bf611937f22c23d13d
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Northern_Rebirth/scenarios/02_01_Infested_Caves.cfg
Log Message:
-----------
NR S2: improve balancing
[ci skip]
(cherry-picked from commit 682a84ffecdd8ebf8f2849463d16efc97a44d99a)
Commit: df4ee4005e8fed1a892d55ac3c8793d835684ff0
https://github.com/wesnoth/wesnoth/commit/df4ee4005e8fed1a892d55ac3c8793d835684ff0
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/units/undead/Skele_Death_Knight.cfg
Log Message:
-----------
Change Death Knights axe icon to fitting axe
[ci skip]
(cherry-picked from commit 1d288355b006dfafe13a902fb5810357fabc3a42)
Commit: 637994690a700c0179cc41d2844f6cbd343f3193
https://github.com/wesnoth/wesnoth/commit/637994690a700c0179cc41d2844f6cbd343f3193
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Northern_Rebirth/scenarios/02_01_Infested_Caves.cfg
Log Message:
-----------
NR S2: better conditional for victory event
previousl one could trigger victory while being at
the other side of the cave wall
[ci skip]
(cherry-picked from commit 41298d76c7c659ce318a3584413c8ecb6dd49da9)
Commit: 9e8f245e73793407a55c5adf284fcb50f4542372
https://github.com/wesnoth/wesnoth/commit/9e8f245e73793407a55c5adf284fcb50f4542372
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Northern_Rebirth/scenarios/02_01_Infested_Caves.cfg
Log Message:
-----------
NR S2: fixup prose
[ci_skip]
(cherry-picked from commit 9baee77e4a569ec1663b142ea775d048be313799)
Commit: cd566ec07f18a7c67cdf8e42f9c526857e75df0a
https://github.com/wesnoth/wesnoth/commit/cd566ec07f18a7c67cdf8e42f9c526857e75df0a
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/game_initialization/lobby_data.cpp
Log Message:
-----------
MP Lobby: removed "illegal map" error (see #3095)
There's still the "Error while loading the map:" error emitted by the minimap
widget, but this at least curbs the duplicates.
(cherry-picked from commit f34db1b8ac84940e1da91457375c87b37969ef9d)
Commit: 33c1e5fb0d50e4cdd17e3f16b14ebfce70938d56
https://github.com/wesnoth/wesnoth/commit/33c1e5fb0d50e4cdd17e3f16b14ebfce70938d56
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/utils/abilities.cfg
Log Message:
-----------
UtBS utils: add female string (fixup)
[ci skip]
(cherry-picked from commit 1b1762cdf2c67b29deaae27140d15f029e09d0d6)
Commit: d1c504c9b3f199d27b8416caa1f63a9f3920345c
https://github.com/wesnoth/wesnoth/commit/d1c504c9b3f199d27b8416caa1f63a9f3920345c
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/lua/mapgen_helper.lua
Log Message:
-----------
Lua random map generator: fix off-by-one error in flip transforms
Among other things, this gave HttT S17 (Sceptre of Fire) a 50% chance
of crashing at scenario start.
(cherry-picked from commit 7d0d9e19a5fce052e35f866a1d83584dcd8f20bb)
Commit: ba9d13f066fa9c681724e55b909eb6ca1fb568af
https://github.com/wesnoth/wesnoth/commit/ba9d13f066fa9c681724e55b909eb6ca1fb568af
Author: Fernando Carmona Varo <ferkiwi at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg
Log Message:
-----------
tutorial: add labels to villages and keep
Prevents new players from mistaking the graphics
(cherry-picked from commit 026ea6ee780c11859f495983dedaeb4f2e1ebb9f)
Commit: f58a7c06efb7b4cf834f838429471380adb23cf1
https://github.com/wesnoth/wesnoth/commit/f58a7c06efb7b4cf834f838429471380adb23cf1
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/game_initialization/lobby_data.cpp
Log Message:
-----------
Fix compiler warning about unreferenced variable
(cherry-picked from commit c3d711632e70857861e081597c4e943688a3a89f)
Commit: cefbad9b1e9acdac85801262501bb1e33f5670a5
https://github.com/wesnoth/wesnoth/commit/cefbad9b1e9acdac85801262501bb1e33f5670a5
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/ai/formula/ai.cpp
M src/ai/formula/ai.hpp
M src/wml_exception.cpp
M src/wml_exception.hpp
Log Message:
-----------
Mark wml_exception::show const and formula_ai::handle_exception's argument const
(cherry-picked from commit 74f86aea1d3447f66b121489d5adfd38d80d9468)
Commit: d9fb6c0bf572e204a3949b6ac904cc0516d3fc85
https://github.com/wesnoth/wesnoth/commit/d9fb6c0bf572e204a3949b6ac904cc0516d3fc85
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/actions/attack.cpp
M src/actions/undo.cpp
M src/addon/client.cpp
M src/addon/manager_ui.cpp
M src/ai/actions.cpp
M src/ai/composite/component.cpp
M src/ai/composite/goal.cpp
M src/ai/configuration.cpp
M src/ai/formula/ai.cpp
M src/ai/formula/candidates.cpp
M src/ai/formula/stage_unit_formulas.cpp
M src/campaign_server/campaign_server.cpp
M src/commandline_options.cpp
M src/config_cache.cpp
M src/display.cpp
M src/editor/controller/editor_controller.cpp
M src/editor/editor_main.cpp
M src/editor/map/context_manager.cpp
M src/editor/map/editor_map.cpp
M src/editor/map/map_context.cpp
M src/filesystem.cpp
M src/font/font_config.cpp
M src/formula/formula.cpp
M src/formula/variant_value.hpp
M src/game_config.cpp
M src/game_config_manager.cpp
M src/game_events/action_wml.cpp
M src/game_initialization/create_engine.cpp
M src/game_initialization/lobby_data.cpp
M src/game_initialization/lobby_info.cpp
M src/game_initialization/multiplayer.cpp
M src/game_initialization/playcampaign.cpp
M src/game_initialization/singleplayer.cpp
M src/game_launcher.cpp
M src/generators/cave_map_generator.cpp
M src/generators/default_map_generator.cpp
M src/generators/lua_map_generator.cpp
M src/gettext_boost.cpp
M src/gui/dialogs/advanced_graphics_options.cpp
M src/gui/dialogs/editor/custom_tod.cpp
M src/gui/dialogs/game_load.cpp
M src/gui/dialogs/lua_interpreter.cpp
M src/gui/dialogs/multiplayer/lobby.cpp
M src/gui/dialogs/preferences_dialog.cpp
M src/gui/dialogs/story_viewer.hpp
M src/gui/dialogs/title_screen.cpp
M src/gui/dialogs/tooltip.cpp
M src/gui/gui.cpp
M src/gui/widgets/minimap.cpp
M src/gui/widgets/size_lock.cpp
M src/gui/widgets/window.cpp
M src/halo.cpp
M src/image.cpp
M src/image_modifications.cpp
M src/language.cpp
M src/language.hpp
M src/lexical_cast.hpp
M src/map/label.cpp
M src/map/location.cpp
M src/map/map.cpp
M src/menu_events.cpp
M src/mouse_events.cpp
M src/persist_context.cpp
M src/playmp_controller.cpp
M src/playsingle_controller.cpp
M src/preferences/credentials.cpp
M src/preferences/general.cpp
M src/replay.cpp
M src/save_blocker.cpp
M src/save_index.cpp
M src/savegame.cpp
M src/scripting/game_lua_kernel.cpp
M src/scripting/lua_kernel_base.cpp
M src/serialization/preprocessor.cpp
M src/serialization/schema_validator.cpp
M src/serialization/string_utils.cpp
M src/serialization/unicode.cpp
M src/serialization/unicode_cast.hpp
M src/server/ban.cpp
M src/server/forum_user_handler.cpp
M src/server/game.cpp
M src/server/server.cpp
M src/server/simple_wml.cpp
M src/side_filter.cpp
M src/statistics.cpp
M src/synced_commands.cpp
M src/terrain/builder.cpp
M src/terrain/filter.cpp
M src/terrain/translation.cpp
M src/tests/gui/test_gui2.cpp
M src/tests/test_make_enum.cpp
M src/tod_manager.cpp
M src/units/abilities.cpp
M src/units/attack_type.cpp
M src/units/filter.cpp
M src/units/frame_private.hpp
M src/units/unit.cpp
M src/variable.cpp
M src/wesnoth.cpp
M src/whiteboard/move.cpp
M src/whiteboard/side_actions.cpp
Log Message:
-----------
Catch all exceptions (where possible) as const references
A few catch blocks modify something in their exceptions, so those are kept non-const.
(cherry-picked from commit 2bf4d68c87b69256266b7745a9e3453693794e35)
Commit: fbd84baa654e84bdb84f8caa1e477d71b500218f
https://github.com/wesnoth/wesnoth/commit/fbd84baa654e84bdb84f8caa1e477d71b500218f
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/multiplayer/lobby.cpp
Log Message:
-----------
MP Lobby: used "not installed" instead of "missing"
(cherry-picked from commit 0d1571a0b2df0b4ae11708e3a92e7c1af2aa44df)
Commit: f818dc17f4f75e0bccea479014538f54d88b94e6
https://github.com/wesnoth/wesnoth/commit/f818dc17f4f75e0bccea479014538f54d88b94e6
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/build_info.cpp
Log Message:
-----------
bi: Refactor report headers generation
(cherry-picked from commit ba64a502e1b26bd9ccb679152ebbbef32c8707cc)
Commit: f7a1408f22800bee1309acd25aff84c60baa5862
https://github.com/wesnoth/wesnoth/commit/f7a1408f22800bee1309acd25aff84c60baa5862
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/server/forum_user_handler.cpp
Log Message:
-----------
wesnothd: Fix typo introduced recently causing build errors
Fixes commit 2bf4d68c87b69256266b7745a9e3453693794e35.
(cherry-picked from commit c8c3625e3a86b61b592f19bf80d2410d46e8187c)
Commit: 29871070391d62ce05bb17b84cd9bc0fc94b821b
https://github.com/wesnoth/wesnoth/commit/29871070391d62ce05bb17b84cd9bc0fc94b821b
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/multiplayer/lobby.cpp
Log Message:
-----------
MP lobby: don't attempt to restore player list scroll position too early
Fixes error messages in the log when joining the lobby.
(cherry-picked from commit 91e60267bac39c6ae160d4c944c7e2bbd339962a)
Commit: 28572b4c5f8f36efbf1c9bd48d9c9276db9137f5
https://github.com/wesnoth/wesnoth/commit/28572b4c5f8f36efbf1c9bd48d9c9276db9137f5
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-did/fr.po
M po/wesnoth-lib/fr.po
Log Message:
-----------
updated French translation
(cherry-picked from commit adb4c511e232ba93e6c23575760c6f0f647159e5)
Commit: cbfb9dfaba5ecf45db128f2ebeecc621c6022dd3
https://github.com/wesnoth/wesnoth/commit/cbfb9dfaba5ecf45db128f2ebeecc621c6022dd3
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
A data/campaigns/An_Orcish_Incursion/images/maps/l10n/it/aoi--overlay.png
A data/campaigns/Dead_Water/images/maps/l10n/it/dw--overlay.png
A data/campaigns/Descent_Into_Darkness/images/maps/l10n/it/did--overlay.png
A data/campaigns/Eastern_Invasion/images/maps/l10n/it/ei--overlay.png
A data/campaigns/Heir_To_The_Throne/images/maps/l10n/it/httt--overlay.png
A data/campaigns/Legend_of_Wesmere/images/l10n/it/low-map--overlay.png
A data/campaigns/Liberty/images/maps/l10n/it/liberty--overlay.png
A data/campaigns/Northern_Rebirth/images/maps/l10n/it/nr--overlay.png
A data/campaigns/Sceptre_of_Fire/images/maps/l10n/it/sof--overlay.png
A data/campaigns/Son_Of_The_Black_Eye/images/maps/l10n/it/sotbe--overlay.png
A data/campaigns/The_Rise_Of_Wesnoth/images/maps/l10n/it/green_isle--overlay.png
A data/campaigns/The_South_Guard/images/maps/l10n/it/tsg--overlay.png
A data/campaigns/Two_Brothers/images/maps/l10n/it/tb--overlay.png
A data/core/images/maps/l10n/it/titlescreen--overlay.png
Log Message:
-----------
updated Italian translation (images)
(cherry-picked from commit 4918a6234e208d60817e49571c72dcefaaabba9e)
Commit: d97b0c2e3111cde8338ba5b0bbda1814a9771b99
https://github.com/wesnoth/wesnoth/commit/d97b0c2e3111cde8338ba5b0bbda1814a9771b99
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/An_Orcish_Incursion/images/maps/l10n/it/aoi--overlay.png
M data/campaigns/Dead_Water/images/maps/l10n/it/dw--overlay.png
M data/campaigns/Descent_Into_Darkness/images/maps/l10n/it/did--overlay.png
M data/campaigns/Eastern_Invasion/images/maps/l10n/it/ei--overlay.png
M data/campaigns/Heir_To_The_Throne/images/maps/l10n/it/httt--overlay.png
M data/campaigns/Legend_of_Wesmere/images/l10n/it/low-map--overlay.png
M data/campaigns/Liberty/images/maps/l10n/it/liberty--overlay.png
M data/campaigns/Northern_Rebirth/images/maps/l10n/it/nr--overlay.png
M data/campaigns/Sceptre_of_Fire/images/maps/l10n/it/sof--overlay.png
M data/campaigns/Son_Of_The_Black_Eye/images/maps/l10n/it/sotbe--overlay.png
M data/campaigns/The_Rise_Of_Wesnoth/images/maps/l10n/it/green_isle--overlay.png
M data/campaigns/The_South_Guard/images/maps/l10n/it/tsg--overlay.png
M data/campaigns/Two_Brothers/images/maps/l10n/it/tb--overlay.png
M data/core/images/maps/l10n/it/titlescreen--overlay.png
Log Message:
-----------
remove executable flag from italian translation images
(cherry-picked from commit f9b9d5018f5b15451bd5a8761d6849a6500fed56)
Commit: ccbf2f77058cebc83dff6d625e494cd4497cd7b0
https://github.com/wesnoth/wesnoth/commit/ccbf2f77058cebc83dff6d625e494cd4497cd7b0
Author: Martin Hrubý (hrubymar10) <hrubymar10 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
Log Message:
-----------
Fix Xcode project after e0192b1b1fe71b98403bad6f0df3c115adbb2291
(cherry-picked from commit e16373bada5aa65bc2bd741ebc03193b4ddd9314)
Commit: 21580d3ef1055976033c7f446d98ff0d00e456c1
https://github.com/wesnoth/wesnoth/commit/21580d3ef1055976033c7f446d98ff0d00e456c1
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/addon/info.hpp
M src/campaign_server/campaign_server.cpp
M src/chat_events.hpp
M src/config_attribute_value.cpp
M src/config_attribute_value.hpp
M src/display_chat_manager.cpp
M src/display_chat_manager.hpp
M src/filesystem.cpp
M src/filesystem.hpp
M src/format_time_summary.cpp
M src/format_time_summary.hpp
M src/game_initialization/lobby_data.cpp
M src/game_initialization/lobby_data.hpp
M src/gui/dialogs/addon/manager.cpp
M src/gui/dialogs/debug_clock.cpp
M src/gui/widgets/chatbox.cpp
M src/gui/widgets/chatbox.hpp
M src/gui/widgets/debug.cpp
M src/log.cpp
M src/log.hpp
M src/log_windows.cpp
M src/menu_events.cpp
M src/menu_events.hpp
M src/preferences/game.cpp
M src/preferences/game.hpp
M src/replay.cpp
M src/replay.hpp
M src/reports.cpp
M src/save_index.cpp
M src/save_index.hpp
M src/server/ban.cpp
M src/server/ban.hpp
M src/server/forum_user_handler.cpp
M src/server/forum_user_handler.hpp
M src/server/metrics.cpp
M src/server/metrics.hpp
M src/server/player.cpp
M src/server/player.hpp
M src/server/sample_user_handler.cpp
M src/server/sample_user_handler.hpp
M src/server/server.cpp
M src/server/server.hpp
M src/tests/gui/test_gui2.cpp
M src/wesnoth.cpp
Log Message:
-----------
Use std::time_t instead of plain C time_t
(cherry-picked from commit ccbb736a180d37f2640cd56331b91f855c728464)
Commit: 399b589e6044e3e05a6733edc5e89c2cc72bc5bc
https://github.com/wesnoth/wesnoth/commit/399b589e6044e3e05a6733edc5e89c2cc72bc5bc
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/ai/contexts.cpp
M src/ai/formula/ai.cpp
M src/campaign_server/campaign_server.cpp
M src/chat_command_handler.cpp
M src/chat_events.cpp
M src/format_time_summary.cpp
M src/formula/function.cpp
M src/game_events/pump.cpp
M src/game_initialization/lobby_data.cpp
M src/generators/map_generator.cpp
M src/gui/dialogs/debug_clock.cpp
M src/gui/widgets/chatbox.cpp
M src/gui/widgets/debug.cpp
M src/log.cpp
M src/log_windows.cpp
M src/menu_events.cpp
M src/playmp_controller.cpp
M src/playsingle_controller.cpp
M src/playturn.cpp
M src/replay.cpp
M src/scripting/game_lua_kernel.cpp
M src/scripting/lua_common.cpp
M src/server/ban.cpp
M src/server/ban.hpp
M src/server/forum_user_handler.cpp
M src/server/metrics.cpp
M src/server/player.cpp
M src/server/sample_user_handler.cpp
M src/server/sample_user_handler.hpp
M src/server/server.cpp
M src/server/user_handler.cpp
M src/wesnoth.cpp
M src/whiteboard/manager.cpp
Log Message:
-----------
Use std::time() instead of plain C time()
(cherry-picked from commit d26824901de8c76a32742ebf1d1c3331fe082a60)
Commit: 16fdbc417acf4ab1cbd4daea3d1fb20a076fdc09
https://github.com/wesnoth/wesnoth/commit/16fdbc417acf4ab1cbd4daea3d1fb20a076fdc09
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/format_time_summary.cpp
M src/gui/dialogs/debug_clock.cpp
M src/save_index.cpp
M src/server/ban.cpp
Log Message:
-----------
Use std::localtime() instead of plain C localtime()
(cherry-picked from commit 00bea6494ff7ac84f569bc568267fd630aded83e)
Commit: 64d176530f86b9b747cd083bb6370a2d5efe08a1
https://github.com/wesnoth/wesnoth/commit/64d176530f86b9b747cd083bb6370a2d5efe08a1
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/format_time_summary.cpp
M src/gui/dialogs/debug_clock.cpp
M src/save_index.cpp
M src/server/ban.cpp
Log Message:
-----------
Use std::tm instead of plain C tm
(cherry-picked from commit 36e83e646c01906bf1b2ae4694f840f25ee7f349)
Commit: 19e3afb463097e207946a8bdca907661ec8b34ab
https://github.com/wesnoth/wesnoth/commit/19e3afb463097e207946a8bdca907661ec8b34ab
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/ai/composite/goal.cpp
M src/ai/contexts.cpp
M src/ai/default/attack.cpp
M src/ai/default/ca.cpp
M src/ai/default/ca_move_to_targets.cpp
M src/ai/default/contexts.cpp
M src/ai/formula/ai.cpp
M src/ai/formula/function_table.cpp
M src/ai/testing.cpp
M src/attack_prediction.cpp
M src/color.hpp
M src/deprecation.cpp
M src/display.cpp
M src/display.hpp
M src/editor/controller/editor_controller.cpp
M src/formula/string_utils.cpp
M src/game_events/action_wml.cpp
M src/game_state.cpp
M src/generators/cave_map_generator.cpp
M src/generators/default_map_generator_job.cpp
M src/gui/dialogs/file_dialog.cpp
M src/gui/widgets/slider.cpp
M src/hash.cpp
M src/image_modifications.cpp
M src/mouse_events.cpp
M src/pathfind/astarsearch.cpp
M src/play_controller.cpp
M src/preferences/general.cpp
M src/replay.cpp
M src/replay_helper.cpp
M src/reports.cpp
M src/scripting/game_lua_kernel.cpp
M src/scripting/lua_kernel_base.cpp
M src/sdl/utils.cpp
M src/serialization/string_utils.cpp
M src/server/forum_user_handler.cpp
M src/team.cpp
M src/terrain/builder.cpp
M src/units/abilities.cpp
M src/units/drawer.cpp
M src/units/unit.cpp
M src/variable.cpp
M src/whiteboard/manager.cpp
Log Message:
-----------
Convert C-style casts to static_cast
(cherry-picked from commit 0dc5656c328cdd02eebb4dbd10dbab3eb4553b57)
Commit: 96c2a1f6f7586ed6e0b58e0ecdd0f46a6799165a
https://github.com/wesnoth/wesnoth/commit/96c2a1f6f7586ed6e0b58e0ecdd0f46a6799165a
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/editor/palette/location_palette.cpp
Log Message:
-----------
editor: don't allow bad location id strings
in particular using spaces or commas here results in invalid map files when the map is written to disk. (repoted on the forum)
(cherry-picked from commit 5c278a39364ed1a7d04892f6c33ede3d64961cc8)
Commit: d972ed78c09a2518afd944aeb87f22847a4d047c
https://github.com/wesnoth/wesnoth/commit/d972ed78c09a2518afd944aeb87f22847a4d047c
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/whiteboard/side_actions.cpp
Log Message:
-----------
wb: don't clear undo stack when dsu is active
since that might lead to assertion failures&oos later, fixes #3029
(cherry-picked from commit 5884aa27ea9d5a18203e2618c1c0a55321f5dc9e)
Commit: b953e31116b39bcfb375e0b4677595a50316b35e
https://github.com/wesnoth/wesnoth/commit/b953e31116b39bcfb375e0b4677595a50316b35e
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/whiteboard/recruit.cpp
Log Message:
-----------
wb: add a assertion
(cherry-picked from commit 6a9e2c260d8dd6a3a476f91768547ec7e2afff71)
Commit: f7f0235b943a70171cae52e94f57eea9a2d4b744
https://github.com/wesnoth/wesnoth/commit/f7f0235b943a70171cae52e94f57eea9a2d4b744
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/whiteboard/manager.cpp
M src/whiteboard/move.cpp
Log Message:
-----------
wb: fix incorrect handling of skirmisher.
fixes #3014
(cherry-picked from commit eaabf1648d9d200c2f44b7170efcba67bc724061)
Commit: 959f6766e305a6243b385bcb83e1ce2fd81cb304
https://github.com/wesnoth/wesnoth/commit/959f6766e305a6243b385bcb83e1ce2fd81cb304
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/fake_unit_ptr.cpp
Log Message:
-----------
wb: fix segfault when ending the game
fixes #3008
This is not the prettiest fix, but in particular for 1.14 stable it's
less risky than some big refactor.
(cherry-picked from commit fd48bad8d929a5ec48d0eeeae063a07b046ea1b4)
Commit: 88db848d207a71704d8247f9938f8649835e5e30
https://github.com/wesnoth/wesnoth/commit/88db848d207a71704d8247f9938f8649835e5e30
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/units/filter.cpp
Log Message:
-----------
fix uncaught stoi exception
(cherry-picked from commit e88a73fc2a5b4deb4c67650b419d0ef528088a65)
Commit: 72d626bcc11b0ce89f1295ce7456c2c52c69ce07
https://github.com/wesnoth/wesnoth/commit/72d626bcc11b0ce89f1295ce7456c2c52c69ce07
Author: doofus-01 <doofus-01 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/dustbok.png
M data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg
A data/campaigns/Under_the_Burning_Suns/units/quenoth/Dustbok.cfg
Log Message:
-----------
[UtBS] replacing horses with dustboks (#3049)
* removing horses from text strings - replaced with dustboks
* adding a riderless dustbok to monsters race, needs description and probably other adjustments
* removing disengage ability and translation mark from dustbok unit file
* adding #po translation hint for name
(cherry-picked from commit fa59b1084c44140b4d244eaf699c7de90adb8c47)
Commit: 2b0b6fe4e94650233530eaf890b9c4650814df5d
https://github.com/wesnoth/wesnoth/commit/2b0b6fe4e94650233530eaf890b9c4650814df5d
Author: catagent101 <16071498+catagent101 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_South_Guard/scenarios/07a_Into_the_Depths.cfg
Log Message:
-----------
TSG S07a: Fix dialogue not triggering in TSG 'Into the Depths' (#3048)
(cherry-picked from commit 743be1522cfe101da31744f9718f1563354eedee)
Commit: ece2a6092f4ccab99a828bd31e25732faa28599a
https://github.com/wesnoth/wesnoth/commit/ece2a6092f4ccab99a828bd31e25732faa28599a
Author: ln-zookeeper <lari.nieminen at iki.fi>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/terrain-graphics.cfg
Log Message:
-----------
Fixed a remaining glitch with off-map<->water transitions
(cherry-picked from commit 9c65035075928f7b10d24ff8534873ca4815759b)
Commit: c98fad3791c39e857c4db15416ca16cea108b7f0
https://github.com/wesnoth/wesnoth/commit/c98fad3791c39e857c4db15416ca16cea108b7f0
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/ai/micro_ais/scenarios/The_Elves_Besieged.cfg
M data/ai/micro_ais/scenarios/animals.cfg
M data/ai/micro_ais/scenarios/bottleneck_defense.cfg
M data/ai/micro_ais/scenarios/dragon.cfg
M data/ai/micro_ais/scenarios/fast.cfg
M data/ai/micro_ais/scenarios/goto.cfg
M data/ai/micro_ais/scenarios/guardians.cfg
M data/ai/micro_ais/scenarios/hang_out.cfg
M data/ai/micro_ais/scenarios/healer_support.cfg
M data/ai/micro_ais/scenarios/lurkers.cfg
M data/ai/micro_ais/scenarios/messenger_escort.cfg
M data/ai/micro_ais/scenarios/patrols.cfg
M data/ai/micro_ais/scenarios/protect_unit.cfg
M data/ai/micro_ais/scenarios/recruiting.cfg
M data/ai/micro_ais/scenarios/scenario_micro_ai.cfg
M data/ai/micro_ais/scenarios/simple_attack.cfg
M data/ai/micro_ais/scenarios/swarm.cfg
M data/ai/micro_ais/scenarios/wolves.cfg
Log Message:
-----------
MAI test scenarios: remove uses of deprecated MESSAGE macro
(cherry-picked from commit 5e5a9e69e5e3b0323e39ebfb090cc060347f4516)
Commit: 382a650d9fd291ea73de033d8bdf2350ed67f0a2
https://github.com/wesnoth/wesnoth/commit/382a650d9fd291ea73de033d8bdf2350ed67f0a2
Author: doofus-01 <doofus-01 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/pathfinder-defend1.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/pathfinder-defend2.png
M data/campaigns/Under_the_Burning_Suns/images/units/quenoth/pathfinder.png
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Pathfinder.cfg
Log Message:
-----------
pathfinder defense animation
(cherry-picked from commit fc639f6cc00089b6549df37cc80981f15b5c01f8)
Commit: 1a953e1cbb161c3fadb0b41067ad5bda35fc8f66
https://github.com/wesnoth/wesnoth/commit/1a953e1cbb161c3fadb0b41067ad5bda35fc8f66
Author: doofus-01 <doofus-01 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/outrider-defend1.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/outrider-defend2.png
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Outrider.cfg
Log Message:
-----------
outrider defense animation
(cherry-picked from commit a943e1c55d69c433a7705271686bb32dad32cf8e)
Commit: 6be2579e5fca6b0cda61dc5d19c3a51161587ae2
https://github.com/wesnoth/wesnoth/commit/6be2579e5fca6b0cda61dc5d19c3a51161587ae2
Author: Thom Diment <mr.diment at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Northern_Rebirth/maps/05a_01_The_Pursuit.map
Log Message:
-----------
changed SE path to remove 1-hex bottlenecks
This allows player 3 to send more enemies against the human player sooner. If this is an issue, may be necessary to consider changing the scenario wml to delay this player spawning by a turn.
(cherry-picked from commit b7b6ff34dfd0ec17e50cdaf6b676a6477f71710a)
Commit: 0d674a09ce6fd4e080d1ba64cc92ccd8e67264db
https://github.com/wesnoth/wesnoth/commit/0d674a09ce6fd4e080d1ba64cc92ccd8e67264db
Author: doofus-01 <doofus-01 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/fighter-attack1.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/fighter-attack2.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/fighter-attack3.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/fighter-attack4.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/fighter-attack5.png
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Fighter.cfg
Log Message:
-----------
quenoth fighter attack animation
(cherry-picked from commit 90fefabc4e24b2ed99791c21d75c6d2c3eaf6c19)
Commit: e394ddd1c8fbebe0fdced3ffda60f6eddc2872ec
https://github.com/wesnoth/wesnoth/commit/e394ddd1c8fbebe0fdced3ffda60f6eddc2872ec
Author: doofus-01 <doofus-01 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Fighter.cfg
Log Message:
-----------
clean-up of unit cfg
(cherry-picked from commit 16d5bc50285705c5bf1dabc3dbdd0ec1e1707e04)
Commit: 448a20779ffdc7200c35cbb4f72795eb1ec8be48
https://github.com/wesnoth/wesnoth/commit/448a20779ffdc7200c35cbb4f72795eb1ec8be48
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/lua/backwards-compatibility.lua
M data/lua/wml-flow.lua
M data/lua/wml-utils.lua
M data/lua/wml/objectives.lua
Log Message:
-----------
Lua code: replace deprecated wesnoth.tovconfig() calls
(cherry-picked from commit 138107c8f6d9cfce6348fc262fbbe4f48d7d7cb8)
Commit: 05d5afa6a9c5cf1165f85946c96909f3a8e05802
https://github.com/wesnoth/wesnoth/commit/05d5afa6a9c5cf1165f85946c96909f3a8e05802
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/ai/scenarios/scenario-AI_Arena_small.cfg
M data/lua/core.lua
M data/lua/helper.lua
M data/lua/location_set.lua
M data/lua/wml-flow.lua
M data/lua/wml-tags.lua
M data/lua/wml-utils.lua
M data/lua/wml/modify_unit.lua
M data/lua/wml/set_variable.lua
M data/lua/wml/test_condition.lua
M data/multiplayer/eras.lua
M data/multiplayer/scenarios/2p_Dark_Forecast.lua
M data/scenario-test.cfg
M data/test/scenarios/ai/_main.cfg
M data/test/scenarios/recruit_facing.cfg
Log Message:
-----------
Lua code: replace deprecated wesnoth.get_variable() calls
(cherry-picked from commit f1764d182fe33c4e29c6bd42761be2e946cd0c94)
Commit: 76ec65102c981659555fa73e75c2ce3cd3956e78
https://github.com/wesnoth/wesnoth/commit/76ec65102c981659555fa73e75c2ce3cd3956e78
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/lua/core.lua
Log Message:
-----------
Prevent definition of wml.variables to cause deprecation warnings
(cherry-picked from commit 0f157bff27fd4db281695710c059b7898d394e8a)
Commit: 0e017d9f7c57104243bc47dd5afdced5df05943f
https://github.com/wesnoth/wesnoth/commit/0e017d9f7c57104243bc47dd5afdced5df05943f
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/lua/core.lua
M data/lua/helper.lua
M data/lua/location_set.lua
M data/lua/wml-flow.lua
M data/lua/wml-tags.lua
M data/lua/wml-utils.lua
M data/lua/wml/find_path.lua
M data/lua/wml/harm_unit.lua
M data/lua/wml/heal_unit.lua
M data/lua/wml/items.lua
M data/lua/wml/message.lua
M data/lua/wml/modify_unit.lua
M data/lua/wml/random_placement.lua
M data/lua/wml/set_variable.lua
M data/multiplayer/scenarios/2p_Dark_Forecast.lua
M data/multiplayer/scenarios/2p_Hornshark_Island.lua
M data/scenario-test.cfg
M data/test/scenarios/ai/_main.cfg
M data/test/scenarios/break_replay_with_lua_random.cfg
M data/test/scenarios/recruit_facing.cfg
M data/test/scenarios/test_clear.cfg
M data/test/scenarios/test_dofile.cfg
M data/test/scenarios/test_lua.cfg
M data/test/scenarios/test_lua_wml.cfg
M data/test/scenarios/test_menu_items.cfg
M data/test/scenarios/test_require.cfg
Log Message:
-----------
Lua code: replace deprecated wesnoth.set_variable() calls
(cherry-picked from commit ce7faae4f41f23f1d1f61d2b4f5ca95d4ce4f89a)
Commit: 8a4d1ad14548f3ba6ba66118fe744506c52d86bb
https://github.com/wesnoth/wesnoth/commit/8a4d1ad14548f3ba6ba66118fe744506c52d86bb
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/game_initialization/configure_engine.cpp
M src/game_initialization/mp_game_utils.cpp
M src/game_initialization/multiplayer.cpp
M src/game_initialization/playcampaign.cpp
M src/saved_game.cpp
M src/saved_game.hpp
M src/savegame.cpp
M src/savegame.hpp
M src/tests/test_mp_connect.cpp
Log Message:
-----------
Saved Game: reame "starting pos" to "starting point" to avoid confusion
The old name was too easy to confuse with a side's map staring position, something
I've done several times.
(cherry-picked from commit 8f93d0a7c67f77e3917c5a24c55a9d450579a423)
Commit: a0decde7b98e2145dee73144afd112fbce304104
https://github.com/wesnoth/wesnoth/commit/a0decde7b98e2145dee73144afd112fbce304104
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/lua/core.lua
M data/test/scenarios/test_clear.cfg
Log Message:
-----------
Lua code: replace deprecated wesnoth.get_all_vars() calls
(cherry-picked from commit 64f7ad256022426040ef9e13ad7941b6bec789a8)
Commit: da0f6c073fc12b37cde58aacfebe1b6977d4caf1
https://github.com/wesnoth/wesnoth/commit/da0f6c073fc12b37cde58aacfebe1b6977d4caf1
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/scenario-test.cfg
Log Message:
-----------
Lua code: replace deprecated helper.get_variable_proxy_array() call
(cherry-picked from commit f153279e87aa8b5a22c3f0d371bb40d9580f09eb)
Commit: 58529e95f8ec0c08e8dc28fca89ed01bcee38050
https://github.com/wesnoth/wesnoth/commit/58529e95f8ec0c08e8dc28fca89ed01bcee38050
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/ai/lua/ai_helper.lua
M data/ai/lua/generic_recruit_engine.lua
M data/ai/lua/retreat.lua
M data/ai/micro_ais/cas/ca_assassin_move.lua
M data/ai/micro_ais/cas/ca_big_animals.lua
M data/ai/micro_ais/cas/ca_coward.lua
M data/ai/micro_ais/cas/ca_fast_attack_utils.lua
M data/ai/micro_ais/cas/ca_fast_combat.lua
M data/ai/micro_ais/cas/ca_fast_combat_leader.lua
M data/ai/micro_ais/cas/ca_forest_animals_move.lua
M data/ai/micro_ais/cas/ca_goto.lua
M data/ai/micro_ais/cas/ca_hang_out.lua
M data/ai/micro_ais/cas/ca_healer_initialize.lua
M data/ai/micro_ais/cas/ca_healer_move.lua
M data/ai/micro_ais/cas/ca_herding_attack_close_enemy.lua
M data/ai/micro_ais/cas/ca_herding_dog_move.lua
M data/ai/micro_ais/cas/ca_herding_dog_stopmove.lua
M data/ai/micro_ais/cas/ca_herding_f_herding_area.lua
M data/ai/micro_ais/cas/ca_herding_herd_sheep.lua
M data/ai/micro_ais/cas/ca_herding_sheep_move.lua
M data/ai/micro_ais/cas/ca_herding_sheep_runs_dog.lua
M data/ai/micro_ais/cas/ca_herding_sheep_runs_enemy.lua
M data/ai/micro_ais/cas/ca_hunter.lua
M data/ai/micro_ais/cas/ca_lurkers.lua
M data/ai/micro_ais/cas/ca_messenger_attack.lua
M data/ai/micro_ais/cas/ca_messenger_escort_move.lua
M data/ai/micro_ais/cas/ca_messenger_f_next_waypoint.lua
M data/ai/micro_ais/cas/ca_patrol.lua
M data/ai/micro_ais/cas/ca_return_guardian.lua
M data/ai/micro_ais/cas/ca_simple_attack.lua
M data/ai/micro_ais/cas/ca_stationed_guardian.lua
M data/ai/micro_ais/cas/ca_wolves_move.lua
M data/ai/micro_ais/cas/ca_wolves_wander.lua
M data/ai/micro_ais/cas/ca_zone_guardian.lua
M data/ai/micro_ais/mai-defs/animals.lua
M data/ai/micro_ais/mai-defs/escort.lua
M data/ai/micro_ais/mai-defs/guardian.lua
M data/ai/micro_ais/mai-defs/patrol.lua
M data/ai/micro_ais/micro_ai_helper.lua
M join.lua
Log Message:
-----------
Lua code: replace deprecated helper.get_child() calls
(cherry-picked from commit f0bb40590fe1a9c2c6683157f9aa93b631848251)
Commit: 4586e04eca8e898724757c887c87ad6dc666b7b4
https://github.com/wesnoth/wesnoth/commit/4586e04eca8e898724757c887c87ad6dc666b7b4
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/ai/lua/battle_calcs.lua
M data/ai/lua/generic_recruit_engine.lua
M data/ai/lua/retreat.lua
M data/ai/micro_ais/cas/ca_fast_attack_utils.lua
M data/ai/micro_ais/cas/ca_hang_out.lua
M data/ai/micro_ais/cas/ca_protect_unit_attack.lua
M data/ai/micro_ais/cas/ca_protect_unit_finish.lua
M data/ai/micro_ais/cas/ca_protect_unit_move.lua
M data/ai/micro_ais/cas/ca_recruit_random.lua
M data/ai/micro_ais/mai-defs/protect.lua
M data/ai/micro_ais/micro_ai_helper.lua
M data/ai/micro_ais/micro_ai_self_data.lua
M data/ai/micro_ais/micro_ai_unit_variables.lua
M data/multiplayer/scenarios/2p_Dark_Forecast.lua
Log Message:
-----------
Lua code: replace deprecated helper.child_range() calls
(cherry-picked from commit 7c137e1a336559acdd6f797192a9516135480b2e)
Commit: f48f566afd51e8200219cc488c97cf86d8f1d2f0
https://github.com/wesnoth/wesnoth/commit/f48f566afd51e8200219cc488c97cf86d8f1d2f0
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/ai/micro_ais/cas/ca_forest_animals_move.lua
M data/ai/micro_ais/cas/ca_forest_animals_new_rabbit.lua
M data/ai/micro_ais/engines/priority_target_engine.lua
M data/multiplayer/scenarios/2p_Dark_Forecast.lua
M data/test/scenarios/ai/_main.cfg
Log Message:
-----------
Lua code: replace deprecated helper.[gs]et_variable_array() calls
(cherry-picked from commit 3c792fc7d774c96ef467847a6267a71a2f731f96)
Commit: 49b1ef95499a6a9305f9184e7db0471019e94eb7
https://github.com/wesnoth/wesnoth/commit/49b1ef95499a6a9305f9184e7db0471019e94eb7
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/ai/scenarios/scenario-AI_Arena_small.cfg
Log Message:
-----------
Lua code: remove deprecated helper.set_wml_var_metatable() call
It’s not needed here.
(cherry-picked from commit 08a000a7daabb74f6dd7370c1b2b95f3e83e5501)
Commit: cb1bc56478c8fdf5aa3e409e77ed9b5199cfb11f
https://github.com/wesnoth/wesnoth/commit/cb1bc56478c8fdf5aa3e409e77ed9b5199cfb11f
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/ai/lua/generic_recruit_engine.lua
M data/ai/lua/generic_rush_engine.lua
M data/ai/micro_ais/cas/ca_forest_animals_move.lua
M data/ai/micro_ais/cas/ca_forest_animals_new_rabbit.lua
M data/ai/micro_ais/cas/ca_hunter.lua
M data/ai/scenarios/scenario-AI_Arena_small.cfg
M data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg
M data/test/scenarios/interrupts.cfg
Log Message:
-----------
Remove unnecessary inclusions of helper.set_wml_action_metatable {}
(cherry-picked from commit 1684e2f5daa6b84906186b101c83a6a017b07581)
Commit: 1c88a6d8c87d999753521c372ede80da59075793
https://github.com/wesnoth/wesnoth/commit/1c88a6d8c87d999753521c372ede80da59075793
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/ai/lua/generic_recruit_engine.lua
M data/ai/lua/generic_rush_engine.lua
M data/ai/micro_ais/cas/ca_fast_attack_utils.lua
M data/ai/micro_ais/cas/ca_fast_combat.lua
M data/ai/micro_ais/cas/ca_forest_animals_move.lua
M data/ai/micro_ais/cas/ca_forest_animals_new_rabbit.lua
M data/ai/micro_ais/cas/ca_hang_out.lua
M data/ai/micro_ais/cas/ca_healer_initialize.lua
M data/ai/micro_ais/cas/ca_healer_move.lua
M data/ai/micro_ais/cas/ca_herding_attack_close_enemy.lua
M data/ai/micro_ais/cas/ca_herding_dog_move.lua
M data/ai/micro_ais/cas/ca_herding_dog_stopmove.lua
M data/ai/micro_ais/cas/ca_herding_herd_sheep.lua
M data/ai/micro_ais/cas/ca_herding_sheep_runs_dog.lua
M data/ai/micro_ais/cas/ca_herding_sheep_runs_enemy.lua
M data/ai/micro_ais/cas/ca_lurkers.lua
M data/ai/micro_ais/cas/ca_messenger_escort_move.lua
M data/ai/micro_ais/cas/ca_messenger_f_next_waypoint.lua
M data/ai/micro_ais/cas/ca_patrol.lua
M data/ai/micro_ais/cas/ca_protect_unit_attack.lua
M data/ai/micro_ais/cas/ca_protect_unit_finish.lua
M data/ai/micro_ais/cas/ca_protect_unit_move.lua
M data/ai/micro_ais/cas/ca_return_guardian.lua
M data/ai/micro_ais/cas/ca_simple_attack.lua
M data/ai/micro_ais/cas/ca_wolves_move.lua
M data/ai/micro_ais/cas/ca_wolves_wander.lua
M data/ai/micro_ais/mai-defs/fast.lua
M data/ai/micro_ais/mai-defs/recruiting.lua
M data/ai/micro_ais/micro_ai_self_data.lua
M data/ai/micro_ais/micro_ai_unit_variables.lua
M data/ai/scenarios/scenario-AI_Arena_small.cfg
M data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg
M data/campaigns/Legend_of_Wesmere/lua/wml_tags.lua
M data/campaigns/tutorial/lua/character_selection.lua
M data/scenario-test.cfg
M data/test/scenarios/ai/_main.cfg
M data/test/scenarios/interrupts.cfg
M join.lua
Log Message:
-----------
Do not load helper.lua where it is not used any more
(cherry-picked from commit 4b6681a300f29eab3b5adcf3b12df8bc6ad455dd)
Commit: 7afb8a8a41bc506c179469672f244d10548ef8c0
https://github.com/wesnoth/wesnoth/commit/7afb8a8a41bc506c179469672f244d10548ef8c0
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/tools/wmllint
Log Message:
-----------
wmllint: add campaign abilites & specials
So far only stun was in the list
[ci skip]
(cherry-picked from commit ed46bc1d2b605befac33724bc396b2859e4b7e3a)
Commit: 2b436c1530c5113cbe2127836ea7ac138f0b62cb
https://github.com/wesnoth/wesnoth/commit/2b436c1530c5113cbe2127836ea7ac138f0b62cb
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/actions/attack.cpp
M src/units/unit.cpp
M src/units/unit.hpp
Log Message:
-----------
Allow modifying dead units in last_breath and die event handlers
Fixes an unintentional API change from commit 3c344e8da502b92d3feefc7d1690c29a3a2c76ec, discussed in
comments of #3042.
(cherry-picked from commit 15446acb2ad1fd7990e52e7194480820c4923596)
Commit: 32dc3cc953143d6d000d0daf4bcfc38578329d03
https://github.com/wesnoth/wesnoth/commit/32dc3cc953143d6d000d0daf4bcfc38578329d03
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Northern_Rebirth/maps/02_01_Infested_Caves.map
M data/campaigns/Northern_Rebirth/scenarios/02_01_Infested_Caves.cfg
Log Message:
-----------
NR S2: balance imporvements between AIs
* castle of the southwestern leader has been moved down a bit
* fixup for gate event and troll die event not properly working
* give dwarves more gold if they are in trouble, increased income of trolls
* added micro AIs, currently not working as expected
* other minor map edits
* removed patch 9b9aa13 for #3073, the village had been moved down one hex
for visual reasons
[ci skip]
(cherry-picked from commit fd9fc26ca00a526f1ff266faab6c5283e2e7ee73)
Commit: 841e5c6b06f55b76691cccd019f639881c99778c
https://github.com/wesnoth/wesnoth/commit/841e5c6b06f55b76691cccd019f639881c99778c
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Delfadors_Memoirs/utils/sides.cfg
M data/scenario-test.cfg
M data/test/scenarios/characterize_pathfinding.cfg
Log Message:
-----------
Replace remaining uses of FOREACH macro
(cherry-picked from commit 66b9e11a2d99761847ab26a54fdf959e4dfbe1dc)
Commit: 64442ea04170b805ba91fab7303d9ab1c0dbb39d
https://github.com/wesnoth/wesnoth/commit/64442ea04170b805ba91fab7303d9ab1c0dbb39d
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/core/canvas.cpp
Log Message:
-----------
GUI2/Canvas: simplify clear_shapes logic
(cherry-picked from commit 10e43a6642df0496beda23f891fd5cd334270921)
Commit: 67289fa56e4698c781c21a92c2609df72414c60e
https://github.com/wesnoth/wesnoth/commit/67289fa56e4698c781c21a92c2609df72414c60e
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/VC14/campaignd.vcxproj
M projectfiles/VC14/wesnoth.vcxproj
M projectfiles/VC14/wesnothd.vcxproj
Log Message:
-----------
Fixup 2a585118d8b6c (forgot to bump defines on all configurations)
[ci skip]
(cherry-picked from commit 946e9c31b453611271491eddf6f12437863a75b5)
Commit: 5d18e8274bf70ee540b65e9c411a5a37ed0793ea
https://github.com/wesnoth/wesnoth/commit/5d18e8274bf70ee540b65e9c411a5a37ed0793ea
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/server/server.cpp
Log Message:
-----------
Wesnothd: dropped a giant block of commented-out code
This is a relic from the old pro-Boost ASIO implementation.
(cherry-picked from commit b623e7a647d7c88f4113b8bddcd6867ea7eb67e0)
Commit: fc9e086b0fd9c01a15900bccf6ff8c55fee8c720
https://github.com/wesnoth/wesnoth/commit/fc9e086b0fd9c01a15900bccf6ff8c55fee8c720
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/server/server.cpp
Log Message:
-----------
Wesnothd: formatting cleanup
(cherry-picked from commit 9a2d09f97ef62dd732aecc8887b488020dce58f4)
Commit: f89596344ab344d713571043b07983feeb6647fe
https://github.com/wesnoth/wesnoth/commit/f89596344ab344d713571043b07983feeb6647fe
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/server/server.cpp
Log Message:
-----------
Wesnothd: minor code cleanup
(cherry-picked from commit 2d600d10dcca7eebe83f35623b0014d574f225b9)
Commit: d7c62247184945d809b2cff011d951ae9c744818
https://github.com/wesnoth/wesnoth/commit/d7c62247184945d809b2cff011d951ae9c744818
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Northern_Rebirth/scenarios/02_01_Infested_Caves.cfg
Log Message:
-----------
NR S2: fix filters for Micro AIs
and allow L2 recruits if the dwarves are under attack in late game.
[ci skip]
(cherry-picked from commit ddaf9f5a877c1939ac8ec4fdb3de28d2146876e3)
Commit: 3f3253576cc5ce993a89fcc125e184eb03632ac7
https://github.com/wesnoth/wesnoth/commit/3f3253576cc5ce993a89fcc125e184eb03632ac7
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/game_events/pump.cpp
M src/game_events/pump.hpp
M src/units/unit.cpp
Log Message:
-----------
Throw a Lua exception when creating a negative-HP unit in a Lua context
Instead of throwing a WML error. This allows the UMC author to get a stack
trace if the unit creation was triggered from Lua.
Requested by @gfgtdf in a comment of #3042.
(cherry-picked from commit 258a0e4689e9c000e3e0017ceed5e120156883ae)
Commit: c249a7879647fae3a8b4e739d9b167aa0e030447
https://github.com/wesnoth/wesnoth/commit/c249a7879647fae3a8b4e739d9b167aa0e030447
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-editor/es.po
M po/wesnoth-help/es.po
M po/wesnoth-lib/es.po
M po/wesnoth-manpages/es.po
Log Message:
-----------
updated Spanish translation
(cherry-picked from commit 2d9e02cffa1ae5146632c4ddbcc9e379648f6bb5)
Commit: e9990f7b6e58ea203eda6481918e0a2175d92b88
https://github.com/wesnoth/wesnoth/commit/e9990f7b6e58ea203eda6481918e0a2175d92b88
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/multiplayer/mp_options_helper.cpp
M src/saved_game.cpp
Log Message:
-----------
Revert "Save custom options data in a more concise way"
This reverts commit e3db7cc225618ab013ad25d94909ff50f04fb67b. Turns out the
id = value syntax did not work for options in an array since '.' is not a
valid config key name.
(cherry-picked from commit 1097bad28c79810a40a04c840a19184a68314a9b)
Commit: 86f6debd57b84a11fa3c7732aaca27e45b874951
https://github.com/wesnoth/wesnoth/commit/86f6debd57b84a11fa3c7732aaca27e45b874951
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/server/send_receive_wml_helpers.ipp
M src/server/server_base.hpp
Log Message:
-----------
Convert a few remaining cases of boost::uint32_t to uint32_t
(cherry-picked from commit ba6fa1e46bb33b69c76d223898e4d448df74087d)
Commit: 461ce4975d0e2ddd0bdbb7aa5715e0fb996ce50d
https://github.com/wesnoth/wesnoth/commit/461ce4975d0e2ddd0bdbb7aa5715e0fb996ce50d
Author: Pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M CMakeLists.txt
M src/CMakeLists.txt
Log Message:
-----------
Don't require SDL2 or OGL for building the servers.
Requiring SDL2 was masking needing to add -lpthread explicitly.
(cherry-picked from commit fd34fe849770de379096ac1ffe612fb22473a846)
Commit: da76017d263d951cf50b75bd7343d6d15a9ad06a
https://github.com/wesnoth/wesnoth/commit/da76017d263d951cf50b75bd7343d6d15a9ad06a
Author: Aaron Winter <winter.aaron93 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Son_Of_The_Black_Eye/scenarios/01_End_of_Peace.cfg
M data/campaigns/Son_Of_The_Black_Eye/scenarios/17_The_Human_Attack.cfg
Log Message:
-----------
SotBE: Changed a few dates to fit the tweaked timeline from the forums
Discussed in detail in https://forums.wesnoth.org/viewtopic.php?f=12&t=46460
(cherry-picked from commit 77fd148f063c06866e4c7bd56451afd35bf8d448)
Commit: 3b89e7f7e9a86ca3579d06989c430efb5ce81eb7
https://github.com/wesnoth/wesnoth/commit/3b89e7f7e9a86ca3579d06989c430efb5ce81eb7
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/CodeBlocks/wesnoth.cbp
M projectfiles/VC14/wesnothlib.vcxproj
M projectfiles/VC14/wesnothlib.vcxproj.filters
M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
M source_lists/libwesnoth_core
A src/gettext.cpp
R src/gettext_boost.cpp
Log Message:
-----------
Rename gettext_boost.cpp to gettext.cpp
Since there isn't another version anymore.
(cherry-picked from commit e0beff6615288a580553ee43ff3799a9794625b4)
Commit: a907ed4638dd946230a2915ea971dfced553ecdb
https://github.com/wesnoth/wesnoth/commit/a907ed4638dd946230a2915ea971dfced553ecdb
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/actions/attack.cpp
Log Message:
-----------
Allow modifying dead units in more event handlers
Namely attacker_hits, attacker_misses, defender_hits and defender_misses.
(cherry-picked from commit 9110e49760e40d9856b96f884f3c1636e034768c)
Commit: 90f9fb9ea51fc134b44e8d1d871d745da94252f6
https://github.com/wesnoth/wesnoth/commit/90f9fb9ea51fc134b44e8d1d871d745da94252f6
Author: Wedge009 <wedge009 at wedge009.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/units.cfg
M utils/pofix.py
Log Message:
-----------
Revert "Revert "'moreso' isn't a word in any dialect of English.""
This reverts commit 4d5a3de4e63ebaac4a853b0f724d1d342d451dd0.
Restoring correction at @Vultraz's request.
[ci skip]
(cherry-picked from commit e161d59536452ca78897d92cb2eaae2099228075)
Commit: 885baa1e68d6a809881512856c792965cfdea90f
https://github.com/wesnoth/wesnoth/commit/885baa1e68d6a809881512856c792965cfdea90f
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Northern_Rebirth/scenarios/02_01_Infested_Caves.cfg
Log Message:
-----------
NR S2: let Hammel not take part in combat
All this trouble is about keeping him alive after all.
And fix a spelling mistake resuling in always false.
[ci skip]
(cherry-picked from commit 3730ff9738ee4eb2b9058c131490405957c62954)
Commit: 4934cd6526540714b45a81835b797ff3de26a1f8
https://github.com/wesnoth/wesnoth/commit/4934cd6526540714b45a81835b797ff3de26a1f8
Author: doofus-01 <doofus-01 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/nym-sword0.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/nym-sword1.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/nym-sword2.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/nym-sword3.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/nym-sword4.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/nym-sword5.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/nym-sword6.png
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Youth.cfg
Log Message:
-----------
Nym sword attack animation
(cherry-picked from commit 29f97cd2fe901e98da10f5a3164157881df93fdd)
Commit: a9449c1c879267fecefa97a2be2af219c3dde666
https://github.com/wesnoth/wesnoth/commit/a9449c1c879267fecefa97a2be2af219c3dde666
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-editor/cs.po
M po/wesnoth-help/cs.po
M po/wesnoth-lib/cs.po
M po/wesnoth-manpages/cs.po
Log Message:
-----------
updated Czech translation
(cherry-picked from commit 20532e33820fe430a2b70bbc676c1175f2ba7a36)
Commit: 418bca055671094160497825882bc388e1179d76
https://github.com/wesnoth/wesnoth/commit/418bca055671094160497825882bc388e1179d76
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-help/en_GB.po
M po/wesnoth-lib/en_GB.po
M po/wesnoth-nr/en_GB.po
M po/wesnoth-sotbe/en_GB.po
M po/wesnoth-tutorial/en_GB.po
M po/wesnoth-utbs/en_GB.po
M po/wesnoth/en_GB.po
Log Message:
-----------
updated British English translation
(cherry-picked from commit 2efd2c1d30a368e66b96a34aec8d1c5176b5de06)
Commit: 4e18e2b1a18c114a4b1eadd88b1de290c7f79d8b
https://github.com/wesnoth/wesnoth/commit/4e18e2b1a18c114a4b1eadd88b1de290c7f79d8b
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-ei/fr.po
M po/wesnoth-sota/fr.po
M po/wesnoth-tsg/fr.po
Log Message:
-----------
updated French translation
(cherry-picked from commit 20f92c383829ca2586c2d741afe7e492611968dd)
Commit: 5e6d969bd4a5d92d904422a83f2c028819cae85d
https://github.com/wesnoth/wesnoth/commit/5e6d969bd4a5d92d904422a83f2c028819cae85d
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-editor/gl.po
M po/wesnoth-help/gl.po
M po/wesnoth-lib/gl.po
M po/wesnoth-manpages/gl.po
M po/wesnoth-nr/gl.po
M po/wesnoth-sotbe/gl.po
M po/wesnoth-tutorial/gl.po
M po/wesnoth-utbs/gl.po
M po/wesnoth/gl.po
Log Message:
-----------
updated Galician translation
(cherry-picked from commit 83e1f6ad1cfbedaa93fd7e1341e79b9ba407d505)
Commit: 0ece26f208432201dc5ae46d197dde24c9919435
https://github.com/wesnoth/wesnoth/commit/0ece26f208432201dc5ae46d197dde24c9919435
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-ai/it.po
M po/wesnoth-editor/it.po
M po/wesnoth-help/it.po
M po/wesnoth-lib/it.po
M po/wesnoth-manpages/it.po
M po/wesnoth-nr/it.po
M po/wesnoth-sotbe/it.po
M po/wesnoth-tutorial/it.po
M po/wesnoth-utbs/it.po
M po/wesnoth/it.po
Log Message:
-----------
updated Italian translation
(cherry-picked from commit 7877bc3ef4dd53164da4303fa1f47859c8a8bc93)
Commit: c4531723f01d96ef31b91dd8e8ecd4f89c80a4fd
https://github.com/wesnoth/wesnoth/commit/c4531723f01d96ef31b91dd8e8ecd4f89c80a4fd
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Heir_To_The_Throne/images/maps/l10n/it/httt--overlay.png
M data/campaigns/The_Rise_Of_Wesnoth/images/maps/l10n/it/green_isle--overlay.png
M data/core/images/maps/l10n/it/titlescreen--overlay.png
M po/wesnoth-help/it.po
M po/wesnoth-httt/it.po
M po/wesnoth-manual/it.po
M po/wesnoth-sotbe/it.po
M po/wesnoth-tsg/it.po
M po/wesnoth-tutorial/it.po
M po/wesnoth-units/it.po
Log Message:
-----------
updated Italian translation
(cherry-picked from commit 63bac52b71ed04ffd124a940a680e82dad261b12)
Commit: ab702fe19da5a74517381672ecea1f744923302d
https://github.com/wesnoth/wesnoth/commit/ab702fe19da5a74517381672ecea1f744923302d
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-ai/zh_CN.po
M po/wesnoth-anl/zh_CN.po
M po/wesnoth-aoi/zh_CN.po
M po/wesnoth-did/zh_CN.po
M po/wesnoth-dm/zh_CN.po
M po/wesnoth-dw/zh_CN.po
M po/wesnoth-editor/zh_CN.po
M po/wesnoth-ei/zh_CN.po
M po/wesnoth-help/zh_CN.po
M po/wesnoth-httt/zh_CN.po
M po/wesnoth-l/zh_CN.po
M po/wesnoth-lib/zh_CN.po
M po/wesnoth-low/zh_CN.po
M po/wesnoth-manpages/zh_CN.po
M po/wesnoth-manual/zh_CN.po
M po/wesnoth-multiplayer/zh_CN.po
M po/wesnoth-nr/zh_CN.po
M po/wesnoth-sof/zh_CN.po
M po/wesnoth-sota/zh_CN.po
M po/wesnoth-sotbe/zh_CN.po
M po/wesnoth-tb/zh_CN.po
M po/wesnoth-test/zh_CN.po
M po/wesnoth-thot/zh_CN.po
M po/wesnoth-trow/zh_CN.po
M po/wesnoth-tsg/zh_CN.po
M po/wesnoth-tutorial/zh_CN.po
M po/wesnoth-units/zh_CN.po
M po/wesnoth-utbs/zh_CN.po
M po/wesnoth/zh_CN.po
Log Message:
-----------
updated Chinese (Simplified) translation
(cherry-picked from commit 1b7d8b2f604a68df27d18d2f66255f74d4a12f02)
Commit: ab36d7b60093a60a4b64aa12e023b9fe9358e004
https://github.com/wesnoth/wesnoth/commit/ab36d7b60093a60a4b64aa12e023b9fe9358e004
Author: Celtic Minstrel <CelticMinstrel at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/lua/wml/random_placement.lua
Log Message:
-----------
Support [break], [continue], and [return] in [random_placement]
(cherry-picked from commit 4a3508f13fea69b5cafdfa2d46a99caec201d6e5)
Commit: d58ff8dd0d9b7165f0580acf7e52029fa837614e
https://github.com/wesnoth/wesnoth/commit/d58ff8dd0d9b7165f0580acf7e52029fa837614e
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/widgets/listbox.cpp
Log Message:
-----------
Listbox: don't try to keep the selected item visible (#3016)
@Vultraz stated in Discord that list box should keep the scroll position
instead.
Resolves #3016.
(cherry-picked from commit 3deef64439e0ae8d762fb76bafd46bb3fea0cb16)
Commit: 90c311b4270be7b856c9d28462827e4f67dd0225
https://github.com/wesnoth/wesnoth/commit/90c311b4270be7b856c9d28462827e4f67dd0225
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M players_changelog.md
Log Message:
-----------
Changelog entry for commit 3deef64439e0ae8d762fb76bafd46bb3fea0cb16
[ci skip]
(cherry-picked from commit c68a7ba5f61481240644ee39f0412f9ffcb354d2)
Commit: f2c1744f3a9370c1939022a4db3afa07446d5ac2
https://github.com/wesnoth/wesnoth/commit/f2c1744f3a9370c1939022a4db3afa07446d5ac2
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/widgets/listbox.cpp
Log Message:
-----------
Fix build with -Werror=unused-variable
(cherry-picked from commit a388c2d891b77645f62999e550740ed772f7b24b)
Commit: a6d7835228a876c0c6c14717232182ade9105adf
https://github.com/wesnoth/wesnoth/commit/a6d7835228a876c0c6c14717232182ade9105adf
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
A data/campaigns/Heir_To_The_Throne/images/maps/l10n/zh_CN/httt--overlay.png
A data/core/images/maps/l10n/zh_CN/titlescreen--overlay.png
M po/wesnoth-dm/zh_CN.po
M po/wesnoth-ei/zh_CN.po
M po/wesnoth-help/zh_CN.po
M po/wesnoth-httt/zh_CN.po
M po/wesnoth-l/zh_CN.po
M po/wesnoth-low/zh_CN.po
M po/wesnoth-manual/zh_CN.po
M po/wesnoth-multiplayer/zh_CN.po
M po/wesnoth-sof/zh_CN.po
M po/wesnoth-sota/zh_CN.po
M po/wesnoth-trow/zh_CN.po
Log Message:
-----------
updated Chinese (Simplified) translation
(cherry-picked from commit 71a6488419f1e19226f49eaa83e64f7b880157da)
Commit: 19a776adf76845e5b076efe5b30262e46a9579fb
https://github.com/wesnoth/wesnoth/commit/19a776adf76845e5b076efe5b30262e46a9579fb
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-help/es.po
M po/wesnoth-lib/es.po
M po/wesnoth-nr/es.po
M po/wesnoth-sotbe/es.po
M po/wesnoth-tutorial/es.po
M po/wesnoth-utbs/es.po
M po/wesnoth/es.po
Log Message:
-----------
updated Spanish translation
(cherry-picked from commit 132f67395a62bdafe54ce28c52e4fb8a00f8d88f)
Commit: 24889d7da7db8631a85d53595a2fe01871728229
https://github.com/wesnoth/wesnoth/commit/24889d7da7db8631a85d53595a2fe01871728229
Author: Martin Hrubý (hrubymar10) <hrubymar10 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
Log Message:
-----------
Xcode enable all warnings in DEBUG scheme
(cherry-picked from commit d19a82801faf6d9bdc23adb167cbd13b8b468b70)
Commit: ac3ab605aa38f9636fb52a9d77417d253fba3fb7
https://github.com/wesnoth/wesnoth/commit/ac3ab605aa38f9636fb52a9d77417d253fba3fb7
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/commandline_options.cpp
Log Message:
-----------
Sort command-line options so the comment isn't lying
(cherry-picked from commit 5e28c13b8710322117e53aea32888bff1d96bb4e)
Commit: 6177d4ae0a4e81f61666ea49fde640bad3ecf4f6
https://github.com/wesnoth/wesnoth/commit/6177d4ae0a4e81f61666ea49fde640bad3ecf4f6
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/commandline_options.cpp
M src/commandline_options.hpp
M src/game_launcher.cpp
M src/language.cpp
M src/language.hpp
Log Message:
-----------
Add a command-line option to show incomplete translations in the language list
(cherry-picked from commit fc74e782b7e5afc9a842f231655d48e42d63f4e6)
Commit: b3cf3cacbd9df058b5b8bf7df1127ef11cb62814
https://github.com/wesnoth/wesnoth/commit/b3cf3cacbd9df058b5b8bf7df1127ef11cb62814
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/language.cpp
Log Message:
-----------
Remove now-obsolete compile flag for disabling translation completion filtering
(cherry-picked from commit b28c61c6dca0c4ed7b64bcfaec9896e37954169f)
Commit: b36ca170bd12dd9eeefdf1f74f5a55dc866d1eae
https://github.com/wesnoth/wesnoth/commit/b36ca170bd12dd9eeefdf1f74f5a55dc866d1eae
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Update changelog
(cherry-picked from commit 51f6f52709606082bb204915e28c3ef3b63da659)
Commit: c9c869b72bb89d8d63044ab95cd65c18ef1a4a49
https://github.com/wesnoth/wesnoth/commit/c9c869b72bb89d8d63044ab95cd65c18ef1a4a49
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M doc/man/wesnoth.6
Log Message:
-----------
Documentation for the translation completeness command-line flags
(cherry-picked from commit 691435ed4c5d2a7cb386971288a117e1e94ac569)
Commit: 96b323657fe6ec2fa08777ff2d389337bb64d022
https://github.com/wesnoth/wesnoth/commit/96b323657fe6ec2fa08777ff2d389337bb64d022
Author: Pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/about.cfg
A data/core/images/units/dunefolk/wyvern-rider.png
A data/core/images/units/monsters/jinn.png
A data/core/images/units/monsters/wild-wyvern.png
A data/core/images/units/monsters/young-roc-attack.png
A data/core/images/units/monsters/young-roc.png
M data/core/units.cfg
A data/core/units/dunefolk/Wyvern_Rider.cfg
A data/core/units/monsters/Jinn.cfg
A data/core/units/monsters/Roc.cfg
A data/core/units/monsters/Wild_Wyvern.cfg
A data/core/units/monsters/Young_Roc.cfg
Log Message:
-----------
Add new units as discussed on the forums.
See https://forums.wesnoth.org/viewtopic.php?f=32&t=47721&start=450#p625660
All images but the young roc/roc would remain under the GPL, since Kwandulin based them on images by Sleepwalker and I wasn't able to contact him about using the CC BY-SA for them. The young roc base and attack sprites are under the CC BY-SA, and are by Vyncyn(forum username).
(cherry-picked from commit 16bfab0b0a9a0d95c3c66d2adb3ab6b535ec2799)
Commit: 5224eefa77890995816dc65da38ab2dcc86cc940
https://github.com/wesnoth/wesnoth/commit/5224eefa77890995816dc65da38ab2dcc86cc940
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/game_initialization/create_engine.cpp
M src/saved_game.cpp
M src/saved_game.hpp
Log Message:
-----------
fix require_scenario=yes not working with map_generation
this fixes require_scenario=yes for scenarios that use map_generation or
scenario_generation, the problem was that create_engine does not call
saved_game::expand_scenario for random maps, (which is the function that
checks require_scenario=yes)
fixes #3105
(cherry-picked from commit a10287c5c2a49ff248f218c11f4061e472090089)
Commit: 4b93e0db422e215eec6e84926459b3727cd1c623
https://github.com/wesnoth/wesnoth/commit/4b93e0db422e215eec6e84926459b3727cd1c623
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_Hammer_of_Thursagan/scenarios/02_Reclaiming_the_Past.cfg
Log Message:
-----------
THoT S2: fixed misspelled event name (fixes #3131)
[ci skip]
(cherry-picked from commit 91150f25043386454d62f1956da0df134ab1ce86)
Commit: 155e9f377a207388cec2e7968201e5d74b920ba0
https://github.com/wesnoth/wesnoth/commit/155e9f377a207388cec2e7968201e5d74b920ba0
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/serialization/preprocessor.cpp
Log Message:
-----------
Fix preprocessor error with deprecated macros intended to be used as an attribute value
(cherry-picked from commit c9d58328458fec55ce88e7843a770dc37a200651)
Commit: e59a50b2f5048b1f35d76322bb3d626cacc358e5
https://github.com/wesnoth/wesnoth/commit/e59a50b2f5048b1f35d76322bb3d626cacc358e5
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/game_config_manager.cpp
Log Message:
-----------
fix require_resource in [resource]
previously https://github.com/wesnoth/wesnoth/blob/918cdfcb36054e04c6663e903c731943e823ddc2/src/saved_game.cpp#L293 would fail for [resource] because cfg["addon_id"] was empty.
(cherry-picked from commit 7ef9f9a18fdb25b993e0a2b3f533b0f4d04dc53f)
Commit: c1319349b3bda73276ec423f9b300254a813f6ac
https://github.com/wesnoth/wesnoth/commit/c1319349b3bda73276ec423f9b300254a813f6ac
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M data/lua/wml-tags.lua
Log Message:
-----------
Fix [change_theme] crashing when theme= isn't specified
Leaving theme= unspecified ought to have the same effect as providing it
and setting it to an empty string. Without the check for a nil value,
however, it would result in a crash like this:
20180519 22:31:54 error scripting/lua: lua/wml-tags.lua:922: bad argument #3 to '__newindex' (string expected, got nil)
stack traceback:
[C]: in metamethod '__newindex'
lua/wml-tags.lua:922: in local 'cmd'
lua/wml-utils.lua:145: in field 'handle_event_commands'
lua/wml-flow.lua:6: in function <lua/wml-flow.lua:5>
(cherry-picked from commit e82d811ab09ba2b6933fa3d12c9872f56369db51)
Commit: 90be81c7bc3c69bb9de3f8f731b5bdb69a987efd
https://github.com/wesnoth/wesnoth/commit/90be81c7bc3c69bb9de3f8f731b5bdb69a987efd
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/whiteboard/recall.cpp
M src/whiteboard/recruit.cpp
M src/whiteboard/utility.cpp
M src/whiteboard/utility.hpp
Log Message:
-----------
wb: fix handling of extra_recruit and [filter_recall]
fixes #3100
(cherry-picked from commit 5785ef7925d13381593176c1bfc532403221e65a)
Commit: 0e3514d4cd40960ec713a6dc3bddfd62091e8423
https://github.com/wesnoth/wesnoth/commit/0e3514d4cd40960ec713a6dc3bddfd62091e8423
Author: doofus-01 <doofus-01 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-sword1.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-sword2.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-sword3.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-sword4.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-sword5.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-sword6.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-sword7.png
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Youth.cfg
Log Message:
-----------
kaleh sword animation
(cherry-picked from commit c585ac4462b32634c5b8ef88f643e930c60a7a5c)
Commit: 6eb3b7ee258f10721a5c0a875af8602122d59e55
https://github.com/wesnoth/wesnoth/commit/6eb3b7ee258f10721a5c0a875af8602122d59e55
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/help/help_topic_generators.cpp
Log Message:
-----------
Removed useless Hide Help entry for debug terrain info
(cherry-picked from commit 23732cf40fc333517feb7454516fed68b9fe3351)
Commit: 74a3fbd37fe33a1fdd6d99175031fa36b148a168
https://github.com/wesnoth/wesnoth/commit/74a3fbd37fe33a1fdd6d99175031fa36b148a168
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/whiteboard/recall.cpp
M src/whiteboard/recruit.cpp
Log Message:
-----------
wb: fixup fix handling of extra_recruit and [filter_recall]
this was probably lost during rebasing.
(cherry-picked from commit 0f2b4fae1def36036ce8df639a035876c4aa1332)
Commit: 954b31de86330fa487776cb2415359bbc3183189
https://github.com/wesnoth/wesnoth/commit/954b31de86330fa487776cb2415359bbc3183189
Author: Pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/about.cfg
Log Message:
-----------
Fixup: Vyncyn was already listed in the credits.
(cherry-picked from commit d02e16d7120a3df26b87ec586bbb6bc5519dcf2a)
Commit: 0203eecce99427e8b3e3d167cd695c10d53035f3
https://github.com/wesnoth/wesnoth/commit/0203eecce99427e8b3e3d167cd695c10d53035f3
Author: ln-zookeeper <lari.nieminen at iki.fi>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
R data/campaigns/Under_the_Burning_Suns/images/units/quenoth/nym-sword0.png
M data/campaigns/Under_the_Burning_Suns/images/units/quenoth/nym-sword1.png
M data/campaigns/Under_the_Burning_Suns/images/units/quenoth/nym-sword2.png
M data/campaigns/Under_the_Burning_Suns/images/units/quenoth/nym-sword3.png
M data/campaigns/Under_the_Burning_Suns/images/units/quenoth/nym-sword4.png
M data/campaigns/Under_the_Burning_Suns/images/units/quenoth/nym-sword5.png
M data/campaigns/Under_the_Burning_Suns/images/units/quenoth/nym-sword6.png
A data/campaigns/Under_the_Burning_Suns/images/units/quenoth/nym-sword7.png
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Youth.cfg
Log Message:
-----------
UtBS: Re-numbered Nym's sword animation frames
Also optimized them.
(cherry-picked from commit 43c5b6fbb25104437b25779d2f2d3ab9f185860a)
Commit: 9b6f933dedbfebcb10c73c58e2eec0753d0943b7
https://github.com/wesnoth/wesnoth/commit/9b6f933dedbfebcb10c73c58e2eec0753d0943b7
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/ai/lua/generic_recruit_engine.lua
Log Message:
-----------
Fix Experimental AI not working without enemy units
An example are the first two turns of Dark Forecast.
(cherry-picked from commit a65605c54726a391cc05d1bb75761966a8088cac)
Commit: f1eacc51adceefb45b3404742e9a8a053c694d72
https://github.com/wesnoth/wesnoth/commit/f1eacc51adceefb45b3404742e9a8a053c694d72
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/ai/lua/generic_recruit_engine.lua
Log Message:
-----------
Experimental AI: clear recruit cache when no recruit action found
(cherry-picked from commit f810504306f7b97bd5e532793b36591ada8ba671)
Commit: 0c707294cb11beb5a8ac0b2cf99f663b1f84bb4b
https://github.com/wesnoth/wesnoth/commit/0c707294cb11beb5a8ac0b2cf99f663b1f84bb4b
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/ai/lua/generic_recruit_engine.lua
Log Message:
-----------
Experimental AI recruiting: use math.huge instead of 9e99
(cherry-picked from commit a6c0012689b39d74e2d9578f17010a048ef7d296)
Commit: b83d9fa189f5aafbb771f153274f86e41eb3cd89
https://github.com/wesnoth/wesnoth/commit/b83d9fa189f5aafbb771f153274f86e41eb3cd89
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Update changelog
(cherry-picked from commit ee62a75be21545e260380d9d4596dbfb219ca119)
Commit: e0045bf78fed1e79f0fa89af677f084e2abac036
https://github.com/wesnoth/wesnoth/commit/e0045bf78fed1e79f0fa89af677f084e2abac036
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/unit_recall.cpp
Log Message:
-----------
Unit Recall: select the first row after applying sorting
Reported on the forums: https://forums.wesnoth.org/viewtopic.php?f=4&t=48219
(cherry-picked from commit 7f673dcd1f825c9ae8789b1b0e7458ea50e2e673)
Commit: 3848fe30a9c990ba15fd5a8135c5740d50d1696f
https://github.com/wesnoth/wesnoth/commit/3848fe30a9c990ba15fd5a8135c5740d50d1696f
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M src/time_of_day.hpp
Log Message:
-----------
Clamp tod_color values in the [-510, 510] range instead of [-255, 255]
[color_adjust] needs to be able to use absolute values as large as
2*255 in certain edge cases to set the screen a single solid colour when
interacting with time of day colour shifts.
Fixes #3144.
(cherry-picked from commit ae127ea73a27ac1df37b065169810833774452de)
Commit: 5aa4bf24ee6331cac846fe3c4ecad256d9af9150
https://github.com/wesnoth/wesnoth/commit/5aa4bf24ee6331cac846fe3c4ecad256d9af9150
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/random.cpp
Log Message:
-----------
Added a static assertion for IEEE 754 floating point compliance
(cherry-picked from commit 1bfa8e363cae458fb0fad80bd2adfbaf46e4cbe0)
Commit: 8c369ed7993a9f9555406c22b7a3cff632ce4338
https://github.com/wesnoth/wesnoth/commit/8c369ed7993a9f9555406c22b7a3cff632ce4338
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M data/core/terrain-graphics.cfg
M data/core/terrain.cfg
Log Message:
-----------
Remove door terrains that were supposed to be removed by 1.14
If someone was using these despite being hidden and everything they were
really asking to get shot in the foot at some point.
(cherry-picked from commit 6eddc6f978b0c3196bdba67b811459eaabbcaac6)
Commit: 848062fde69c41d75e8fe45f91f7fe3879e799df
https://github.com/wesnoth/wesnoth/commit/848062fde69c41d75e8fe45f91f7fe3879e799df
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M CMakeLists.txt
M SConstruct
R scons/ieee_754.py
R src/compile_time_tests/ieee_754.cpp
Log Message:
-----------
Remove the CMake/Scons compile-time check for IEEE 754 compliance
Now handled by a static assertion.
(cherry-picked from commit d9315199ee44dfa8a36e4e01a9332ef21505df3c)
Commit: 13e16b473f1ecafe144876d0e7860526996052fb
https://github.com/wesnoth/wesnoth/commit/13e16b473f1ecafe144876d0e7860526996052fb
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/macros/names.cfg
Log Message:
-----------
name generators: update translation hint
[ci skip]
(cherry-picked from commit 69f17c775d0fc73207f24cdac8db565c71b11ef2)
Commit: 66f46b6e6d9e516a0ea0c0db37c84e82be05d1a2
https://github.com/wesnoth/wesnoth/commit/66f46b6e6d9e516a0ea0c0db37c84e82be05d1a2
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/multiplayer/mp_create_game.cpp
Log Message:
-----------
GUI: add a translation prefix
Depending on the context there are different possible word
to translate 'to' with.
[ci skip]
(cherry-picked from commit fd8473e3da01bfabdd696883d1fabab599f62da4)
Commit: d8ffa70062106d288f4ffbcb44091c133a3ee9ce
https://github.com/wesnoth/wesnoth/commit/d8ffa70062106d288f4ffbcb44091c133a3ee9ce
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M doc/man/wesnoth.6
Log Message:
-----------
manpages: clarify deprecation logdomain
[ci skip]
(cherry-picked from commit 36026a5ff7911f97fb60819d3da5e0daaf792725)
Commit: ef640257a16877594412a8a70e0ad1d91d2a1dd2
https://github.com/wesnoth/wesnoth/commit/ef640257a16877594412a8a70e0ad1d91d2a1dd2
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/whiteboard/side_actions.cpp
M src/whiteboard/side_actions.hpp
Log Message:
-----------
wb: dont resend 'bump_later' commands
these caused 'illegal whiteboard data' messages from the mp server.
(cherry-picked from commit 5dffb16d5eefd0bc014ffceeafd231c20a7d0791)
Commit: ae34a2e03fa2eddb4c09e5d294be73475e7b07ce
https://github.com/wesnoth/wesnoth/commit/ae34a2e03fa2eddb4c09e5d294be73475e7b07ce
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-editor/gd.po
M po/wesnoth-help/gd.po
M po/wesnoth-lib/gd.po
M po/wesnoth-tutorial/gd.po
M po/wesnoth/gd.po
Log Message:
-----------
updated Scottish Gaelic translation
(cherry-picked from commit d942bead185828ac363f834d8b1cf379c1b33563)
Commit: 15779dddfbaddcc16f7f23d58f24b76b351272ba
https://github.com/wesnoth/wesnoth/commit/15779dddfbaddcc16f7f23d58f24b76b351272ba
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-trow/fr.po
Log Message:
-----------
updated French translation
(cherry-picked from commit a7dbdb4aa2f9377a6433408e0660e5a8ca57cbd3)
Commit: 9f2919fa4bd2646197a05173e3a7c08573b8f773
https://github.com/wesnoth/wesnoth/commit/9f2919fa4bd2646197a05173e3a7c08573b8f773
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-editor/ja.po
M po/wesnoth-help/ja.po
M po/wesnoth-lib/ja.po
M po/wesnoth-manpages/ja.po
M po/wesnoth-nr/ja.po
M po/wesnoth-sotbe/ja.po
M po/wesnoth-tutorial/ja.po
M po/wesnoth-utbs/ja.po
M po/wesnoth/ja.po
Log Message:
-----------
updated Japanese translation
(cherry-picked from commit 6bfc5623e7d1023e5d0cdb38d6aff504898cfd33)
Commit: e6e8e205515763e7cb77ff89b000876fbee5849d
https://github.com/wesnoth/wesnoth/commit/e6e8e205515763e7cb77ff89b000876fbee5849d
Author: Martin Hrubý (hrubymar10) <hrubymar10 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M utils/travis/steps/script.sh
Log Message:
-----------
Switch travis Xcode to DEBUG scheme
(cherry-picked from commit dee670d2b5882c50464423b503477b0ae7593057)
Commit: 6265087354f1baf326d4a5840064fb857ee48b99
https://github.com/wesnoth/wesnoth/commit/6265087354f1baf326d4a5840064fb857ee48b99
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/image.cpp
Log Message:
-----------
Preallocate memory for image/file presence caches
Should avoid unnecessary reallocations.
(cherry-picked from commit 949266b5aac34dea0f5d0b4d14228a32cd0eb4c3)
Commit: a553d5baac29f18092382fe8a905805976043783
https://github.com/wesnoth/wesnoth/commit/a553d5baac29f18092382fe8a905805976043783
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/image.cpp
Log Message:
-----------
Revert "Preallocate memory for image/file presence caches"
This reverts commit a3ef80853caac8fd1c115418b2474af07dd1cb14.
Vector reallocation cost is logarithmic. Assuming that a vector
starts at a size of one and doubles its size in each allocation, the
result is 11 allocations - completely negligible compared with, you
know, loading 20 000 images from disk.
(cherry-picked from commit 1066de1a827338840cfe44a32824e6d1a2e9207f)
Commit: a842f677962177e5909fee721e324b6df0830d75
https://github.com/wesnoth/wesnoth/commit/a842f677962177e5909fee721e324b6df0830d75
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Updated changelog
[ci skip]
(cherry-picked from commit 998cf67e1a3b14d9905a31b45cea7e8af4765d8c)
Commit: c9c61744cda4a802a0b988341089947a82799f5b
https://github.com/wesnoth/wesnoth/commit/c9c61744cda4a802a0b988341089947a82799f5b
Author: Martin Hrubý (hrubymar10) <hrubymar10 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
Log Message:
-----------
Xcode Disable -Wsign-conversion and -Wshorten-64-to-32 flags
(cherry-picked from commit 6f2235088cf11cd4359763567320b1a02f4e148e)
Commit: ea95f2697655e89865e2d1432f3a231308f86192
https://github.com/wesnoth/wesnoth/commit/ea95f2697655e89865e2d1432f3a231308f86192
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/07_Elves_Last_Stand.cfg
Log Message:
-----------
LoW 2 S7 - fix repeated endlevel execution
[ci skip]
(cherry-picked from commit f291deb6cfb6aa3819391fb0fc242ab758d91bd3)
Commit: c132309c66ac9c4f9ff896188942ce1c8bc65338
https://github.com/wesnoth/wesnoth/commit/c132309c66ac9c4f9ff896188942ce1c8bc65338
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/saved_game.cpp
Log Message:
-----------
remove 'cannot handle require_scenario=' warning
since it triggers on mainline content
(cherry-picked from commit 29120661f457189def15788db8eb890f40c10e6c)
Commit: 8f0cb83d8c50875cd80795baa24221a67bde6f48
https://github.com/wesnoth/wesnoth/commit/8f0cb83d8c50875cd80795baa24221a67bde6f48
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M data/core/images/units/undead-skeletal/revenant/revenant-ne-bob3.png
Log Message:
-----------
Fix broken TC in a north-facing standing animation frame for the Revenant
[ci skip]
(cherry-picked from commit df782f5401f2f1fc8b6b80d30a03604ff4a1caad)
Commit: 56cba5aacf8a40175aaff07dd59e2d0ade5c11fc
https://github.com/wesnoth/wesnoth/commit/56cba5aacf8a40175aaff07dd59e2d0ade5c11fc
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M data/lua/wml/message.lua
Log Message:
-----------
Do not allow [message] to scroll to units through fog/shroud
This was a regression from 1.12.
(cherry-picked from commit 8ae38ac19fa48ec9c380a9bce49c17dc43be9a05)
Commit: f68aec177fe328fc6899a4766064f256ceb9fd58
https://github.com/wesnoth/wesnoth/commit/f68aec177fe328fc6899a4766064f256ceb9fd58
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M data/lua/wml-tags.lua
Log Message:
-----------
[remove_sound_source] now accepts a comma-separated ID list
[ci skip]
Lack of this pointed out by @shikadiqueen.
This change will also throw an error if id= is missing. Not sure if it did so before.
(cherry-picked from commit 8d3f54ce7c4647a97efb8ddb8b598d5a1af0f815)
Commit: b249e30cd37bcb9b9778675dbbc459b3c8d8d448
https://github.com/wesnoth/wesnoth/commit/b249e30cd37bcb9b9778675dbbc459b3c8d8d448
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/playsingle_controller.cpp
Log Message:
-----------
don't generate a savegame snapshot unless needed
fixes #3150
(cherry-picked from commit 7eec132d762dec707af0d9ea2cf49e2e1678f56c)
Commit: cea548d2f66f4bed550d66ba26040fcb0a3b5c09
https://github.com/wesnoth/wesnoth/commit/cea548d2f66f4bed550d66ba26040fcb0a3b5c09
Author: ln-zookeeper <lari.nieminen at iki.fi>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Sceptre_of_Fire/maps/9_overlay/9_o1.mask
M data/campaigns/Sceptre_of_Fire/maps/9_overlay/9_o2.mask
M data/campaigns/Sceptre_of_Fire/maps/9_overlay/9_o3.mask
M data/campaigns/Sceptre_of_Fire/maps/9_overlay/9_o4.mask
M data/campaigns/Sceptre_of_Fire/maps/9_overlay/9_o5.mask
M data/campaigns/Sceptre_of_Fire/maps/9_overlay/9_o6.mask
M data/campaigns/Sceptre_of_Fire/maps/9_overlay/9_o7.mask
M data/campaigns/Sceptre_of_Fire/maps/9_overlay/9_o8.mask
M data/campaigns/Sceptre_of_Fire/maps/9_overlay/9_o9.mask
M data/campaigns/Sceptre_of_Fire/maps/9_overlay/9_of.mask
M data/campaigns/Sceptre_of_Fire/scenarios/9_Caverns_of_Flame.cfg
Log Message:
-----------
SoF S9: Fixed some issues with the volcano eruption (fixes #3099)
This merely patches the worst problems (multiple successive [endlevel] calls, inconsistent [endlevel] contents, recursive elf die event, lava fills visually broken); ideally the whole scenario should be rewritten and redesigned.
The mask changes only consist of re-sizing them to match the map size.
(cherry-picked from commit c0583a18429204c047aec16dbc553a1ad5cb13e0)
Commit: cbc6be30f283551586be813774d2e96dc9532dde
https://github.com/wesnoth/wesnoth/commit/cbc6be30f283551586be813774d2e96dc9532dde
Author: ln-zookeeper <lari.nieminen at iki.fi>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_South_Guard/maps/03_A_Desperate_Errand.map
M data/campaigns/The_South_Guard/scenarios/03_A_Desparate_Errand.cfg
Log Message:
-----------
TSG S03: Made the scenario very subtly harder
Increased the number of bats/undead the enemy can recruit, and made the terrain east of the enemy camp more easily passable.
(cherry-picked from commit 856b8ce78b196f1d25eeb8d5c6cc28c1b5d2597e)
Commit: bb0d30d055b11cc826892bcdddecace6758afcba
https://github.com/wesnoth/wesnoth/commit/bb0d30d055b11cc826892bcdddecace6758afcba
Author: ln-zookeeper <lari.nieminen at iki.fi>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Heir_To_The_Throne/scenarios/08_The_Princess_of_Wesnoth.cfg
Log Message:
-----------
HttT S08: Increased Li'sar's income slightly
(cherry-picked from commit bd23bb32535cf69c0507a15e48b7ade5cd8b156a)
Commit: 41d56adedbb850825378e656e1e3294217562f9b
https://github.com/wesnoth/wesnoth/commit/41d56adedbb850825378e656e1e3294217562f9b
Author: ln-zookeeper <lari.nieminen at iki.fi>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_Rise_Of_Wesnoth/scenarios/15_A_New_Land.cfg
Log Message:
-----------
TRoW S15: Increased the amount of lvl2 units enemies recruit
This will make enemies recruit equally many lvl1 and lvl2 units, thus decreasing the amount of units overall and making it less feasible to last indefinitely due to hordes of lvl1 units blocking better damage-dealers from reaching player units.
(cherry-picked from commit 0de4a4c7068ca82bcdae7242bd6751d03ce1fd5b)
Commit: dc16d909d3afe8373c8e25e38b51a710a684dcbf
https://github.com/wesnoth/wesnoth/commit/dc16d909d3afe8373c8e25e38b51a710a684dcbf
Author: ln-zookeeper <lari.nieminen at iki.fi>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M players_changelog.md
Log Message:
-----------
Updated changelogs
(cherry-picked from commit 59b69288bafd026c01dab7544d837f41ed1ee657)
Commit: 5a08ed2bfdb71023f81931674aac5135c7c1d6b4
https://github.com/wesnoth/wesnoth/commit/5a08ed2bfdb71023f81931674aac5135c7c1d6b4
Author: ln-zookeeper <lari.nieminen at iki.fi>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Sceptre_of_Fire/scenarios/9_Caverns_of_Flame.cfg
Log Message:
-----------
SoF S9: Removed garbage terrain code
(cherry-picked from commit cdea2e70cfa446322e59174e28e1ca74183c5f4b)
Commit: 6fb00a5182caa2d0b27b4c38fa993cd42525bf99
https://github.com/wesnoth/wesnoth/commit/6fb00a5182caa2d0b27b4c38fa993cd42525bf99
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/playmp_controller.cpp
Log Message:
-----------
fix oos when using 'back to turn' in mp
(cherry-picked from commit 31d4579500cb840fb8de36fbffdb8a197ae6e4f7)
Commit: 25c98edb2ebf41228466877e0a2fd9222e10957d
https://github.com/wesnoth/wesnoth/commit/25c98edb2ebf41228466877e0a2fd9222e10957d
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/playsingle_controller.cpp
Log Message:
-----------
don't autosave after using 'back to turn' in mp
(cherry-picked from commit fb54b0376d0fff9250d8947e269587cc60df6a6c)
Commit: 790326b4690ad1a7715af682fa36fcd2f3574633
https://github.com/wesnoth/wesnoth/commit/790326b4690ad1a7715af682fa36fcd2f3574633
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/carryover.cpp
M src/game_initialization/connect_engine.cpp
Log Message:
-----------
fix different carryover when loading startofscenario-save
this removes a hack in connect_engine.cpp that set save_id to a value to make sure that other connect_engine.cpp code does not chnge it later to the plyers id, (it did so at some point iirc).
Instead we update carryover.cpp to make sure that a side with no save_id (or id since save_id defaults to id) is not carried over to the next scenario,
fixes #3152
(cherry-picked from commit fef4254c84c3e7c8a63250809408971e0c795b1e)
Commit: ef09c1d10a137b86b49ecb0a1aca19a69b8e8cfb
https://github.com/wesnoth/wesnoth/commit/ef09c1d10a137b86b49ecb0a1aca19a69b8e8cfb
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M data/gui/window/wml_message.cfg
Log Message:
-----------
GUI2/Message: tweaked Magic Numbers to fix layout failure with large portraits
[ci skip]
Fixes #2912
(cherry-picked from commit 9bf7a4c8fb4cf4c0ace3e745c855a26fcdf04626)
Commit: bcf56aac3a06943aea2e668dc40919c50dbd6b8f
https://github.com/wesnoth/wesnoth/commit/bcf56aac3a06943aea2e668dc40919c50dbd6b8f
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M data/gui/window/preferences.cfg
M src/gui/dialogs/preferences_dialog.cpp
Log Message:
-----------
gui2/preferences: Add version info button
Also simplifies the layout of the bottom-most row of the dialog a bit.
(cherry-picked from commit e8c803d4267aa0fb5d8693fb02dca7e6d2e7a0e8)
Commit: c06a83f6a38be6cfd2ddebe3d6f63dcde9adf617
https://github.com/wesnoth/wesnoth/commit/c06a83f6a38be6cfd2ddebe3d6f63dcde9adf617
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M players_changelog.md
Log Message:
-----------
Add a couple of entries to players_changelog
[ci skip]
(cherry-picked from commit 2bc7be607e938eba916cb3ef1dd4f2bf5fabfb06)
Commit: 34c9a2aedc1c878e439a556988a707c4d1d84b1c
https://github.com/wesnoth/wesnoth/commit/34c9a2aedc1c878e439a556988a707c4d1d84b1c
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/gui/window/preferences.cfg
Log Message:
-----------
gui2/preferences: Add margin around the version info button
[ci skip]
(cherry-picked from commit f30634842eb92ce31a5d35badec3ae97f4550eac)
Commit: b67fd6d96da5ec6df0627adf0d91c93f4e8b614a
https://github.com/wesnoth/wesnoth/commit/b67fd6d96da5ec6df0627adf0d91c93f4e8b614a
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/gui/window/wml_message.cfg
Log Message:
-----------
Fixup 9bf7a4c (WFL comment syntax)
[ci skip]
(cherry-picked from commit c48a8e7edd4f982d1633521ad3c3e12fbbeb91ad)
Commit: 94d28391a6d9ed9fb9f5a08f78d2b6fa46f01b89
https://github.com/wesnoth/wesnoth/commit/94d28391a6d9ed9fb9f5a08f78d2b6fa46f01b89
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M src/units/frame.cpp
Log Message:
-----------
Fixed animation-wide text_color and blend_color keys being overwritten
Regression from a0199c73f91eac64f97aa37982678a9649900c86. This should fix
an issue where levein/levelout fading was sometimes black instead of white.
(cherry-picked from commit 27d0a6f6fe0af877e4bd2f981b8bf4e98dcb2838)
Commit: d99d6bb5517a644c739c008347822c9d2058c1fa
https://github.com/wesnoth/wesnoth/commit/d99d6bb5517a644c739c008347822c9d2058c1fa
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/terrain/filter.cpp
Log Message:
-----------
Fix memory leak in terrain filter matching
(cherry-picked from commit f861883683956c45640d6f86e7ea01b3a4a8a34e)
Commit: b68901727bb6f7b4c7c692b5edb3e7e858603528
https://github.com/wesnoth/wesnoth/commit/b68901727bb6f7b4c7c692b5edb3e7e858603528
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/terrain/filter.cpp
Log Message:
-----------
terrain_filter::match_internal(): use std::make_shared()
(cherry-picked from commit bd5be036b756b76c7485dd1ea5cb90a5451e85dc)
Commit: 70c9829b142b6550a01cf2f375efc65103ebc41d
https://github.com/wesnoth/wesnoth/commit/70c9829b142b6550a01cf2f375efc65103ebc41d
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M players_changelog.md
Log Message:
-----------
Changelog entry for commit f861883683956c45640d6f86e7ea01b3a4a8a34e
(cherry-picked from commit f5609d6911ff1539ac39124be0402f7720f0396e)
Commit: 9ee6991962d3cae3158366a18a9f1f24c5e1b0b8
https://github.com/wesnoth/wesnoth/commit/9ee6991962d3cae3158366a18a9f1f24c5e1b0b8
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-lib/es.po
Log Message:
-----------
updated Spanish translation
(cherry-picked from commit 1122ea7264f7e920aa69af074f817cc339b2b102)
Commit: 4b87d25a5403477e1cb06c94f2194503dc64b116
https://github.com/wesnoth/wesnoth/commit/4b87d25a5403477e1cb06c94f2194503dc64b116
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
A data/campaigns/Liberty/images/maps/l10n/zh_CN/liberty--overlay.png
A data/campaigns/Two_Brothers/images/maps/l10n/zh_CN/tb--overlay.png
M po/wesnoth-dm/zh_CN.po
M po/wesnoth-ei/zh_CN.po
M po/wesnoth-help/zh_CN.po
M po/wesnoth-l/zh_CN.po
M po/wesnoth-trow/zh_CN.po
Log Message:
-----------
updated Chinese (Simplified) translation
(cherry-picked from commit cb43b894eeff5fc1327a612a817bdc275762e629)
Commit: 865738d57d403d3170a7f1f4723b93cddec17839
https://github.com/wesnoth/wesnoth/commit/865738d57d403d3170a7f1f4723b93cddec17839
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Descent_Into_Darkness/scenarios/05_Orc_War.cfg
Log Message:
-----------
Did S5: make campaign easier to debug
by moving an important change into it's own victory event
[ci skip]
(cherry-picked from commit 1315c660e73d04a3ca80d11b43b52331f8b976b4)
Commit: 72c7c17ae689d5273a7cddac0054fd750772d3c1
https://github.com/wesnoth/wesnoth/commit/72c7c17ae689d5273a7cddac0054fd750772d3c1
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Descent_Into_Darkness/scenarios/08_A_Small_Favor2.cfg
M data/campaigns/Descent_Into_Darkness/scenarios/09_A_Small_Favor3.cfg
M data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg
Log Message:
-----------
DiD: fix bug for units not being loyal anymore after leveling up
fixes #3163
[ci_skip]
(cherry-picked from commit 1e5816496138ec7c5bdbf1d3a20d6a0a8ec3bd7a)
Commit: 4dd1463692dc5f476ef37517fd5e428b4860fcb0
https://github.com/wesnoth/wesnoth/commit/4dd1463692dc5f476ef37517fd5e428b4860fcb0
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Eastern_Invasion/scenarios/11_Captured.cfg
Log Message:
-----------
EI S11: use same approach as in 1e58164
to simplify scenario
[ci_skip]
(cherry-picked from commit 0f511e8e55ac873d632366adc669266d8e5d5faf)
Commit: 64f048ad0acc0ac329b5b7fa87ee852512e3ed8c
https://github.com/wesnoth/wesnoth/commit/64f048ad0acc0ac329b5b7fa87ee852512e3ed8c
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg
Log Message:
-----------
DiD S11 & S12: transform all Mages instead of changing their advancements
This has the advantage that they use the same help page as newwly
recruited ons, and their advancement options are correctly shown there.
The transformation code is taken from SotA S18
[ci_skip]
(cherry-picked from commit a24068ad021a45238d31e070ad563e98330216df)
Commit: a309e5561acc129a7d31cf2509aaac4780521177
https://github.com/wesnoth/wesnoth/commit/a309e5561acc129a7d31cf2509aaac4780521177
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg
M data/campaigns/Secrets_of_the_Ancients/scenarios/18_Abandoned_Outpost.cfg
Log Message:
-----------
DiD S11, Sota S18: move unit type transformation to lua
[ci_skip]
(cherry-picked from commit 51db9d01bf8c690a0b9f74c7b254143c74056a3c)
Commit: 29632aeb7542bb00e278c8655f24b539676ff0b8
https://github.com/wesnoth/wesnoth/commit/29632aeb7542bb00e278c8655f24b539676ff0b8
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/campaign_difficulty.cpp
Log Message:
-----------
Campaign Difficulty: colored description column gray
(cherry-picked from commit e6183aa0d462c1a3e4f5a1a323b475c78a20ecaa)
Commit: 2873ad1c7e3e6865c2fca65103cd18b5d3e42489
https://github.com/wesnoth/wesnoth/commit/2873ad1c7e3e6865c2fca65103cd18b5d3e42489
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/gui/window/lobby_main.cfg
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/lobby_info.hpp
M src/gui/dialogs/multiplayer/lobby.cpp
M src/gui/dialogs/multiplayer/lobby.hpp
Log Message:
-----------
MP Lobby: removed manual player list sorting
It didn't make much sense to have these since there's really no situation you'd want
the "default" sorting order, which is however the server decided to send the list.
(cherry-picked from commit e754e64987b3be3e97adebe0755f408066b2f41d)
Commit: 57177c699dcda0ca3068d18a1d7ffbeb6465fdb3
https://github.com/wesnoth/wesnoth/commit/57177c699dcda0ca3068d18a1d7ffbeb6465fdb3
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Updated changelog
[ci skip]
(cherry-picked from commit 4300cb8263af283cd6c1d7baae40315474ba59dc)
Commit: a0eb92e669b94b39a91acc0ab2f02bc7acd32d9a
https://github.com/wesnoth/wesnoth/commit/a0eb92e669b94b39a91acc0ab2f02bc7acd32d9a
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/preferences/lobby.cpp
M src/preferences/lobby.hpp
Log Message:
-----------
Removed now-unused preference getters/setters
(cherry-picked from commit b24de54fb90de63acd4fb26e235d2f331b01ab10)
Commit: 886156b0fe30a04e9bc7d75967ad0bbeca6731cb
https://github.com/wesnoth/wesnoth/commit/886156b0fe30a04e9bc7d75967ad0bbeca6731cb
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M data/gui/window/campaign_difficulty.cfg
M src/gui/dialogs/campaign_difficulty.cpp
Log Message:
-----------
Campaign Difficulty: rearranged entry layout
(cherry-picked from commit 67530c437527d525af90b484b9797dad84837d16)
Commit: d60a2c441f030ee399695ea9c594b590b7e535cf
https://github.com/wesnoth/wesnoth/commit/d60a2c441f030ee399695ea9c594b590b7e535cf
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/font/standard_colors.cpp
Log Message:
-----------
Bump font::GRAY_COLOR from #777 to #888
Bit brighter, looks a bit better.
(cherry-picked from commit 47d766d3743ad3cc1cecb04b608b3f898141f9ed)
Commit: dca6c8d718b6755221b4d71b33fbdf31b9a60b4b
https://github.com/wesnoth/wesnoth/commit/dca6c8d718b6755221b4d71b33fbdf31b9a60b4b
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/campaign_difficulty.cpp
Log Message:
-----------
Campaign Difficulty: restore the description parentheses on request
(cherry-picked from commit 47bef433a96d91a7da0456213feb0c8095f39e64)
Commit: 17a95886437fe03a9d63da215ec55919798317a5
https://github.com/wesnoth/wesnoth/commit/17a95886437fe03a9d63da215ec55919798317a5
Author: ln-zookeeper <lari.nieminen at iki.fi>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Northern_Rebirth/scenarios/05a_01_The_Pursuit.cfg
Log Message:
-----------
NR: Gave the Rod of Justice the magical special and improved animation
The animation now uses all three bolt animations (instead of just one), and has a somewhat different color.
(cherry-picked from commit 8b467104bf4caeac8a8afd6217ec0bbe689a22e7)
Commit: a1b2147a40a09963ef0623b73d9dd43c788f873e
https://github.com/wesnoth/wesnoth/commit/a1b2147a40a09963ef0623b73d9dd43c788f873e
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
A data/campaigns/Northern_Rebirth/images/ellipse/unprivileged-leader-bottom.png
A data/campaigns/Northern_Rebirth/images/ellipse/unprivileged-leader-selected-bottom.png
A data/campaigns/Northern_Rebirth/images/ellipse/unprivileged-leader-selected-top.png
A data/campaigns/Northern_Rebirth/images/ellipse/unprivileged-leader-top.png
M data/campaigns/Northern_Rebirth/scenarios/04_Clearing_the_Mines.cfg
M data/campaigns/Northern_Rebirth/scenarios/05b_Compelled.cfg
M data/campaigns/Northern_Rebirth/scenarios/09b_Judgment.cfg
Log Message:
-----------
NR Path B:
* to enable playing the path in debug mode
* set the betrayed friend variable in S5
* overwrite redruits and gold
* use lua for unit transformations
* clean up code in S5
* fix ellipse change having no effect (probably since 1.12)
* work around bug 3172
[ci skip]
(cherry-picked from commit cca5b6f77608bdb11865e57fa944b1240ca1e938)
Commit: 219ba91ae4de52f95106624eeee549383ed29f9f
https://github.com/wesnoth/wesnoth/commit/219ba91ae4de52f95106624eeee549383ed29f9f
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg
Log Message:
-----------
DiD S7: make villages unattractive
they give no income anymore, but still support
closes #3162
[ci skip]
(cherry-picked from commit c0d6d4ed944ed11fef788778c332fd91362e3a2a)
Commit: f815cbcf1ca9dcf1aa6c5f8ae984a7580b8d1ac0
https://github.com/wesnoth/wesnoth/commit/f815cbcf1ca9dcf1aa6c5f8ae984a7580b8d1ac0
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg
Log Message:
-----------
DiD S7: compensate -1 income with +1 support
[ci skip]
(cherry-picked from commit 9f37896f32ea34fa77e5035494ecc4565b673195)
Commit: 064a7c7a3117df0f779437c012e76193cf69f2c6
https://github.com/wesnoth/wesnoth/commit/064a7c7a3117df0f779437c012e76193cf69f2c6
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/actions/advancement.cpp
Log Message:
-----------
fix untranslatable string.
(cherry-picked from commit acf9a9874c6d51ca205de6fb8cebb35f91c3fec0)
Commit: e326ba4c57a82a41b76f8150c95694e1ba9317fb
https://github.com/wesnoth/wesnoth/commit/e326ba4c57a82a41b76f8150c95694e1ba9317fb
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Secrets_of_the_Ancients/scenarios/18_Abandoned_Outpost.cfg
Log Message:
-----------
SotA S18: move DA transformation to lua
[ci skip]
(cherry-picked from commit 627c39a3a87e68e0e57e7c385e531bb67b4b8747)
Commit: 198f5bed04e7c0ba43d7a1401b4d6c2d0503ca29
https://github.com/wesnoth/wesnoth/commit/198f5bed04e7c0ba43d7a1401b4d6c2d0503ca29
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Secrets_of_the_Ancients/maps/20_North_Knalga.map
M data/campaigns/Secrets_of_the_Ancients/scenarios/20_North_Knalga.cfg
Log Message:
-----------
SotA: fix S20, was broken with the removal of the old gates
[ci skip]
(cherry-picked from commit 4db9f17e099b813b86f8ea5a9776814d29925593)
Commit: 0eb63a050ccacb61094ae6bbaa466b2c8f31f5ca
https://github.com/wesnoth/wesnoth/commit/0eb63a050ccacb61094ae6bbaa466b2c8f31f5ca
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Secrets_of_the_Ancients/scenarios/21_Against_the_World.cfg
Log Message:
-----------
SotA S21: fix terrain filter
The map has been adjusted before, but not the filter
[ci skip]
(cherry-picked from commit fec49a53a67d82b8004e1e2fb7169b7d867d0a47)
Commit: 768c49ec61ae97ccd75dee126c2e605917309d31
https://github.com/wesnoth/wesnoth/commit/768c49ec61ae97ccd75dee126c2e605917309d31
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Secrets_of_the_Ancients/scenarios/18_Abandoned_Outpost.cfg
M data/campaigns/Secrets_of_the_Ancients/scenarios/20_North_Knalga.cfg
M data/campaigns/Under_the_Burning_Suns/scenarios/04_Descending_into_Darkness.cfg
M data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg
M data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg
M data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
Log Message:
-----------
SotA & UtBS: replace deprecated code
[ci skip]
(cherry-picked from commit 3a103e6bbf80b47c508088f31892a680abb9dc89)
Commit: fda634af12657cd960265d6a79218bfdd4e08a8e
https://github.com/wesnoth/wesnoth/commit/fda634af12657cd960265d6a79218bfdd4e08a8e
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Secrets_of_the_Ancients/scenarios/01_Slipping_Away.cfg
M data/campaigns/Secrets_of_the_Ancients/scenarios/02_Dark_Business.cfg
M data/campaigns/Secrets_of_the_Ancients/scenarios/03_Bandits.cfg
M data/campaigns/Secrets_of_the_Ancients/scenarios/04_Becalmed.cfg
M data/campaigns/Secrets_of_the_Ancients/scenarios/05_Blackwater.cfg
M data/campaigns/Secrets_of_the_Ancients/scenarios/06_Following_the_Shadow.cfg
M data/campaigns/Secrets_of_the_Ancients/scenarios/18_Abandoned_Outpost.cfg
M data/campaigns/Secrets_of_the_Ancients/utils/sota-utils.cfg
Log Message:
-----------
SotA: transform units in S5 instead of S18
this commit differs from the 1.14 one
[ci skip]
(cherry-picked from commit 307d1d1d4466e37d1e6cc589f72a195bed867425)
Commit: b3e63cb173460659b8ab0f30238aaa3210cd3eca
https://github.com/wesnoth/wesnoth/commit/b3e63cb173460659b8ab0f30238aaa3210cd3eca
Author: newfrenchy83 <31768074+newfrenchy83 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/actions/advancement.cpp
Log Message:
-----------
Update advancement.cpp
(cherry-picked from commit 5386841088e4b4a40a06bf4f78fe147a11a4164f)
Commit: b4e417d0dce65d6f04e7a78079d2bcd698235270
https://github.com/wesnoth/wesnoth/commit/b4e417d0dce65d6f04e7a78079d2bcd698235270
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M players_changelog.md
Log Message:
-----------
Changelog entry for pull request #3169
(cherry-picked from commit cf2b1ed873cde104048e1654bd354cfdc1258e21)
Commit: eebcdce40abc243020ef7254c02640d76e112641
https://github.com/wesnoth/wesnoth/commit/eebcdce40abc243020ef7254c02640d76e112641
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Updated changelog
[ci skip]
(cherry-picked from commit ff2c72999122aa3759278e66e11c470732f34d97)
Commit: 86adea9afdbea3e062ef39f4b71a5bb7c27ef4c2
https://github.com/wesnoth/wesnoth/commit/86adea9afdbea3e062ef39f4b71a5bb7c27ef4c2
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/sdl/surface.cpp
Log Message:
-----------
Surface: restrict a workaround to SDL 2.0.6 only
It was fixed in 2.0.7.
(cherry-picked from commit 0f1029a93340be004254a539b173059f302222dd)
Commit: fe4f5c974e252286bddf707d141a4019948d4427
https://github.com/wesnoth/wesnoth/commit/fe4f5c974e252286bddf707d141a4019948d4427
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/font/standard_colors.cpp
Log Message:
-----------
Used RAL 6038 (#00b51a) for font::GOOD_COLOR
This is apparently the closest RAL color to RGB 0,255,0 and it happens to look good.
(cherry-picked from commit 107ef77e454aa7a9e0c6d48cfb7bffc5754f3a2d)
Commit: 1eddadb214503ab7ceff007b33801973b62c3f43
https://github.com/wesnoth/wesnoth/commit/1eddadb214503ab7ceff007b33801973b62c3f43
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/widgets/addon_list.cpp
Log Message:
-----------
GUI2/Addon List: don't hardcode green text color for publishable addons
(cherry-picked from commit dab7022552127afde007e0ab0ce4b6615ba13574)
Commit: d1db3fa32cc13a6b980deaa2b20fd499bcf54c95
https://github.com/wesnoth/wesnoth/commit/d1db3fa32cc13a6b980deaa2b20fd499bcf54c95
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/scripting/game_lua_kernel.cpp
Log Message:
-----------
fix [animate_unit] freezing the game
#2970
#3084
(cherry-picked from commit beeb5b43e2b84b3f123a620465526ef124574d38)
Commit: e7d2103292a63ee26ee25270836f758f4e243cd0
https://github.com/wesnoth/wesnoth/commit/e7d2103292a63ee26ee25270836f758f4e243cd0
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/playsingle_controller.cpp
Log Message:
-----------
automaticially end replaymode at the end of a mp turn replay.
previously it did happen that users did not know how to 'escape'
from the replay mode in that case.
(cherry-picked from commit f093341bb4da0890968a4d655cfc1410fd945ef3)
Commit: 4f1416d268f36291cbf1ed732c85ca72ea8b1744
https://github.com/wesnoth/wesnoth/commit/4f1416d268f36291cbf1ed732c85ca72ea8b1744
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/units/unit.cpp
Log Message:
-----------
remove useless code in unit::advance_to
the line above does exactly the same as the line inside that if(){..} so it has no effect.
Also, what the comment says is wrong. We do not want to keep the old recall cost if it is different from the original recall cost because doing that would break removing objects that change recall cost.
(cherry-picked from commit 0c3ca19e9d36144fe21fb406883ff7c99fa109c6)
Commit: f02bcd8439502ac120b7adb6923c8f1d55e06725
https://github.com/wesnoth/wesnoth/commit/f02bcd8439502ac120b7adb6923c8f1d55e06725
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/game_initialization/connect_engine.cpp
M src/game_initialization/flg_manager.cpp
Log Message:
-----------
Moved faction sorting from the FLG manager to the connect engine
This list in the connect engine was passed to each of its side engine's flg managers,
where it was then sorted by update_choosable_factions(). Basically, a whole bunch of
unnecessary sorting. This makes it so the list is already sorted when it's passed to
each side engine.
None of the post-processing of the faction list (in populating available_leaders_)
should mess with the order, as far as I can tell.
(cherry-picked from commit 050430460adb5dc1ed3968a737e3be46dc216bf5)
Commit: 0b4e2682189440178342833af441c3bca599e7a3
https://github.com/wesnoth/wesnoth/commit/0b4e2682189440178342833af441c3bca599e7a3
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/multiplayer/mp_staging.cpp
Log Message:
-----------
MP Staging: simplify a call
(cherry-picked from commit 99c2ed8f65da39ef24dfd339eb12486275009eec)
Commit: fd58826730a4de773237fe1cd84d1662433a5f18
https://github.com/wesnoth/wesnoth/commit/fd58826730a4de773237fe1cd84d1662433a5f18
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
A data/campaigns/The_Hammer_of_Thursagan/images/maps/l10n/it/thot--overlay.png
Log Message:
-----------
updated Italian translation
(cherry-picked from commit 183bc272eaf867570bcf33a609aa6a8f89ec6d72)
Commit: 0d30d3301a97686f7091754affc1d7fc61436d31
https://github.com/wesnoth/wesnoth/commit/0d30d3301a97686f7091754affc1d7fc61436d31
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/events.cpp
Log Message:
-----------
Handle exceptions thrown by call_in_main_thread in the caller thread
Also removes an unnecessary ctor and adds docs.
(cherry-picked from commit 86792656aed349b6ddc67e66b98abdee5fb310e2)
Commit: 26714a3bf9b7381cd09572cecfd2f1925931d749
https://github.com/wesnoth/wesnoth/commit/26714a3bf9b7381cd09572cecfd2f1925931d749
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/events.cpp
Log Message:
-----------
Fixup 86792656aed (re-add ctor)
(cherry-picked from commit 5588588b55d7733dd912c887221670927443a9c3)
Commit: a053bb67fe1c9a06a9e18311e99bbd93882b68eb
https://github.com/wesnoth/wesnoth/commit/a053bb67fe1c9a06a9e18311e99bbd93882b68eb
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/events.cpp
Log Message:
-----------
Fixed CVIdeo::quit being swallowed in invoked_function_data::call
(cherry-picked from commit 8ecbed0205040b566e898f64eb15103162728ec2)
Commit: 3e3d353a5425265d93c99bce100d3f618bc06744
https://github.com/wesnoth/wesnoth/commit/3e3d353a5425265d93c99bce100d3f618bc06744
Author: Celtic Minstrel <CelticMinstrel at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/units/attack_type.cpp
Log Message:
-----------
Fix effects being unable to decrease weapon parry/accuracy
fixes #3181
(cherry-picked from commit 1413dfd4f387f589d59545f0a4cde665d0d1aac2)
Commit: 51e20c01804d6e4406ebb2afcdd3e2209066770e
https://github.com/wesnoth/wesnoth/commit/51e20c01804d6e4406ebb2afcdd3e2209066770e
Author: Celtic Minstrel <CelticMinstrel at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/units/attack_type.cpp
Log Message:
-----------
Fixup previous commit
Accidentally removed the third parameter for `increase_movement` instead of `increase_accuracy`. Whoops!
(cherry-picked from commit d03829dfd097848efaa8a6be3359b481524ebf97)
Commit: b7823147e5a59d975707867a2aabc989cc275080
https://github.com/wesnoth/wesnoth/commit/b7823147e5a59d975707867a2aabc989cc275080
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M utils/pofix.py
Log Message:
-----------
pofix: Update with 1.14.1 -> 1.14.2 rules for the website
[ci skip]
(cherry-picked from commit 0ca822795903e7f0ac93e410b7dde0b8012048fe)
Commit: eb9a219c5fc38c55ef3f509343a431747f67cc96
https://github.com/wesnoth/wesnoth/commit/eb9a219c5fc38c55ef3f509343a431747f67cc96
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/config.cpp
M src/filesystem.cpp
M src/formula/function.cpp
M src/gui/dialogs/wml_error.cpp
M src/preferences/credentials.cpp
M src/scripting/lua_kernel_base.cpp
M src/units/unit.cpp
M src/utils/markov_generator.cpp
Log Message:
-----------
Used std::string::front() and back() in more places
(cherry-picked from commit ed8a8a48f70174dae128afbdb07b1488b5a8d1d9)
Commit: 7566d1c35c8bac1d1786a8dada3f32e86d8e3e0b
https://github.com/wesnoth/wesnoth/commit/7566d1c35c8bac1d1786a8dada3f32e86d8e3e0b
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/actions/attack.cpp
Log Message:
-----------
Revert "Allow modifying dead units in more event handlers"
This reverts commit 9110e49760e40d9856b96f884f3c1636e034768c.
(cherry-picked from commit 70be1d2932be67e19dff5afd680c8405b3325b57)
Commit: c0a5519a88f8a4e7fb6da5ff04c2ebdc7b210af3
https://github.com/wesnoth/wesnoth/commit/c0a5519a88f8a4e7fb6da5ff04c2ebdc7b210af3
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/game_events/pump.cpp
M src/game_events/pump.hpp
M src/units/unit.cpp
Log Message:
-----------
Revert "Throw a Lua exception when creating a negative-HP unit in a Lua context"
This reverts commit 258a0e4689e9c000e3e0017ceed5e120156883ae.
(cherry-picked from commit 58dca3a8848b66f92e4f2b228e775dde1b000634)
Commit: 1d8479d737620fcfaf813a548d6565dcba065396
https://github.com/wesnoth/wesnoth/commit/1d8479d737620fcfaf813a548d6565dcba065396
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/actions/attack.cpp
M src/units/unit.cpp
M src/units/unit.hpp
Log Message:
-----------
Revert "Allow modifying dead units in last_breath and die event handlers"
This reverts commit 15446acb2ad1fd7990e52e7194480820c4923596.
(cherry-picked from commit 050bb3fa2c8d3e1422fe11e56909cfaba63d9aac)
Commit: cd2f8d21b829202eb6afc13bf14d6f47611b4570
https://github.com/wesnoth/wesnoth/commit/cd2f8d21b829202eb6afc13bf14d6f47611b4570
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/scripting/lua_unit.cpp
M src/units/unit.cpp
Log Message:
-----------
Revert "Disallow units with negative HP"
This reverts commit ef60deaa2b0d14006a6747c61fdd4fd33562b6f0.
@ln-zookeeper pointed out that units with negative HP are documented in
the wiki, and thus disallowing them is an API
change.
(cherry-picked from commit 0200487aad71816b843a8c542b3b0c394c5c87d8)
Commit: da18a52ebec1aebdae6393e1fc85d9b9cf2eb58a
https://github.com/wesnoth/wesnoth/commit/da18a52ebec1aebdae6393e1fc85d9b9cf2eb58a
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/attack_prediction.cpp
Log Message:
-----------
Fix #3042: attack prediction gives wrong results for HP <= 0 units
One_strike_fight() assumed that if HP distribution hadn't been calculated,
the unit is alive. It would normally be a valid assumption, but the Wesnoth
engine allows units with negative HP (although things aren't guaranteed to
work correctly in the presence of such units).
The assumption, together with a completely wrong calculation for the
probability that the opponent will counterattack, resulted in badly
incorrect results. That, in turn, caused the calculated probability that
the opponent to kill us to become negative (I observed -75 % when
debugging), making the calculated probability to be poisoned/slowed to
exceed 100 %, and that finally caused an assert if the AI simulated another
fight for the same unit.
I have now fixed those issues. I also noticed that rounding error allowed
the probability to be killed to still become slightly negative, and thus
changed std::min() to utils::clamp() to limit the value to the allowed
range.
(cherry-picked from commit 472b0cbbfbcdde4e32f26a1cb5afaa5ffd6c7a88)
Commit: 6b5ce73605566857d736057e5dc8a163906d1710
https://github.com/wesnoth/wesnoth/commit/6b5ce73605566857d736057e5dc8a163906d1710
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Changelog entries
(cherry-picked from commit ae8baa63560bd89ffb6c0319fda4ee708ff40ff5)
Commit: 504435023c00accc18e91d205b818e69f336fcd2
https://github.com/wesnoth/wesnoth/commit/504435023c00accc18e91d205b818e69f336fcd2
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/image.cpp
Log Message:
-----------
Fixed an occasional crash resulting from multi-thread access of the image cache
This was a problem as of 52db950e94a5e09bdfb3ccc7056db3da90d70483 since the loading
screen could access the image cache while the worker thread cleared it.
(cherry-picked from commit 6d0b7c84243aba8444f5e722cd855feed3501f12)
Commit: fbdc6814e06511e2b07f86037183a10a12af1354
https://github.com/wesnoth/wesnoth/commit/fbdc6814e06511e2b07f86037183a10a12af1354
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Updated changelog
[ci skip]
(cherry-picked from commit 61694688a8e6afc66a34e7347f52b92f2b7a3102)
Commit: 075d793539926d8d002a93180d0b6e5933e26f17
https://github.com/wesnoth/wesnoth/commit/075d793539926d8d002a93180d0b6e5933e26f17
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/gui/window/campaign_difficulty.cfg
M src/gui/dialogs/campaign_difficulty.cpp
Log Message:
-----------
Campaign Difficulty: consolidated both lines into a single label
(cherry-picked from commit f72f89f4d562231f831793b3719a115a79cc102c)
Commit: 8749b97c0a4772becabb55b50738418e37d05733
https://github.com/wesnoth/wesnoth/commit/8749b97c0a4772becabb55b50738418e37d05733
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/events.cpp
Log Message:
-----------
Events: minor cleanup
(cherry-picked from commit eddbaa21593de3007e945a39f104c2a7d48bb284)
Commit: 56a09abe8dda4994c4c0274975a84b3718d2d38a
https://github.com/wesnoth/wesnoth/commit/56a09abe8dda4994c4c0274975a84b3718d2d38a
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/campaign_difficulty.cpp
Log Message:
-----------
Fixup f72f89f
(cherry-picked from commit 4b03168fec89b9d4c29af77111a50ce6b0467538)
Commit: bd06263b504b68830318dc665d8f3c7457d8f1cc
https://github.com/wesnoth/wesnoth/commit/bd06263b504b68830318dc665d8f3c7457d8f1cc
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/campaign_difficulty.cpp
Log Message:
-----------
fixup! Campaign Difficulty: colored description column gray
(cherry-picked from commit 8bdccca7e373f805d1f2ecfe772151141a7015a9)
Commit: 355522656dbf1ba20684414a10c8f40f664749d1
https://github.com/wesnoth/wesnoth/commit/355522656dbf1ba20684414a10c8f40f664749d1
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-httt/fr.po
Log Message:
-----------
updated French translation
(cherry-picked from commit 29c9f1d2983b280a946b1eb1781f6b93f8e9643c)
Commit: 15206762cce6c1cceabea86400dfa4f206178253
https://github.com/wesnoth/wesnoth/commit/15206762cce6c1cceabea86400dfa4f206178253
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/actions/attack.cpp
M src/addon/client.cpp
M src/ai/composite/engine.hpp
M src/ai/composite/goal.hpp
M src/ai/composite/stage.hpp
M src/ai/default/aspect_attacks.cpp
M src/ai/default/recruitment.cpp
M src/ai/formula/ai.cpp
M src/ai/formula/engine_fai.cpp
M src/editor/action/action.cpp
M src/formula/formula.cpp
M src/game_events/wmi_manager.cpp
M src/game_initialization/multiplayer.cpp
M src/hotkey/hotkey_item.cpp
M src/server/game.cpp
M src/tests/test_rng.cpp
M src/wesnoth.cpp
Log Message:
-----------
Deployed std::make_unique and std::make_shared in more places
(cherry-picked from commit cc2cc29376fa19aa21b705a9754496d7f6d30162)
Commit: adaa115a7d61c21b5e5b0aba0db3b52a434573bd
https://github.com/wesnoth/wesnoth/commit/adaa115a7d61c21b5e5b0aba0db3b52a434573bd
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/core/event/dispatcher.cpp
M src/gui/core/event/dispatcher.hpp
M src/gui/dialogs/debug_clock.cpp
M src/gui/dialogs/end_credits.cpp
M src/gui/dialogs/outro.cpp
M src/gui/dialogs/story_viewer.cpp
Log Message:
-----------
GUI2/Dispatcher: added a connect_signal convenience wrapper for draw callbacks
Didn't use this in the window widget since that doesn't specify front_child as
the queue position. I need to evaluate whether draw callbacks need to be in that
position anyway. AFAIR I only started adding them there since I noticed the one
in the debug clock dialog used that.
(cherry-picked from commit 569d86277a0ee90385e7303dea80fd2d0da367d5)
Commit: b239ac4850399d0d035eacfd85f32739f837a8e4
https://github.com/wesnoth/wesnoth/commit/b239ac4850399d0d035eacfd85f32739f837a8e4
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/formula/string_utils.cpp
M src/formula/string_utils.hpp
Log Message:
-----------
Made vgettext/vngetext internals harder to use accidentally (resolves #2716)
Also removed the two implementation function overloads that did not take a textdomain.
(cherry-picked from commit aad64d72cf27123a45655fd23eacebec37fe4ab6)
Commit: 54ca88468a5fc21941bb380f7fefed5f1e680b6f
https://github.com/wesnoth/wesnoth/commit/54ca88468a5fc21941bb380f7fefed5f1e680b6f
Author: Byteron <aaron.winter93 at yahoo.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg
M data/campaigns/The_South_Guard/scenarios/07a_Into_the_Depths.cfg
Log Message:
-----------
TSG: Deoran can't recruit Peasants anymore
for the whole campaign, only in the first two scenarios
closes #3051 [ci skip]
(cherry-picked from commit 7f2a8f7c1971879956eaafe17f7ce0016d1f51d7)
Commit: 56db59e1dc588e4f05d0eb3bb9c873530fa10efe
https://github.com/wesnoth/wesnoth/commit/56db59e1dc588e4f05d0eb3bb9c873530fa10efe
Author: Pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/units/dunefolk/Wyvern_Rider.cfg
M data/core/units/monsters/Jinn.cfg
M data/core/units/monsters/Wild_Wyvern.cfg
Log Message:
-----------
Add a couple missing things from the PR that added the units.
Added the elemental trait to the Jinn. Added the undead_variation key to the Jinn, Wyvern Rider, and Wild Wyvern.
(cherry-picked from commit d913aafc534ccaeb239cc910bd963893e313fdcf)
Commit: 7cd78a6b12cadb9e807b9b87740b3d9ba8eeb4c7
https://github.com/wesnoth/wesnoth/commit/7cd78a6b12cadb9e807b9b87740b3d9ba8eeb4c7
Author: Pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/units/goblins/Spearman.cfg
Log Message:
-----------
Updated goblin spearman description.
See: https://forums.wesnoth.org/viewtopic.php?f=32&t=48137&start=60#p628424 and related posts.
(cherry-picked from commit 0b7ca63a86157b8d6a82c1d59858bdd1713685f4)
Commit: 7dec6296b593f9fb15a50c15c8e388b8d087a216
https://github.com/wesnoth/wesnoth/commit/7dec6296b593f9fb15a50c15c8e388b8d087a216
Author: Pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/units/goblins/Spearman.cfg
Log Message:
-----------
Fixup goblin description.
Somehow missed removing the part about the failing bloodline.
(cherry-picked from commit 9242a5ffd0db9a6bdeb65c498a7e3db852d60f21)
Commit: 61bbdbb637f2772eaad0d15c5eb9f6c9d74732d4
https://github.com/wesnoth/wesnoth/commit/61bbdbb637f2772eaad0d15c5eb9f6c9d74732d4
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/widgets/chatbox.cpp
Log Message:
-----------
GUI2/Chatbox: removed spurious newline from initial PM notice
(cherry-picked from commit 8c3673dfa0dcc0bc056a20374ab6a3e48e2d3d43)
Commit: f05702abd60ee1bba59b6ab5a9d223ab05b5396b
https://github.com/wesnoth/wesnoth/commit/f05702abd60ee1bba59b6ab5a9d223ab05b5396b
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/units/filter.cpp
Log Message:
-----------
fix unit filter always evaluating [and] even if it is not needed.
(cherry-picked from commit af6559af75efcb0cc7ff06b25f87f6135d167034)
Commit: bdfd39d72b1753f612e4149a1334baac65257608
https://github.com/wesnoth/wesnoth/commit/bdfd39d72b1753f612e4149a1334baac65257608
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/generators/default_map_generator_job.cpp
Log Message:
-----------
add mapgen debug info.
(cherry-picked from commit f69af8533a31e9820f188916e9466136360973e5)
Commit: 67b728a035381f653e86d16ef28b421df5606d38
https://github.com/wesnoth/wesnoth/commit/67b728a035381f653e86d16ef28b421df5606d38
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/generators/default_map_generator_job.cpp
Log Message:
-----------
add mapgen debug info.
(cherry-picked from commit 8e3ee5c5976a91a97acc7efaca69c1a370863e7f)
Commit: 1de83f64d4e56455487457616abd6a946c71463a
https://github.com/wesnoth/wesnoth/commit/1de83f64d4e56455487457616abd6a946c71463a
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/generators/default_map_generator_job.cpp
Log Message:
-----------
add mapgen debug info.
(cherry-picked from commit 84d94ca30549ffa60fead6330f119accd8392d85)
Commit: 2d6d43bcd14b989c68286681cd185e300f92fd8e
https://github.com/wesnoth/wesnoth/commit/2d6d43bcd14b989c68286681cd185e300f92fd8e
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/scripting/mapgen_lua_kernel.cpp
Log Message:
-----------
fix seed not resetting in lua mapgen.
(cherry-picked from commit 0dd382eab32ed2255689d4bec7418d4d0bf5d040)
Commit: 2d7c3e8f3eb86cb435bb364595bcb7698ac8ce0a
https://github.com/wesnoth/wesnoth/commit/2d7c3e8f3eb86cb435bb364595bcb7698ac8ce0a
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/game_initialization/lobby_data.hpp
Log Message:
-----------
MP Lobby: display self before friends in player list (fixes #3185)
(cherry-picked from commit 6cc91794f544e16f2feca3cf0e26c070548d9483)
Commit: ec9f2c82653b7c040d37cc0d6aadd947fefc2810
https://github.com/wesnoth/wesnoth/commit/ec9f2c82653b7c040d37cc0d6aadd947fefc2810
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/multiplayer/mp_staging.cpp
Log Message:
-----------
MP Staging: removed gender tooltip (resolves #2998)
I had only added it originally in case someone didn't know the symbols offhand,
but sevu is right that they can get a bit annoying.
(cherry-picked from commit 3d8d38983d1c5a6bfe542ee756b6ce3ac3471bd3)
Commit: f7ad6de3fdc32fed56f61c69d120fb375efabf5a
https://github.com/wesnoth/wesnoth/commit/f7ad6de3fdc32fed56f61c69d120fb375efabf5a
Author: loonycyborg <loonycyborg at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M SConstruct
Log Message:
-----------
Enable ASLR and NX bit security features for mingw builds
(cherry-picked from commit 8b1a5c0dde9e1a36531e6d104737b40531e59cd0)
Commit: da145736269f5484936499b5027d1a327fc10ad1
https://github.com/wesnoth/wesnoth/commit/da145736269f5484936499b5027d1a327fc10ad1
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/whiteboard/move.cpp
Log Message:
-----------
wb: fixup "fix incorrect handling of skirmisher."
(cherry-picked from commit 9cc32ebc46a006b70916572594c08cacfaad6571)
Commit: ca5b152f0167e9b984e956e04eda2d4bf964623a
https://github.com/wesnoth/wesnoth/commit/ca5b152f0167e9b984e956e04eda2d4bf964623a
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/game_initialization/lobby_data.cpp
Log Message:
-----------
MP Lobby: added translation hints for C/S markers
(cherry-picked from commit 2503ac88978c8332085b2964154a6af4738cf610)
Commit: a86bb81abc8bc50bf3d457f23f1a7563aac5e7b8
https://github.com/wesnoth/wesnoth/commit/a86bb81abc8bc50bf3d457f23f1a7563aac5e7b8
Author: loonycyborg <loonycyborg at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/SConscript
Log Message:
-----------
scons: fix issue #3132
(cherry-picked from commit d35f22e0773abffdf54b591b75d6ffb75f3ff6a6)
Commit: 723d6dbc6a131728ed40a37541f038810a989ad1
https://github.com/wesnoth/wesnoth/commit/723d6dbc6a131728ed40a37541f038810a989ad1
Author: sigurdfdragon <jjwcoat at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Secrets_of_the_Ancients/scenarios/09_Training_Session.cfg
Log Message:
-----------
SotA S09: Fix #3192
...by making the filter more exact.
(cherry-picked from commit 047ededd9efa9008d931ca483e71b9cc0e582f6b)
Commit: a94a62c6211381e7285b5037783402af5258ca55
https://github.com/wesnoth/wesnoth/commit/a94a62c6211381e7285b5037783402af5258ca55
Author: sigurdfdragon <jjwcoat at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M players_changelog.md
Log Message:
-----------
Update changelogs
(cherry-picked from commit 03d0e5deeeccf3bd6d3371a17ef22b922ad01d54)
Commit: 69c978cb9ef04961f35c8b2e1538d62c2397a6d1
https://github.com/wesnoth/wesnoth/commit/69c978cb9ef04961f35c8b2e1538d62c2397a6d1
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/game_initialization/mp_game_utils.cpp
Log Message:
-----------
fix possible 'manditory child missing' when loading mp campaign games
the error could happen a soon as you advance to the next scenario if you reload a campaign save from another player.
(cherry-picked from commit 575e104ca58066315b2540cda1a6ae241937e885)
Commit: 2dbb8e48ee6d69ce4424095d6f8a41719c73bda2
https://github.com/wesnoth/wesnoth/commit/2dbb8e48ee6d69ce4424095d6f8a41719c73bda2
Author: loonycyborg <loonycyborg at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M scons/gl.py
Log Message:
-----------
Change GL include in scons check so it actually works under mingw
(cherry-picked from commit f53237b20f09eba6701a90f7b5be81515317fc0d)
Commit: d665a8810dbe9d816a666ba4e97064462be6b045
https://github.com/wesnoth/wesnoth/commit/d665a8810dbe9d816a666ba4e97064462be6b045
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg
M data/campaigns/Northern_Rebirth/scenarios/11a_The_Eastern_Flank.cfg
M data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg
M data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg
Log Message:
-----------
NR S11 - 13: reduced enemy starting gold and income (resolves #3198)
[ci skip]
Also similarly reduced one of your ally's starting gold in S13.
(cherry-picked from commit 5adb931b2aafa1747dda62fad05a0b24754eedbd)
Commit: e54aa7670069aa2e4d2cfdb6062e7cc2f23fe59b
https://github.com/wesnoth/wesnoth/commit/e54aa7670069aa2e4d2cfdb6062e7cc2f23fe59b
Author: loonycyborg <loonycyborg at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M scons/boost.py
Log Message:
-----------
scons: workaround for msys2's build's of sdl "#define main" breaking non-sdl checks
(cherry-picked from commit 2bc7cc3e6106d089f168510a2a12cc53bfd48007)
Commit: b7ee956d63d03192b46cbc524dbe560fd2c5cfba
https://github.com/wesnoth/wesnoth/commit/b7ee956d63d03192b46cbc524dbe560fd2c5cfba
Author: loonycyborg <loonycyborg at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M scons/cross_compile.py
Log Message:
-----------
scons: set env["PLATFORM"] to "win32" on msys
(cherry-picked from commit d8743f8e6e51a30f0b039d40dc053b8e4dbf34b3)
Commit: 13c5f02e0417b67b6ded81f1a0304830dabc5819
https://github.com/wesnoth/wesnoth/commit/13c5f02e0417b67b6ded81f1a0304830dabc5819
Author: loonycyborg <loonycyborg at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M scons/sdl.py
Log Message:
-----------
scons: use pkg-config on msys platform for sdl
(cherry-picked from commit aa925e1fc6f64266b66fe63f16c19ef08a34362c)
Commit: ffb078c119918275f87c9b0abd142891c1867060
https://github.com/wesnoth/wesnoth/commit/ffb078c119918275f87c9b0abd142891c1867060
Author: loonycyborg <loonycyborg at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M SConstruct
M scons/cairo.py
M scons/pango.py
M scons/pkgconfig.py
M scons/sdl.py
Log Message:
-----------
scons: don't let pkg-config to add prefix on msys2
This is workaround for windows style path confusing scons if they appear
in CPPATH etc. Paths without prefix still happen to be valid and they
start with "/", not "c:".
(cherry-picked from commit b347bc70b163a572751b7ac72f23e472c3ac9238)
Commit: b3bd32a93648dd834af01898ecb88b50da22de9d
https://github.com/wesnoth/wesnoth/commit/b3bd32a93648dd834af01898ecb88b50da22de9d
Author: loonycyborg <loonycyborg at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M SConstruct
Log Message:
-----------
scons: add missing winapi lib dependencies to mingw build
(cherry-picked from commit d96d5c506c2d8c8f47984b2e1d4bf13111e195a2)
Commit: 01d81d29ad320db2e068a358631c95e90a950843
https://github.com/wesnoth/wesnoth/commit/01d81d29ad320db2e068a358631c95e90a950843
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg
Log Message:
-----------
NR S13: further reduce enemy gold
[ci skip]
Also fixed an error in my last commit that gave your ally Dwarvish side *more*
gold on higher difficulties.
(cherry-picked from commit a46eaa28749e48cf4027d1ec4523439b8407bc9b)
Commit: 49908e5cb9e910b9d5e8e2ac61550aeb2f65cc01
https://github.com/wesnoth/wesnoth/commit/49908e5cb9e910b9d5e8e2ac61550aeb2f65cc01
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Northern_Rebirth/maps/10a_Stolen_Gold.map
M data/campaigns/Northern_Rebirth/maps/11a_The_Eastern_Flank.map
M data/campaigns/Northern_Rebirth/maps/12a_Get_the_Gold.map
M data/campaigns/Northern_Rebirth/maps/13a_Showdown.map
M data/campaigns/Northern_Rebirth/maps/14a_Epilogue.map
Log Message:
-----------
NR S10 - 14: minor cosmetic map tweaks
[ci skip]
(cherry-picked from commit 20af37d527efdd476aa96cbe57aff071bf8b7dd5)
Commit: a5b80533403ae6ae3afbe290aa896d09f53d25de
https://github.com/wesnoth/wesnoth/commit/a5b80533403ae6ae3afbe290aa896d09f53d25de
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/gui/window/campaign_dialog.cfg
Log Message:
-----------
Campaign Dialog: renamed Deterministic Mode label to "Save random seed"
[ci skip]
This better conveys its behavior, especially with the introduction of the hidden PRNG
preference.
(cherry-picked from commit bf92dbbfd2c1699a9af11e6ddc1b850e154d16f9)
Commit: 1ec69044fbf1c02f878ea06c5ccddeb2d9b35ca4
https://github.com/wesnoth/wesnoth/commit/1ec69044fbf1c02f878ea06c5ccddeb2d9b35ca4
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/image.cpp
Log Message:
-----------
Revert "Fixed an occasional crash resulting from multi-thread access of the image cache"
This reverts commit 6d0b7c84243aba8444f5e722cd855feed3501f12. Turns out there's
a better way to fix this problem without using mutexes, which have a noticeable
performance hit (5.2% of the execution time of game_display::draw_invalidated()
according to @jyrkive).
(cherry-picked from commit b8ad791a1d8d1e76d921d4f48a6fd57aee3c134e)
Commit: 0313deefe980d085ddc56396e4d5088802b19f7d
https://github.com/wesnoth/wesnoth/commit/0313deefe980d085ddc56396e4d5088802b19f7d
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/game_config_manager.cpp
Log Message:
-----------
Game Config Manager: handle clearing image cache in main thread
See comment for explanation. This was a better solution that adding mutexes to
the cache accessors; that had performance downsides.
(cherry-picked from commit 011cbfe3b8fd2d634e3294484f4cb9b255eac029)
Commit: 320b2f321f33aa4728f96f0223866b9ddd2277ec
https://github.com/wesnoth/wesnoth/commit/320b2f321f33aa4728f96f0223866b9ddd2277ec
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M players_changelog.md
M po/wesnoth-help/zh_TW.po
M po/wesnoth-manual/zh_TW.po
M po/wesnoth-units/zh_TW.po
M po/wesnoth/zh_TW.po
Log Message:
-----------
updated Chinese (Traditional) translation
(cherry-picked from commit 3a8343b4dd478497d1f2dd428e391f64b640a8b1)
Commit: a267018b2e86cc2e2ccbde1127f929fb0fc3900f
https://github.com/wesnoth/wesnoth/commit/a267018b2e86cc2e2ccbde1127f929fb0fc3900f
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-ai/it.po
M po/wesnoth-low/it.po
Log Message:
-----------
updated Italian translation
(cherry-picked from commit 87552f083b115cabef0a4d981e4913cd7c43a15c)
Commit: 34fb36934ef153af9dd944760411b1bf12cf396b
https://github.com/wesnoth/wesnoth/commit/34fb36934ef153af9dd944760411b1bf12cf396b
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-httt/fr.po
M po/wesnoth-sotbe/fr.po
M po/wesnoth-tb/fr.po
M po/wesnoth-thot/fr.po
Log Message:
-----------
updated French translation
(cherry-picked from commit ad0b8bce8ca8d4c84dab205b6ed7608c437cd87e)
Commit: 454c44f8bb097f5dde3d33cf713a8099080e4ccd
https://github.com/wesnoth/wesnoth/commit/454c44f8bb097f5dde3d33cf713a8099080e4ccd
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/server/player.cpp
M src/server/player.hpp
M src/server/server.cpp
M src/server/server.hpp
Log Message:
-----------
add player_version mp command
to tell you what wesnoth version another player is using.
(cherry-picked from commit ba6afa4d1706a30c067a15ab26c1ab3b9ef5b87b)
Commit: 1a72f04d4a71d899aba817ce28e5f7d62eb63fcc
https://github.com/wesnoth/wesnoth/commit/1a72f04d4a71d899aba817ce28e5f7d62eb63fcc
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/server/server.cpp
M src/server/server.hpp
Log Message:
-----------
rename mp command player_version to version
(cherry-picked from commit 0853b2718d1344449a23ae68252330d457f29f3a)
Commit: e4100fc3bd2b85a1f62f42e062dd19b336d20ad8
https://github.com/wesnoth/wesnoth/commit/e4100fc3bd2b85a1f62f42e062dd19b336d20ad8
Author: Gunter Labes <soliton at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/server/server.cpp
Log Message:
-----------
check for empty parameters before looping over all players
(cherry-picked from commit 0362e36305eda584d16fb89de40f9314278316e0)
Commit: cc3e79c0a5d3acb1244c532b38c0b846e7f65089
https://github.com/wesnoth/wesnoth/commit/cc3e79c0a5d3acb1244c532b38c0b846e7f65089
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg
Log Message:
-----------
Tutorial S2: made enemy starting gold equal to that of the player
[ci skip]
(cherry-picked from commit c7a06939abcc44a9f6d20d5e974ef4dc87b3e34d)
Commit: 2305281666498ace9ec70edad5a07871e423ba6e
https://github.com/wesnoth/wesnoth/commit/2305281666498ace9ec70edad5a07871e423ba6e
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/editor/help.cfg
Log Message:
-----------
remove a duplicated space in a translatable string
...thiugh, in this case it has no effect.
[ci skip]
(cherry-picked from commit 4b7a6a98eccc07fd762ec29bcf1cd1ea84636992)
Commit: 3ef2eb1ae5dbb137293002f3bb05d208456c5aec
https://github.com/wesnoth/wesnoth/commit/3ef2eb1ae5dbb137293002f3bb05d208456c5aec
Author: loonycyborg <loonycyborg at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/server/player_connection.hpp
M src/server/server.cpp
Log Message:
-----------
server: remember client's ip in player_connections_ and use it in remove_player()
this is needed so ip is properly logged even if socket is closed or invalid
(cherry-picked from commit aaabbf2687ea0bc25dc3a9f8705fe0b6f29c1af2)
Commit: 361c98c91ceb4ddda3ab07b3ffaf27cb8fa86cd6
https://github.com/wesnoth/wesnoth/commit/361c98c91ceb4ddda3ab07b3ffaf27cb8fa86cd6
Author: loonycyborg <loonycyborg at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/server/server.cpp
Log Message:
-----------
Update server to use new way of getting wesnoth version
(cherry-picked from commit 57da02a9196f6b616ade01cda3de08f2d40ba554)
Commit: d3a658090885ff7f391c4318741ffcc06c0b5d61
https://github.com/wesnoth/wesnoth/commit/d3a658090885ff7f391c4318741ffcc06c0b5d61
Author: loonycyborg <loonycyborg at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/server/server.cpp
M src/server/server.hpp
Log Message:
-----------
wesnothd: restore functionality to log stats every 5 minutes
(cherry-picked from commit 0714d488bcd1eadd37c7785a1066925d5fa1b0d8)
Commit: 77376ff3786c648cc30f29eb5433027b65622eae
https://github.com/wesnoth/wesnoth/commit/77376ff3786c648cc30f29eb5433027b65622eae
Author: loonycyborg <loonycyborg at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/server/server.cpp
M src/server/server.hpp
Log Message:
-----------
wesnothd: restore lan server auto-shutdown functionality
(cherry-picked from commit 4eea1b5f0d4a0de9155c23be8a5abe097cf23f09)
Commit: 72775f4ebd2731d18c90d5ea60345b5f042b64c7
https://github.com/wesnoth/wesnoth/commit/72775f4ebd2731d18c90d5ea60345b5f042b64c7
Author: Thom Diment <mr.diment at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Northern_Rebirth/scenarios/05a_01_The_Pursuit.cfg
Log Message:
-----------
NR5_1: Fixes to Malifor attack and secret door events (#3154)
NR S5a: bugfixes
* Fixes #3117 - Malifor damage event now occurs on defence as well on attack
* Fixes #3116: - Doors to the study can now be opened from inside
[ci skip]
(cherry-picked from commit 913b77d79d9ac0fb4d67ac1461811aeb691daa60)
Commit: 8d282c97afa2f7e647d6af5b5c85883ddd4e1ad4
https://github.com/wesnoth/wesnoth/commit/8d282c97afa2f7e647d6af5b5c85883ddd4e1ad4
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Northern_Rebirth/lua/respawn_utils.lua
M data/campaigns/Northern_Rebirth/maps/05a_01_The_Pursuit.map
M data/campaigns/Northern_Rebirth/scenarios/02_01_Infested_Caves.cfg
M data/campaigns/Northern_Rebirth/scenarios/05a_01_The_Pursuit.cfg
Log Message:
-----------
NR S5a: more bugfixes
* now the situation can appear that spiders can attack Malifor,
this handles it.
* add *^Xo Terrain to the filter. While there is no bug to fix,
it looks like it belongs there too.
* work around a tile glitching with an [item] at 22,4
* remove code referring to removed variables
* and run wmlindent
[ci skip]
(cherry-picked from commit fc427ce58c6ce2c3948711207e67c646d2295951)
Commit: 5c04fe72d5b89f8fc2f143738251c73645ca45a4
https://github.com/wesnoth/wesnoth/commit/5c04fe72d5b89f8fc2f143738251c73645ca45a4
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M data/lua/wml/kill.lua
Log Message:
-----------
Don't allow [kill] animate=yes to scroll to units through fog and shroud
Restores 1.12's behaviour.
(cherry-picked from commit 4e37cdc713d054a48b1f31f43cb5511f42626847)
Commit: 009e789b8b0be59abee2dffde6608784388784be
https://github.com/wesnoth/wesnoth/commit/009e789b8b0be59abee2dffde6608784388784be
Author: sigurdfdragon <jjwcoat at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Dead_Water/scenarios/10_The_Flaming_Sword.cfg
Log Message:
-----------
DW: Fix #3207
...by preventing any allied units from moving to the sword.
(cherry-picked from commit 85ba7797b23fd2a98af33b61bfe22ea3e5f56f94)
Commit: ae67350fd93993c7889ec6f0a9c4d09629954f09
https://github.com/wesnoth/wesnoth/commit/ae67350fd93993c7889ec6f0a9c4d09629954f09
Author: sigurdfdragon <jjwcoat at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M players_changelog.md
Log Message:
-----------
Update changelogs
(cherry-picked from commit c9c689da668e40d17e54cb8b2d8479a9df7149fc)
Commit: 097244559f5ff8957222a120800a777f6367fdfd
https://github.com/wesnoth/wesnoth/commit/097244559f5ff8957222a120800a777f6367fdfd
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/savegame.cpp
M src/sound.cpp
M src/sound.hpp
Log Message:
-----------
Fix #2602: music doesn't change immediately on loading a save
(cherry-picked from commit 94b69e028125f344dbb0e8fc1a76845891b291f2)
Commit: d5f66e229fc585d682ace6c23eb686412877bb71
https://github.com/wesnoth/wesnoth/commit/d5f66e229fc585d682ace6c23eb686412877bb71
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M players_changelog.md
Log Message:
-----------
Changelog entry for commit 94b69e028125f344dbb0e8fc1a76845891b291f2
(cherry-picked from commit b7c1007f34f6e5ff9c15e14b4cf1334b45749237)
Commit: 7b604c2a89e5d2a08218621773a3614d255f69b4
https://github.com/wesnoth/wesnoth/commit/7b604c2a89e5d2a08218621773a3614d255f69b4
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M data/lua/wml/message.lua
Log Message:
-----------
Fall back to the unit type name for [message] captions for nameless units
Fixes #3211.
(cherry-picked from commit 051182fa1c6fa75184d991920ff4e8e84831a848)
Commit: e1a7e08a92480de20af8776921cc73fe112e3b4f
https://github.com/wesnoth/wesnoth/commit/e1a7e08a92480de20af8776921cc73fe112e3b4f
Author: loonycyborg <loonycyborg at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/server/server.cpp
M src/server/server.hpp
Log Message:
-----------
wesnothd: avoid needlessly casting pointer to long int
(cherry-picked from commit a25180893344c6a99013e6b94eb3cb7110b1d987)
Commit: f8361aa7d1bcca95737b930b7f1c2d79396c1e12
https://github.com/wesnoth/wesnoth/commit/f8361aa7d1bcca95737b930b7f1c2d79396c1e12
Author: loonycyborg <loonycyborg at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/server/forum_user_handler.cpp
Log Message:
-----------
wesnothd: fix server terminating in response to unregistered login
if unregistered logins are allowed
(cherry-picked from commit 0c0bf7f91d7654a7ac83861236b5e0589e1bbcaf)
Commit: de1bdba76951c4e4ec302a032edabd27b13ab627
https://github.com/wesnoth/wesnoth/commit/de1bdba76951c4e4ec302a032edabd27b13ab627
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/savegame.cpp
M src/sound.cpp
M src/sound.hpp
Log Message:
-----------
Revert "Fix #2602: music doesn't change immediately on loading a save"
This reverts commit 94b69e028125f344dbb0e8fc1a76845891b291f2.
(cherry-picked from commit cafede479c70cbc2d70d052fd0c51e5c5440fa57)
Commit: bcc914bfe8aa16b04c9ffb6462ebac0100092bb1
https://github.com/wesnoth/wesnoth/commit/bcc914bfe8aa16b04c9ffb6462ebac0100092bb1
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/playsingle_controller.cpp
M src/scripting/lua_audio.cpp
M src/sound.cpp
M src/sound.hpp
M src/wesnoth.cpp
Log Message:
-----------
Fix #2602: music doesn't change immediately on loading a save
This time I added an option to disable the feature to allow the currently
playing track to finish when changing the playlist. This allows more
fine-grained control of distinct use cases.
In wesnoth.cpp:do_gameloop(), I reversed the order of the title screen
music and default music because otherwise adding the default music would
enable play_once for the title screen music and prevent instant music
change when the player loads a save. I play title screen music with
immediate=yes, so it's still played first.
(cherry-picked from commit 91afbfd5868595e29a3147748c78652c88d6323e)
Commit: 3505af2f09c40120147af67f8635c4a4729d6770
https://github.com/wesnoth/wesnoth/commit/3505af2f09c40120147af67f8635c4a4729d6770
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M src/gui/dialogs/unit_create.cpp
Log Message:
-----------
gui2/unit_create: Do not exclude do_not_list units
This is a debug mode-only dialog. If I want to spawn a unit, the game
had better allow me to spawn any unit I want. do_not_list was created
for use by wmlunits anyway.
(cherry-picked from commit 085236f556dd485fe186473208bdf4438ec4826d)
Commit: 325864d7f1a9d703ff052cd5731fbc24407abcae
https://github.com/wesnoth/wesnoth/commit/325864d7f1a9d703ff052cd5731fbc24407abcae
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Changelog entry for the fix for issue #3206
[ci skip]
(cherry-picked from commit 94a85e0185d0a1b4f0ddf65128e5992f5ca63d28)
Commit: 231bb484e71a5399e19a997fc73f696d3f6875fc
https://github.com/wesnoth/wesnoth/commit/231bb484e71a5399e19a997fc73f696d3f6875fc
Author: loonycyborg <loonycyborg at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/server/server.cpp
Log Message:
-----------
wesnothd: fix prematurely adding new players to games_and_users_list_
If dc happens during asio read that would call server::add_player
then a "ghost" player will appear in games_and_users_list_. Fix works by
moving the list update into the handler, it will be called only if read is
successful.
This should prevent issue #2989 unless it has some other mechanism
(cherry-picked from commit 787a1a0dae41e68d237cacd9ceca381d6dad76df)
Commit: 9d2522a2d0ea731017500f7ceb794e038e98cac2
https://github.com/wesnoth/wesnoth/commit/9d2522a2d0ea731017500f7ceb794e038e98cac2
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-lib/en_GB.po
M po/wesnoth-manpages/en_GB.po
M po/wesnoth-units/en_GB.po
M po/wesnoth/en_GB.po
Log Message:
-----------
updated British English translation
(cherry-picked from commit 5e35e4e8f3ab91aa4a1750bc9f9773b3b2ea91f7)
Commit: 092687cdbee82862b0a2f2f0d05d71bc7fdca1f3
https://github.com/wesnoth/wesnoth/commit/092687cdbee82862b0a2f2f0d05d71bc7fdca1f3
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-lib/it.po
M po/wesnoth-manpages/it.po
M po/wesnoth-units/it.po
M po/wesnoth/it.po
Log Message:
-----------
updated Italian translation
(cherry-picked from commit c9b7d5b22f574f8cc13a9430507caf6a6dacdc68)
Commit: 6d0cbe99fdf5b78858dc92ac537db518ddc708bc
https://github.com/wesnoth/wesnoth/commit/6d0cbe99fdf5b78858dc92ac537db518ddc708bc
Author: doofus-01 <doofus-01 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
A data/campaigns/Under_the_Burning_Suns/images/portraits/monsters/giant_ant.png
M data/campaigns/Under_the_Burning_Suns/images/units/monsters/ant-attack.png
M data/campaigns/Under_the_Burning_Suns/images/units/monsters/ant-defend.png
M data/campaigns/Under_the_Burning_Suns/images/units/monsters/ant.png
M data/campaigns/Under_the_Burning_Suns/units/monsters/Ant.cfg
Log Message:
-----------
UtBS: Graphics update for Giant Ant (#3190)
* graphics update for giant ant unit
* slight revision to ant base sprite
(cherry-picked from commit 9bb6cbb82c46a51aa9a3f4da2eefdcff9c4409e6)
Commit: 674a39a43e1d6173597febda40ffda23ecca60ec
https://github.com/wesnoth/wesnoth/commit/674a39a43e1d6173597febda40ffda23ecca60ec
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/ai/lua/ai_helper.lua
Log Message:
-----------
AI helper: improve efficiency of get_unit functions
The old method is very slightly faster in some circumstances (e.g. for
simple filters and when all units have moves/attacks/etc. left), but we
are talking fractions of micro seconds. By contrast, depending on the
filter used, the new method can save large amounts of evaluation time
once some units have move or attacked.
(cherry-picked from commit 972ecc2f56c3cc1391db165518324b1a3757431d)
Commit: 6a64e6e37e4f29f425475768fbed7d7e35a12af4
https://github.com/wesnoth/wesnoth/commit/6a64e6e37e4f29f425475768fbed7d7e35a12af4
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/ai/micro_ais/cas/ca_goto.lua
Log Message:
-----------
Goto Micro AI: change order of SLF and SUF evaluation
This is for efficiency reasons, as location filters do not necessarily
change throughout a side’s turn, while fewer and fewer units have moves
left.
(cherry-picked from commit 0dcbe1d0d0b1dda90a0fa649120348b7542f2644)
Commit: 22ca458bfd76ebc0996157af0cd82b106a7dc3ec
https://github.com/wesnoth/wesnoth/commit/22ca458bfd76ebc0996157af0cd82b106a7dc3ec
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/ai/micro_ais/cas/ca_goto.lua
Log Message:
-----------
Goto Micro AI: add [and] to a filter
Another efficiency improvement. This ensures that the side of the unit
is checked first before the potentially complex rest of the filter is
evaluated.
(cherry-picked from commit 6c38b8ce934ea68bd11a3aa960a91fe6f9dbfb87)
Commit: fa6da90138be36fb8b81005101c6eb9455e6e117
https://github.com/wesnoth/wesnoth/commit/fa6da90138be36fb8b81005101c6eb9455e6e117
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Changelog: collect AI entries in 'AI' section
(cherry-picked from commit 7ed5b210b5aecffc5f9d34e468abe237783be158)
Commit: a5e447a438bee7dab04990baa36fab492facb6bd
https://github.com/wesnoth/wesnoth/commit/a5e447a438bee7dab04990baa36fab492facb6bd
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Update changelog with Lua AI efficiency improvements
(cherry-picked from commit 7afe6adbee971ddfbd23df67929a965ff57597d1)
Commit: 58880c845317a29a4848571807418f9565e0aff6
https://github.com/wesnoth/wesnoth/commit/58880c845317a29a4848571807418f9565e0aff6
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/events.cpp
Log Message:
-----------
Ensure events::call_in_main_thread is thread-safe
(cherry-picked from commit b70463b6adbeb235ba24da315627c5dba79b5e75)
Commit: 2373407bd24e244359b7ad1d53e0c8bb3bea70b6
https://github.com/wesnoth/wesnoth/commit/2373407bd24e244359b7ad1d53e0c8bb3bea70b6
Author: ln-zookeeper <lari.nieminen at iki.fi>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/units/undead/Corpse_Soulless.cfg
M data/core/units/undead/Corpse_Walking.cfg
Log Message:
-----------
Restructured WC/Soulless bat variation defense animation (fixes #3215)
There were two overlapping problems: 1) the branching was written incorrectly (due to combining top-level and [if] filters) and 2) the first [defend] tag getting merged with the base WC/Soulless defense animation.
(cherry-picked from commit 131868581d1bb22c2d5612e223657951489e6c1d)
Commit: 1b547fec0a3da4e054a69849d2ae49c0cc50a149
https://github.com/wesnoth/wesnoth/commit/1b547fec0a3da4e054a69849d2ae49c0cc50a149
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/core/register_widget.hpp
M src/gui/widgets/addon_list.cpp
M src/gui/widgets/addon_list.hpp
M src/gui/widgets/button.cpp
M src/gui/widgets/button.hpp
M src/gui/widgets/chatbox.cpp
M src/gui/widgets/chatbox.hpp
M src/gui/widgets/drawing.cpp
M src/gui/widgets/drawing.hpp
M src/gui/widgets/horizontal_scrollbar.cpp
M src/gui/widgets/horizontal_scrollbar.hpp
M src/gui/widgets/image.cpp
M src/gui/widgets/image.hpp
M src/gui/widgets/label.cpp
M src/gui/widgets/label.hpp
M src/gui/widgets/list.hpp
M src/gui/widgets/listbox.cpp
M src/gui/widgets/listbox.hpp
M src/gui/widgets/matrix.hpp
M src/gui/widgets/menu_button.cpp
M src/gui/widgets/menu_button.hpp
M src/gui/widgets/minimap.cpp
M src/gui/widgets/minimap.hpp
M src/gui/widgets/multi_page.cpp
M src/gui/widgets/multi_page.hpp
M src/gui/widgets/multimenu_button.cpp
M src/gui/widgets/multimenu_button.hpp
M src/gui/widgets/panel.cpp
M src/gui/widgets/panel.hpp
M src/gui/widgets/password_box.cpp
M src/gui/widgets/password_box.hpp
M src/gui/widgets/progress_bar.cpp
M src/gui/widgets/progress_bar.hpp
M src/gui/widgets/repeating_button.cpp
M src/gui/widgets/repeating_button.hpp
M src/gui/widgets/scroll_label.cpp
M src/gui/widgets/scroll_label.hpp
M src/gui/widgets/scrollbar_container.cpp
M src/gui/widgets/scrollbar_container.hpp
M src/gui/widgets/scrollbar_panel.cpp
M src/gui/widgets/scrollbar_panel.hpp
M src/gui/widgets/size_lock.cpp
M src/gui/widgets/size_lock.hpp
M src/gui/widgets/slider.cpp
M src/gui/widgets/slider.hpp
M src/gui/widgets/spacer.cpp
M src/gui/widgets/spacer.hpp
M src/gui/widgets/stacked_widget.cpp
M src/gui/widgets/stacked_widget.hpp
M src/gui/widgets/styled_widget.hpp
M src/gui/widgets/text_box.cpp
M src/gui/widgets/text_box.hpp
M src/gui/widgets/toggle_button.cpp
M src/gui/widgets/toggle_button.hpp
M src/gui/widgets/toggle_panel.cpp
M src/gui/widgets/toggle_panel.hpp
M src/gui/widgets/tree_view.cpp
M src/gui/widgets/tree_view.hpp
M src/gui/widgets/unit_preview_pane.cpp
M src/gui/widgets/unit_preview_pane.hpp
M src/gui/widgets/vertical_scrollbar.cpp
M src/gui/widgets/vertical_scrollbar.hpp
M src/gui/widgets/window.cpp
M src/gui/widgets/window.hpp
Log Message:
-----------
GUI2: added a public static type getter to all widgets implementing get_control_type
Fixes #2400. See comment in styled_widget.hpp for details.
(cherry-picked from commit 52f7fcf5cc3d7446904df90381f467d15d4f5aad)
Commit: a13791c23b25dc9e6936ebb3ae22678a547692a6
https://github.com/wesnoth/wesnoth/commit/a13791c23b25dc9e6936ebb3ae22678a547692a6
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/core/window_builder.hpp
M src/gui/dialogs/drop_down_menu.cpp
M src/gui/dialogs/preferences_dialog.cpp
M src/gui/widgets/scrollbar_container.cpp
Log Message:
-----------
GUI2: removed now-redundant type parameter from build_single_widget_and_cast_to
(cherry-picked from commit 34195ae6548131ef00aa894b4f82c7312fa140da)
Commit: cb90af3afe3758aceefeb6dc0b9882158c992ed1
https://github.com/wesnoth/wesnoth/commit/cb90af3afe3758aceefeb6dc0b9882158c992ed1
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/events.cpp
Log Message:
-----------
Added missing <atomic> include
(cherry-picked from commit bc0ad54ab096501d01e05f71a9299d67a970eb1e)
Commit: d8086b1d35bf036ff809d4f769710837f955094c
https://github.com/wesnoth/wesnoth/commit/d8086b1d35bf036ff809d4f769710837f955094c
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/events.cpp
Log Message:
-----------
Fixup this atomic_bool again
Apparently atomic types aren't copy-assignable.
(cherry-picked from commit 424e0e0ab44f51932c25e7bad364a9602f6c8bc5)
Commit: f5c791d598df339832a6958a27a547c210a594fe
https://github.com/wesnoth/wesnoth/commit/f5c791d598df339832a6958a27a547c210a594fe
Author: Thom Diment <mr.diment at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg
Log Message:
-----------
UtBS 5: changes to scenario locations (#3104)
* UtBS 5: changes to scenario locations
Fixes #3077:
* Moved AI leader spawns to keeps
* Changed spawn of trolls that were spawning in walls
* Sanity-checked village ownership in cavern
Fixes #3078:
* Changed spawn of Eastern Troll Flamecaster
* Fixed entry routes of Troll Flamecasters
>From author notes:
* Made 'Wounded Dwarf' a wounded unit
(cherry-picked from commit 7feb9aee113def823d506f987d0bee737da60ed7)
Commit: 322afd978a8c056037a986822cc5fd5cc1f62679
https://github.com/wesnoth/wesnoth/commit/322afd978a8c056037a986822cc5fd5cc1f62679
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/tutorial/lua/character_selection.lua
Log Message:
-----------
Tutorial: show the female fighteress in the help (if she is chosen)
Uses the workaround mentioned in #3012
[ci skip]
(cherry-picked from commit 18a101be6650fa19da900e680a29a39049ce69c0)
Commit: 965b5e164836090772eb1b141bf9463cc3ab9c1e
https://github.com/wesnoth/wesnoth/commit/965b5e164836090772eb1b141bf9463cc3ab9c1e
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M src/gui/dialogs/unit_attack.cpp
M src/mouse_events.cpp
Log Message:
-----------
Unit Attack: fixed issues arising from displayed items potentially not equally available items
Since there were weapons included that weren't shown, it was possible for the best
weapon selection to be a hidden one (in which case, the initial selection would be
wrong, and it was possible for the returned index to point to a hidden, disabled
weapon.
This resolves both issues by excluding these disabled attacks from the weapon choices
list altogether. They aren't considered when calculating the best attack either.
mouse_handler::fill_weapon_choices is also used in mouse_handler::attack_enemy_, but
I don't foresee this change should cause any issues there, since you aren't supposed
to be able to actually attack with disabled weapons anyway.
(cherry-picked from commit 00e58f12f9a57b2e25dd4f67efb1255b177e173b)
Commit: c0f6c6c54073622e8729dca04962d51464739f9a
https://github.com/wesnoth/wesnoth/commit/c0f6c6c54073622e8729dca04962d51464739f9a
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-lib/es.po
M po/wesnoth-manpages/es.po
M po/wesnoth-units/es.po
M po/wesnoth/es.po
Log Message:
-----------
updated Spanish translation
(cherry-picked from commit ca25c0dc5c519a66f19146240273712a2264b81a)
Commit: e78bb6c086eea22cdd95f53bd17b271590dafc06
https://github.com/wesnoth/wesnoth/commit/e78bb6c086eea22cdd95f53bd17b271590dafc06
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-tutorial/fr.po
Log Message:
-----------
updated French translation
(cherry-picked from commit e464082e0629522330eefcabcca5da811e4b316f)
Commit: 98cc5372a795c1d38034739ab523025494865a1a
https://github.com/wesnoth/wesnoth/commit/98cc5372a795c1d38034739ab523025494865a1a
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-lib/gd.po
M po/wesnoth/gd.po
Log Message:
-----------
updated Scottish Gaelic translation
(cherry-picked from commit f8742ccce40ecf3be3eaf1afa437de7d7ed4d733)
Commit: ae9559d8f04232024b99d92da410f3d2a76ea8de
https://github.com/wesnoth/wesnoth/commit/ae9559d8f04232024b99d92da410f3d2a76ea8de
Author: stevecotton <steve at octalot.co.uk>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg
Log Message:
-----------
DiD S2: When ambushed by goblins, cancel any pending attack (#3227)
This happens in a village-capture event, so the unit has finished
moving for this turn in any case.
(cherry-picked from commit 8d055bf038624fc61d965049832722555711af8a)
Commit: 628d0d9ed25c263440fa8dbd2789dec908e0423d
https://github.com/wesnoth/wesnoth/commit/628d0d9ed25c263440fa8dbd2789dec908e0423d
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/tools/about_cfg_to_wiki
Log Message:
-----------
Make Credits page on wiki.w.o use the new TOC markup for mobile support
[ci skip]
(cherry-picked from commit 45ab8e5b6229d40d3c23e2cd64d3c7922a1e55c8)
Commit: 131e1795deb6a3ba281480b95d749a3f4bcc58ff
https://github.com/wesnoth/wesnoth/commit/131e1795deb6a3ba281480b95d749a3f4bcc58ff
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-help/cs.po
M po/wesnoth-lib/cs.po
M po/wesnoth-nr/cs.po
M po/wesnoth-sotbe/cs.po
M po/wesnoth-tutorial/cs.po
M po/wesnoth-utbs/cs.po
Log Message:
-----------
updated Czech translation
(cherry-picked from commit 725f6eba04e3f7ae10369e256e4b71ecd1520b00)
Commit: 5b412030f4617f042afaf1b0360f7fb6b0cd91e9
https://github.com/wesnoth/wesnoth/commit/5b412030f4617f042afaf1b0360f7fb6b0cd91e9
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-lib/ja.po
M po/wesnoth-manpages/ja.po
M po/wesnoth-sota/ja.po
M po/wesnoth-units/ja.po
M po/wesnoth/ja.po
Log Message:
-----------
updated Japanese translation
(cherry-picked from commit 92816d42d5ce60c570a74a666f05bc03b7a83acc)
Commit: a5739073ea6b2fd052772d1fce17dc4274dd3b36
https://github.com/wesnoth/wesnoth/commit/a5739073ea6b2fd052772d1fce17dc4274dd3b36
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/actions/move.cpp
M src/game_events/pump.cpp
M src/game_events/pump.hpp
Log Message:
-----------
Remove game_events::wml_event_pump::wml_tracking()
The variable **always** changed when event handlers were run, and thus the
optimizations to avoid updating some status after WML/Lua has run weren't
doing anything. In addition, commit 62ec3b3951bfb7bf6331ad1e98f45ce99e5191d5 removed the most
important optimization that relied on wml_tracking().
Resolves #2578.
(cherry-picked from commit f0896bdf8c9af1f23269e4745a993259b4def060)
Commit: 758fe79fe2f5930debeb79655d7d06579e719d99
https://github.com/wesnoth/wesnoth/commit/758fe79fe2f5930debeb79655d7d06579e719d99
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/actions/create.cpp
M src/game_events/action_wml.cpp
M src/game_events/conditional_wml.cpp
M src/gui/dialogs/statistics_dialog.cpp
M src/play_controller.cpp
M src/scripting/game_lua_kernel.cpp
M src/side_filter.cpp
M src/statistics.cpp
M src/team.hpp
M src/variable.cpp
Log Message:
-----------
fix issues caused by empty save id
ee50171d13c7f20a3c8147201c2b78ab54fafae3 broke some codes that relied on
unique save ids, that is in particular the statistic code and
scoped_recall_unit, so now these codes fallback to the side number if
the save id is empty.
(cherry-picked from commit c79e1645c8f04c8a7eaae8dcc1c717f9a6fae7d6)
Commit: 9aef0f923e2709c8f8b19badb79cff3676009b5a
https://github.com/wesnoth/wesnoth/commit/9aef0f923e2709c8f8b19badb79cff3676009b5a
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/replay.cpp
Log Message:
-----------
fix teamchat not marked #3119
(cherry-picked from commit 25840c8a4bdfa1bd7b93069ba9fc2562eca39910)
Commit: 90cc4569a79286159717e7a4f98000369401e470
https://github.com/wesnoth/wesnoth/commit/90cc4569a79286159717e7a4f98000369401e470
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/about.cfg
Log Message:
-----------
Shuffled a few credits entries around
[ci skip]
(cherry-picked from commit c8fc88454bddbfb03b7da9f9007dcb442cc27485)
Commit: e68bdd1b5f479da2c1c0e1144cc4dbce1498bb44
https://github.com/wesnoth/wesnoth/commit/e68bdd1b5f479da2c1c0e1144cc4dbce1498bb44
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M data/lua/wml-tags.lua
Log Message:
-----------
Fix Lua errors when failing to set a music track on an empty playlist
Closes #3194.
(cherry-picked from commit 5871557dbfe407ab454d9f55be6bc2a0fcad0434)
Commit: 201b2973d2e01dde44b22826536fb29e3daace8a
https://github.com/wesnoth/wesnoth/commit/201b2973d2e01dde44b22826536fb29e3daace8a
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M src/filesystem_common.cpp
Log Message:
-----------
Fixed [scenario] map_file basically being unusable
Automatically checking the path relative to a maps/ directory without binary
path support results in an invalid path almost every single time. If I remember
correctly from my testing, the only time that worked was if I added a data/maps
folder.
(cherry-picked from commit 42349651cb23f372f6919997f3f72ce1a9fc7766)
Commit: 16b3e3dba1597eb96bd43d49f14660cc40763fef
https://github.com/wesnoth/wesnoth/commit/16b3e3dba1597eb96bd43d49f14660cc40763fef
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Move changelog entry around
[ci skip]
(cherry-picked from commit ce8bf3cfc3c9310d97da94d102256e498c9b6f1d)
Commit: 115c8d1d0cc7c1f7a5e2e05870d3751189121de3
https://github.com/wesnoth/wesnoth/commit/115c8d1d0cc7c1f7a5e2e05870d3751189121de3
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M data/campaigns/Descent_Into_Darkness/maps/01_Saving_Parthyn.map
M data/campaigns/Descent_Into_Darkness/maps/06_Return_to_Parthyn.map
M data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Parthyn.cfg
M data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg
Log Message:
-----------
DiD S1/S6: new Parthyn maps
[ci skip]
(cherry-picked from commit b6416b832929a71e6611e1172a0f9e3796f505b5)
Commit: 4e97b511f362b60e3fd7274de24594c8a07c68e8
https://github.com/wesnoth/wesnoth/commit/4e97b511f362b60e3fd7274de24594c8a07c68e8
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg
Log Message:
-----------
DiD S6: shift the escape location slightly to account for the map redraw
[ci skip]
(cherry-picked from commit 500259a7c2aab1f296441e720ee057e068291a32)
Commit: 27279f96e18fea5d5bcc26e5124d37ae952f25c5
https://github.com/wesnoth/wesnoth/commit/27279f96e18fea5d5bcc26e5124d37ae952f25c5
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Added 1.13.13 - 1.14.3 changelog sections
[ci skip]
Duplicate entry cleanup for the 1.15.0-dev section to come
(cherry-picked from commit 556d088e5754ef8197e47c82a828e7fadbc5f93c)
Commit: 1871a32995def7f90cba385799269a8bb2b76100
https://github.com/wesnoth/wesnoth/commit/1871a32995def7f90cba385799269a8bb2b76100
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M data/gui/window/statistics_dialog.cfg
M src/gui/dialogs/statistics_dialog.cpp
M src/gui/dialogs/statistics_dialog.hpp
Log Message:
-----------
Statistics Dialog: remove mode toggle in favor of an All Scenarios menu entry
Closes #2886.
(cherry-picked from commit b5f1e1a48a9d817d1d68a5868903bb3e518cba3d)
Commit: 1e1839de3d4c40c45011882f0ce712fc25f49f06
https://github.com/wesnoth/wesnoth/commit/1e1839de3d4c40c45011882f0ce712fc25f49f06
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/gui/window/statistics_dialog.cfg
M src/gui/dialogs/statistics_dialog.cpp
Log Message:
-----------
Statistics Dialog: merge unit name and count labels
Makes it easier for translators to do something specific with this label if needs
be. I remember the reason the count (NUMx) label was moved prior to the name had
to do with language conventions too, so this should alleviate any other such issues.
Also made the name label default size instead of small.
(cherry-picked from commit 142a2f20ca70deaf4d6a71c918de47aef366fc47)
Commit: 9baabd8b18e8addb27ec4c17d16435ade5831437
https://github.com/wesnoth/wesnoth/commit/9baabd8b18e8addb27ec4c17d16435ade5831437
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Removed duplicate changelog entries under the 1.15.0-dev header
[ci skip]
These were all mentioned between 1.13.13 and 1.14.3, meaning the remaining changes
are everything new in 1.15.0-dev so far. Also removed one entry that was mentioned
twice in the WML Engine section.
(cherry-picked from commit 70a1cdd3e6949a765cead1b31fa6504d44b99b90)
Commit: d1e1214f20c29e6a4365a42a65487b2dc5eae6f1
https://github.com/wesnoth/wesnoth/commit/d1e1214f20c29e6a4365a42a65487b2dc5eae6f1
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Removed a duplicate changelog entry I missed
[ci skip]
(cherry-picked from commit 92c67f52442f1c334be463409dfda51eb0b70aa6)
Commit: d002ce2abfe9e459a04f7f36e66df504c418c518
https://github.com/wesnoth/wesnoth/commit/d002ce2abfe9e459a04f7f36e66df504c418c518
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Changelog: moved an entry, fixed a typo
[ci skip]
(cherry-picked from commit b27d1c21f5ef59f1694e95d821a04ab6d0993070)
Commit: 6698a8269a4b26b216d29a9e6eb436133f35e003
https://github.com/wesnoth/wesnoth/commit/6698a8269a4b26b216d29a9e6eb436133f35e003
Author: Celtic Minstrel <CelticMinstrel at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Remove duplicate changelog entries
(cherry-picked from commit 93d4a1237544dc42c8ed15d646b9f70afd8a9a16)
Commit: 3f9137f7e8f96a3ecc3a5dd7dced89400ac5956d
https://github.com/wesnoth/wesnoth/commit/3f9137f7e8f96a3ecc3a5dd7dced89400ac5956d
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M data/advanced_preferences.cfg
Log Message:
-----------
Added an advanced preference for the PRNG combat option
[ci skip]
(cherry-picked from commit 8baeb8457d96e2048ebdac9188bb95fcfbffd340)
Commit: 037f515e41bef2c29b4af5772b382506da3aa8ed
https://github.com/wesnoth/wesnoth/commit/037f515e41bef2c29b4af5772b382506da3aa8ed
Author: doofus-01 <doofus-01 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/units/humans/Outlaw_Ruffian.cfg
Log Message:
-----------
change ruffian attack anim timings
(cherry-picked from commit c398a8fa8651411c6d0b9742464c063cd0534a86)
Commit: ff4821841af3b5efe4397bfd8da36e82f87a1959
https://github.com/wesnoth/wesnoth/commit/ff4821841af3b5efe4397bfd8da36e82f87a1959
Author: doofus-01 <doofus-01 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
A data/core/images/units/human-peasants/peasant-attack1.png
M data/core/images/units/human-peasants/peasant-attack2.png
A data/core/images/units/human-peasants/peasant-attack3.png
A data/core/images/units/human-peasants/peasant-attack4.png
A data/core/images/units/human-peasants/peasant-attack5.png
A data/core/images/units/human-peasants/peasant-ranged1.png
A data/core/images/units/human-peasants/peasant-ranged2.png
M data/core/units/humans/Peasant.cfg
Log Message:
-----------
peasant attack animations
(cherry-picked from commit 3f3e13c0b4375a7cf8df8ee6931c0a850b950863)
Commit: 447e946e865a1c8563dbd10cba1ecdb0839edf74
https://github.com/wesnoth/wesnoth/commit/447e946e865a1c8563dbd10cba1ecdb0839edf74
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Updated changelog
[ci skip]
(cherry-picked from commit 802443eaf9a7306fda645742855432d14629ee71)
Commit: 2ce506604f06cf17c9a3fc17d2be8940a9c0e496
https://github.com/wesnoth/wesnoth/commit/2ce506604f06cf17c9a3fc17d2be8940a9c0e496
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/statistics_dialog.cpp
Log Message:
-----------
Statistics Dialog: keep the same stat selected between scenario selections
Fixes #3223, closes #3226.
(cherry-picked from commit f1d2f85479654a0d5e027bd8afc7ae2d7ddd884f)
Commit: 482b003a168e1059a4771d0a7bdea93e1b16f8f1
https://github.com/wesnoth/wesnoth/commit/482b003a168e1059a4771d0a7bdea93e1b16f8f1
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
A data/tools/steam-changelog
Log Message:
-----------
tools: Add steam-changelog
This is a script to take a changelog section (provided in the command
line as such: `steam-changelog changelog.md X.Y.Z`) and convert it to
BBCode for posting on Steam.
[ci skip]
(cherry-picked from commit a92b83e40466c6ea53d9ad98907abb4d9ce4d4ee)
Commit: 49d53795a6e382385ca4eb5b37deb115efef7581
https://github.com/wesnoth/wesnoth/commit/49d53795a6e382385ca4eb5b37deb115efef7581
Author: Steve Cotton <steve at octalot.co.uk>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/about.cfg
Log Message:
-----------
Update core/about.cfg to use "merfolk" instead of "mermen" (part of #2940)
(cherry-picked from commit fbc74bf007258436a65926bf3e3edf9f7aa143f3)
Commit: 39785177e2261b509baf292530fe5739b2a5dc3e
https://github.com/wesnoth/wesnoth/commit/39785177e2261b509baf292530fe5739b2a5dc3e
Author: Pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M SConstruct
Log Message:
-----------
Fix stack protection with LTO.
(cherry-picked from commit 5a2d1bc992a4527eeee60f8624880a34d84be57c)
Commit: 2b4ae206ab796934899a628be6d3808a4ccd6c60
https://github.com/wesnoth/wesnoth/commit/2b4ae206ab796934899a628be6d3808a4ccd6c60
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M src/game_initialization/multiplayer.cpp
Log Message:
-----------
Fixed MP admins being unable to observe private games (fixes #2851)
This was due to the change in the MP initialization process wherein the lobby wouldn't
show up until the initial gamelist was received. Since the admin auth message is sent
after [join_game] and before the initial gamelist, and the chatbox widget handled parsing
the auth message, the client was never marked as authenticated and therefor couldn't
observe private games. This fixes that by adding auth parsing to the MP initialization
process.
Note this doesn't fix the issue of the auth confirmation not showing up in the lobby chat
(issue #2920). I'll have to think of a way to fix that separately.
(cherry-picked from commit e8d55062c4293391ce6a9d70ed24bfa57aaa6490)
Commit: b524c05e040dd6008a91c4de30afd3c77d92236a
https://github.com/wesnoth/wesnoth/commit/b524c05e040dd6008a91c4de30afd3c77d92236a
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M utils/pofix.py
Log Message:
-----------
pofix: Update with 1.14.2 -> 1.14.3 rules for the website
[ci skip]
(cherry-picked from commit 73680ed764840a2e61d54d859a4768c75b873b3c)
Commit: 1e8163c93f2d5bab7e70b9f787418dcf18c72190
https://github.com/wesnoth/wesnoth/commit/1e8163c93f2d5bab7e70b9f787418dcf18c72190
Author: doofus-01 <doofus-01 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
A data/campaigns/Under_the_Burning_Suns/images/terrain/citadel_zocthanol.png
A data/campaigns/Under_the_Burning_Suns/images/terrain/citadel_zocthanol_clouds.png
A data/campaigns/Under_the_Burning_Suns/images/terrain/citadel_zocthanol_sub.png
M data/campaigns/Under_the_Burning_Suns/scenarios/11_Battle_for_Zocthanol_Isle.cfg
Log Message:
-----------
UtBS S11: Citadel graphics, drawn over the cavewall donut
(cherry-picked from commit 79246493191443ccac936b92b6d413a3d28c126e)
Commit: fdd8f5737d8318a3fb3c35e51ffd554f461b4cd9
https://github.com/wesnoth/wesnoth/commit/fdd8f5737d8318a3fb3c35e51ffd554f461b4cd9
Author: doofus-01 <doofus-01 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/scenarios/12_The_Final_Confrontation.cfg
M data/campaigns/Under_the_Burning_Suns/units/monsters/Alien_Body.cfg
Log Message:
-----------
UtBS S12: Make alien central body vulnerability more visible to player
(cherry-picked from commit 636575627d6616c47a7678c71fc127d8f8dde841)
Commit: d474ca9796d3b4fce19d8e5e8e9841c4741794e2
https://github.com/wesnoth/wesnoth/commit/d474ca9796d3b4fce19d8e5e8e9841c4741794e2
Author: loonycyborg <loonycyborg at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M packaging/flatpak/org.wesnoth.Wesnoth.json
Log Message:
-----------
Update flatpak manifest
(cherry-picked from commit c78e95cf6c149095b88e18fecd7421e4f0f0a844)
Commit: 26dd437f819b9158ca38c31f19803f1851a709e1
https://github.com/wesnoth/wesnoth/commit/26dd437f819b9158ca38c31f19803f1851a709e1
Author: Thom Diment <mr.diment at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Dead_Water/scenarios/05_Tirigaz.cfg
Log Message:
-----------
DW 5 Tirigaz - Changes to orc leader death event (#3103)
DW 5 Tirigaz - Changes to orc leader death event
Fixes #3092 - Updates objectives if orc leader is killed first, and gives additional dialogue
Fixes #3903 - Gold event doesn't fire if ghosts kill the orc leader
(cherry-picked from commit b3c40498d83d4ad3d0701baaee7ca8166546c7e3)
Commit: 90ad7f51cafda13121f642a124e63a5a1dca6cbc
https://github.com/wesnoth/wesnoth/commit/90ad7f51cafda13121f642a124e63a5a1dca6cbc
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M utils/pofix.py
Log Message:
-----------
pofix: Update with 1.14.3 -> 1.14.3a (macOS) rules for the website
[ci skip]
(cherry-picked from commit e636549497feaccc4b9ea3cc5857b148e86a30ee)
Commit: 8ebc39fab27b590a6925cd63f1e9b8c43d5fe37c
https://github.com/wesnoth/wesnoth/commit/8ebc39fab27b590a6925cd63f1e9b8c43d5fe37c
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M doc/man/wesnoth.6
Log Message:
-----------
doc/wesnoth(6): 'none' is a keyword in the --log-<level> description
[ci skip]
(cherry-picked from commit d05de7ced84fc2d8fcb4c3ec3dc8d49d939886ef)
Commit: c2bba0512f235ad602b443b9dbcd44b915e7de26
https://github.com/wesnoth/wesnoth/commit/c2bba0512f235ad602b443b9dbcd44b915e7de26
Author: ln-zookeeper <lari.nieminen at iki.fi>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Eastern_Invasion/scenarios/11_Captured.cfg
Log Message:
-----------
EI S11: Fixed missing prisoners (fixes #3237)
The problem was introduced by commit 0f511e8 due to the [modify_unit] tag apparently causing prisoners to disappear because technically they were duplicates as they had merely been unstored and still existed on the recall list as well.
(cherry-picked from commit c9bb31d1cc9182a4450f29ae529416d2192ab4f9)
Commit: 58d046cacd1ec3c934019d1bf9eede4074dd62c0
https://github.com/wesnoth/wesnoth/commit/58d046cacd1ec3c934019d1bf9eede4074dd62c0
Author: Steve Cotton <steve at octalot.co.uk>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Dead_Water/scenarios/05_Tirigaz.cfg
Log Message:
-----------
DW S05: Add a po hint about the orc saying "mermen" (part of #2940) (#3243)
The orc calls them fish-men several times, so changing it to "merfolk"
wouldn't fit.
Also a whitespace fix from wmlindent.
[ci skip]
(cherry-picked from commit ce093e229016f09da90415dd59305c36958b7c18)
Commit: 98299d56ef75399046f2f4d82df3325329876429
https://github.com/wesnoth/wesnoth/commit/98299d56ef75399046f2f4d82df3325329876429
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/gui/window/end_credits.cfg
Log Message:
-----------
End Credits: reduced text surface size by 42%
[ci skip]
Really no reason for the text area to grow since the text is set in pre_show and
therefor the widget is always the right size. >_<
(cherry-picked from commit 01d37ca7953f3efdd143f7265ecc94dc01791ebb)
Commit: 6be6646a4edbf38f2a86c330c05c0f76d2a4db9e
https://github.com/wesnoth/wesnoth/commit/6be6646a4edbf38f2a86c330c05c0f76d2a4db9e
Author: Pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M CMakeLists.txt
M SConstruct
Log Message:
-----------
Enabled hardened executables by default.
The result of running "hardening-check wesnoth" now shows:
* Position Independent Executable: yes
* Stack protected: yes
* Fortify Source functions: yes (some protected functions found)
* Read-only relocations: yes
* Immediate binding: yes
(cherry-picked from commit 3290961db2eb00221c94f88f02f77ab640f497a4)
Commit: bc3ad71f039397409d26572c4f34152e86eba7f0
https://github.com/wesnoth/wesnoth/commit/bc3ad71f039397409d26572c4f34152e86eba7f0
Author: Pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M CMakeLists.txt
M SConstruct
Log Message:
-----------
Fixup for osx hardening options.
(cherry-picked from commit da6ebc7423ea7b2e8a242ceb44f7bc72f2d08426)
Commit: b87c36274a023aa75f14542d55531ca92f6cd441
https://github.com/wesnoth/wesnoth/commit/b87c36274a023aa75f14542d55531ca92f6cd441
Author: Steve Cotton <steve at octalot.co.uk>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Dead_Water/utils/dw-utils.cfg
Log Message:
-----------
DW: Change the team name from Merman Forces to Merfolk
(cherry-picked from commit 94dd2880c6f71e16bee607ebb7b3fbd2c2e5b410)
Commit: 175c95a2df229972334ec2b06539872385b9c166
https://github.com/wesnoth/wesnoth/commit/175c95a2df229972334ec2b06539872385b9c166
Author: Steve Cotton <steve at octalot.co.uk>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Dead_Water/scenarios/07_Bilheld.cfg
M data/campaigns/Dead_Water/scenarios/10_The_Flaming_Sword.cfg
M data/campaigns/Dead_Water/scenarios/12_Revenge.cfg
M data/campaigns/Dead_Water/scenarios/13_Epilogue.cfg
M data/campaigns/Dead_Water/units/Citizen.cfg
Log Message:
-----------
Dead Water: Change "mermen" to "merfolk" (part of #2940)
This commit excludes changes to S05 Tirigaz, I think changing the dialogue
there is going to be more complicated, and it's better for that to have a
separate PR.
(cherry-picked from commit d5f6c1723910ba32326aff466c1fb710f6afa803)
Commit: 1aa974a250c06ea00540b4cc6c8a5ed8eed19f11
https://github.com/wesnoth/wesnoth/commit/1aa974a250c06ea00540b4cc6c8a5ed8eed19f11
Author: Steve Cotton <steve at octalot.co.uk>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Dead_Water/utils/items.cfg
M data/core/macros/items.cfg
Log Message:
-----------
Prose: the Storm Trident's description uses "merfolk" (issue #2936)
Also update Dead Water's copy of it to use race= instead of a
list of unit types (as done for the core object in 613dd431).
(cherry-picked from commit ad7bc19dd98990b443bd5037952ff612dce502af)
Commit: a025eaaadd7b73f53aab76f826f9de3857fc5637
https://github.com/wesnoth/wesnoth/commit/a025eaaadd7b73f53aab76f826f9de3857fc5637
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/widgets/button.hpp
M src/gui/widgets/horizontal_scrollbar.hpp
M src/gui/widgets/repeating_button.hpp
M src/gui/widgets/slider.hpp
M src/gui/widgets/toggle_button.hpp
M src/gui/widgets/toggle_panel.hpp
M src/gui/widgets/vertical_scrollbar.hpp
Log Message:
-----------
GUI2: added a bunch of missing virtual specifiers
(cherry-picked from commit d7edb83b165c5e6225783e1bbb65d1d040bebe6d)
Commit: 4f34220e596558214fd14698d4463afab83779b7
https://github.com/wesnoth/wesnoth/commit/4f34220e596558214fd14698d4463afab83779b7
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/widgets/menu_button.cpp
M src/gui/widgets/menu_button.hpp
M src/gui/widgets/multimenu_button.cpp
M src/gui/widgets/multimenu_button.hpp
Log Message:
-----------
GUI2/[Multi]Menu Button: removed retval handling
Retvals are only relevant for widgets that are supposed to trigger something
like a window closure, and that makes sense for neither of these widgets. The
only reason the Menu Button widget has it is its original implementation was
largely copied from the Button widget, and the Multimenu Button widget copied
from the Menu Button widget.
(cherry-picked from commit 2d9b7d82c6a602c0b142bea38cebdb3650db62d6)
Commit: 247750e59896025f19044811b35d7ce912fcf642
https://github.com/wesnoth/wesnoth/commit/247750e59896025f19044811b35d7ce912fcf642
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/addon/manager.cpp
M src/gui/dialogs/multiplayer/faction_select.cpp
M src/gui/dialogs/multiplayer/lobby.cpp
M src/gui/dialogs/multiplayer/mp_create_game.cpp
M src/gui/dialogs/multiplayer/mp_options_helper.cpp
M src/gui/dialogs/multiplayer/mp_staging.cpp
M src/gui/dialogs/preferences_dialog.cpp
M src/gui/dialogs/statistics_dialog.cpp
M src/gui/widgets/menu_button.hpp
M src/gui/widgets/multimenu_button.hpp
Log Message:
-----------
GUI2/Menu Button: changed callbacks to NOTIFY_MODIFIED ones
menu_button doesn't even actually inherit from clickable_item. The only reason
[dis]connect_click_handler was declared in this class is the original implementation
was copied extensively from the Button widget.
Using NOTIFY_MODIFIED also means callbacks can fire if set_value/set_selected is used
on a menu_button.
The [dis]connect_click_handler functions were also removed from multimenu_button. All
callbacks for this widget type already used NOTIFY_MODIFIED signals.
(cherry-picked from commit 55f14ff22cf09c8e28da3c97731913349073fcd1)
Commit: b5344a7991a571848a23d62f1f193ae5b388cd2d
https://github.com/wesnoth/wesnoth/commit/b5344a7991a571848a23d62f1f193ae5b388cd2d
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M src/gui/widgets/menu_button.cpp
M src/gui/widgets/menu_button.hpp
Log Message:
-----------
GUI2/Menu Button: allow changing selections with the scrollwheel (closes #3251)'
The changelog entry is under 1.14.3+dev since this is going to be backported.
(cherry-picked from commit a5169f7c501ed6675ba814cd86f4f10bf9059544)
Commit: a1a46b059d90b3897c39c73a85ddff6c062fb935
https://github.com/wesnoth/wesnoth/commit/a1a46b059d90b3897c39c73a85ddff6c062fb935
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/multiplayer/faction_select.hpp
M src/gui/dialogs/multiplayer/mp_join_game.cpp
M src/gui/dialogs/multiplayer/mp_staging.cpp
Log Message:
-----------
Faction Select: declared an execute() helper
(cherry-picked from commit 0632f91bd6492b8cc6ce34866e6fe76eecc3d8b4)
Commit: 9c9fbe464950690c8f31ac0e9a8c9a09e0e65477
https://github.com/wesnoth/wesnoth/commit/9c9fbe464950690c8f31ac0e9a8c9a09e0e65477
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M src/gui/dialogs/multiplayer/faction_select.cpp
M src/gui/dialogs/multiplayer/faction_select.hpp
Log Message:
-----------
Faction Select: fixed changes persisting even if you cancel the dialog
(cherry-picked from commit c2c613325b075a57728e4bf87659fd2606817630)
Commit: 24a99da305759c08b7b5249b7dc7eb1f755b54ef
https://github.com/wesnoth/wesnoth/commit/24a99da305759c08b7b5249b7dc7eb1f755b54ef
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/multiplayer/faction_select.cpp
Log Message:
-----------
Fixup unused parameter
(cherry-picked from commit 3526aa8e86ee62b1a5fa9732238f55b563d031a8)
Commit: ad12193cf9a65b9692b501dc9c1cb47353789800
https://github.com/wesnoth/wesnoth/commit/ad12193cf9a65b9692b501dc9c1cb47353789800
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/widgets/menu_button.cpp
M src/gui/widgets/menu_button.hpp
Log Message:
-----------
GUI2/Menu Button: store selected index as an unsigned int
Also initialized it to 0 in the ctor instead of relying on that being set
via set_values().
(cherry-picked from commit e8bd3c26d2dfaed83edb5f66b55b3ddaa5004911)
Commit: 4b1340598d1abb031d6f0664a41cdd71b56f685b
https://github.com/wesnoth/wesnoth/commit/4b1340598d1abb031d6f0664a41cdd71b56f685b
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/widgets/menu_button.cpp
M src/gui/widgets/multimenu_button.cpp
Log Message:
-----------
Cleaned up two emplace_back calls
(cherry-picked from commit f95dc40f132afb79432d4a73db88406b5c5e7b9d)
Commit: 025af47181aaf92dede5f66cbf89554fe38a4541
https://github.com/wesnoth/wesnoth/commit/025af47181aaf92dede5f66cbf89554fe38a4541
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/widgets/multimenu_button.cpp
M src/gui/widgets/multimenu_button.hpp
Log Message:
-----------
GUI2/Multimenu Button: store max shown count as an unsigned int
A negative count here makes no sense...
(cherry-picked from commit 23740ea3cfd625a6e4c0ab2575db0d1c6f247ff4)
Commit: 32f0f0e03abdf27a47666e7ef49d1873acc7bc77
https://github.com/wesnoth/wesnoth/commit/32f0f0e03abdf27a47666e7ef49d1873acc7bc77
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/widgets/multimenu_button.cpp
Log Message:
-----------
GUI2/Multimenu Button: fixed maximum_shown defaulting to 0 instead of 1
Fixes the campaign selection dialog's modification dropdown saying "1 other" for
the first mod you select.
(cherry-picked from commit f54b3f722515c94a96d8ba1694e65ae4697c1c01)
Commit: 08874f69cf787ee7877537382b0b815fb8ea8fd1
https://github.com/wesnoth/wesnoth/commit/08874f69cf787ee7877537382b0b815fb8ea8fd1
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/select_orb_colors.cpp
M src/gui/dialogs/select_orb_colors.hpp
Log Message:
-----------
Select Orb Colors: cleaned up dialog implementation
Also fixes #2958 in the process since the entire setup process isn't repeated
when resetting selections.
(cherry-picked from commit 30121aeb9c31420564d0249e99cf777098244d83)
Commit: f0dfd2e8f5c53284d29b3c9070edc8df1f11a571
https://github.com/wesnoth/wesnoth/commit/f0dfd2e8f5c53284d29b3c9070edc8df1f11a571
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-ai/sk.po
M po/wesnoth-editor/sk.po
M po/wesnoth-lib/sk.po
M po/wesnoth-nr/sk.po
M po/wesnoth-trow/sk.po
M po/wesnoth-utbs/sk.po
M po/wesnoth/sk.po
Log Message:
-----------
updated Slovak translation
(cherry-picked from commit 37ccd8321533bfcc5cbd53f19dbfdf0f14d1c8d2)
Commit: 0b818bd29a386d39b37fe1fd73a30012fe1ff52a
https://github.com/wesnoth/wesnoth/commit/0b818bd29a386d39b37fe1fd73a30012fe1ff52a
Author: doofus-01 <doofus-01 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
A data/campaigns/Under_the_Burning_Suns/images/items/burial2.png
M data/campaigns/Under_the_Burning_Suns/images/items/orcish-flag2.png
A data/campaigns/Under_the_Burning_Suns/images/items/orcish-flag3.png
A data/campaigns/Under_the_Burning_Suns/images/items/rock-cairn3.png
M data/campaigns/Under_the_Burning_Suns/scenarios/04_Descending_into_Darkness.cfg
M data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg
Log Message:
-----------
UtBS S04 and S05: some variations in scenery items
(cherry-picked from commit 4b1a06a82da5883bdbe5408a0667c3c1cff893d0)
Commit: a66d47425e47fc79c0571555b3e3f3d33c879eed
https://github.com/wesnoth/wesnoth/commit/a66d47425e47fc79c0571555b3e3f3d33c879eed
Author: doofus-01 <doofus-01 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/maps/05_A_Subterranean_Struggle.map
Log Message:
-----------
UtBS S05: replace troll camps with actual troll camps instead of orc castles
(cherry-picked from commit 5fbd494244fc01cf4f1df0930f92e5f900d95ed0)
Commit: 9f74f4bff1234a784e5cf741b6987c2ea0f22d1d
https://github.com/wesnoth/wesnoth/commit/9f74f4bff1234a784e5cf741b6987c2ea0f22d1d
Author: doofus-01 <doofus-01 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh.png
Log Message:
-----------
slight tweak to Kalehs base sprite
(cherry-picked from commit f0b963a2b168637206c2ffb7b0a01edbda8b33ce)
Commit: fbb8817931e4898bfb3906047f45ad81c2de9ece
https://github.com/wesnoth/wesnoth/commit/fbb8817931e4898bfb3906047f45ad81c2de9ece
Author: doofus-01 <doofus-01 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Sun_Sylph.cfg
Log Message:
-----------
change sun-sylph halo to be warmer, sunny color, instead of clean, holy color
(cherry-picked from commit a3294cd04d6be0c4badfea84daf0e65a5cc6cd48)
Commit: 4d897f4e96975d3226a698cf1443c6cf9930402c
https://github.com/wesnoth/wesnoth/commit/4d897f4e96975d3226a698cf1443c6cf9930402c
Author: doofus-01 <doofus-01 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg
Log Message:
-----------
UtBS S06b: make sure dwarf sergeant is facing the right way in comic-relief dialog
(cherry-picked from commit ea3ee2a336320d955f4efa171ff862954f8c37cf)
Commit: b1d97a84965bfd45c000784b9e37cd0f1f76d908
https://github.com/wesnoth/wesnoth/commit/b1d97a84965bfd45c000784b9e37cd0f1f76d908
Author: doofus-01 <doofus-01 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/maps/06b_In_the_Domain_of_the_Dwarves.map
M data/campaigns/Under_the_Burning_Suns/maps/07b_Talking_with_Trolls.map
Log Message:
-----------
UtBS S06b and S07b: cosmetic changes to maps, to make them more fitting with dialogs
(cherry-picked from commit 13ec0493fc810b184771b937e3b8e3ef67c3c5dc)
Commit: 2482cf2c5373fe8322549c20d8a706d00f567bd9
https://github.com/wesnoth/wesnoth/commit/2482cf2c5373fe8322549c20d8a706d00f567bd9
Author: doofus-01 <doofus-01 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/maps/08_Out_of_the_Frying_Pan.map
M data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
Log Message:
-----------
UtBS S08: mostly cosmetic changes to map
(cherry-picked from commit 41adc41093a47de4508e093508cbf83cb45ddcf0)
Commit: 9e78232e0e5ccccad9efb0f82dac37815ca126f8
https://github.com/wesnoth/wesnoth/commit/9e78232e0e5ccccad9efb0f82dac37815ca126f8
Author: Pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M CMakeLists.txt
M SConstruct
Log Message:
-----------
Fixup hardening options for Windows.
(cherry-picked from commit 277158222200d4131bbbb385e45a8c6993020b44)
Commit: ea643fff186e6194d7be8736e35e626d197ad766
https://github.com/wesnoth/wesnoth/commit/ea643fff186e6194d7be8736e35e626d197ad766
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/preferences_dialog.cpp
Log Message:
-----------
Preferences: Keep the acceleration speed slider enabled even when the checkbox is disabled.
Apparently, this also causes the slider's value to be saved when dismissing the dialog with the checkbox disabled.
Fixes #2741
(cherry-picked from commit e126e5ba3672fe87e7045bce8580ac26b1f536aa)
Commit: 01bd2af9ae7846e1827b42f2d07a204018663b65
https://github.com/wesnoth/wesnoth/commit/01bd2af9ae7846e1827b42f2d07a204018663b65
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/gui/window/preferences/01_general.cfg
Log Message:
-----------
Preferences: Improve label and tooltip of 'Accelerated speed' slider.
(cherry-picked from commit d95efd3409f75614c48732dc3532e6fd2f166dd4)
Commit: 4712fe1cc6934a01eb87dfa2005a258889e7ce60
https://github.com/wesnoth/wesnoth/commit/4712fe1cc6934a01eb87dfa2005a258889e7ce60
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/units.cfg
Log Message:
-----------
Fix several typographical style errors in recent race descriptions
[ci skip]
(cherry-picked from commit 61e94c21a9d2a7e6b195f245361900329a624af8)
Commit: aaa055a6ac56b631f9d523520e02cee5a14865e1
https://github.com/wesnoth/wesnoth/commit/aaa055a6ac56b631f9d523520e02cee5a14865e1
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-help/af.po
M po/wesnoth-help/ang.po
M po/wesnoth-help/ang at latin.po
M po/wesnoth-help/ar.po
M po/wesnoth-help/ast.po
M po/wesnoth-help/bg.po
M po/wesnoth-help/ca.po
M po/wesnoth-help/ca_ES at valencia.po
M po/wesnoth-help/cs.po
M po/wesnoth-help/da.po
M po/wesnoth-help/de.po
M po/wesnoth-help/el.po
M po/wesnoth-help/en at shaw.po
M po/wesnoth-help/en_GB.po
M po/wesnoth-help/eo.po
M po/wesnoth-help/es.po
M po/wesnoth-help/et.po
M po/wesnoth-help/eu.po
M po/wesnoth-help/fi.po
M po/wesnoth-help/fr.po
M po/wesnoth-help/fur_IT.po
M po/wesnoth-help/ga.po
M po/wesnoth-help/gd.po
M po/wesnoth-help/gl.po
M po/wesnoth-help/he.po
M po/wesnoth-help/hr.po
M po/wesnoth-help/hu.po
M po/wesnoth-help/id.po
M po/wesnoth-help/is.po
M po/wesnoth-help/it.po
M po/wesnoth-help/ja.po
M po/wesnoth-help/ko.po
M po/wesnoth-help/la.po
M po/wesnoth-help/lt.po
M po/wesnoth-help/lv.po
M po/wesnoth-help/mk.po
M po/wesnoth-help/mr.po
M po/wesnoth-help/nb_NO.po
M po/wesnoth-help/nl.po
M po/wesnoth-help/pl.po
M po/wesnoth-help/pt.po
M po/wesnoth-help/pt_BR.po
M po/wesnoth-help/racv.po
M po/wesnoth-help/ro.po
M po/wesnoth-help/ru.po
M po/wesnoth-help/sk.po
M po/wesnoth-help/sl.po
M po/wesnoth-help/sr.po
M po/wesnoth-help/sr at ijekavian.po
M po/wesnoth-help/sr at ijekavianlatin.po
M po/wesnoth-help/sr at latin.po
M po/wesnoth-help/sv.po
M po/wesnoth-help/tl.po
M po/wesnoth-help/tr.po
M po/wesnoth-help/uk.po
M po/wesnoth-help/vi.po
M po/wesnoth-help/wesnoth-help.pot
M po/wesnoth-help/zh_CN.po
M po/wesnoth-help/zh_TW.po
M utils/pofix.py
Log Message:
-----------
pofix: Add rules to address typographical fixes to race descriptions
NOTE: the rule for the "true orc" case does not work. The string in
question will just have to be fuzzied.
[ci skip]
(cherry-picked from commit 72948787450d2ba273b9a901455ae02ccf1cce5e)
Commit: 3be3f0acbbd3fd0bf0b64172c790c46a9478d075
https://github.com/wesnoth/wesnoth/commit/3be3f0acbbd3fd0bf0b64172c790c46a9478d075
Author: ln-zookeeper <lari.nieminen at iki.fi>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Eastern_Invasion/scenarios/17b_Weldyn_Besieged.cfg
Log Message:
-----------
EI S17b: Prevent spell breaking effect playing out twice (fixes #3254)
(cherry-picked from commit a702674da2fa8df0b47126a3ee51c255d90aab26)
Commit: 0c5a47def4d629a24deb4c07c39e59c948a886a1
https://github.com/wesnoth/wesnoth/commit/0c5a47def4d629a24deb4c07c39e59c948a886a1
Author: ln-zookeeper <lari.nieminen at iki.fi>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh.png
Log Message:
-----------
UtBS: Cropped Kaleh's base sprite back to 72x72
[ci skip]
(cherry-picked from commit a98c6587425f9d34e0f0316133e7757902d0c3ed)
Commit: b14b1e9509561d16d8cf57d3211b510f3099009e
https://github.com/wesnoth/wesnoth/commit/b14b1e9509561d16d8cf57d3211b510f3099009e
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/server/server.cpp
Log Message:
-----------
wesnothd: Only disclose the number of online admins to admins using adminmsg
(cherry-picked from commit be41a692fb44cba62b720a462f5bebe7efec303c)
Commit: 7e51f119dea2ceaac7246d3ee66005b0fbbc9de7
https://github.com/wesnoth/wesnoth/commit/7e51f119dea2ceaac7246d3ee66005b0fbbc9de7
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M src/server/server.cpp
Log Message:
-----------
wesnothd: Fix lobby messages and whispers not being truncated as they should
For lobby messages, there was a length cap in place already, but the
truncated message was lost in processing because it ended up in a WML
document that isn't the one relayed to listening clients.
On the other hand, whisper messages were missing the truncate logic
entirely. Oops.
(The logic for in-game messages does truncate messages correctly as far
as I can tell, and additionally the client UI doesn't allow overlong
messages.)
Thanks to Soliton for pointing me towards the faulty code.
(cherry-picked from commit cdc8da25aea2cbc055dc12879d2c4333fecfc3e1)
Commit: 746b1c9235d75ba70d2b4a45006d5b858cc7535e
https://github.com/wesnoth/wesnoth/commit/746b1c9235d75ba70d2b4a45006d5b858cc7535e
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
U does not precede G in the English alphabet
[ci skip]
(cherry-picked from commit 6b2ca320261326d7862d3fe52f395e83913f9c6d)
Commit: 8137e9a4540ad1d221e82fa7fdff6a6fedd75e22
https://github.com/wesnoth/wesnoth/commit/8137e9a4540ad1d221e82fa7fdff6a6fedd75e22
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/gui/widget/chatbox.cfg
Log Message:
-----------
GUI2/Chatbox: limit input to 256 characters (fixes #3267)
[ci skip]
(cherry-picked from commit c5d6f695dd712c9a33fd3a5c12f98e19e2b393fd)
Commit: 6d0ac6b58e1543efcd561777c37d7e28ab77e46d
https://github.com/wesnoth/wesnoth/commit/6d0ac6b58e1543efcd561777c37d7e28ab77e46d
Author: loonycyborg <loonycyborg at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M packaging/flatpak/org.wesnoth.Wesnoth.json
Log Message:
-----------
flatpak: pass hardening options when building static boost
(cherry-picked from commit f5974941576fb541ebddb0d3e690cc469b8f5e75)
Commit: adeda87982c8c779e8e52a3f58b21172b8c1d7ba
https://github.com/wesnoth/wesnoth/commit/adeda87982c8c779e8e52a3f58b21172b8c1d7ba
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Secrets_of_the_Ancients/units/Necro_Ancient_Lich.cfg
Log Message:
-----------
SotA: reuse mainline string for ancient lich
[ci skip]
(cherry-picked from commit 9d95aa776c9e0b3a6e968317a87bda1a5c48b3ee)
Commit: 6ee18b58f61567c68347f322f40fa26d225f412e
https://github.com/wesnoth/wesnoth/commit/6ee18b58f61567c68347f322f40fa26d225f412e
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M src/config_cache.cpp
Log Message:
-----------
config/cache: Ensure built-in symbols like WESNOTH_VERSION are always defined
Half-fix for issue #1634 and issue #1924.
The issue that remains to be solved is that on subsequent sessions after
a campaign has failed to load, it is possible for the game to generate a
cache entry for it that only contains the main menu WML for it.
Apparently the config cache transactions mechanism causes the game to
try to generate a cache entry with the wrong defines (a define set that
doesn't include the campaign's symbol, for instance) instead of the ones
that are actually needed and used to match the cache entry's filename
via checksumming. As a result, on subsequent sessions the failed
campaign is aborted with "failed to load the scenario" instead of
displaying the real WML error again (since the error is not hit again if
it depends on the campaign's symbol being defined).
In the meantime, this at least removes the red herring error and makes
the underlying issue a bit more visible. It's a very crude hack but it
does the job.
(cherry-picked from commit 0c2298d8c2057344b9c94c9fe7ce848838b363e6)
Commit: 18642d983b3c99d25f8c5a9591db3954c5e4c089
https://github.com/wesnoth/wesnoth/commit/18642d983b3c99d25f8c5a9591db3954c5e4c089
Author: newfrenchy83 <31768074+newfrenchy83 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/CodeBlocks/wesnoth.cbp
Log Message:
-----------
Update wesnoth.cbp
(cherry-picked from commit cffd51a42570350a7e9704c44a602444c7cad0d2)
Commit: fb403a982a2050ebe4670a6acbb7dd493288daed
https://github.com/wesnoth/wesnoth/commit/fb403a982a2050ebe4670a6acbb7dd493288daed
Author: newfrenchy83 <31768074+newfrenchy83 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/CodeBlocks/wesnothd.cbp
Log Message:
-----------
Update wesnothd.cbp
(cherry-picked from commit 9bcaf3a897b2c9174f11d24112a89b7577628f08)
Commit: d6833d76d00d2207fb8e2029c47036ece10f435b
https://github.com/wesnoth/wesnoth/commit/d6833d76d00d2207fb8e2029c47036ece10f435b
Author: Pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
R data/test/test/image/base.png
R data/test/test/image/blend/0F_000000FF.png
R data/test/test/image/blend/0F_0000FF00.png
R data/test/test/image/blend/0F_00FF0000.png
R data/test/test/image/blend/1F_000000FF.png
R data/test/test/image/blend/1F_0000FF00.png
R data/test/test/image/blend/1F_00FF0000.png
R data/test/test/image/blend/2F_000000FF.png
R data/test/test/image/blend/2F_0000FF00.png
R data/test/test/image/blend/2F_00FF0000.png
R data/test/test/image/blend/3F_000000FF.png
R data/test/test/image/blend/3F_0000FF00.png
R data/test/test/image/blend/3F_00FF0000.png
R data/test/test/image/blend/4F_000000FF.png
R data/test/test/image/blend/4F_0000FF00.png
R data/test/test/image/blend/4F_00FF0000.png
R data/test/test/image/blend/5F_000000FF.png
R data/test/test/image/blend/5F_0000FF00.png
R data/test/test/image/blend/5F_00FF0000.png
R data/test/test/image/blend/6F_000000FF.png
R data/test/test/image/blend/6F_0000FF00.png
R data/test/test/image/blend/6F_00FF0000.png
R data/test/test/image/blend/7F_000000FF.png
R data/test/test/image/blend/7F_0000FF00.png
R data/test/test/image/blend/7F_00FF0000.png
R data/test/test/image/blend/8F_000000FF.png
R data/test/test/image/blend/8F_0000FF00.png
R data/test/test/image/blend/8F_00FF0000.png
R data/test/test/image/blend/9F_000000FF.png
R data/test/test/image/blend/9F_0000FF00.png
R data/test/test/image/blend/9F_00FF0000.png
R data/test/test/image/blend/AF_000000FF.png
R data/test/test/image/blend/AF_0000FF00.png
R data/test/test/image/blend/AF_00FF0000.png
R data/test/test/image/blend/BF_000000FF.png
R data/test/test/image/blend/BF_0000FF00.png
R data/test/test/image/blend/BF_00FF0000.png
R data/test/test/image/blend/CF_000000FF.png
R data/test/test/image/blend/CF_0000FF00.png
R data/test/test/image/blend/CF_00FF0000.png
R data/test/test/image/blend/DF_000000FF.png
R data/test/test/image/blend/DF_0000FF00.png
R data/test/test/image/blend/DF_00FF0000.png
R data/test/test/image/blend/EF_000000FF.png
R data/test/test/image/blend/EF_0000FF00.png
R data/test/test/image/blend/EF_00FF0000.png
R data/test/test/image/blend/FF_000000FF.png
R data/test/test/image/blend/FF_0000FF00.png
R data/test/test/image/blend/FF_00FF0000.png
M source_lists/boost_unit_tests
R src/tests/test_sdl_utils.cpp
R src/tests/test_sdl_utils.hpp
Log Message:
-----------
Remove unused test file and images.
(cherry-picked from commit 0a7ed44c087f1c66d65b8656fc197309d4c0325a)
Commit: bf8cd9f90b5770f8298328a1c145c09ea2e1ade9
https://github.com/wesnoth/wesnoth/commit/bf8cd9f90b5770f8298328a1c145c09ea2e1ade9
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/gui/widget/toggle_button_listbox_header.cfg
Log Message:
-----------
GUI: Fix the direction of the arrow on a listbox sort column header.
This affects the files list in the the "Load Game" dialog.
(cherry-picked from commit 8481927a5a630165c98a7c81c5cf5556ccfc9e35)
Commit: aed2ab29f7d9facca7377e04d5f1c1cc549a2879
https://github.com/wesnoth/wesnoth/commit/aed2ab29f7d9facca7377e04d5f1c1cc549a2879
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-sota/fr.po
M po/wesnoth/fr.po
Log Message:
-----------
updated French translation
(cherry-picked from commit 63e4c16f1d82c02b9e27882840d3453a14beb110)
Commit: 2b2dd321c92b9ece90024443fa7de6e506c0c713
https://github.com/wesnoth/wesnoth/commit/2b2dd321c92b9ece90024443fa7de6e506c0c713
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-l/sk.po
M po/wesnoth-nr/sk.po
M po/wesnoth-tb/sk.po
Log Message:
-----------
updated Slovak translation
(cherry-picked from commit e94af64b8dcad498f0a2825b4b9fb0ce00c10bb7)
Commit: 9f2cbad96f1c9d405e6053593f7540c7685151fc
https://github.com/wesnoth/wesnoth/commit/9f2cbad96f1c9d405e6053593f7540c7685151fc
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/gui/window/mp_faction_select.cfg
M src/gui/dialogs/multiplayer/faction_select.cpp
M src/gui/dialogs/multiplayer/faction_select.hpp
Log Message:
-----------
MP Faction Select dialog: Show leader unit details.
If the leader hasn't been discovered, the "Unknown Unit" topic will be shown.
Fixes #1491
(cherry-picked from commit a8f83f6e687abe997d33a028f841c0bdd5495a11)
Commit: 73cb9cff96ebe0c2f7d17fe4c94b1faad75559b4
https://github.com/wesnoth/wesnoth/commit/73cb9cff96ebe0c2f7d17fe4c94b1faad75559b4
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/multiplayer/faction_select.cpp
Log Message:
-----------
MP Faction Select dialog: Always show the leading unit information, never "Unknown Unit".
(cherry-picked from commit 175aa8194138a81dfcb6a975c625ad78bf8c207e)
Commit: ee6af7d8ce787008028ead9f0a423aef770c021c
https://github.com/wesnoth/wesnoth/commit/ee6af7d8ce787008028ead9f0a423aef770c021c
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg
Log Message:
-----------
NR S7a: remove dots from objectives
[ci skip]
(cherry-picked from commit e1cd47b8ec8c9b623b73a7bd269fcc767f3849e8)
Commit: e405dc2bff483981e74a98d63788d9f3e7069330
https://github.com/wesnoth/wesnoth/commit/e405dc2bff483981e74a98d63788d9f3e7069330
Author: Pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M CMakeLists.txt
M SConstruct
Log Message:
-----------
Disabling hardening on Windows due to tdm-gcc's poor support.
As per sigurd's trial and error: RELRO's options are unknown entirely and -fstack-protector-strong results in compile errors. Building with just PIE and _FORTIFY_SOURCE enabled does then compile, but results in a broken executable.
(cherry-picked from commit c9541176776aeb676e99f1804d123552430582ee)
Commit: 56c347fad0ea3d1d983f5561f12db64aa49e287c
https://github.com/wesnoth/wesnoth/commit/56c347fad0ea3d1d983f5561f12db64aa49e287c
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Northern_Rebirth/scenarios/05a_01_The_Pursuit.cfg
Log Message:
-----------
NR S5a: clarify text
[ci skip]
(cherry-picked from commit 37566db87c364daa15c1e80761160f0eb7ebaba0)
Commit: b6356f57e40553621f6bbb0e967651f3702abd4f
https://github.com/wesnoth/wesnoth/commit/b6356f57e40553621f6bbb0e967651f3702abd4f
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/unit_list.cpp
M src/gui/dialogs/unit_recall.cpp
M src/gui/dialogs/unit_recall.hpp
Log Message:
-----------
Unit List: Sort by XP as second criterion when sorting by level.
Fixes #3260.
(cherry-picked from commit 5316a83349496bf247416d93396d5bcae4a730e6)
Commit: c38c37fa3c046436e5058b9478850f81f2aa1881
https://github.com/wesnoth/wesnoth/commit/c38c37fa3c046436e5058b9478850f81f2aa1881
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/unit_list.cpp
M src/gui/dialogs/unit_recall.cpp
M src/gui/dialogs/unit_recall.hpp
Log Message:
-----------
Rename unit_recall_default_compare to default_compare
(cherry-picked from commit 46fb1b6d48708478c8fbba755f4790fe9323c5a3)
Commit: a5859dc9573a65747bdb2551525f8176a67dd0c4
https://github.com/wesnoth/wesnoth/commit/a5859dc9573a65747bdb2551525f8176a67dd0c4
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/drop_down_menu.cpp
Log Message:
-----------
Drop Down List: added documentation and did some code cleanup
(cherry-picked from commit b6a0b2cb870a8e4a4c154362c2924bc2245c8587)
Commit: e679abcf84886f02f2e0f92fb9ad36f35963c7b9
https://github.com/wesnoth/wesnoth/commit/e679abcf84886f02f2e0f92fb9ad36f35963c7b9
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/font/pango/escape.hpp
Log Message:
-----------
Pango/Escape: used a stringstream for constructing the escaped text
(cherry-picked from commit 69207298120734b283e7a30ec9e0d2b2b9889ec7)
Commit: bdb5f34c9bfb6dc3a747281cfc19f4e1abd1f8cf
https://github.com/wesnoth/wesnoth/commit/bdb5f34c9bfb6dc3a747281cfc19f4e1abd1f8cf
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M src/gui/widgets/unit_preview_pane.cpp
Log Message:
-----------
GUI2/Unit Preview Pane: fixed default race icon not showing for units
Missed in 207e763401a11e86c6c8ad3602efa514812bf902. Was only working for unit types.
(cherry-picked from commit f59f68a5277cb1dcbbbccc023ad005e7653d4fd2)
Commit: 4b6d883c3be3e2671d95584c3265c5719426dfa0
https://github.com/wesnoth/wesnoth/commit/4b6d883c3be3e2671d95584c3265c5719426dfa0
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Updated changelog
[ci skip]
(cherry-picked from commit 48c13761cc16e5b62ec099487fdcfc5a94a5b116)
Commit: 4dd931b54c2022224d6a7af7c8cf198367fde421
https://github.com/wesnoth/wesnoth/commit/4dd931b54c2022224d6a7af7c8cf198367fde421
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/auxiliary/iterator/iterator.hpp
Log Message:
-----------
GUI2/Iterator: added some alias templates and a get() function
(cherry-picked from commit 1eaa51b3f9033723ac5f18d65d25780d761c2ae7)
Commit: b9c26464b6606406b38a951f1abca4ae1aa6b025
https://github.com/wesnoth/wesnoth/commit/b9c26464b6606406b38a951f1abca4ae1aa6b025
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/select_orb_colors.cpp
Log Message:
-----------
Select Orb Colors: used a widget iterator instead of a walker
The documentation indicates you're not really meant to use the walker directly.
They're part of the implementation of the iterators. They could be used directly,
as shown here, but this is shorter.
(cherry-picked from commit aca7d4e6df4648ff45f48b6acb9e643de8c05103)
Commit: 0b633badc5ece0b82b9fe8b024be5f1a98d343a6
https://github.com/wesnoth/wesnoth/commit/0b633badc5ece0b82b9fe8b024be5f1a98d343a6
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M SConstruct
Log Message:
-----------
Fix 'scons dist'
This makes 'scons dist' work, although the resulting tarballs are not
yet identical to cmake tarballs.
Remove awk usage made obsolete by the git transition
(7f85fa000c836c27cfe9d829db3b0e8aaeb49821).
Update src/revision.hpp reference to use src/revision.h. The former
name is unused since at least 7625b1e079b470119d72ea67ce955104f464e4b8.
(cherry-picked from commit 0ee485415710288d27f7b766e48fe7451b03c9a4)
Commit: 2b2b08431e60f5584cfa9dece12af2995290bb0d
https://github.com/wesnoth/wesnoth/commit/2b2b08431e60f5584cfa9dece12af2995290bb0d
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M SConstruct
Log Message:
-----------
Revert "Excluded data/test/ from tarball"
This reverts commit c93482560779c0e137d9598b9e7185338afe2b82.
Keep data/test/ in 'scons dist' tarballs to match official tarballs.
(cherry-picked from commit bad6897cbc75225624814b66c9226cf6233e95cf)
Commit: 8763e2f2b16ff0c86560342673d825fe83498021
https://github.com/wesnoth/wesnoth/commit/8763e2f2b16ff0c86560342673d825fe83498021
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M src/sound.cpp
Log Message:
-----------
sound: Halt sound sources that go inaudible instead of fading them out
Fixes #3280.
(cherry-picked from commit e46c05162fdab578d172cf06e7b35792b045223a)
Commit: bf2d7d53e6ad9f7052dbdbf79afaba2c4f8a98a4
https://github.com/wesnoth/wesnoth/commit/bf2d7d53e6ad9f7052dbdbf79afaba2c4f8a98a4
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M src/campaign_server/addon_utils.cpp
Log Message:
-----------
campaignd: Detect .po files in add-ons and add them to the list of locales
(cherry-picked from commit 1db6fb393ea468a3657e0f7e1053b48c947c05a9)
Commit: 9e9e1e800f9a9133d44d6f35cfd1ad75289881cb
https://github.com/wesnoth/wesnoth/commit/9e9e1e800f9a9133d44d6f35cfd1ad75289881cb
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/playsingle_controller.cpp
Log Message:
-----------
Replay: Don't disable the "Point of view" button after reset
Fixes #3107
(cherry-picked from commit fb88f40b61eb541f227e2ed62b148ba33c042e44)
Commit: 611bacf3b6d54b661e92ea88814f4fe38fdee5ef
https://github.com/wesnoth/wesnoth/commit/611bacf3b6d54b661e92ea88814f4fe38fdee5ef
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/game_config_manager.cpp
Log Message:
-----------
Cleaned up addon loading process
This makes it so addon metadata (title, version) will be fetched from _server.pbl if
present and _info.cfg if not (see #3278).
This also eliminates the temporary addon_source struct and unifies the metadata parsing
and actual loading stages. They used to be separate since single-file addons were a
thing, but those were removed in 3f640b8e718e4c45d8f73798d839bfea0b413fab.
Also a bunch of minor code cleanup.
(cherry-picked from commit cd3c13aca223e8a8c681556fe8020915d98058e0)
Commit: 2420e61d14e3401a42f4c74d0619cededfa550d7
https://github.com/wesnoth/wesnoth/commit/2420e61d14e3401a42f4c74d0619cededfa550d7
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/images/misc/time-schedules/default/schedule-firstwatch.png
M data/core/images/misc/time-schedules/default/schedule-secondwatch.png
Log Message:
-----------
Swapped the first watch and second watch ToD graphics
[ci skip]
See #1905.
(cherry-picked from commit 11ca2d8ad833d5258b6fa09acd9bf1e5313c4bd8)
Commit: f46e217454a9f60ba45dd19730095b25233da0be
https://github.com/wesnoth/wesnoth/commit/f46e217454a9f60ba45dd19730095b25233da0be
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/controller_base.cpp
M src/controller_base.hpp
M src/editor/controller/editor_controller.cpp
M src/editor/controller/editor_controller.hpp
M src/editor/editor_main.cpp
M src/editor/editor_main.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/lobby_info.hpp
M src/game_initialization/multiplayer.cpp
M src/game_initialization/multiplayer.hpp
M src/game_initialization/playcampaign.cpp
M src/game_initialization/playcampaign.hpp
M src/game_launcher.cpp
M src/menu_events.cpp
M src/menu_events.hpp
M src/play_controller.cpp
M src/play_controller.hpp
M src/playmp_controller.cpp
M src/playmp_controller.hpp
M src/playsingle_controller.cpp
M src/playsingle_controller.hpp
Log Message:
-----------
Stop passing a milion game_config refs around during game initializaton
There are only 3 places where it's actually really needed. Used the game_config_manager
singleton to retrieve a reference in those cases.
(cherry-picked from commit 4eee386664b66e801bd4498e8730c017af03f0aa)
Commit: e98ec7e8468a91a54e21ca295c18e0fead59bf31
https://github.com/wesnoth/wesnoth/commit/e98ec7e8468a91a54e21ca295c18e0fead59bf31
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/game_initialization/configure_engine.cpp
M src/gui/dialogs/multiplayer/faction_select.cpp
Log Message:
-----------
Cleaned up a few game_config_manager.hpp includes
(cherry-picked from commit feb99c384a3da58380697bfcf9ad18bc57df950f)
Commit: 81083e5ceae863959452c06e8830f537ebbc4c07
https://github.com/wesnoth/wesnoth/commit/81083e5ceae863959452c06e8830f537ebbc4c07
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/tests/gui/test_gui2.cpp
Log Message:
-----------
Fixup tests for 4eee386
(cherry-picked from commit 862b086ba9d43edb87362bbf4b7f75355eb50955)
Commit: e8c65ebece1d9f7b018af4f55d3a230a335d4954
https://github.com/wesnoth/wesnoth/commit/e8c65ebece1d9f7b018af4f55d3a230a335d4954
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/tests/gui/test_gui2.cpp
Log Message:
-----------
Fixup 862b086
(cherry-picked from commit 3147be87718d5685dc41dd73256692268c41b6e6)
Commit: 92b95d7a44d271ec4f47eab9b74a521256813e6f
https://github.com/wesnoth/wesnoth/commit/92b95d7a44d271ec4f47eab9b74a521256813e6f
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/gui/window/unit_advance.cfg
Log Message:
-----------
Unit Advance: left-align header
[ci skip]
(cherry-picked from commit 893860321a8da181164782b13a931b6c61f5febd)
Commit: 0e5eb5067e891aa0e710f66c5176310e3848e761
https://github.com/wesnoth/wesnoth/commit/0e5eb5067e891aa0e710f66c5176310e3848e761
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/images/misc/time-schedules/default/schedule-firstwatch.png
M data/core/images/misc/time-schedules/default/schedule-secondwatch.png
Log Message:
-----------
Revert "Swapped the first watch and second watch ToD graphics"
[ci skip]
This reverts commit 11ca2d8ad833d5258b6fa09acd9bf1e5313c4bd8.
(cherry-picked from commit 0aa60a7b4cc3492f9d84c765f6218f00aee8830e)
Commit: 826a76a939149409d5e98d9fc36664a92efc6438
https://github.com/wesnoth/wesnoth/commit/826a76a939149409d5e98d9fc36664a92efc6438
Author: DisherProject <pycchio at tiscali.it>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/reports.cpp
M src/units/abilities.cpp
M src/units/attack_type.hpp
Log Message:
-----------
Fix weapon specials marked as inactive
(cherry-picked from commit 902cf6dcfb6fd1d25e403acc8a57c8e16a61535b)
Commit: a2a22ae10b836efcc184331b747409eae10a486f
https://github.com/wesnoth/wesnoth/commit/a2a22ae10b836efcc184331b747409eae10a486f
Author: Andras Szell <szell.andris at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/lua/wml/message.lua
Log Message:
-----------
Fix: add redraw to narrator's message so village count is refreshed
Fixes: https://forums.wesnoth.org/viewtopic.php?f=21&t=48370
In the tutorial when we occupy the first village the message tells us the
village count got incremented, but in the old version it was incremented
only afterwards. Non-narrator messages were updated properly. By adding the
redraw, narrator messages triggered by capture event produce the same
result as other speakers.
(cherry-picked from commit 1ea4149a4456ab8713dde4fbfcdd446b5762adcf)
Commit: cdbb8cc491750dbf98a9566b68c5be46c7717f90
https://github.com/wesnoth/wesnoth/commit/cdbb8cc491750dbf98a9566b68c5be46c7717f90
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M src/editor/map/map_context.cpp
Log Message:
-----------
Fixed saving a map as a scenario not enabling scenario editor tools
(cherry-picked from commit 4bda3e7311c7b54742fbd29cb725dc0b292de633)
Commit: 7e32681b46526eceb9f882e42759b5eedefa45a9
https://github.com/wesnoth/wesnoth/commit/7e32681b46526eceb9f882e42759b5eedefa45a9
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/whiteboard/side_actions.cpp
Log Message:
-----------
wb: dont send delete of actions of other sides
(cherry-picked from commit ee00b88427ac229ee9ff68e706782c049ca781ee)
Commit: 5c43c70cba3edafb4c903f8a60b5db73883ef98e
https://github.com/wesnoth/wesnoth/commit/5c43c70cba3edafb4c903f8a60b5db73883ef98e
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/whiteboard/mapbuilder.cpp
M src/whiteboard/mapbuilder.hpp
Log Message:
-----------
wb: don't remove invalid actions from other players
this would bring the whiteboard data of the differnt clients out of sync which could be a problem since the wb network protocoll identifies the actions to be removed ot replaced by index.
(cherry-picked from commit 3a28c3a3460aaff0d59826f401623dad8ecadb3f)
Commit: bd97d0c471481d3d00c3133be52c366aa544484f
https://github.com/wesnoth/wesnoth/commit/bd97d0c471481d3d00c3133be52c366aa544484f
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/whiteboard/highlighter.cpp
Log Message:
-----------
wb: remove outcommented code
(cherry-picked from commit 17a91649045415179f77342053cb784124f98e58)
Commit: 81bd61ae14610531dedfccbd761275946bd4377c
https://github.com/wesnoth/wesnoth/commit/81bd61ae14610531dedfccbd761275946bd4377c
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/pathfind/pathfind.cpp
Log Message:
-----------
wb: fix wrong simulated movement points when planning to capture a village.
(cherry-picked from commit ff82a007d5330baa89c0f9063e71f221db527f00)
Commit: fb409b5db431103a6885e8b7d12e5b425c19a66d
https://github.com/wesnoth/wesnoth/commit/fb409b5db431103a6885e8b7d12e5b425c19a66d
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M data/tools/wesnoth/wmltools3.py
Log Message:
-----------
wmllint: Leave gzipped binary files alone, they're not safe for consumption
Fixes wmllint crashing like this upon encountering a gzip tarball in an
add-on:
Traceback (most recent call last):
File "/home/shadowm/bin/wmllint-1.14", line 3188, in <module>
for fn in allcfgfiles(directory):
File "/home/shadowm/bin/wmllint-1.14", line 2944, in allcfgfiles
if interesting(os.path.join(root, name)):
File "/home/shadowm/bin/wmllint-1.14", line 2927, in interesting
return fn.endswith(".cfg") or is_map(fn) or issave(fn)
File "/home/shadowm/src/wesnoth-1.14/data/tools/wesnoth/wmltools3.py", line 270, in issave
return firstline.startswith("label=")
TypeError: startswith first arg must be bytes or a tuple of bytes, not str
[ci skip]
(cherry-picked from commit c92e167a14229ed0d9b6f16f1d1ca31cacd292cd)
Commit: 0b22ffbacfe624e180d2da34076761a863f46c9f
https://github.com/wesnoth/wesnoth/commit/0b22ffbacfe624e180d2da34076761a863f46c9f
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/multiplayer/mp_create_game.cpp
Log Message:
-----------
MP Create Game: escape any formatting applied to game name
This is a good point since it ensures any place that might use the title before the lobby
(don't think there's any such places right now) won't inadvertently get formatted.
Also might be worth looking into a way to just strip formatting completely.
(cherry-picked from commit 58a2e23a0c78078844f7fc2d684f04f448081f8b)
Commit: 5a4cb1d4713d157f0c1db290e3ab76e462ea7610
https://github.com/wesnoth/wesnoth/commit/5a4cb1d4713d157f0c1db290e3ab76e462ea7610
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/multiplayer/mp_create_game.cpp
Log Message:
-----------
Revert "MP Create Game: escape any formatting applied to game name"
This reverts commit 58a2e23a0c78078844f7fc2d684f04f448081f8b.
(cherry-picked from commit 87fcacbd28981933b3f3f190d1bfc9e7c18126fb)
Commit: 06dd8d421d2e9eb09175bced3caaccc460a6ae25
https://github.com/wesnoth/wesnoth/commit/06dd8d421d2e9eb09175bced3caaccc460a6ae25
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/about.cfg
Log Message:
-----------
Updated a credits entry regarding the Dunefolk
[ci skip]
(cherry-picked from commit 0cbbed2832fc34f73927e38bf0141b4b7c636346)
Commit: 106d66009b3783638dec55bfca737df79c8111c2
https://github.com/wesnoth/wesnoth/commit/106d66009b3783638dec55bfca737df79c8111c2
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/game_initialization/lobby_data.cpp
Log Message:
-----------
MP Lobby: escape any game name formatting *after* receiving it from server
This avoids an issue where people could still apply formatting by using an older client.
Granted, any formatting would still appear in-lobby to anyone using an older client, but
this at least prevents the possibility of formatting appearing indefinitely if a game host
happens to never update their own client.
(cherry-picked from commit 9c311e2ca5db1f2b53570ae5bc0681f574c66f9d)
Commit: 2e3652f43f6cfa50b76ff046d89d873b9bd7ad9f
https://github.com/wesnoth/wesnoth/commit/2e3652f43f6cfa50b76ff046d89d873b9bd7ad9f
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/core/event/handler.cpp
Log Message:
-----------
Fix insufficient struct initialization in init_mouse_location()
See pull request #3252. This is the fix @Vultraz prefers to the PR.
(cherry-picked from commit 7fc6a23643adcd3041a6a17dee7c2a3a5ddec31a)
Commit: 54a3546f1ed26873b004e37369c8f0936ebbb332
https://github.com/wesnoth/wesnoth/commit/54a3546f1ed26873b004e37369c8f0936ebbb332
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M data/tools/wmllint
Log Message:
-----------
wmllint: Skip inexistent paths passed in the command line
Fixes issue #3286.
[ci skip]
(cherry-picked from commit fbc9ac5a52100c12d2cfb8d9e89afbf101d3a566)
Commit: 6d4d48e54018f5285baaacc3fe08425d01ab92a4
https://github.com/wesnoth/wesnoth/commit/6d4d48e54018f5285baaacc3fe08425d01ab92a4
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/tools/wmllint
Log Message:
-----------
wmllint: Exit with non-zero status after failing to read any directories
[ci skip]
(cherry-picked from commit ceca46c5537807db723450ca35bc5b4d43a0c011)
Commit: 0d37a0f116f1c8268df7a9ff4bce4b03bee62519
https://github.com/wesnoth/wesnoth/commit/0d37a0f116f1c8268df7a9ff4bce4b03bee62519
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/editor/action/mouse/mouse_action_unit.cpp
M src/editor/palette/editor_palettes.cpp
M src/editor/palette/unit_palette.cpp
M src/editor/palette/unit_palette.hpp
Log Message:
-----------
Editor: don't make unit type copies in the editor palette
(cherry-picked from commit 9e29c2f1d1f838b299dd6a7fcc4d9b6d17f1440a)
Commit: 6cb6edde7b360e58564fa50325495133ba9fc3ce
https://github.com/wesnoth/wesnoth/commit/6cb6edde7b360e58564fa50325495133ba9fc3ce
Author: Gunter Labes <soliton at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/languages/ast_ES.cfg
Log Message:
-----------
Fix line endings
[ci skip]
(cherry-picked from commit 51b5549bd2161e703efccb137c53bf9f0e567817)
Commit: 4c8788f62aad2b95dd0eab90f00113b5c3a92aba
https://github.com/wesnoth/wesnoth/commit/4c8788f62aad2b95dd0eab90f00113b5c3a92aba
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/gui/window/preferences/02_hotkeys.cfg
Log Message:
-----------
Preferences Dialog: drop characters_per_line from hotkey list
[ci skip]
For some reason, this made the entire page stack thinner than it should be. I have
no idea why, and I'm not sure wrap= here instead does anything (namely, wrap if it
gets too long), but it's better than what was happening before.
(cherry-picked from commit cb7a6791421511f4251f2d1cb31a894fa8de90cf)
Commit: ff7f3c06a01623d9de2745cb4e45881420fa66f0
https://github.com/wesnoth/wesnoth/commit/ff7f3c06a01623d9de2745cb4e45881420fa66f0
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/gui/window/preferences/01_general.cfg
Log Message:
-----------
Preferences: shifted the Skip AI Moves button around
[ci skip]
Makes it clear it's not intrinsically tied to the Accelerated Speed factor.
(cherry-picked from commit 10e663ed6ce49974e22d4dab5211716210ead6e9)
Commit: 39edd7c0c6d1125e2cb745bcab2cd9208bd3cf06
https://github.com/wesnoth/wesnoth/commit/39edd7c0c6d1125e2cb745bcab2cd9208bd3cf06
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/gui/window/preferences/01_general.cfg
Log Message:
-----------
Preferences: added a mention of the in-game accelerated speed toggle
[ci skip]
(cherry-picked from commit 98ddc311fc1cfec3c95c2c24cc1e3e48603643a8)
Commit: 27ea9ccd2467ee40f865784ab3c5cb87903f03e5
https://github.com/wesnoth/wesnoth/commit/27ea9ccd2467ee40f865784ab3c5cb87903f03e5
Author: pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
R data/campaigns/Dead_Water/images/units/merfolk/child_king-attack-1.png
R data/campaigns/Dead_Water/images/units/merfolk/child_king-attack-2.png
R data/campaigns/Dead_Water/images/units/merfolk/child_king-attack-3.png
R data/campaigns/Dead_Water/images/units/merfolk/child_king-attack-3n.png
R data/campaigns/Dead_Water/images/units/merfolk/child_king-attack-4.png
R data/campaigns/Dead_Water/images/units/merfolk/child_king-attack-5.png
R data/campaigns/Dead_Water/images/units/merfolk/child_king-defend.png
R data/campaigns/Dead_Water/images/units/merfolk/soldier_king-attack-1.png
R data/campaigns/Dead_Water/images/units/merfolk/soldier_king-attack-2.png
R data/campaigns/Dead_Water/images/units/merfolk/soldier_king-attack-3.png
R data/campaigns/Dead_Water/images/units/merfolk/soldier_king-attack-4.png
R data/campaigns/Dead_Water/images/units/merfolk/soldier_king-attack-4n.png
R data/campaigns/Dead_Water/images/units/merfolk/soldier_king-attack-5.png
R data/campaigns/Dead_Water/images/units/merfolk/soldier_king-attack-6.png
R data/campaigns/Dead_Water/images/units/merfolk/soldier_king-attack-7.png
R data/campaigns/Dead_Water/images/units/merfolk/soldier_king-attack-8.png
R data/campaigns/Dead_Water/images/units/merfolk/soldier_king-defend.png
R data/campaigns/Dead_Water/images/units/merfolk/soldier_king-leading.png
R data/campaigns/Dead_Water/images/units/merfolk/warrior_king-attack-1.png
R data/campaigns/Dead_Water/images/units/merfolk/warrior_king-attack-2.png
R data/campaigns/Dead_Water/images/units/merfolk/warrior_king-attack-3.png
R data/campaigns/Dead_Water/images/units/merfolk/warrior_king-attack-4.png
R data/campaigns/Dead_Water/images/units/merfolk/warrior_king-attack-4n.png
R data/campaigns/Dead_Water/images/units/merfolk/warrior_king-attack-5.png
R data/campaigns/Dead_Water/images/units/merfolk/warrior_king-attack-6.png
R data/campaigns/Dead_Water/images/units/merfolk/warrior_king-attack-7.png
R data/campaigns/Dead_Water/images/units/merfolk/warrior_king-attack-8.png
R data/campaigns/Dead_Water/images/units/merfolk/warrior_king-attack-9.png
R data/campaigns/Dead_Water/images/units/merfolk/warrior_king-defend.png
R data/campaigns/Dead_Water/images/units/merfolk/warrior_king-leading.png
R data/campaigns/Dead_Water/images/units/merfolk/young_king-attack-1.png
R data/campaigns/Dead_Water/images/units/merfolk/young_king-attack-2.png
R data/campaigns/Dead_Water/images/units/merfolk/young_king-attack-3.png
R data/campaigns/Dead_Water/images/units/merfolk/young_king-attack-4.png
R data/campaigns/Dead_Water/images/units/merfolk/young_king-attack-4n.png
R data/campaigns/Dead_Water/images/units/merfolk/young_king-attack-5.png
R data/campaigns/Dead_Water/images/units/merfolk/young_king-attack-6.png
R data/campaigns/Dead_Water/images/units/merfolk/young_king-attack-7.png
R data/campaigns/Dead_Water/images/units/merfolk/young_king-attack-8.png
R data/campaigns/Dead_Water/images/units/merfolk/young_king-attack-9.png
R data/campaigns/Dead_Water/images/units/merfolk/young_king-defend.png
R data/campaigns/Dead_Water/images/units/merfolk/young_king-leading.png
M data/campaigns/Dead_Water/units/Child_King.cfg
M data/campaigns/Dead_Water/units/Soldier_King.cfg
M data/campaigns/Dead_Water/units/Warrior_King.cfg
M data/campaigns/Dead_Water/units/Young_King.cfg
Log Message:
-----------
Remove unused images from Dead Water.
Also confirmed via PM with beetlenaut that they can be removed, and aren't supposed to still be there.
(cherry-picked from commit 649fdc9a6204cc4e2019aac41a79910b493b7d5a)
Commit: 2709456d2fc133cb682263f24cfb7e317165c671
https://github.com/wesnoth/wesnoth/commit/2709456d2fc133cb682263f24cfb7e317165c671
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/test/scenarios/feeding.cfg
M src/actions/attack.cpp
Log Message:
-----------
disallow attacking with disabled attacks via [do_command]
this fixes some rare cheats in mp.
(cherry-picked from commit 26b5ca55e40176f338265b162178df7342ec2882)
Commit: 5a39a621180f72187a652a06b96fe6c90ffd20a2
https://github.com/wesnoth/wesnoth/commit/5a39a621180f72187a652a06b96fe6c90ffd20a2
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/gui/window/mp_join_game.cfg
M src/gui/dialogs/multiplayer/mp_join_game.cpp
M src/gui/dialogs/multiplayer/mp_join_game.hpp
Log Message:
-----------
allow non hosts to change factions later.
previously players had to leave an rejoin the game to change their faction.
this was most annoying in coop games where you want might want to choose
your faction in consultation with the other players. Also you previously could
not even checkout the different available factions again after you joined
the game.
(cherry-picked from commit 5ba389111eaa5d08f55d60c1b437c250a329bc58)
Commit: 45fd7c9011b7750c1cb828ab673864de85c2f117
https://github.com/wesnoth/wesnoth/commit/45fd7c9011b7750c1cb828ab673864de85c2f117
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/game_initialization/flg_manager.cpp
M src/game_initialization/flg_manager.hpp
M src/gui/dialogs/multiplayer/mp_join_game.cpp
Log Message:
-----------
make flg manager not store confg& side_
in the non-host case the clients might get updates that change the [side] config while the flg dialog is open which might result in invalid pointers, note that flg_manager::default_leader_cfg_ is still there but this is no problm because that is never dereferenced it's only compared to other pointers.
we also make a copy of all [multiplayer_side] on the non hosts side for the same reason.
(cherry-picked from commit c805897797d7ff22f3ea4fd1ce9c0fb126baefea)
Commit: 745abef62d413e15a3b171dfda1ed659d91e9b89
https://github.com/wesnoth/wesnoth/commit/745abef62d413e15a3b171dfda1ed659d91e9b89
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/multiplayer/faction_select.cpp
M src/gui/dialogs/multiplayer/faction_select.hpp
M src/gui/dialogs/multiplayer/mp_join_game.cpp
M src/gui/dialogs/multiplayer/mp_join_game.hpp
A src/utils/scope_exit.hpp
Log Message:
-----------
cancel faction_select when the game starts
or when the hosts assigned control of that side to another player.
(cherry-picked from commit 2dd65574498a9731b501e18da04c01f959ab6654)
Commit: dd1960d988f255d379c21a7270b997cf1f807d35
https://github.com/wesnoth/wesnoth/commit/dd1960d988f255d379c21a7270b997cf1f807d35
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/multiplayer/mp_join_game.cpp
M src/gui/dialogs/multiplayer/mp_join_game.hpp
Log Message:
-----------
mp join: fix crash when the dialog is updated while the flg dialog is open.
we cannnot call show_flg_select from inside the select_leader_buttons callback because that select_leader_buttons might be deleted/recreated while that dialog is open whihc leads to crashes, so what we do is executing the show_flg_select
in a seperate callstack by using a 0 ms non-repeating timer
(cherry-picked from commit c55512755237dc818abc3b6bce4c3d31dbd2449b)
Commit: 6ad9977886248e91789e8319ea83235f839597cd
https://github.com/wesnoth/wesnoth/commit/6ad9977886248e91789e8319ea83235f839597cd
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/core/timer.cpp
Log Message:
-----------
add a comment
(cherry-picked from commit 0296b6068cad37db4034b1edcc33025e3be82987)
Commit: c112f49041831d167737a423257fee7188b63812
https://github.com/wesnoth/wesnoth/commit/c112f49041831d167737a423257fee7188b63812
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/multiplayer/mp_join_game.cpp
M src/gui/dialogs/multiplayer/mp_join_game.hpp
Log Message:
-----------
fix code dublication of mp_join_game::show_flg_select
this also fixes a bug where the side number in the initial flg dialog would be off by one.
This is also a slight behviour change where not finding [era] in mp_join_game::fetch_game_config no longer throws config::error but just returns false (=cannot join game)
(cherry-picked from commit a2a4dff050713e96b0b14612486d82cf3f93fa3d)
Commit: 130bd95e274b55483923e7682eb2127a5ebcf3a1
https://github.com/wesnoth/wesnoth/commit/130bd95e274b55483923e7682eb2127a5ebcf3a1
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/multiplayer/faction_select.cpp
M src/gui/dialogs/multiplayer/faction_select.hpp
M src/gui/dialogs/multiplayer/mp_join_game.cpp
M src/gui/dialogs/multiplayer/mp_join_game.hpp
Log Message:
-----------
MP Join Game: cleaned up implementation of the recent players-choose-factions changes
(cherry-picked from commit fa01fb14d24f9f2830c7411cbabae88fd8a2d228)
Commit: 58dae34823c7c5f78ec0654d0ee4bbee4b211804
https://github.com/wesnoth/wesnoth/commit/58dae34823c7c5f78ec0654d0ee4bbee4b211804
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/multiplayer/mp_join_game.cpp
M src/gui/dialogs/multiplayer/mp_join_game.hpp
Log Message:
-----------
Remove unnecessary heap allocation
(cherry-picked from commit 3a5c2df0a15448c753e1eb19419d4b05b07e475c)
Commit: 591494627d30aff066d9e5ebebf2de820253ad39
https://github.com/wesnoth/wesnoth/commit/591494627d30aff066d9e5ebebf2de820253ad39
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/multiplayer/mp_join_game.hpp
Log Message:
-----------
Fix build
(cherry-picked from commit d8eada856aa5323e451551c86ec9c1ef15337ee0)
Commit: f551e5ca8e16ce4a3e48a6703b96ed0123bbbb00
https://github.com/wesnoth/wesnoth/commit/f551e5ca8e16ce4a3e48a6703b96ed0123bbbb00
Author: newfrenchy83 <31768074+newfrenchy83 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/CodeBlocks/liblua.cbp
M projectfiles/CodeBlocks/wesnoth.cbp
M projectfiles/CodeBlocks/wesnothd.cbp
Log Message:
-----------
Enable C++17 in Code::Blocks
(cherry-picked from commit 882eeb52ab38547004f2ba7249913323596188d7)
Commit: 19f83246d26303b150c5010732d4001e567787ca
https://github.com/wesnoth/wesnoth/commit/19f83246d26303b150c5010732d4001e567787ca
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-editor/zh_TW.po
M po/wesnoth-help/zh_TW.po
M po/wesnoth-tutorial/zh_TW.po
M po/wesnoth-units/zh_TW.po
M po/wesnoth/zh_TW.po
Log Message:
-----------
updated Chinese (Traditional) translation
(cherry-picked from commit 478df79f3135a282aa0d4c156d202e5ce2c6030e)
Commit: 398165631cba68a02d2eea375306c7af1f9059a7
https://github.com/wesnoth/wesnoth/commit/398165631cba68a02d2eea375306c7af1f9059a7
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-ai/de.po
M po/wesnoth-anl/de.po
M po/wesnoth-aoi/de.po
M po/wesnoth-did/de.po
M po/wesnoth-dm/de.po
M po/wesnoth-dw/de.po
M po/wesnoth-editor/de.po
M po/wesnoth-ei/de.po
M po/wesnoth-help/de.po
M po/wesnoth-httt/de.po
M po/wesnoth-l/de.po
M po/wesnoth-lib/de.po
M po/wesnoth-low/de.po
M po/wesnoth-manpages/de.po
M po/wesnoth-manual/de.po
M po/wesnoth-multiplayer/de.po
M po/wesnoth-nr/de.po
M po/wesnoth-sof/de.po
M po/wesnoth-sota/de.po
M po/wesnoth-sotbe/de.po
M po/wesnoth-tb/de.po
M po/wesnoth-thot/de.po
M po/wesnoth-trow/de.po
M po/wesnoth-tsg/de.po
M po/wesnoth-tutorial/de.po
M po/wesnoth-units/de.po
M po/wesnoth-utbs/de.po
M po/wesnoth/de.po
Log Message:
-----------
copied German translation to maser
primary reason is rather to have less problems if
someone uses the master files when translating for 1.14
[ci skip]
(cherry-picked from commit 9a37fe3a072ecd15ba8e196adcfac7e6a12e5444)
Commit: c6e9efde9cda0f1a86c758f45eff727143264544
https://github.com/wesnoth/wesnoth/commit/c6e9efde9cda0f1a86c758f45eff727143264544
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M source_lists/libwesnoth_widgets
M src/gui/core/gui_definition.cpp
M src/gui/dialogs/addon/manager.cpp
M src/gui/dialogs/addon/uninstall_list.cpp
M src/gui/dialogs/campaign_difficulty.cpp
M src/gui/dialogs/campaign_selection.cpp
M src/gui/dialogs/chat_log.cpp
M src/gui/dialogs/core_selection.cpp
M src/gui/dialogs/depcheck_select_new.cpp
M src/gui/dialogs/editor/generate_map.cpp
M src/gui/dialogs/editor/set_starting_position.cpp
M src/gui/dialogs/file_dialog.cpp
M src/gui/dialogs/game_load.cpp
M src/gui/dialogs/game_stats.cpp
M src/gui/dialogs/game_version.cpp
M src/gui/dialogs/game_version.hpp
M src/gui/dialogs/label_settings.cpp
M src/gui/dialogs/language_selection.cpp
M src/gui/dialogs/multiplayer/faction_select.cpp
M src/gui/dialogs/multiplayer/lobby.cpp
M src/gui/dialogs/multiplayer/lobby.hpp
M src/gui/dialogs/multiplayer/mp_change_control.cpp
M src/gui/dialogs/multiplayer/mp_connect.cpp
M src/gui/dialogs/multiplayer/mp_create_game.cpp
M src/gui/dialogs/multiplayer/mp_join_game.cpp
M src/gui/dialogs/multiplayer/mp_method_selection.cpp
M src/gui/dialogs/multiplayer/mp_staging.cpp
M src/gui/dialogs/preferences_dialog.cpp
M src/gui/dialogs/simple_item_selector.cpp
M src/gui/dialogs/statistics_dialog.cpp
M src/gui/dialogs/terrain_layers.cpp
M src/gui/dialogs/theme_list.cpp
M src/gui/dialogs/unit_advance.cpp
M src/gui/dialogs/unit_attack.cpp
M src/gui/dialogs/unit_create.cpp
M src/gui/dialogs/unit_list.cpp
M src/gui/dialogs/unit_recall.cpp
M src/gui/dialogs/unit_recruit.cpp
M src/gui/dialogs/wml_message.cpp
M src/gui/widgets/debug.cpp
R src/gui/widgets/list.cpp
R src/gui/widgets/list.hpp
M src/gui/widgets/listbox.cpp
M src/gui/widgets/listbox.hpp
M src/gui/widgets/scrollbar_container.hpp
M src/scripting/lua_gui2.cpp
Log Message:
-----------
GUI2: removed 2010 experimental listbox
This was never finished, is not maintained, suffers from a lack of features the "old" listbox
class now has, and seems (according to the logs) to be have been superceded by the pane widget.
At the very least, the pane widget seems to be what mordante was working with in his early
prototype of a new addon manager, and not this 2010 list class.
(cherry-picked from commit 458dd284b8342b33e6a6359aefbbbdb386b28875)
Commit: a72b344029865248301d65c47f0a557197565b1f
https://github.com/wesnoth/wesnoth/commit/a72b344029865248301d65c47f0a557197565b1f
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/VC14/wesnoth.vcxproj
M projectfiles/VC14/wesnoth.vcxproj.filters
Log Message:
-----------
Updated VS projectfile
[ci skip]
(cherry-picked from commit 162b9de330322edf9723ef2cbed02978b7a38571)
Commit: d3d3e19275048919159c49edc3fd219afd060536
https://github.com/wesnoth/wesnoth/commit/d3d3e19275048919159c49edc3fd219afd060536
Author: Martin Hrubý (hrubymar10) <hrubymar10 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
Log Message:
-----------
Fix Xcode project after 458dd284b8342b33e6a6359aefbbbdb386b28875
(cherry-picked from commit dc6d5850f552bbccc2b21ea3d7e6d8b4539e1915)
Commit: 5addcb9a9784931f72d39b8e561a1b9e080d1ddf
https://github.com/wesnoth/wesnoth/commit/5addcb9a9784931f72d39b8e561a1b9e080d1ddf
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg
Log Message:
-----------
DiD S6: fixed previously stored orc leader ending up in the wrong place (fixes #3304)
[ci skip]
(cherry-picked from commit 78076941a07a15d4b3b2e99cbc200730567e4fe3)
Commit: 5cca1478d2c50c583e42192b64a455819b82b6c4
https://github.com/wesnoth/wesnoth/commit/5cca1478d2c50c583e42192b64a455819b82b6c4
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg
Log Message:
-----------
Fixup 7807694
[ci skip]
(cherry-picked from commit c39aa72f56930f9d8d062250f55c5b97883c5007)
Commit: 14e4115193b741bd93f7db290896522e74d562e6
https://github.com/wesnoth/wesnoth/commit/14e4115193b741bd93f7db290896522e74d562e6
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg
Log Message:
-----------
TSG S05: Hide completed objectives.
Fixes #3031.
(cherry-picked from commit f4ba5cbcb84684907e0617df763814016563eeaa)
Commit: f017725b5775a3660bc78a98d24ef091898bb8cf
https://github.com/wesnoth/wesnoth/commit/f017725b5775a3660bc78a98d24ef091898bb8cf
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg
Log Message:
-----------
TSG S05: Merge all instances of [objectives].
Suggested by @sevu.
(cherry-picked from commit ea62caadf0b23d61accf56f66611d4c781a424f1)
Commit: 267c00edd72ce51e4fd302606845a8b655eeeda5
https://github.com/wesnoth/wesnoth/commit/267c00edd72ce51e4fd302606845a8b655eeeda5
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg
Log Message:
-----------
TSG S5: fix an unlikely scenario outcome
In case the player goes south and runs away fromt he bandits, and defeats
the lich first, then the choice to side or not with the bandits would
happen very late.
In case he allied with them and the other undead leader still lived, he
could end the scenario still by triggering "enemies defeated". If they were
already defeated, the scenario could not end anymore. Furthermore, the
storytext doesn't make sense anymore, at least the ending dilogue would
miss,
In case of siding with the elves one can still win by defeating Urza Afalas.
and the story still makes sense,
To solve this, in this special situation the player has no choice anymore,
the path of the elves is chosen.
(the diff may be hard to read; a good part has been wrappend with an [if])
[ci skip]
(cherry-picked from commit 5dc80e7428a22611bbcbeecd9be05b2a0f253106)
Commit: 753f1fb3e5a0f9b45e63111d5a3d466870a608ba
https://github.com/wesnoth/wesnoth/commit/753f1fb3e5a0f9b45e63111d5a3d466870a608ba
Author: newfrenchy83 <31768074+newfrenchy83 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/CodeBlocks/wesnoth.cbp
Log Message:
-----------
Update CB project (#3307)
(cherry-picked from commit 411eb6105dccc83fa0adbb6ac7b107788947a81f)
Commit: 31e26a42155b3457e988d0730060532598f221f2
https://github.com/wesnoth/wesnoth/commit/31e26a42155b3457e988d0730060532598f221f2
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M utils/wmlxgettext
Log Message:
-----------
wmlxgettext: insert links which use ssl
[ci skip]
(cherry-picked from commit a66b30312bd2bc80f07490216b8120e1d32e3e01)
Commit: 80846a1a7852640790a9993621df2c23c64b52d7
https://github.com/wesnoth/wesnoth/commit/80846a1a7852640790a9993621df2c23c64b52d7
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_South_Guard/maps/04_Vale_of_Tears.map
M data/campaigns/The_South_Guard/scenarios/04_Vale_of_Tears.cfg
Log Message:
-----------
TSG S4: prevent leader of the undeads from suiciding
This is generally a problem with most leaders, but here it's worse.
Also changed his keep to the ruined version.
(Not the ajdacent castle tiles as it looks better that way.)
[ci skip]
(cherry-picked from commit 090ad3140fd606f1531058f58322ea7b9b6018d2)
Commit: eceb09dc568cebd9353e761807fcce72220adfea
https://github.com/wesnoth/wesnoth/commit/eceb09dc568cebd9353e761807fcce72220adfea
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg
Log Message:
-----------
DiD S10: add a redraw
apparently it happens normally only after dismissing the objectives
[ci skip]
(cherry-picked from commit a62264412d54157184ce8b6250520238f2421aaf)
Commit: 885700ecf7fe1c00a4f24e8d40e3679dbba10847
https://github.com/wesnoth/wesnoth/commit/885700ecf7fe1c00a4f24e8d40e3679dbba10847
Author: sigurdfdragon <jjwcoat at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Secrets_of_the_Ancients/scenarios/16_The_Mage.cfg
Log Message:
-----------
SotA S16: Simplify dialog to fix #3291
(cherry-picked from commit fd43d8454ce418c207aebb16ba8908af5a6e2799)
Commit: 193fe4accdb11fe551ae73f34262abfcda368aeb
https://github.com/wesnoth/wesnoth/commit/193fe4accdb11fe551ae73f34262abfcda368aeb
Author: sigurdfdragon <jjwcoat at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Secrets_of_the_Ancients/scenarios/11_Battleground.cfg
M data/campaigns/Secrets_of_the_Ancients/scenarios/21_Against_the_World.cfg
Log Message:
-----------
SotA S11 & 21: Fix #3294
Adjust units to have appropriate gender for story reasons.
(cherry-picked from commit 2f710f83bf5f7b5086ef66ec49aaef4c156b75bd)
Commit: f20ceac0f6508424e09eaf9761ea0829ab1c3da6
https://github.com/wesnoth/wesnoth/commit/f20ceac0f6508424e09eaf9761ea0829ab1c3da6
Author: sigurdfdragon <jjwcoat at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Update changelog
(cherry-picked from commit 7d60eeeefb65cc80e6e25162443422d33ae963eb)
Commit: 9384019393fc4215fa10becf8668a6046a92f7bd
https://github.com/wesnoth/wesnoth/commit/9384019393fc4215fa10becf8668a6046a92f7bd
Author: sigurdfdragon <jjwcoat at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Secrets_of_the_Ancients/scenarios/21_Against_the_World.cfg
Log Message:
-----------
SotA S21: Set facing for naga appearance
(cherry-picked from commit d22c1746e89cb7369b2ca502d16124f4e978b329)
Commit: 9093a2c9f0c2cdd233c38217d1fe88fa44f8312a
https://github.com/wesnoth/wesnoth/commit/9093a2c9f0c2cdd233c38217d1fe88fa44f8312a
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Northern_Rebirth/scenarios/05a_02_Dealings.cfg
M data/campaigns/Northern_Rebirth/scenarios/06a_Old_Friend.cfg
M data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg
M data/campaigns/Northern_Rebirth/scenarios/08a_Elvish_Princess.cfg
M data/campaigns/Northern_Rebirth/scenarios/09a_Introductions.cfg
M data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg
M data/campaigns/Northern_Rebirth/scenarios/11a_The_Eastern_Flank.cfg
M data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg
M data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg
M data/campaigns/Northern_Rebirth/scenarios/14a_Epilogue.cfg
Log Message:
-----------
NR: Disallow lvl 0 recruits after scenario 5.
Don't bother carrying them through the whole campaign.
This scenario seems like a good time, because there begins a new episide in the story
and all the level 1 advancement are available now too.
closes #3074
[ci skip]
(cherry-picked from commit 785f91065b212dbf8cc7462a02cc594de0f60f53)
Commit: 12c7a950d2aeb0c940de29f674ad7cb85ad0fe9e
https://github.com/wesnoth/wesnoth/commit/12c7a950d2aeb0c940de29f674ad7cb85ad0fe9e
Author: Choicerer <38387804+Choicerer at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/themes/default.cfg
Log Message:
-----------
Fixes broken tooltips for the unit_side flag and the unit name. (#3315)
Fixes #3306
(cherry-picked from commit f50b644c30e126d53db54d5a342f3be4dc0461c8)
Commit: bdabd78439b974245848c56155b6998c3ee5109d
https://github.com/wesnoth/wesnoth/commit/bdabd78439b974245848c56155b6998c3ee5109d
Author: Choicerer <38387804+Choicerer at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/replay.cpp
Log Message:
-----------
Fix team chat not being marked on remote clients (#3314)
Fixing the lack of stars on the remote client when sending a team/observer message.
This commit didn't modify the necessary lines in replay.cpp:
6aa3b3b
(of which the chat_msg::chat_msg one has already been fixed)
Fixes #3119
(cherry-picked from commit 02bdd179946ae1eef3424541115e529e758b8fc0)
Commit: a930dc28a99ed84903ad8c34018840196c7ebc62
https://github.com/wesnoth/wesnoth/commit/a930dc28a99ed84903ad8c34018840196c7ebc62
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/lua/wml/objectives.lua
Log Message:
-----------
WML: Don't add a \n before condition=lose objectives if there are no objectives listed before them.
(cherry-picked from commit 045d331da8cc8120e4a5affd639ce389e344bc16)
Commit: 494ba287ece1704cce9808ac3755d9b5b2f57557
https://github.com/wesnoth/wesnoth/commit/494ba287ece1704cce9808ac3755d9b5b2f57557
Author: Celtic Minstrel <CelticMinstrel at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/reports.cpp
Log Message:
-----------
Fix incorrect formatting of probabilities in the sidebar
This resulted from an incorrect use of std::setprecision, which sets the number of significant figures to display, not the number of decimal places.
(cherry-picked from commit 41e757be9fc42da21f772c68a4c6877c135b810d)
Commit: e4418de7ff64f00aaa929e9a5a8378c195032066
https://github.com/wesnoth/wesnoth/commit/e4418de7ff64f00aaa929e9a5a8378c195032066
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg
M data/core/macros/schedules.cfg
Log Message:
-----------
Change campfire timezones in UtBS S3
Instead of having another ToD, the image of the current ToD is used,
but illuminated. This is a visual change, no gameplay changes included.
The ToD shifting for 'dawn' looked better than for 'dusk', and was
conidered better looking than having no ToD shift compared to the
surrounding.
part of #3056
[ci skip]
(cherry-picked from commit c7d8d232563e665cdfc0bcde201d780a511a4d93)
Commit: dc2b7943514864db9736f7ac7052ade9e67af09a
https://github.com/wesnoth/wesnoth/commit/dc2b7943514864db9736f7ac7052ade9e67af09a
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg
Log Message:
-----------
Change Campfire timezones in TSG S8b
Instead of having another ToD, the image of the current ToD is used,
but illuminated. This is an visual change, no gameplay changes included.
Due to the lack of a save I could not view the result myself,
I chose the ToD shifting colors based on the other scenarios.
part of #3056
[ci skip]
(cherry-picked from commit f2a1acd97e76dd89a7830904f596c3d19984c1fa)
Commit: 85089649351d86a445dd7212dac60231a1068afd
https://github.com/wesnoth/wesnoth/commit/85089649351d86a445dd7212dac60231a1068afd
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/multiplayer/scenarios/2p_Tombs_of_Kesorak.cfg
Log Message:
-----------
Change campfire timezones in MP: Tombs of Kesorak
Instead of having another ToD, the image of the current ToD is used,
but illuminated. This is a visual change, no gameplay changes included.
For the always dark one exists no immage, uses one from after the fall,
with slightly adjusted ToD shifting as it looked to weak.
The 1 hex small campfires look best with dusk.
part of #3056
[ci skip]
(cherry-picked from commit f5890c10a21451b0477ca13956bb6f9124ce621e)
Commit: 9cacb51351912ecb3bfb6cca2edbf05cd8ee5ef8
https://github.com/wesnoth/wesnoth/commit/9cacb51351912ecb3bfb6cca2edbf05cd8ee5ef8
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/multiplayer/maps/2p_Tombs_of_Kesorak.map
M data/multiplayer/scenarios/2p_Tombs_of_Kesorak.cfg
Log Message:
-----------
Replace deprecated macro with terrain code in MP: Tombs of Kesorak
[ci skip]
(cherry-picked from commit 2a5ea00ad04f5b879ab316aae9578c29378eabb8)
Commit: 40dc80f02f5cbecd9c36457e7fc6d3da96d004bd
https://github.com/wesnoth/wesnoth/commit/40dc80f02f5cbecd9c36457e7fc6d3da96d004bd
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg
M data/campaigns/Under_the_Burning_Suns/scenarios/11_Battle_for_Zocthanol_Isle.cfg
M data/campaigns/Under_the_Burning_Suns/scenarios/12_The_Final_Confrontation.cfg
M data/multiplayer/scenarios/2p_Caves_of_the_Basilisk.cfg
M data/multiplayer/scenarios/2p_Thousand_Stings_Garrison.cfg
Log Message:
-----------
slight text edits
- missing dots in some MP strings
- superfluous space in some MP strings
-ran wmlinden on UtBS scenarios
[ci skip]
(cherry-picked from commit 5bd6221c44d1523b210bf9eaa5cf693cde350221)
Commit: 3b26cc15e34a9f92dc28924c5f6f5c2ed230600a
https://github.com/wesnoth/wesnoth/commit/3b26cc15e34a9f92dc28924c5f6f5c2ed230600a
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/attack_prediction.cpp
Log Message:
-----------
Damage prediction: round very close slow probabilities to 0 or 1
In the case in bug #3321, damage prediction code somehow receives a
combatant whose probability to be slowed is very close to one of those
values but not quite it. I couldn't figure out how it's possible because
only damage prediction code itself is supposed to emit slow probabilities,
and it's not producing such a probability in this case.
Without more information, I'm simply fixing the bug by force. If the
probability is in the problematic area, we simply round it to 0 or 1. This
way such probabilities are impossible later on when we try to scale the HP
distributions so that they add to 1.
Fixes #3321.
(cherry-picked from commit 00d8548c24a70365f1b02116e129c8835dff206a)
Commit: ecfd0f54f1779cb3733fd0c842a08d1b3fdaad7e
https://github.com/wesnoth/wesnoth/commit/ecfd0f54f1779cb3733fd0c842a08d1b3fdaad7e
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_South_Guard/scenarios/04_Vale_of_Tears.cfg
Log Message:
-----------
TSG 04: Better implementation to protect the magican
The player can all the time view the stats of any unit in the sidebar. This allowed to
see that he doesn't attack because he has only one move. There is no way to see the
movement costs directly, and as long as they are higher than the max_moves it's not
possible to figure out that this is not AI behavior but a game restriction.
Additionally, as the player has to kill both leaders to continue, try to not let the
player camp around the castle for the rest of the game, by giving the leader a possiblity
to attack if he recruited last turn a unit.
[ci skip]
(cherry-picked from commit 7ea951d5b9cf36986c51d1d8d603bc87ae559286)
Commit: 613ea5182385a824c2b234c301b6933dc3c2a0ad
https://github.com/wesnoth/wesnoth/commit/613ea5182385a824c2b234c301b6933dc3c2a0ad
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_Hammer_of_Thursagan/scenarios/07_Mages_and_Drakes.cfg
Log Message:
-----------
THoT S7: Select Darchas so the narrator's reference to him isn't dangling.
(cherry-picked from commit 29e814d8f4b15a4edae973837e81e85295494bb4)
Commit: cb88a7a232117a5bcff2c96441c2bcd3997986d9
https://github.com/wesnoth/wesnoth/commit/cb88a7a232117a5bcff2c96441c2bcd3997986d9
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/help/help_topic_generators.cpp
Log Message:
-----------
Help: Use `female_name` and `name` as fallback when `male_name` is empty and don't list hidden traits.
This algorithm was lifted from help::generate_trait_topics().
Fixes #3284
(cherry-picked from commit a4b0de5ece5a9bf1edac3b6f49dfac647ff1194f)
Commit: 0396437f1853e1ad462f3940f0b0a3c60811f23f
https://github.com/wesnoth/wesnoth/commit/0396437f1853e1ad462f3940f0b0a3c60811f23f
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/help/help_topic_generators.cpp
Log Message:
-----------
Help: only use male_name/female_name if the unit has male/female variants.
(cherry-picked from commit dcbdac8ab5d593d31faa04f6069da8ae5c6744c5)
Commit: 34545ba9e427323690acd2a1d7b827f8698f4f5f
https://github.com/wesnoth/wesnoth/commit/34545ba9e427323690acd2a1d7b827f8698f4f5f
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/advanced_preferences.cfg
M data/gui/window/preferences/01_general.cfg
Log Message:
-----------
gui2/preferences: Use curly quotes in quoted text in tooltips
[ci skip]
(cherry-picked from commit b8b403185eb81a239b5ab130fcf32698ac3de1d1)
Commit: 31aaabb92ede6b43801a56182ab5303a65da6f29
https://github.com/wesnoth/wesnoth/commit/31aaabb92ede6b43801a56182ab5303a65da6f29
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg
M data/campaigns/Northern_Rebirth/scenarios/05a_02_Dealings.cfg
M data/campaigns/Secrets_of_the_Ancients/scenarios/18_Abandoned_Outpost.cfg
M data/campaigns/The_Rise_Of_Wesnoth/scenarios/09_Fallen_Lich_Point.cfg
M data/multiplayer/scenarios/2p_Caves_of_the_Basilisk.cfg
Log Message:
-----------
Fix excessive dots in ellipses in several mainline scenarios
[ci skip]
(cherry-picked from commit de8d468b14119d7486bbbb782a2aabce1b650991)
Commit: 373437ec70f2545e5fe02d5040678831b490abdf
https://github.com/wesnoth/wesnoth/commit/373437ec70f2545e5fe02d5040678831b490abdf
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-httt/af.po
M po/wesnoth-httt/ang.po
M po/wesnoth-httt/ang at latin.po
M po/wesnoth-httt/ar.po
M po/wesnoth-httt/ast.po
M po/wesnoth-httt/bg.po
M po/wesnoth-httt/ca.po
M po/wesnoth-httt/ca_ES at valencia.po
M po/wesnoth-httt/cs.po
M po/wesnoth-httt/da.po
M po/wesnoth-httt/de.po
M po/wesnoth-httt/el.po
M po/wesnoth-httt/en at shaw.po
M po/wesnoth-httt/en_GB.po
M po/wesnoth-httt/eo.po
M po/wesnoth-httt/es.po
M po/wesnoth-httt/et.po
M po/wesnoth-httt/eu.po
M po/wesnoth-httt/fi.po
M po/wesnoth-httt/fr.po
M po/wesnoth-httt/fur_IT.po
M po/wesnoth-httt/ga.po
M po/wesnoth-httt/gd.po
M po/wesnoth-httt/gl.po
M po/wesnoth-httt/he.po
M po/wesnoth-httt/hr.po
M po/wesnoth-httt/hu.po
M po/wesnoth-httt/id.po
M po/wesnoth-httt/is.po
M po/wesnoth-httt/it.po
M po/wesnoth-httt/ja.po
M po/wesnoth-httt/ko.po
M po/wesnoth-httt/la.po
M po/wesnoth-httt/lt.po
M po/wesnoth-httt/lv.po
M po/wesnoth-httt/mk.po
M po/wesnoth-httt/mr.po
M po/wesnoth-httt/nb_NO.po
M po/wesnoth-httt/nl.po
M po/wesnoth-httt/pl.po
M po/wesnoth-httt/pt.po
M po/wesnoth-httt/pt_BR.po
M po/wesnoth-httt/racv.po
M po/wesnoth-httt/ro.po
M po/wesnoth-httt/ru.po
M po/wesnoth-httt/sk.po
M po/wesnoth-httt/sl.po
M po/wesnoth-httt/sr.po
M po/wesnoth-httt/sr at ijekavian.po
M po/wesnoth-httt/sr at ijekavianlatin.po
M po/wesnoth-httt/sr at latin.po
M po/wesnoth-httt/sv.po
M po/wesnoth-httt/tl.po
M po/wesnoth-httt/tr.po
M po/wesnoth-httt/uk.po
M po/wesnoth-httt/vi.po
M po/wesnoth-httt/wesnoth-httt.pot
M po/wesnoth-httt/zh_CN.po
M po/wesnoth-httt/zh_TW.po
M po/wesnoth-multiplayer/af.po
M po/wesnoth-multiplayer/ang.po
M po/wesnoth-multiplayer/ang at latin.po
M po/wesnoth-multiplayer/ar.po
M po/wesnoth-multiplayer/ast.po
M po/wesnoth-multiplayer/bg.po
M po/wesnoth-multiplayer/ca.po
M po/wesnoth-multiplayer/ca_ES at valencia.po
M po/wesnoth-multiplayer/cs.po
M po/wesnoth-multiplayer/da.po
M po/wesnoth-multiplayer/de.po
M po/wesnoth-multiplayer/el.po
M po/wesnoth-multiplayer/en at shaw.po
M po/wesnoth-multiplayer/en_GB.po
M po/wesnoth-multiplayer/eo.po
M po/wesnoth-multiplayer/es.po
M po/wesnoth-multiplayer/et.po
M po/wesnoth-multiplayer/eu.po
M po/wesnoth-multiplayer/fi.po
M po/wesnoth-multiplayer/fr.po
M po/wesnoth-multiplayer/fur_IT.po
M po/wesnoth-multiplayer/ga.po
M po/wesnoth-multiplayer/gd.po
M po/wesnoth-multiplayer/gl.po
M po/wesnoth-multiplayer/he.po
M po/wesnoth-multiplayer/hr.po
M po/wesnoth-multiplayer/hu.po
M po/wesnoth-multiplayer/id.po
M po/wesnoth-multiplayer/is.po
M po/wesnoth-multiplayer/it.po
M po/wesnoth-multiplayer/ja.po
M po/wesnoth-multiplayer/ko.po
M po/wesnoth-multiplayer/la.po
M po/wesnoth-multiplayer/lt.po
M po/wesnoth-multiplayer/lv.po
M po/wesnoth-multiplayer/mk.po
M po/wesnoth-multiplayer/mr.po
M po/wesnoth-multiplayer/nb_NO.po
M po/wesnoth-multiplayer/nl.po
M po/wesnoth-multiplayer/pl.po
M po/wesnoth-multiplayer/pt.po
M po/wesnoth-multiplayer/pt_BR.po
M po/wesnoth-multiplayer/racv.po
M po/wesnoth-multiplayer/ro.po
M po/wesnoth-multiplayer/ru.po
M po/wesnoth-multiplayer/sk.po
M po/wesnoth-multiplayer/sl.po
M po/wesnoth-multiplayer/sr.po
M po/wesnoth-multiplayer/sr at ijekavian.po
M po/wesnoth-multiplayer/sr at ijekavianlatin.po
M po/wesnoth-multiplayer/sr at latin.po
M po/wesnoth-multiplayer/sv.po
M po/wesnoth-multiplayer/tl.po
M po/wesnoth-multiplayer/tr.po
M po/wesnoth-multiplayer/uk.po
M po/wesnoth-multiplayer/vi.po
M po/wesnoth-multiplayer/wesnoth-multiplayer.pot
M po/wesnoth-multiplayer/zh_CN.po
M po/wesnoth-multiplayer/zh_TW.po
M po/wesnoth-nr/af.po
M po/wesnoth-nr/ang.po
M po/wesnoth-nr/ang at latin.po
M po/wesnoth-nr/ar.po
M po/wesnoth-nr/ast.po
M po/wesnoth-nr/bg.po
M po/wesnoth-nr/ca.po
M po/wesnoth-nr/ca_ES at valencia.po
M po/wesnoth-nr/cs.po
M po/wesnoth-nr/da.po
M po/wesnoth-nr/de.po
M po/wesnoth-nr/el.po
M po/wesnoth-nr/en at shaw.po
M po/wesnoth-nr/en_GB.po
M po/wesnoth-nr/eo.po
M po/wesnoth-nr/es.po
M po/wesnoth-nr/et.po
M po/wesnoth-nr/eu.po
M po/wesnoth-nr/fi.po
M po/wesnoth-nr/fr.po
M po/wesnoth-nr/fur_IT.po
M po/wesnoth-nr/ga.po
M po/wesnoth-nr/gd.po
M po/wesnoth-nr/gl.po
M po/wesnoth-nr/he.po
M po/wesnoth-nr/hr.po
M po/wesnoth-nr/hu.po
M po/wesnoth-nr/id.po
M po/wesnoth-nr/is.po
M po/wesnoth-nr/it.po
M po/wesnoth-nr/ja.po
M po/wesnoth-nr/ko.po
M po/wesnoth-nr/la.po
M po/wesnoth-nr/lt.po
M po/wesnoth-nr/lv.po
M po/wesnoth-nr/mk.po
M po/wesnoth-nr/mr.po
M po/wesnoth-nr/nb_NO.po
M po/wesnoth-nr/nl.po
M po/wesnoth-nr/pl.po
M po/wesnoth-nr/pt.po
M po/wesnoth-nr/pt_BR.po
M po/wesnoth-nr/racv.po
M po/wesnoth-nr/ro.po
M po/wesnoth-nr/ru.po
M po/wesnoth-nr/sk.po
M po/wesnoth-nr/sl.po
M po/wesnoth-nr/sr.po
M po/wesnoth-nr/sr at ijekavian.po
M po/wesnoth-nr/sr at ijekavianlatin.po
M po/wesnoth-nr/sr at latin.po
M po/wesnoth-nr/sv.po
M po/wesnoth-nr/tl.po
M po/wesnoth-nr/tr.po
M po/wesnoth-nr/uk.po
M po/wesnoth-nr/vi.po
M po/wesnoth-nr/wesnoth-nr.pot
M po/wesnoth-nr/zh_CN.po
M po/wesnoth-nr/zh_TW.po
M po/wesnoth-sota/af.po
M po/wesnoth-sota/ang.po
M po/wesnoth-sota/ang at latin.po
M po/wesnoth-sota/ar.po
M po/wesnoth-sota/ast.po
M po/wesnoth-sota/bg.po
M po/wesnoth-sota/ca.po
M po/wesnoth-sota/ca_ES at valencia.po
M po/wesnoth-sota/cs.po
M po/wesnoth-sota/da.po
M po/wesnoth-sota/de.po
M po/wesnoth-sota/el.po
M po/wesnoth-sota/en at shaw.po
M po/wesnoth-sota/en_GB.po
M po/wesnoth-sota/eo.po
M po/wesnoth-sota/es.po
M po/wesnoth-sota/et.po
M po/wesnoth-sota/eu.po
M po/wesnoth-sota/fi.po
M po/wesnoth-sota/fr.po
M po/wesnoth-sota/fur.po
M po/wesnoth-sota/fur_IT.po
M po/wesnoth-sota/ga.po
M po/wesnoth-sota/gd.po
M po/wesnoth-sota/gl.po
M po/wesnoth-sota/he.po
M po/wesnoth-sota/hr.po
M po/wesnoth-sota/hu.po
M po/wesnoth-sota/id.po
M po/wesnoth-sota/is.po
M po/wesnoth-sota/it.po
M po/wesnoth-sota/ja.po
M po/wesnoth-sota/ko.po
M po/wesnoth-sota/la.po
M po/wesnoth-sota/lt.po
M po/wesnoth-sota/lv.po
M po/wesnoth-sota/mk.po
M po/wesnoth-sota/mr.po
M po/wesnoth-sota/nb.po
M po/wesnoth-sota/nb_NO.po
M po/wesnoth-sota/nl.po
M po/wesnoth-sota/pl.po
M po/wesnoth-sota/pt.po
M po/wesnoth-sota/pt_BR.po
M po/wesnoth-sota/racv.po
M po/wesnoth-sota/ro.po
M po/wesnoth-sota/ru.po
M po/wesnoth-sota/sk.po
M po/wesnoth-sota/sl.po
M po/wesnoth-sota/sr.po
M po/wesnoth-sota/sr at ijekavian.po
M po/wesnoth-sota/sr at ijekavianlatin.po
M po/wesnoth-sota/sr at latin.po
M po/wesnoth-sota/sv.po
M po/wesnoth-sota/tl.po
M po/wesnoth-sota/tr.po
M po/wesnoth-sota/uk.po
M po/wesnoth-sota/vi.po
M po/wesnoth-sota/wesnoth-sota.pot
M po/wesnoth-sota/zh_CN.po
M po/wesnoth-sota/zh_TW.po
M po/wesnoth-trow/af.po
M po/wesnoth-trow/ang.po
M po/wesnoth-trow/ang at latin.po
M po/wesnoth-trow/ar.po
M po/wesnoth-trow/ast.po
M po/wesnoth-trow/bg.po
M po/wesnoth-trow/ca.po
M po/wesnoth-trow/ca_ES at valencia.po
M po/wesnoth-trow/cs.po
M po/wesnoth-trow/da.po
M po/wesnoth-trow/de.po
M po/wesnoth-trow/el.po
M po/wesnoth-trow/en at shaw.po
M po/wesnoth-trow/en_GB.po
M po/wesnoth-trow/eo.po
M po/wesnoth-trow/es.po
M po/wesnoth-trow/et.po
M po/wesnoth-trow/eu.po
M po/wesnoth-trow/fi.po
M po/wesnoth-trow/fr.po
M po/wesnoth-trow/fur_IT.po
M po/wesnoth-trow/ga.po
M po/wesnoth-trow/gd.po
M po/wesnoth-trow/gl.po
M po/wesnoth-trow/he.po
M po/wesnoth-trow/hr.po
M po/wesnoth-trow/hu.po
M po/wesnoth-trow/id.po
M po/wesnoth-trow/is.po
M po/wesnoth-trow/it.po
M po/wesnoth-trow/ja.po
M po/wesnoth-trow/ko.po
M po/wesnoth-trow/la.po
M po/wesnoth-trow/lt.po
M po/wesnoth-trow/lv.po
M po/wesnoth-trow/mk.po
M po/wesnoth-trow/mr.po
M po/wesnoth-trow/nb_NO.po
M po/wesnoth-trow/nl.po
M po/wesnoth-trow/pl.po
M po/wesnoth-trow/pt.po
M po/wesnoth-trow/pt_BR.po
M po/wesnoth-trow/racv.po
M po/wesnoth-trow/ro.po
M po/wesnoth-trow/ru.po
M po/wesnoth-trow/sk.po
M po/wesnoth-trow/sl.po
M po/wesnoth-trow/sr.po
M po/wesnoth-trow/sr at ijekavian.po
M po/wesnoth-trow/sr at ijekavianlatin.po
M po/wesnoth-trow/sr at latin.po
M po/wesnoth-trow/sv.po
M po/wesnoth-trow/tl.po
M po/wesnoth-trow/tr.po
M po/wesnoth-trow/uk.po
M po/wesnoth-trow/vi.po
M po/wesnoth-trow/wesnoth-trow.pot
M po/wesnoth-trow/zh_CN.po
M po/wesnoth-trow/zh_TW.po
M utils/pofix.py
Log Message:
-----------
pofix: Add rules for whitespace/dot count-changing commits
[ci skip]
(cherry-picked from commit aa1976f090a2d9fc80b6f8d564a6fc855dee2c28)
Commit: b2db67bea6f26dc15a3aa1dae6eb96feb8d79eaf
https://github.com/wesnoth/wesnoth/commit/b2db67bea6f26dc15a3aa1dae6eb96feb8d79eaf
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-ai/zh_CN.po
M po/wesnoth-anl/zh_CN.po
M po/wesnoth-aoi/zh_CN.po
M po/wesnoth-did/zh_CN.po
M po/wesnoth-dm/zh_CN.po
M po/wesnoth-dw/zh_CN.po
M po/wesnoth-ei/zh_CN.po
M po/wesnoth-help/zh_CN.po
M po/wesnoth-httt/zh_CN.po
M po/wesnoth-l/zh_CN.po
M po/wesnoth-lib/zh_CN.po
M po/wesnoth-low/zh_CN.po
M po/wesnoth-manpages/zh_CN.po
M po/wesnoth-manual/zh_CN.po
M po/wesnoth-multiplayer/zh_CN.po
M po/wesnoth-nr/zh_CN.po
M po/wesnoth-sof/zh_CN.po
M po/wesnoth-sota/zh_CN.po
M po/wesnoth-sotbe/zh_CN.po
M po/wesnoth-tb/zh_CN.po
M po/wesnoth-test/zh_CN.po
M po/wesnoth-thot/zh_CN.po
M po/wesnoth-trow/zh_CN.po
M po/wesnoth-tsg/zh_CN.po
M po/wesnoth-tutorial/zh_CN.po
M po/wesnoth-units/zh_CN.po
M po/wesnoth-utbs/zh_CN.po
M po/wesnoth/zh_CN.po
Log Message:
-----------
updated Chinese (Simplified) translation
(cherry-picked from commit 8b7410317af0555eb54c96c45f737d62810021a6)
Commit: 9b79bb52af8646da15ff802b14c05b2e2deba99d
https://github.com/wesnoth/wesnoth/commit/9b79bb52af8646da15ff802b14c05b2e2deba99d
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/unit_list.cpp
M src/gui/dialogs/unit_recall.cpp
M src/gui/dialogs/unit_recall.hpp
Log Message:
-----------
Unit List/Unit Recall: simplified level sorting functionality
(cherry-picked from commit 94db6ba8c5b75d7c916ba7003b5720d6dc353a2e)
Commit: e437f99c91fce9a5d4e7d303ea9c3d67cc01466d
https://github.com/wesnoth/wesnoth/commit/e437f99c91fce9a5d4e7d303ea9c3d67cc01466d
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/unit_recall.cpp
Log Message:
-----------
Unit Recall: marked some sorting options as translatable
This matches Unit List.
(cherry-picked from commit 60950a797f034e6d6608f803809b3a7061a304b1)
Commit: ab125c511584a9c830730906c674f2d7bdc2d59e
https://github.com/wesnoth/wesnoth/commit/ab125c511584a9c830730906c674f2d7bdc2d59e
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Updated changelog
[ci skip]
The chatbox entry was redundant.
(cherry-picked from commit d8426ac37adf046d980fc7aaf3952ca0d965ad51)
Commit: a508f626fee47656cf86bd183fbe8a82c51341bd
https://github.com/wesnoth/wesnoth/commit/a508f626fee47656cf86bd183fbe8a82c51341bd
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_South_Guard/scenarios/04_Vale_of_Tears.cfg
Log Message:
-----------
TSG S4: improve magican's movement behaviour
- the movement restriction won't be applied if the magican is not
in the caslte (due to the one exception).
- As for the exception, it's not enough if the magican has only one
unit left, but this unit has to be on the caslte.
To sum up, the magican never leaves the castle, unless he has
(before recruiting) one last unit which is on the castle. (Maybe
from last turn's recruiting).
In case he left the castle, he goes back next to the keep next turn,
as leaders usually do.
[ci skip]
(cherry-picked from commit d4a6df034e9c67a17c84615a3306eaedd1905be2)
Commit: 10ef1ed44f2a94c91d1dcaf85e1f61f97f492733
https://github.com/wesnoth/wesnoth/commit/10ef1ed44f2a94c91d1dcaf85e1f61f97f492733
Author: sigurdfdragon <jjwcoat at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Delfadors_Memoirs/scenarios/01_Overture.cfg
M data/campaigns/Delfadors_Memoirs/scenarios/17_A_New_Ally.cfg
M data/campaigns/Delfadors_Memoirs/utils/characters.cfg
Log Message:
-----------
DM: Fix #3277
Make heroes have no upkeep, and remove hero status from character that
didn't need it. Minor touch ups.
(cherry-picked from commit 831e3e86d80f4d3c1ae9069646145559cb6ab8f0)
Commit: cb6ce938c7fb84b09033bbfe477a354787e0d958
https://github.com/wesnoth/wesnoth/commit/cb6ce938c7fb84b09033bbfe477a354787e0d958
Author: sigurdfdragon <jjwcoat at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Update changelog
(cherry-picked from commit 4fbeff273ac608744ff58abcb9d6af0d906be950)
Commit: c1ba1e77ba6f811c6b33ad40b850b016145474b6
https://github.com/wesnoth/wesnoth/commit/c1ba1e77ba6f811c6b33ad40b850b016145474b6
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M src/gui/widgets/chatbox.cpp
Log Message:
-----------
Fix #2789: lobby chat scrolls to top on new messages if not at bottom
(cherry-picked from commit 1699c0d3f904614db378604088b0ecb7fa6e981d)
Commit: 9e60bcbba6e49c9992cfd1feb5b37fcd4c8930f2
https://github.com/wesnoth/wesnoth/commit/9e60bcbba6e49c9992cfd1feb5b37fcd4c8930f2
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg
M data/campaigns/The_South_Guard/scenarios/09a_Vengeance.cfg
Log Message:
-----------
TSG, end of campaign: Use linger mode to allow to review the current scenario.
Only after pressing the 'End Scenario' button the epilogue will be shown.
closes #3058
[ci skip]
(cherry-picked from commit 591b1cd68ece8248c7b3b45fdd9db3874a0d9de8)
Commit: 16639f9d272a942f48bba4518c0d1dbbbf3440ff
https://github.com/wesnoth/wesnoth/commit/16639f9d272a942f48bba4518c0d1dbbbf3440ff
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Corrupted_Elf.cfg
Log Message:
-----------
UtBS: change weapon name of the corrupted elf
to match the one of the Champion, and to match his sprite.
closes #3323
[ci skip]
(cherry-picked from commit 5f7e8bd749970dd602981033d5f89db134f9d335)
Commit: 9ebdebc03408571f3e0245da299abc09340ac9bd
https://github.com/wesnoth/wesnoth/commit/9ebdebc03408571f3e0245da299abc09340ac9bd
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/server/game.cpp
Log Message:
-----------
Fix #2813: wrong chat color after a side is unassigned from a player
Regression from commit 36e9290.
As @gfgtdf pointed out in the bug report, because old_player was a
reference to the shared_ptr, resetting the shared_ptr in sides_ also
changed old_player, and thus 'the player lost his last side' check never
passed.
Thanks to @gfgtdf for figuring out the cause.
(cherry-picked from commit 95f19745ca87a5e7e3beecf69cbc84b1840ed076)
Commit: 6dfe1e1ff38b28d02b2ffb1e193901c245c07ffe
https://github.com/wesnoth/wesnoth/commit/6dfe1e1ff38b28d02b2ffb1e193901c245c07ffe
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-help/gd.po
M po/wesnoth-httt/gd.po
M po/wesnoth-lib/gd.po
M po/wesnoth-multiplayer/gd.po
M po/wesnoth-sota/gd.po
M po/wesnoth/gd.po
Log Message:
-----------
updated Scottish Gaelic translation
(cherry-picked from commit 94b5e1fc52376e30868dab9aa601e9ec42ccfaf8)
Commit: 4df57aee089f0b628cbae3f7db675b7bd088fd39
https://github.com/wesnoth/wesnoth/commit/4df57aee089f0b628cbae3f7db675b7bd088fd39
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-dw/es.po
M po/wesnoth-help/es.po
M po/wesnoth-lib/es.po
M po/wesnoth-multiplayer/es.po
M po/wesnoth-nr/es.po
M po/wesnoth-sota/es.po
M po/wesnoth-utbs/es.po
M po/wesnoth/es.po
Log Message:
-----------
updated Spanish translation
(cherry-picked from commit 9f16ce658bfbf773e57bffe9de3bf89dfc3df808)
Commit: 5250d970b31ff4977b795bd1f21dbe87db7dcdae
https://github.com/wesnoth/wesnoth/commit/5250d970b31ff4977b795bd1f21dbe87db7dcdae
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
R players_changelog.md
Log Message:
-----------
Removed players_changelog.md
[ci kip]
We decided to no longer use this and everything in here is also in the full changelog.
(cherry-picked from commit 5595c12e934b15d16082ce5f8574487f4f0b4ca4)
Commit: ee619b999fdcd7c195aff1950d96e6b0c4c96beb
https://github.com/wesnoth/wesnoth/commit/ee619b999fdcd7c195aff1950d96e6b0c4c96beb
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/build_info.cpp
M src/config.cpp
M src/tstring.cpp
Log Message:
-----------
Convert a few remaining C-style casts (for char) too static_cast
(cherry-picked from commit ce85c170200aee86ebd0b7a98ef7102a03e62dd5)
Commit: f05ca6536dffde3f6fadfffebe43db75d72a7c81
https://github.com/wesnoth/wesnoth/commit/f05ca6536dffde3f6fadfffebe43db75d72a7c81
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/config.cpp
Log Message:
-----------
Use '\t' instead of static_cast<char>(9)
(cherry-picked from commit 4c29a0dd5895784b94a2393feddf0613742f3a0c)
Commit: 39ff3e9114e1ce91295089a40ba8fe2a4136b396
https://github.com/wesnoth/wesnoth/commit/39ff3e9114e1ce91295089a40ba8fe2a4136b396
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M utils/travis/check_utf8.sh
Log Message:
-----------
Remove reference to players_changelog
(cherry-picked from commit 5bb72d7c8987ba4bb3ff734efe54d9c33c0d19b5)
Commit: aba5b94b99db9089b872cc5ee6fc24e96dc2d48e
https://github.com/wesnoth/wesnoth/commit/aba5b94b99db9089b872cc5ee6fc24e96dc2d48e
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M src/lua/COPYRIGHT
M src/lua/lapi.cpp
M src/lua/lapi.h
M src/lua/lauxlib.cpp
M src/lua/lauxlib.h
M src/lua/lbaselib.cpp
M src/lua/lbitlib.cpp
M src/lua/lcode.cpp
M src/lua/lcode.h
M src/lua/lcorolib.cpp
M src/lua/lctype.cpp
M src/lua/lctype.h
M src/lua/ldblib.cpp
M src/lua/ldebug.cpp
M src/lua/ldebug.h
M src/lua/ldo.cpp
M src/lua/ldo.h
M src/lua/ldump.cpp
M src/lua/lfunc.cpp
M src/lua/lfunc.h
M src/lua/lgc.cpp
M src/lua/lgc.h
M src/lua/liolib.cpp
M src/lua/llex.cpp
M src/lua/llex.h
M src/lua/llimits.h
M src/lua/lmathlib.cpp
M src/lua/lmem.cpp
M src/lua/lmem.h
M src/lua/loadlib.cpp
M src/lua/lobject.cpp
M src/lua/lobject.h
M src/lua/lopcodes.cpp
M src/lua/lopcodes.h
M src/lua/loslib.cpp
M src/lua/lparser.cpp
M src/lua/lparser.h
M src/lua/lprefix.h
M src/lua/lstate.cpp
M src/lua/lstate.h
M src/lua/lstring.cpp
M src/lua/lstring.h
M src/lua/lstrlib.cpp
M src/lua/ltable.cpp
M src/lua/ltable.h
M src/lua/ltablib.cpp
M src/lua/ltm.cpp
M src/lua/ltm.h
M src/lua/lua.h
M src/lua/luaconf.h
M src/lua/lualib.h
M src/lua/lundump.cpp
M src/lua/lundump.h
M src/lua/lutf8lib.cpp
M src/lua/lvm.cpp
M src/lua/lvm.h
M src/lua/lzio.cpp
M src/lua/lzio.h
M src/wesnoth_lua_config.md
Log Message:
-----------
Upgrade to Lua 5.3.5
(cherry-picked from commit 264389807c1cb789a3cfc3c386da049becdfbe67)
Commit: 7451421db79e582fdb4f6d825fb93e58b569dfaa
https://github.com/wesnoth/wesnoth/commit/7451421db79e582fdb4f6d825fb93e58b569dfaa
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/lua/luaconf.h
Log Message:
-----------
Reapply d0100758f855ec0d8f30dff41e8a8b6ff2d45fda
(cherry-picked from commit 8fcd3f2a833682a95c7d175d6a48cc42fa5e0c2d)
Commit: 97e05cac7eaa2777fc1e8ef07db4c1974fc4a8c5
https://github.com/wesnoth/wesnoth/commit/97e05cac7eaa2777fc1e8ef07db4c1974fc4a8c5
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Synced 1.14.3+dev changelog section with the 1.14 branch
[ci skip]
(cherry-picked from commit d5972c6f43e7cf8da54f02083b11b1d35451b509)
Commit: 766a0ffead23ffcf7ffce8537acf158d05ee423f
https://github.com/wesnoth/wesnoth/commit/766a0ffead23ffcf7ffce8537acf158d05ee423f
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/multiplayer/mp_options_helper.cpp
M src/gui/widgets/tree_view.cpp
M src/gui/widgets/tree_view.hpp
M src/gui/widgets/tree_view_node.cpp
M src/gui/widgets/tree_view_node.hpp
Log Message:
-----------
GUI2/Tree View: added interface for moving nodes between parent nodes
(cherry-picked from commit fa7c967c0a3645734d93d56c1ade8ca394d20846)
Commit: 2ea002b1127766e970cfcc93b91cfbca9772c922
https://github.com/wesnoth/wesnoth/commit/2ea002b1127766e970cfcc93b91cfbca9772c922
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/widgets/tree_view_node.hpp
Log Message:
-----------
Backport tree_view_node::ptr_t from master
Said typename was added to master in commit "GUI2: made widget
initialization process more secure against memory leaks"
(3d894faf11bba1b214914a7af565f4c712e29a5a). It is required on this
'remaster' branch by commit "GUI2/Tree View: added interface for moving
nodes between parent nodes" (fa7c967c0a3645734d93d56c1ade8ca394d20846
on master, e247892616aca160fea8df5d34fcca52c891baf2 on 1.14).
(cherry-picked from commit 0f511e8e55ac873d632366adc669266d8e5d5faf)
Commit: 1b4cd8195b063f89fcce73620c12bb007f116eb6
https://github.com/wesnoth/wesnoth/commit/1b4cd8195b063f89fcce73620c12bb007f116eb6
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/multiplayer/mp_staging.cpp
M src/gui/dialogs/multiplayer/mp_staging.hpp
Log Message:
-----------
MP Staging: move side nodes when changing teams instead of recreating them
Mp Join Game will require further refactoring; it recreates the entire tree when receiving data...
(cherry-picked from commit ae7d05e8fc8618aa247aae04b3a03431f7b0f0a7)
Commit: 06423777b41e4aac9415c5c33cdc58d62f0506cd
https://github.com/wesnoth/wesnoth/commit/06423777b41e4aac9415c5c33cdc58d62f0506cd
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M po/wesnoth-lib/hu.po
M po/wesnoth-sota/hu.po
M po/wesnoth-tutorial/hu.po
M po/wesnoth/hu.po
Log Message:
-----------
updated Hungarian translation
(cherry-picked from commit 3a3bf21e3772fed706b1887fdfecc588f51cc409)
Commit: 9da2700f101546ea78455a19860a2ed9d94ea824
https://github.com/wesnoth/wesnoth/commit/9da2700f101546ea78455a19860a2ed9d94ea824
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-dw/ja.po
M po/wesnoth-help/ja.po
M po/wesnoth-lib/ja.po
M po/wesnoth-multiplayer/ja.po
M po/wesnoth-nr/ja.po
M po/wesnoth-sota/ja.po
M po/wesnoth-utbs/ja.po
M po/wesnoth/ja.po
Log Message:
-----------
updated Japanese translation
(cherry-picked from commit fb4dbb3fcee878f427897469a26bab3536857a9c)
Commit: d8d00911c478ed30e3e78323dd210d55333fd872
https://github.com/wesnoth/wesnoth/commit/d8d00911c478ed30e3e78323dd210d55333fd872
Author: DisherProject <pycchio at tiscali.it>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Delfadors_Memoirs/scenarios/08_Ur_Thorodor.cfg
Log Message:
-----------
DM S08: Remove some (apparently) unused stuff
(cherry-picked from commit 4a9c6610d48c5a059cdba95afa3b7b4a31da6c94)
Commit: 83a6de205a99a21719c5d7d4c341dd1474a1c484
https://github.com/wesnoth/wesnoth/commit/83a6de205a99a21719c5d7d4c341dd1474a1c484
Author: DisherProject <pycchio at tiscali.it>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Delfadors_Memoirs/scenarios/14_Shadows.cfg
Log Message:
-----------
DM S14: follow up TODO
(cherry-picked from commit 289af5ba1b66df897d1b04c63a9e9e9b83f87aad)
Commit: 50c457489a5bd675e5486f276f2f37cb593ed567
https://github.com/wesnoth/wesnoth/commit/50c457489a5bd675e5486f276f2f37cb593ed567
Author: DisherProject <pycchio at tiscali.it>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Delfadors_Memoirs/utils/sides.cfg
Log Message:
-----------
DM utils/sides.cfg: follow up FIXME
(cherry-picked from commit 370e50c5a67243c9584b8901c08a9fc728d97b2f)
Commit: 1e516f14fb07c55645e5e2328edc1f1d8619f0b0
https://github.com/wesnoth/wesnoth/commit/1e516f14fb07c55645e5e2328edc1f1d8619f0b0
Author: DisherProject <pycchio at tiscali.it>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Delfadors_Memoirs/scenarios/21_Clash_at_the_Manor.cfg
Log Message:
-----------
DM S21: Add some visual effects
1) Give elves orcish bows
2) Animate the first two riders when they're spawned, so it
looks like they've been recruited
(cherry-picked from commit d0a369c65dd57d6cf45ad1ab5eb514e6378813d7)
Commit: 2981dfd4896c0bbdf8193c555bc68c4b529a91df
https://github.com/wesnoth/wesnoth/commit/2981dfd4896c0bbdf8193c555bc68c4b529a91df
Author: DisherProject <pycchio at tiscali.it>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Delfadors_Memoirs/scenarios/15_Save_the_King.cfg
M data/campaigns/Delfadors_Memoirs/utils/deaths.cfg
Log Message:
-----------
DM: add some TODOs
(cherry-picked from commit d5e22a32c354d135a7e1453a7f82429d4199caf4)
Commit: fcfd534d90ce95292410ab58dbd73c6931ef9090
https://github.com/wesnoth/wesnoth/commit/fcfd534d90ce95292410ab58dbd73c6931ef9090
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/actions/advancement.cpp
M src/editor/map/context_manager.cpp
M src/hotkey/command_executor.cpp
M src/menu_events.cpp
M src/mouse_events.cpp
M src/savegame.cpp
Log Message:
-----------
Used the return value of modal_dialog::show instead of an explicit retval check when possible
(cherry-picked from commit 637e69f27173fb55a396eefe98a2cbbc5c662257)
Commit: 071ca23a12cef3d5057180009048354fec8f3b1a
https://github.com/wesnoth/wesnoth/commit/071ca23a12cef3d5057180009048354fec8f3b1a
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/game_launcher.cpp
M src/gui/dialogs/language_selection.hpp
Log Message:
-----------
Language Selection: declared an execute function
(cherry-picked from commit c0b09315d1a67be30aaf82d09d06f594d0d5d2ed)
Commit: 568b6cc1f57b8045957d8b1547ac0e023586dfe7
https://github.com/wesnoth/wesnoth/commit/568b6cc1f57b8045957d8b1547ac0e023586dfe7
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/multiplayer/mp_join_game.cpp
Log Message:
-----------
add a comment
(cherry-picked from commit 08d907e5708e8eed46471b03d41c0384e92b407e)
Commit: 8e07d7a8d00897a68e71cc3752321a93a73de593
https://github.com/wesnoth/wesnoth/commit/8e07d7a8d00897a68e71cc3752321a93a73de593
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-dw/en_GB.po
M po/wesnoth-help/en_GB.po
M po/wesnoth-lib/en_GB.po
M po/wesnoth-multiplayer/en_GB.po
M po/wesnoth-nr/en_GB.po
M po/wesnoth-sota/en_GB.po
M po/wesnoth-utbs/en_GB.po
M po/wesnoth/en_GB.po
Log Message:
-----------
updated British English translation
(cherry-picked from commit 0a35507f3fc42e62eb07948644ca053f5dd5625f)
Commit: 07ff2834db111104e3e8ace0a1f0f78cb33fa205
https://github.com/wesnoth/wesnoth/commit/07ff2834db111104e3e8ace0a1f0f78cb33fa205
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/terrain.cfg
Log Message:
-----------
Help: Hide "Lit Stone Wall" terrain (#2966)
The terrain was deprecated in commit 64493b256fcdc8cceb8a88286513534efaf93f10.
@Vultraz has said in comments of #2966 that deprecated terrains aren't
supposed to be shown in help.
Fixes #2966.
[ci skip]
(cherry-picked from commit d11d8ec8e11d0a73b92d07eacc6ba191e4703945)
Commit: f0b6a40677ff82073e7f5221e5cebbe1315ead0c
https://github.com/wesnoth/wesnoth/commit/f0b6a40677ff82073e7f5221e5cebbe1315ead0c
Author: sigurdfdragon <jjwcoat at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Delfadors_Memoirs/utils/sides.cfg
Log Message:
-----------
DM: Fixup 370e50c
(cherry-picked from commit d0931ae9cf2362eef8bc3fe6ad9ff7932883fa37)
Commit: ad2d4685428c58c68cf62bad9a8ea4162e61946d
https://github.com/wesnoth/wesnoth/commit/ad2d4685428c58c68cf62bad9a8ea4162e61946d
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_Hammer_of_Thursagan/scenarios/06_High_Pass.cfg
Log Message:
-----------
THoT S6: improve mage appearance event
- is now less odd if the event is triggered from the map borders
- works with debug mode
[ci skip]
(cherry-picked from commit 3c57546e8932d576182570ba01c0e9e8c3f466f7)
Commit: 85ec6a3149f151f7c1b270b54c944d8a88172bff
https://github.com/wesnoth/wesnoth/commit/85ec6a3149f151f7c1b270b54c944d8a88172bff
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_Hammer_of_Thursagan/scenarios/04_Troll_Bridge.cfg
Log Message:
-----------
THoT S4: Let the enemy recruit level 2 units on normal difficulty.
[ci skip]
(cherry-picked from commit fbd08b006e5bce8256288d156d7ef8fc7794b286)
Commit: e647c87ae50f6b2972c1d901ac9df094eceaf3ba
https://github.com/wesnoth/wesnoth/commit/e647c87ae50f6b2972c1d901ac9df094eceaf3ba
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_Hammer_of_Thursagan/scenarios/03_Strange_Allies.cfg
Log Message:
-----------
THoT S3: Marth-Tak faces east before hailing Aiglondur.
[ci skip]
(cherry-picked from commit 96fffa218259aee20935fec25ae38bb39f08979e)
Commit: fe8a7aaa59de9a82ffac69fdfd521612d74a4fbc
https://github.com/wesnoth/wesnoth/commit/fe8a7aaa59de9a82ffac69fdfd521612d74a4fbc
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_Hammer_of_Thursagan/scenarios/06_High_Pass.cfg
Log Message:
-----------
THoT S6: Highlight the hut mentioned in dialog.
[ci skip]
(cherry-picked from commit f4aa5ac66a047907894d0f1916a825aa60020775)
Commit: 937d302f449ae1eb118a8a4b8fe0a7c3ea40e17f
https://github.com/wesnoth/wesnoth/commit/937d302f449ae1eb118a8a4b8fe0a7c3ea40e17f
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-dw/cs.po
M po/wesnoth-lib/cs.po
M po/wesnoth-manpages/cs.po
M po/wesnoth-multiplayer/cs.po
M po/wesnoth-nr/cs.po
M po/wesnoth-sota/cs.po
M po/wesnoth-utbs/cs.po
M po/wesnoth/cs.po
Log Message:
-----------
updated Czech translation
(cherry-picked from commit e4da51adc319746e15970a63b4157340e0115573)
Commit: 5f849fcbfdb677c6967ff2d204e871d759ea8dfc
https://github.com/wesnoth/wesnoth/commit/5f849fcbfdb677c6967ff2d204e871d759ea8dfc
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/core/event/dispatcher.cpp
M src/gui/core/event/dispatcher.hpp
M src/gui/widgets/window.cpp
M src/gui/widgets/window.hpp
Log Message:
-----------
GUI2/Dispatcher: pass the message parameter for message events around as const
Really no reason for it to be non-const. That would imply the message's contents should
be modifiable, but that doesn't make sense.
(cherry-picked from commit 300197e9c0358e2a2df412352f8b30c457066f3c)
Commit: a351139dafdbe6475f13c124e856513fd23aa926
https://github.com/wesnoth/wesnoth/commit/a351139dafdbe6475f13c124e856513fd23aa926
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/units/unit.cpp
Log Message:
-----------
WML: Support the the 'jamming' key in [unit].
This syntax is already in use in the test scenario.
(cherry-picked from commit af71bfe9c749c37326682cb31ae84bcebe54efd0)
Commit: 1929b1a57c6394c1cffbcc520ed676cfe802da1c
https://github.com/wesnoth/wesnoth/commit/1929b1a57c6394c1cffbcc520ed676cfe802da1c
Author: Andras Szell <szell.andris at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg
Log Message:
-----------
Tutorial S1: prevent getting stuck next to Delfador, unable to end turn
Fixes #1584 1c - Delfador summons the puppet, you have 0 MP left but the
puppet is not adjacent to you, and can't attack or undo
Changed Delfador's initial position to match the quintain's, and made him
step away to summon in the original place next to us, so we don't need to
move again to attack after we reach him.
The movement points of the mage are now updated and he gained quick trait
to fit for the more movements he does.
Final movement also touched, so he does not seem to sidestep the new
enemies when leaving the map.
(cherry-picked from commit e3a95cc039c1b7d1c5f71f7de35c260438a5cbb0)
Commit: aa0f5d298e173814860c0fa5153135104c45d103
https://github.com/wesnoth/wesnoth/commit/aa0f5d298e173814860c0fa5153135104c45d103
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg
M data/campaigns/tutorial/utils/utils.cfg
Log Message:
-----------
Tutorial S1: followup previous commits
- Removed need for quick trait by spawning quantain next to Delfador
- Disabled movement point tracking due to #3344
- Use only one [label] tag to place both labels
- Removed id's of later quintains, as they are not used
- added some whitespaces
[ci skip]
(cherry-picked from commit 74b39ef3d68bee958998cae6780080c154997a01)
Commit: a0c70a9b7d43969bd47f761234abc3faafc5361c
https://github.com/wesnoth/wesnoth/commit/a0c70a9b7d43969bd47f761234abc3faafc5361c
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_Hammer_of_Thursagan/scenarios/09_Forbidden_Forest.cfg
Log Message:
-----------
THoT S9: Implement a victory condition closer to the one described in the objectives.
The previous condition was, "Win as soon as Aiglondur and Angarthing
have each touched the signpost". The new condition is, "Win as soon
as Aiglondur is on the signpost and Angarthing is next to him, or the
other way around".
[ci skip]
(cherry-picked from commit d2c8c1ae0dfc412616f9934d7ce5a2010c294b43)
Commit: 533040527498bce7db352fb267a9da55c5b17dbb
https://github.com/wesnoth/wesnoth/commit/533040527498bce7db352fb267a9da55c5b17dbb
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/scripting/game_lua_kernel.cpp
Log Message:
-----------
wesnoth.find_path: Allow specifying custom flags (in particular teleport) when using a custom cost function
(cherry-picked from commit 99233339dd2b3897929ed21803e9fe9792ed73c0)
Commit: 39e7d69f9af617e92180e670f6dec8cd8521d7d1
https://github.com/wesnoth/wesnoth/commit/39e7d69f9af617e92180e670f6dec8cd8521d7d1
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/ai/default/ca.cpp
Log Message:
-----------
Fix AI ignoring teleport locations when moving leader to leader goals
(cherry-picked from commit 45674a3d797df79813d2932094fbb7c2ca07ed2f)
Commit: b401d39cfa73ce3ad12d654ea4beabbbff99a471
https://github.com/wesnoth/wesnoth/commit/b401d39cfa73ce3ad12d654ea4beabbbff99a471
Author: Łukasz Hryniuk <code at hryniuk.pl>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/gui/window/unit_recall.cfg
M src/gui/dialogs/unit_recall.cpp
M src/gui/dialogs/unit_recall.hpp
Log Message:
-----------
gui2: allow renaming units in the Recall dialog
(cherry-picked from commit 349b18b216c5c8c96a1bc9fd96ecc8e02cbe5a13)
Commit: 1fcf643c7ddaf437631350d38e51dfc093022cb9
https://github.com/wesnoth/wesnoth/commit/1fcf643c7ddaf437631350d38e51dfc093022cb9
Author: Łukasz Hryniuk <code at hryniuk.pl>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/about.cfg
Log Message:
-----------
Add about.cfg entry
(cherry-picked from commit c11ac9081bf5b42b1028d381bcdf69a738e6bbb0)
Commit: 674fda85b7d74ea45d7db4ef842616097b58f0a1
https://github.com/wesnoth/wesnoth/commit/674fda85b7d74ea45d7db4ef842616097b58f0a1
Author: Martin Hrubý (hrubymar10) <hrubymar10 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M INSTALL.md
M changelog.md
M cmake/FindTranslationTools.cmake
M copyright
M data/ai/micro_ais/scenarios/The_Elves_Besieged.cfg
M data/ai/micro_ais/scenarios/animals.cfg
M data/ai/micro_ais/scenarios/bottleneck_defense.cfg
M data/ai/micro_ais/scenarios/dragon.cfg
M data/ai/micro_ais/scenarios/goto.cfg
M data/ai/micro_ais/scenarios/guardians.cfg
M data/ai/micro_ais/scenarios/hang_out.cfg
M data/ai/micro_ais/scenarios/healer_support.cfg
M data/ai/micro_ais/scenarios/lurkers.cfg
M data/ai/micro_ais/scenarios/messenger_escort.cfg
M data/ai/micro_ais/scenarios/patrols.cfg
M data/ai/micro_ais/scenarios/protect_unit.cfg
M data/ai/micro_ais/scenarios/recruiting.cfg
M data/ai/micro_ais/scenarios/swarm.cfg
M data/ai/micro_ais/scenarios/wolves.cfg
M data/core/terrain-graphics.cfg
M data/scenario-test.cfg
M data/themes/classic.cfg
M data/themes/default.cfg
M data/themes/editor.cfg
M data/tools/campaign2wiki.py
M data/tools/emacs_mode/README.md
M data/tools/emacs_mode/wesnoth-mode.texi
M data/tools/expand-terrain-macros.py
M data/tools/vim/wesml.vim
M data/tools/wesnoth/wescamp.py
M data/tools/wesnoth/wmlparser.py
M data/tools/wmllint
M data/tools/wmllint-1.4
M doc/design/gui2/abstract.tex
M doc/design/gui2/creating_widgets_and_dialogs.tex
M doc/man/fi/wesnothd.6
M doc/manual/manual.cs.html
M doc/manual/manual.de.html
M doc/manual/manual.en_GB.html
M doc/manual/manual.es.html
M doc/manual/manual.et.html
M doc/manual/manual.fi.html
M doc/manual/manual.fr.html
M doc/manual/manual.gl.html
M doc/manual/manual.hu.html
M doc/manual/manual.id.html
M doc/manual/manual.it.html
M doc/manual/manual.ja.html
M doc/manual/manual.pl.html
M doc/manual/manual.pt.html
M doc/manual/manual.pt_BR.html
M doc/manual/manual.ru.html
M doc/manual/manual.sk.html
M doc/manual/manual.sr.html
M doc/manual/manual.sr at ijekavian.html
M doc/manual/manual.sr at ijekavianlatin.html
M doc/manual/manual.sr at latin.html
M doc/manual/manual.uk.html
M doc/manual/manual.vi.html
M doc/manual/manual.zh_CN.html
M doc/manual/manual.zh_TW.html
M misc/fortunes/wesnoth
M po/SConscript
M po/wesnoth-ai/Makevars
M po/wesnoth-ai/wesnoth-ai.pot
M po/wesnoth-anl/Makevars
M po/wesnoth-anl/wesnoth-anl.pot
M po/wesnoth-aoi/Makevars
M po/wesnoth-aoi/wesnoth-aoi.pot
M po/wesnoth-did/Makevars
M po/wesnoth-did/wesnoth-did.pot
M po/wesnoth-dm/Makevars
M po/wesnoth-dm/wesnoth-dm.pot
M po/wesnoth-dw/Makevars
M po/wesnoth-dw/wesnoth-dw.pot
M po/wesnoth-editor/Makevars
M po/wesnoth-editor/wesnoth-editor.pot
M po/wesnoth-ei/Makevars
M po/wesnoth-ei/wesnoth-ei.pot
M po/wesnoth-help/Makevars
M po/wesnoth-help/wesnoth-help.pot
M po/wesnoth-httt/Makevars
M po/wesnoth-httt/wesnoth-httt.pot
M po/wesnoth-l/Makevars
M po/wesnoth-l/wesnoth-l.pot
M po/wesnoth-lib/Makevars
M po/wesnoth-lib/wesnoth-lib.pot
M po/wesnoth-low/Makevars
M po/wesnoth-low/wesnoth-low.pot
M po/wesnoth-manual/wesnoth-manual.pot
M po/wesnoth-multiplayer/Makevars
M po/wesnoth-multiplayer/wesnoth-multiplayer.pot
M po/wesnoth-nr/Makevars
M po/wesnoth-nr/wesnoth-nr.pot
M po/wesnoth-sof/Makevars
M po/wesnoth-sof/wesnoth-sof.pot
M po/wesnoth-sota/Makevars
M po/wesnoth-sota/wesnoth-sota.pot
M po/wesnoth-sotbe/Makevars
M po/wesnoth-sotbe/wesnoth-sotbe.pot
M po/wesnoth-tb/Makevars
M po/wesnoth-tb/wesnoth-tb.pot
M po/wesnoth-test/Makevars
M po/wesnoth-test/wesnoth-test.pot
M po/wesnoth-thot/Makevars
M po/wesnoth-thot/wesnoth-thot.pot
M po/wesnoth-trow/Makevars
M po/wesnoth-trow/wesnoth-trow.pot
M po/wesnoth-tsg/Makevars
M po/wesnoth-tsg/wesnoth-tsg.pot
M po/wesnoth-tutorial/Makevars
M po/wesnoth-tutorial/wesnoth-tutorial.pot
M po/wesnoth-units/Makevars
M po/wesnoth-units/wesnoth-units.pot
M po/wesnoth-utbs/Makevars
M po/wesnoth-utbs/wesnoth-utbs.pot
M po/wesnoth/Makevars
M po/wesnoth/wesnoth.pot
M projectfiles/VC14/WindowsTimeout.cpp
M src/about.cpp
M src/about.hpp
M src/actions/advancement.cpp
M src/actions/advancement.hpp
M src/actions/attack.cpp
M src/actions/attack.hpp
M src/actions/create.cpp
M src/actions/create.hpp
M src/actions/heal.cpp
M src/actions/heal.hpp
M src/actions/move.cpp
M src/actions/move.hpp
M src/actions/shroud_clearing_action.cpp
M src/actions/shroud_clearing_action.hpp
M src/actions/undo.cpp
M src/actions/undo.hpp
M src/actions/undo_action.cpp
M src/actions/undo_action.hpp
M src/actions/undo_dismiss_action.cpp
M src/actions/undo_dismiss_action.hpp
M src/actions/undo_move_action.cpp
M src/actions/undo_move_action.hpp
M src/actions/undo_recall_action.cpp
M src/actions/undo_recall_action.hpp
M src/actions/undo_recruit_action.cpp
M src/actions/undo_recruit_action.hpp
M src/actions/undo_update_shroud_action.cpp
M src/actions/undo_update_shroud_action.hpp
M src/actions/unit_creator.cpp
M src/actions/unit_creator.hpp
M src/actions/vision.cpp
M src/actions/vision.hpp
M src/addon/client.cpp
M src/addon/client.hpp
M src/addon/info.cpp
M src/addon/info.hpp
M src/addon/manager.cpp
M src/addon/manager.hpp
M src/addon/manager_ui.cpp
M src/addon/manager_ui.hpp
M src/addon/state.cpp
M src/addon/state.hpp
M src/addon/validation.cpp
M src/addon/validation.hpp
M src/ai/actions.cpp
M src/ai/actions.hpp
M src/ai/composite/ai.cpp
M src/ai/composite/ai.hpp
M src/ai/composite/aspect.cpp
M src/ai/composite/aspect.hpp
M src/ai/composite/component.cpp
M src/ai/composite/component.hpp
M src/ai/composite/contexts.cpp
M src/ai/composite/contexts.hpp
M src/ai/composite/engine.cpp
M src/ai/composite/engine.hpp
M src/ai/composite/goal.cpp
M src/ai/composite/goal.hpp
M src/ai/composite/property_handler.hpp
M src/ai/composite/rca.cpp
M src/ai/composite/rca.hpp
M src/ai/composite/stage.cpp
M src/ai/composite/stage.hpp
M src/ai/composite/value_translator.hpp
M src/ai/configuration.cpp
M src/ai/configuration.hpp
M src/ai/contexts.cpp
M src/ai/contexts.hpp
M src/ai/default/aspect_attacks.cpp
M src/ai/default/aspect_attacks.hpp
M src/ai/default/attack.cpp
M src/ai/default/ca.cpp
M src/ai/default/ca.hpp
M src/ai/default/ca_move_to_targets.cpp
M src/ai/default/ca_move_to_targets.hpp
M src/ai/default/contexts.cpp
M src/ai/default/contexts.hpp
M src/ai/default/engine_cpp.cpp
M src/ai/default/engine_cpp.hpp
M src/ai/default/recruitment.cpp
M src/ai/default/recruitment.hpp
M src/ai/default/stage_rca.cpp
M src/ai/default/stage_rca.hpp
M src/ai/formula/ai.cpp
M src/ai/formula/ai.hpp
M src/ai/formula/callable_objects.cpp
M src/ai/formula/callable_objects.hpp
M src/ai/formula/candidates.cpp
M src/ai/formula/candidates.hpp
M src/ai/formula/engine_fai.cpp
M src/ai/formula/engine_fai.hpp
M src/ai/formula/function_table.cpp
M src/ai/formula/function_table.hpp
M src/ai/formula/stage_side_formulas.cpp
M src/ai/formula/stage_side_formulas.hpp
M src/ai/formula/stage_unit_formulas.cpp
M src/ai/formula/stage_unit_formulas.hpp
M src/ai/game_info.cpp
M src/ai/game_info.hpp
M src/ai/gamestate_observer.cpp
M src/ai/gamestate_observer.hpp
M src/ai/lua/aspect_advancements.cpp
M src/ai/lua/aspect_advancements.hpp
M src/ai/lua/core.cpp
M src/ai/lua/core.hpp
M src/ai/lua/engine_lua.cpp
M src/ai/lua/engine_lua.hpp
M src/ai/lua/lua_object.cpp
M src/ai/lua/lua_object.hpp
M src/ai/manager.cpp
M src/ai/manager.hpp
M src/ai/registry.cpp
M src/ai/registry.hpp
M src/ai/simulated_actions.cpp
M src/ai/simulated_actions.hpp
M src/ai/testing.cpp
M src/ai/testing.hpp
M src/animated.cpp
M src/animated.hpp
M src/animated.tpp
M src/arrow.cpp
M src/arrow.hpp
M src/attack_prediction.cpp
M src/attack_prediction.hpp
M src/boilerplate-header.cpp
M src/buffered_istream.hpp
M src/build_info.cpp
M src/build_info.hpp
M src/campaign_server/addon_utils.cpp
M src/campaign_server/addon_utils.hpp
M src/campaign_server/blacklist.cpp
M src/campaign_server/blacklist.hpp
M src/campaign_server/campaign_server.cpp
M src/campaign_server/campaign_server.hpp
M src/campaign_server/control.hpp
M src/campaign_server/fs_commit.cpp
M src/campaign_server/fs_commit.hpp
M src/carryover.cpp
M src/carryover.hpp
M src/chat_command_handler.cpp
M src/chat_command_handler.hpp
M src/chat_events.cpp
M src/chat_events.hpp
M src/color.cpp
M src/color.hpp
M src/color_range.cpp
M src/color_range.hpp
M src/commandline_options.cpp
M src/commandline_options.hpp
M src/config.cpp
M src/config.hpp
M src/config_attribute_value.cpp
M src/config_attribute_value.hpp
M src/config_cache.cpp
M src/config_cache.hpp
M src/configr_assign.hpp
M src/controller_base.cpp
M src/controller_base.hpp
M src/countdown_clock.cpp
M src/countdown_clock.hpp
M src/cursor.cpp
M src/cursor.hpp
M src/deprecation.cpp
M src/deprecation.hpp
M src/desktop/apple_notification.hpp
M src/desktop/apple_notification.mm
M src/desktop/clipboard.cpp
M src/desktop/clipboard.hpp
M src/desktop/dbus_notification.cpp
M src/desktop/dbus_notification.hpp
M src/desktop/notifications.cpp
M src/desktop/notifications.hpp
M src/desktop/open.cpp
M src/desktop/open.hpp
M src/desktop/paths.cpp
M src/desktop/paths.hpp
M src/desktop/version.cpp
M src/desktop/version.hpp
M src/desktop/windows_tray_notification.cpp
M src/desktop/windows_tray_notification.hpp
M src/display.cpp
M src/display.hpp
M src/display_chat_manager.cpp
M src/display_chat_manager.hpp
M src/display_context.cpp
M src/display_context.hpp
M src/editor/action/action.cpp
M src/editor/action/action.hpp
M src/editor/action/action_base.hpp
M src/editor/action/action_item.cpp
M src/editor/action/action_item.hpp
M src/editor/action/action_label.cpp
M src/editor/action/action_label.hpp
M src/editor/action/action_select.cpp
M src/editor/action/action_select.hpp
M src/editor/action/action_unit.cpp
M src/editor/action/action_unit.hpp
M src/editor/action/action_village.cpp
M src/editor/action/action_village.hpp
M src/editor/action/mouse/mouse_action.cpp
M src/editor/action/mouse/mouse_action.hpp
M src/editor/action/mouse/mouse_action_item.cpp
M src/editor/action/mouse/mouse_action_item.hpp
M src/editor/action/mouse/mouse_action_map_label.cpp
M src/editor/action/mouse/mouse_action_map_label.hpp
M src/editor/action/mouse/mouse_action_select.cpp
M src/editor/action/mouse/mouse_action_select.hpp
M src/editor/action/mouse/mouse_action_unit.cpp
M src/editor/action/mouse/mouse_action_unit.hpp
M src/editor/action/mouse/mouse_action_village.cpp
M src/editor/action/mouse/mouse_action_village.hpp
M src/editor/controller/editor_controller.cpp
M src/editor/controller/editor_controller.hpp
M src/editor/editor_common.hpp
M src/editor/editor_display.cpp
M src/editor/editor_display.hpp
M src/editor/editor_main.cpp
M src/editor/editor_main.hpp
M src/editor/map/context_manager.cpp
M src/editor/map/context_manager.hpp
M src/editor/map/editor_map.cpp
M src/editor/map/editor_map.hpp
M src/editor/map/map_context.cpp
M src/editor/map/map_context.hpp
M src/editor/map/map_fragment.cpp
M src/editor/map/map_fragment.hpp
M src/editor/palette/common_palette.hpp
M src/editor/palette/editor_palettes.cpp
M src/editor/palette/editor_palettes.hpp
M src/editor/palette/empty_palette.hpp
M src/editor/palette/item_palette.cpp
M src/editor/palette/item_palette.hpp
M src/editor/palette/location_palette.cpp
M src/editor/palette/location_palette.hpp
M src/editor/palette/palette_manager.cpp
M src/editor/palette/palette_manager.hpp
M src/editor/palette/terrain_palettes.cpp
M src/editor/palette/terrain_palettes.hpp
M src/editor/palette/tristate_button.cpp
M src/editor/palette/tristate_button.hpp
M src/editor/palette/unit_palette.cpp
M src/editor/palette/unit_palette.hpp
M src/editor/toolkit/brush.cpp
M src/editor/toolkit/brush.hpp
M src/editor/toolkit/editor_toolkit.cpp
M src/editor/toolkit/editor_toolkit.hpp
M src/events.cpp
M src/events.hpp
M src/exceptions.hpp
M src/fake_unit_manager.cpp
M src/fake_unit_manager.hpp
M src/fake_unit_ptr.cpp
M src/fake_unit_ptr.hpp
M src/filesystem.cpp
M src/filesystem.hpp
M src/filesystem_common.cpp
M src/filesystem_sdl.cpp
M src/filter_context.hpp
M src/floating_label.cpp
M src/floating_label.hpp
M src/font/constants.cpp
M src/font/constants.hpp
M src/font/error.hpp
M src/font/font_config.cpp
M src/font/font_config.hpp
M src/font/font_options.hpp
M src/font/marked-up_text.cpp
M src/font/marked-up_text.hpp
M src/font/pango/escape.hpp
M src/font/pango/font.hpp
M src/font/pango/hyperlink.hpp
M src/font/pango/stream_ops.hpp
M src/font/standard_colors.cpp
M src/font/standard_colors.hpp
M src/font/text.cpp
M src/font/text.hpp
M src/font/text_cache.hpp
M src/font/text_formatting.cpp
M src/font/text_formatting.hpp
M src/format_time_summary.cpp
M src/format_time_summary.hpp
M src/formatter.hpp
M src/formula/callable.hpp
M src/formula/callable_fwd.hpp
M src/formula/callable_objects.cpp
M src/formula/callable_objects.hpp
M src/formula/debugger.cpp
M src/formula/debugger.hpp
M src/formula/debugger_fwd.cpp
M src/formula/debugger_fwd.hpp
M src/formula/formula.cpp
M src/formula/formula.hpp
M src/formula/formula_fwd.hpp
M src/formula/function.cpp
M src/formula/function.hpp
M src/formula/function_gamestate.cpp
M src/formula/function_gamestate.hpp
M src/formula/string_utils.cpp
M src/formula/string_utils.hpp
M src/formula/tokenizer.cpp
M src/formula/tokenizer.hpp
M src/formula/variant.cpp
M src/formula/variant.hpp
M src/formula/variant_value.cpp
M src/formula/variant_value.hpp
M src/game_board.cpp
M src/game_board.hpp
M src/game_classification.cpp
M src/game_classification.hpp
M src/game_config.cpp
M src/game_config.hpp
M src/game_config_manager.cpp
M src/game_config_manager.hpp
M src/game_data.cpp
M src/game_data.hpp
M src/game_display.cpp
M src/game_display.hpp
M src/game_end_exceptions.cpp
M src/game_end_exceptions.hpp
M src/game_errors.hpp
M src/game_events/action_wml.cpp
M src/game_events/action_wml.hpp
M src/game_events/conditional_wml.cpp
M src/game_events/conditional_wml.hpp
M src/game_events/entity_location.cpp
M src/game_events/entity_location.hpp
M src/game_events/fwd.hpp
M src/game_events/handlers.cpp
M src/game_events/handlers.hpp
M src/game_events/manager.cpp
M src/game_events/manager.hpp
M src/game_events/manager_impl.cpp
M src/game_events/manager_impl.hpp
M src/game_events/menu_item.cpp
M src/game_events/menu_item.hpp
M src/game_events/pump.cpp
M src/game_events/pump.hpp
M src/game_events/wmi_manager.cpp
M src/game_events/wmi_manager.hpp
M src/game_initialization/configure_engine.cpp
M src/game_initialization/configure_engine.hpp
M src/game_initialization/connect_engine.cpp
M src/game_initialization/connect_engine.hpp
M src/game_initialization/create_engine.cpp
M src/game_initialization/create_engine.hpp
M src/game_initialization/depcheck.cpp
M src/game_initialization/depcheck.hpp
M src/game_initialization/flg_manager.cpp
M src/game_initialization/flg_manager.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/lobby_info.hpp
M src/game_initialization/mp_game_utils.cpp
M src/game_initialization/mp_game_utils.hpp
M src/game_initialization/multiplayer.cpp
M src/game_initialization/multiplayer.hpp
M src/game_initialization/playcampaign.cpp
M src/game_initialization/playcampaign.hpp
M src/game_initialization/singleplayer.cpp
M src/game_initialization/singleplayer.hpp
M src/game_launcher.cpp
M src/game_launcher.hpp
M src/game_state.cpp
M src/game_state.hpp
M src/generators/cave_map_generator.cpp
M src/generators/cave_map_generator.hpp
M src/generators/default_map_generator.cpp
M src/generators/default_map_generator.hpp
M src/generators/default_map_generator_job.cpp
M src/generators/default_map_generator_job.hpp
M src/generators/lua_map_generator.cpp
M src/generators/lua_map_generator.hpp
M src/generators/map_create.cpp
M src/generators/map_create.hpp
M src/generators/map_generator.cpp
M src/generators/map_generator.hpp
M src/generic_event.cpp
M src/generic_event.hpp
M src/gettext.cpp
M src/gettext.hpp
M src/global.hpp
M src/gui/auxiliary/field-fwd.hpp
M src/gui/auxiliary/field.hpp
M src/gui/auxiliary/filter.hpp
M src/gui/auxiliary/find_widget.hpp
M src/gui/auxiliary/iterator/exception.hpp
M src/gui/auxiliary/iterator/iterator.cpp
M src/gui/auxiliary/iterator/iterator.hpp
M src/gui/auxiliary/iterator/policy_order.hpp
M src/gui/auxiliary/iterator/policy_visit.hpp
M src/gui/auxiliary/iterator/walker.hpp
M src/gui/auxiliary/iterator/walker_grid.cpp
M src/gui/auxiliary/iterator/walker_grid.hpp
M src/gui/auxiliary/iterator/walker_tree_node.cpp
M src/gui/auxiliary/iterator/walker_tree_node.hpp
M src/gui/auxiliary/iterator/walker_widget.cpp
M src/gui/auxiliary/iterator/walker_widget.hpp
M src/gui/auxiliary/tips.cpp
M src/gui/auxiliary/tips.hpp
M src/gui/auxiliary/typed_formula.hpp
M src/gui/core/canvas.cpp
M src/gui/core/canvas.hpp
M src/gui/core/canvas_private.hpp
M src/gui/core/event/dispatcher.cpp
M src/gui/core/event/dispatcher.hpp
M src/gui/core/event/dispatcher_private.hpp
M src/gui/core/event/distributor.cpp
M src/gui/core/event/distributor.hpp
M src/gui/core/event/handler.cpp
M src/gui/core/event/handler.hpp
M src/gui/core/event/message.hpp
M src/gui/core/gui_definition.cpp
M src/gui/core/gui_definition.hpp
M src/gui/core/layout_exception.hpp
M src/gui/core/linked_group_definition.cpp
M src/gui/core/linked_group_definition.hpp
M src/gui/core/log.cpp
M src/gui/core/log.hpp
M src/gui/core/notifiee.hpp
M src/gui/core/notifier.hpp
M src/gui/core/placer.cpp
M src/gui/core/placer.hpp
M src/gui/core/placer/horizontal_list.cpp
M src/gui/core/placer/horizontal_list.hpp
M src/gui/core/placer/vertical_list.cpp
M src/gui/core/placer/vertical_list.hpp
M src/gui/core/register_widget.hpp
M src/gui/core/static_registry.cpp
M src/gui/core/static_registry.hpp
M src/gui/core/timer.cpp
M src/gui/core/timer.hpp
M src/gui/core/widget_definition.cpp
M src/gui/core/widget_definition.hpp
M src/gui/core/window_builder.cpp
M src/gui/core/window_builder.hpp
M src/gui/core/window_builder/helper.cpp
M src/gui/core/window_builder/helper.hpp
M src/gui/core/window_builder/instance.cpp
M src/gui/core/window_builder/instance.hpp
M src/gui/dialogs/addon/connect.cpp
M src/gui/dialogs/addon/connect.hpp
M src/gui/dialogs/addon/install_dependencies.cpp
M src/gui/dialogs/addon/install_dependencies.hpp
M src/gui/dialogs/addon/manager.cpp
M src/gui/dialogs/addon/manager.hpp
M src/gui/dialogs/addon/uninstall_list.cpp
M src/gui/dialogs/addon/uninstall_list.hpp
M src/gui/dialogs/attack_predictions.cpp
M src/gui/dialogs/attack_predictions.hpp
M src/gui/dialogs/campaign_difficulty.cpp
M src/gui/dialogs/campaign_difficulty.hpp
M src/gui/dialogs/campaign_selection.cpp
M src/gui/dialogs/campaign_selection.hpp
M src/gui/dialogs/chat_log.cpp
M src/gui/dialogs/chat_log.hpp
M src/gui/dialogs/core_selection.cpp
M src/gui/dialogs/core_selection.hpp
M src/gui/dialogs/debug_clock.cpp
M src/gui/dialogs/debug_clock.hpp
M src/gui/dialogs/depcheck_confirm_change.cpp
M src/gui/dialogs/depcheck_confirm_change.hpp
M src/gui/dialogs/depcheck_select_new.cpp
M src/gui/dialogs/depcheck_select_new.hpp
M src/gui/dialogs/drop_down_menu.cpp
M src/gui/dialogs/drop_down_menu.hpp
M src/gui/dialogs/edit_label.cpp
M src/gui/dialogs/edit_label.hpp
M src/gui/dialogs/edit_text.cpp
M src/gui/dialogs/edit_text.hpp
M src/gui/dialogs/editor/custom_tod.cpp
M src/gui/dialogs/editor/custom_tod.hpp
M src/gui/dialogs/editor/edit_label.cpp
M src/gui/dialogs/editor/edit_label.hpp
M src/gui/dialogs/editor/edit_scenario.cpp
M src/gui/dialogs/editor/edit_scenario.hpp
M src/gui/dialogs/editor/edit_side.cpp
M src/gui/dialogs/editor/edit_side.hpp
M src/gui/dialogs/editor/generate_map.cpp
M src/gui/dialogs/editor/generate_map.hpp
M src/gui/dialogs/editor/generator_settings.cpp
M src/gui/dialogs/editor/generator_settings.hpp
M src/gui/dialogs/editor/new_map.cpp
M src/gui/dialogs/editor/new_map.hpp
M src/gui/dialogs/editor/resize_map.cpp
M src/gui/dialogs/editor/resize_map.hpp
M src/gui/dialogs/editor/set_starting_position.cpp
M src/gui/dialogs/editor/set_starting_position.hpp
M src/gui/dialogs/end_credits.cpp
M src/gui/dialogs/end_credits.hpp
M src/gui/dialogs/file_dialog.cpp
M src/gui/dialogs/file_dialog.hpp
M src/gui/dialogs/folder_create.cpp
M src/gui/dialogs/folder_create.hpp
M src/gui/dialogs/formula_debugger.cpp
M src/gui/dialogs/formula_debugger.hpp
M src/gui/dialogs/game_cache_options.cpp
M src/gui/dialogs/game_cache_options.hpp
M src/gui/dialogs/game_delete.cpp
M src/gui/dialogs/game_delete.hpp
M src/gui/dialogs/game_load.cpp
M src/gui/dialogs/game_load.hpp
M src/gui/dialogs/game_save.cpp
M src/gui/dialogs/game_save.hpp
M src/gui/dialogs/game_stats.cpp
M src/gui/dialogs/game_stats.hpp
M src/gui/dialogs/game_version.cpp
M src/gui/dialogs/game_version.hpp
M src/gui/dialogs/gamestate_inspector.cpp
M src/gui/dialogs/gamestate_inspector.hpp
M src/gui/dialogs/help_browser.cpp
M src/gui/dialogs/help_browser.hpp
M src/gui/dialogs/hotkey_bind.cpp
M src/gui/dialogs/hotkey_bind.hpp
M src/gui/dialogs/label_settings.cpp
M src/gui/dialogs/label_settings.hpp
M src/gui/dialogs/language_selection.cpp
M src/gui/dialogs/language_selection.hpp
M src/gui/dialogs/loading_screen.cpp
M src/gui/dialogs/loading_screen.hpp
M src/gui/dialogs/log_settings.cpp
M src/gui/dialogs/log_settings.hpp
M src/gui/dialogs/lua_interpreter.cpp
M src/gui/dialogs/lua_interpreter.hpp
M src/gui/dialogs/message.cpp
M src/gui/dialogs/message.hpp
M src/gui/dialogs/modal_dialog.cpp
M src/gui/dialogs/modal_dialog.hpp
M src/gui/dialogs/modeless_dialog.cpp
M src/gui/dialogs/modeless_dialog.hpp
M src/gui/dialogs/multiplayer/faction_select.cpp
M src/gui/dialogs/multiplayer/faction_select.hpp
M src/gui/dialogs/multiplayer/lobby.cpp
M src/gui/dialogs/multiplayer/lobby.hpp
M src/gui/dialogs/multiplayer/mp_alerts_options.cpp
M src/gui/dialogs/multiplayer/mp_alerts_options.hpp
M src/gui/dialogs/multiplayer/mp_change_control.cpp
M src/gui/dialogs/multiplayer/mp_change_control.hpp
M src/gui/dialogs/multiplayer/mp_connect.cpp
M src/gui/dialogs/multiplayer/mp_connect.hpp
M src/gui/dialogs/multiplayer/mp_create_game.cpp
M src/gui/dialogs/multiplayer/mp_create_game.hpp
M src/gui/dialogs/multiplayer/mp_host_game_prompt.cpp
M src/gui/dialogs/multiplayer/mp_host_game_prompt.hpp
M src/gui/dialogs/multiplayer/mp_join_game.cpp
M src/gui/dialogs/multiplayer/mp_join_game.hpp
M src/gui/dialogs/multiplayer/mp_join_game_password_prompt.cpp
M src/gui/dialogs/multiplayer/mp_join_game_password_prompt.hpp
M src/gui/dialogs/multiplayer/mp_login.cpp
M src/gui/dialogs/multiplayer/mp_login.hpp
M src/gui/dialogs/multiplayer/mp_method_selection.cpp
M src/gui/dialogs/multiplayer/mp_method_selection.hpp
M src/gui/dialogs/multiplayer/mp_options_helper.cpp
M src/gui/dialogs/multiplayer/mp_options_helper.hpp
M src/gui/dialogs/multiplayer/mp_staging.cpp
M src/gui/dialogs/multiplayer/mp_staging.hpp
M src/gui/dialogs/multiplayer/player_info.cpp
M src/gui/dialogs/multiplayer/player_info.hpp
M src/gui/dialogs/multiplayer/player_list_helper.cpp
M src/gui/dialogs/multiplayer/player_list_helper.hpp
M src/gui/dialogs/multiplayer/plugin_executor.hpp
M src/gui/dialogs/multiplayer/synced_choice_wait.cpp
M src/gui/dialogs/multiplayer/synced_choice_wait.hpp
M src/gui/dialogs/network_transmission.cpp
M src/gui/dialogs/network_transmission.hpp
M src/gui/dialogs/outro.cpp
M src/gui/dialogs/outro.hpp
M src/gui/dialogs/preferences_dialog.cpp
M src/gui/dialogs/preferences_dialog.hpp
M src/gui/dialogs/screenshot_notification.cpp
M src/gui/dialogs/screenshot_notification.hpp
M src/gui/dialogs/select_orb_colors.cpp
M src/gui/dialogs/select_orb_colors.hpp
M src/gui/dialogs/simple_item_selector.cpp
M src/gui/dialogs/simple_item_selector.hpp
M src/gui/dialogs/sp_options_configure.cpp
M src/gui/dialogs/sp_options_configure.hpp
M src/gui/dialogs/statistics_dialog.cpp
M src/gui/dialogs/statistics_dialog.hpp
M src/gui/dialogs/story_viewer.cpp
M src/gui/dialogs/story_viewer.hpp
M src/gui/dialogs/surrender_quit.cpp
M src/gui/dialogs/surrender_quit.hpp
M src/gui/dialogs/terrain_layers.cpp
M src/gui/dialogs/terrain_layers.hpp
M src/gui/dialogs/theme_list.cpp
M src/gui/dialogs/theme_list.hpp
M src/gui/dialogs/title_screen.cpp
M src/gui/dialogs/title_screen.hpp
M src/gui/dialogs/tooltip.cpp
M src/gui/dialogs/tooltip.hpp
M src/gui/dialogs/transient_message.cpp
M src/gui/dialogs/transient_message.hpp
M src/gui/dialogs/unit_advance.cpp
M src/gui/dialogs/unit_advance.hpp
M src/gui/dialogs/unit_attack.cpp
M src/gui/dialogs/unit_attack.hpp
M src/gui/dialogs/unit_create.cpp
M src/gui/dialogs/unit_create.hpp
M src/gui/dialogs/unit_list.cpp
M src/gui/dialogs/unit_list.hpp
M src/gui/dialogs/unit_recall.cpp
M src/gui/dialogs/unit_recall.hpp
M src/gui/dialogs/unit_recruit.cpp
M src/gui/dialogs/unit_recruit.hpp
M src/gui/dialogs/wml_error.cpp
M src/gui/dialogs/wml_error.hpp
M src/gui/dialogs/wml_message.cpp
M src/gui/dialogs/wml_message.hpp
M src/gui/gui.cpp
M src/gui/gui.hpp
M src/gui/widgets/addon_list.cpp
M src/gui/widgets/addon_list.hpp
M src/gui/widgets/button.cpp
M src/gui/widgets/button.hpp
M src/gui/widgets/chatbox.cpp
M src/gui/widgets/chatbox.hpp
M src/gui/widgets/clickable_item.hpp
M src/gui/widgets/container_base.cpp
M src/gui/widgets/container_base.hpp
M src/gui/widgets/debug.cpp
M src/gui/widgets/debug.hpp
M src/gui/widgets/drawing.cpp
M src/gui/widgets/drawing.hpp
M src/gui/widgets/event_executor.hpp
M src/gui/widgets/generator.cpp
M src/gui/widgets/generator.hpp
M src/gui/widgets/generator_private.hpp
M src/gui/widgets/grid.cpp
M src/gui/widgets/grid.hpp
M src/gui/widgets/grid_private.hpp
M src/gui/widgets/group.hpp
M src/gui/widgets/helper.cpp
M src/gui/widgets/helper.hpp
M src/gui/widgets/horizontal_scrollbar.cpp
M src/gui/widgets/horizontal_scrollbar.hpp
M src/gui/widgets/image.cpp
M src/gui/widgets/image.hpp
M src/gui/widgets/integer_selector.hpp
M src/gui/widgets/label.cpp
M src/gui/widgets/label.hpp
M src/gui/widgets/listbox.cpp
M src/gui/widgets/listbox.hpp
M src/gui/widgets/matrix.cpp
M src/gui/widgets/matrix.hpp
M src/gui/widgets/menu_button.cpp
M src/gui/widgets/menu_button.hpp
M src/gui/widgets/minimap.cpp
M src/gui/widgets/minimap.hpp
M src/gui/widgets/multi_page.cpp
M src/gui/widgets/multi_page.hpp
M src/gui/widgets/multimenu_button.cpp
M src/gui/widgets/multimenu_button.hpp
M src/gui/widgets/pane.cpp
M src/gui/widgets/pane.hpp
M src/gui/widgets/panel.cpp
M src/gui/widgets/panel.hpp
M src/gui/widgets/password_box.cpp
M src/gui/widgets/password_box.hpp
M src/gui/widgets/progress_bar.cpp
M src/gui/widgets/progress_bar.hpp
M src/gui/widgets/repeating_button.cpp
M src/gui/widgets/repeating_button.hpp
M src/gui/widgets/retval.hpp
M src/gui/widgets/scroll_label.cpp
M src/gui/widgets/scroll_label.hpp
M src/gui/widgets/scrollbar.cpp
M src/gui/widgets/scrollbar.hpp
M src/gui/widgets/scrollbar_container.cpp
M src/gui/widgets/scrollbar_container.hpp
M src/gui/widgets/scrollbar_container_private.hpp
M src/gui/widgets/scrollbar_panel.cpp
M src/gui/widgets/scrollbar_panel.hpp
M src/gui/widgets/selectable_item.hpp
M src/gui/widgets/settings.cpp
M src/gui/widgets/settings.hpp
M src/gui/widgets/size_lock.cpp
M src/gui/widgets/size_lock.hpp
M src/gui/widgets/slider.cpp
M src/gui/widgets/slider.hpp
M src/gui/widgets/slider_base.cpp
M src/gui/widgets/slider_base.hpp
M src/gui/widgets/spacer.cpp
M src/gui/widgets/spacer.hpp
M src/gui/widgets/stacked_widget.cpp
M src/gui/widgets/stacked_widget.hpp
M src/gui/widgets/status_label_helper.hpp
M src/gui/widgets/styled_widget.cpp
M src/gui/widgets/styled_widget.hpp
M src/gui/widgets/text_box.cpp
M src/gui/widgets/text_box.hpp
M src/gui/widgets/text_box_base.cpp
M src/gui/widgets/text_box_base.hpp
M src/gui/widgets/toggle_button.cpp
M src/gui/widgets/toggle_button.hpp
M src/gui/widgets/toggle_panel.cpp
M src/gui/widgets/toggle_panel.hpp
M src/gui/widgets/tree_view.cpp
M src/gui/widgets/tree_view.hpp
M src/gui/widgets/tree_view_node.cpp
M src/gui/widgets/tree_view_node.hpp
M src/gui/widgets/unit_preview_pane.cpp
M src/gui/widgets/unit_preview_pane.hpp
M src/gui/widgets/vertical_scrollbar.cpp
M src/gui/widgets/vertical_scrollbar.hpp
M src/gui/widgets/viewport.cpp
M src/gui/widgets/viewport.hpp
M src/gui/widgets/widget.cpp
M src/gui/widgets/widget.hpp
M src/gui/widgets/widget_helpers.cpp
M src/gui/widgets/widget_helpers.hpp
M src/gui/widgets/window.cpp
M src/gui/widgets/window.hpp
M src/gui/widgets/window_private.hpp
M src/halo.cpp
M src/halo.hpp
M src/hash.cpp
M src/hash.hpp
M src/help/help.cpp
M src/help/help.hpp
M src/help/help_topic_generators.cpp
M src/hotkey/command_executor.cpp
M src/hotkey/command_executor.hpp
M src/hotkey/hotkey_command.cpp
M src/hotkey/hotkey_command.hpp
M src/hotkey/hotkey_handler.cpp
M src/hotkey/hotkey_handler.hpp
M src/hotkey/hotkey_handler_mp.cpp
M src/hotkey/hotkey_handler_mp.hpp
M src/hotkey/hotkey_handler_sp.cpp
M src/hotkey/hotkey_handler_sp.hpp
M src/hotkey/hotkey_item.cpp
M src/hotkey/hotkey_item.hpp
M src/hotkey/hotkey_manager.cpp
M src/hotkey/hotkey_manager.hpp
M src/image.cpp
M src/image.hpp
M src/image_modifications.cpp
M src/image_modifications.hpp
M src/key.cpp
M src/key.hpp
M src/language.cpp
M src/language.hpp
M src/lexical_cast.hpp
M src/libc_error.hpp
M src/log.cpp
M src/log.hpp
M src/log_windows.cpp
M src/log_windows.hpp
M src/lua_jailbreak_exception.cpp
M src/lua_jailbreak_exception.hpp
M src/macosx/SDLMain.mm
M src/map/exception.hpp
M src/map/label.cpp
M src/map/label.hpp
M src/map/location.cpp
M src/map/location.hpp
M src/map/map.cpp
M src/map/map.hpp
M src/map_command_handler.hpp
M src/menu_events.cpp
M src/menu_events.hpp
M src/minimap.cpp
M src/minimap.hpp
M src/mouse_events.cpp
M src/mouse_events.hpp
M src/mouse_handler_base.cpp
M src/mouse_handler_base.hpp
M src/movetype.cpp
M src/movetype.hpp
M src/mp_game_settings.cpp
M src/mp_game_settings.hpp
M src/mp_ui_alerts.cpp
M src/mp_ui_alerts.hpp
M src/mt_rng.cpp
M src/mt_rng.hpp
M src/multiplayer_error_codes.hpp
M src/network_asio.cpp
M src/network_asio.hpp
M src/overlay.hpp
M src/pathfind/astarsearch.cpp
M src/pathfind/pathfind.cpp
M src/pathfind/pathfind.hpp
M src/pathfind/teleport.cpp
M src/pathfind/teleport.hpp
M src/pathutils.cpp
M src/pathutils.hpp
M src/persist_context.cpp
M src/persist_context.hpp
M src/persist_manager.cpp
M src/persist_manager.hpp
M src/persist_var.cpp
M src/persist_var.hpp
M src/play_controller.cpp
M src/play_controller.hpp
M src/playmp_controller.cpp
M src/playmp_controller.hpp
M src/playsingle_controller.cpp
M src/playsingle_controller.hpp
M src/playturn.cpp
M src/playturn.hpp
M src/playturn_network_adapter.cpp
M src/playturn_network_adapter.hpp
M src/preferences/credentials.cpp
M src/preferences/credentials.hpp
M src/preferences/display.cpp
M src/preferences/display.hpp
M src/preferences/editor.cpp
M src/preferences/editor.hpp
M src/preferences/game.cpp
M src/preferences/game.hpp
M src/preferences/general.cpp
M src/preferences/general.hpp
M src/preferences/lobby.cpp
M src/preferences/lobby.hpp
M src/quit_confirmation.cpp
M src/quit_confirmation.hpp
M src/random.cpp
M src/random.hpp
M src/random_deterministic.cpp
M src/random_deterministic.hpp
M src/random_synced.cpp
M src/random_synced.hpp
M src/recall_list_manager.cpp
M src/recall_list_manager.hpp
M src/replay.cpp
M src/replay.hpp
M src/replay_helper.cpp
M src/replay_helper.hpp
M src/replay_recorder_base.cpp
M src/replay_recorder_base.hpp
M src/reports.cpp
M src/reports.hpp
M src/resources.cpp
M src/resources.hpp
M src/save_blocker.cpp
M src/save_blocker.hpp
M src/save_index.cpp
M src/save_index.hpp
M src/saved_game.cpp
M src/saved_game.hpp
M src/savegame.cpp
M src/savegame.hpp
M src/scripting/application_lua_kernel.cpp
M src/scripting/application_lua_kernel.hpp
M src/scripting/debug_lua.cpp
M src/scripting/debug_lua.hpp
M src/scripting/game_lua_kernel.cpp
M src/scripting/game_lua_kernel.hpp
M src/scripting/lua_audio.cpp
M src/scripting/lua_audio.hpp
M src/scripting/lua_common.cpp
M src/scripting/lua_common.hpp
M src/scripting/lua_cpp_function.cpp
M src/scripting/lua_cpp_function.hpp
M src/scripting/lua_fileops.cpp
M src/scripting/lua_fileops.hpp
M src/scripting/lua_formula_bridge.cpp
M src/scripting/lua_formula_bridge.hpp
M src/scripting/lua_gui2.cpp
M src/scripting/lua_gui2.hpp
M src/scripting/lua_kernel_base.cpp
M src/scripting/lua_kernel_base.hpp
M src/scripting/lua_map_location_ops.cpp
M src/scripting/lua_map_location_ops.hpp
M src/scripting/lua_pathfind_cost_calculator.hpp
M src/scripting/lua_preferences.cpp
M src/scripting/lua_preferences.hpp
M src/scripting/lua_race.cpp
M src/scripting/lua_race.hpp
M src/scripting/lua_rng.cpp
M src/scripting/lua_rng.hpp
M src/scripting/lua_team.cpp
M src/scripting/lua_team.hpp
M src/scripting/lua_unit.cpp
M src/scripting/lua_unit.hpp
M src/scripting/lua_unit_attacks.cpp
M src/scripting/lua_unit_attacks.hpp
M src/scripting/lua_unit_type.cpp
M src/scripting/lua_unit_type.hpp
M src/scripting/mapgen_lua_kernel.cpp
M src/scripting/mapgen_lua_kernel.hpp
M src/scripting/plugins/context.cpp
M src/scripting/plugins/context.hpp
M src/scripting/plugins/manager.cpp
M src/scripting/plugins/manager.hpp
M src/scripting/push_check.hpp
M src/sdl/exception.cpp
M src/sdl/exception.hpp
M src/sdl/point.cpp
M src/sdl/point.hpp
M src/sdl/rect.cpp
M src/sdl/rect.hpp
M src/sdl/surface.cpp
M src/sdl/surface.hpp
M src/sdl/userevent.hpp
M src/sdl/utils.cpp
M src/sdl/utils.hpp
M src/sdl/window.cpp
M src/sdl/window.hpp
M src/seed_rng.cpp
M src/seed_rng.hpp
M src/serialization/base64.cpp
M src/serialization/base64.hpp
M src/serialization/binary_or_text.cpp
M src/serialization/binary_or_text.hpp
M src/serialization/compression.hpp
M src/serialization/parser.cpp
M src/serialization/parser.hpp
M src/serialization/preprocessor.cpp
M src/serialization/preprocessor.hpp
M src/serialization/schema_validator.cpp
M src/serialization/schema_validator.hpp
M src/serialization/string_utils.cpp
M src/serialization/string_utils.hpp
M src/serialization/string_view.hpp
M src/serialization/tag.cpp
M src/serialization/tag.hpp
M src/serialization/tokenizer.cpp
M src/serialization/tokenizer.hpp
M src/serialization/ucs4_convert_impl.hpp
M src/serialization/ucs4_iterator_base.hpp
M src/serialization/unicode.cpp
M src/serialization/unicode.hpp
M src/serialization/unicode_cast.hpp
M src/serialization/utf8_exception.hpp
M src/serialization/validator.cpp
M src/serialization/validator.hpp
M src/server/ban.cpp
M src/server/ban.hpp
M src/server/forum_user_handler.cpp
M src/server/forum_user_handler.hpp
M src/server/game.cpp
M src/server/game.hpp
M src/server/metrics.cpp
M src/server/metrics.hpp
M src/server/mysql_prepared_statement.ipp
M src/server/player.cpp
M src/server/player.hpp
M src/server/player_connection.cpp
M src/server/player_connection.hpp
M src/server/player_network.cpp
M src/server/player_network.hpp
M src/server/sample_user_handler.cpp
M src/server/sample_user_handler.hpp
M src/server/send_receive_wml_helpers.ipp
M src/server/server.cpp
M src/server/server.hpp
M src/server/server_base.cpp
M src/server/server_base.hpp
M src/server/simple_wml.cpp
M src/server/simple_wml.hpp
M src/server/user_handler.cpp
M src/server/user_handler.hpp
M src/settings.cpp
M src/settings.hpp
M src/side_filter.cpp
M src/side_filter.hpp
M src/sound.cpp
M src/sound.hpp
M src/sound_music_track.cpp
M src/sound_music_track.hpp
M src/soundsource.cpp
M src/soundsource.hpp
M src/statistics.cpp
M src/statistics.hpp
M src/storyscreen/controller.cpp
M src/storyscreen/controller.hpp
M src/storyscreen/parser.cpp
M src/storyscreen/parser.hpp
M src/storyscreen/part.cpp
M src/storyscreen/part.hpp
M src/synced_checkup.cpp
M src/synced_checkup.hpp
M src/synced_commands.cpp
M src/synced_commands.hpp
M src/synced_context.cpp
M src/synced_context.hpp
M src/syncmp_handler.cpp
M src/syncmp_handler.hpp
M src/team.cpp
M src/team.hpp
M src/teambuilder.cpp
M src/teambuilder.hpp
M src/terrain/builder.cpp
M src/terrain/builder.hpp
M src/terrain/filter.cpp
M src/terrain/filter.hpp
M src/terrain/terrain.cpp
M src/terrain/terrain.hpp
M src/terrain/translation.cpp
M src/terrain/translation.hpp
M src/terrain/type_data.cpp
M src/terrain/type_data.hpp
M src/tests/gui/fire_event.cpp
M src/tests/gui/iterator.cpp
M src/tests/gui/test_gui2.cpp
M src/tests/gui/visitor.cpp
M src/tests/main.cpp
M src/tests/test_addons.cpp
M src/tests/test_commandline_options.cpp
M src/tests/test_config.cpp
M src/tests/test_config_cache.cpp
M src/tests/test_filesystem.cpp
M src/tests/test_formula_ai.cpp
M src/tests/test_formula_core.cpp
M src/tests/test_formula_function.cpp
M src/tests/test_image_modifications.cpp
M src/tests/test_irdya_date.cpp
M src/tests/test_lexical_cast.cpp
M src/tests/test_make_enum.cpp
M src/tests/test_map_location.cpp
M src/tests/test_mp_connect.cpp
M src/tests/test_recall_list.cpp
M src/tests/test_rng.cpp
M src/tests/test_serialization.cpp
M src/tests/test_team.cpp
M src/tests/test_unit_map.cpp
M src/tests/test_util.cpp
M src/tests/test_version.cpp
M src/tests/test_whiteboard_side_actions.cpp
M src/tests/utils/auto_parameterized.hpp
M src/tests/utils/fake_display.cpp
M src/tests/utils/fake_display.hpp
M src/tests/utils/game_config_manager.cpp
M src/tests/utils/game_config_manager.hpp
M src/theme.cpp
M src/theme.hpp
M src/time_of_day.cpp
M src/time_of_day.hpp
M src/tod_manager.cpp
M src/tod_manager.hpp
M src/tooltips.cpp
M src/tooltips.hpp
M src/tracer.cpp
M src/tracer.hpp
M src/tstring.cpp
M src/tstring.hpp
M src/units/abilities.cpp
M src/units/abilities.hpp
M src/units/animation.cpp
M src/units/animation.hpp
M src/units/animation_component.cpp
M src/units/animation_component.hpp
M src/units/attack_type.cpp
M src/units/attack_type.hpp
M src/units/drawer.cpp
M src/units/drawer.hpp
M src/units/filter.cpp
M src/units/filter.hpp
M src/units/formula_manager.cpp
M src/units/formula_manager.hpp
M src/units/frame.cpp
M src/units/frame.hpp
M src/units/frame_private.hpp
M src/units/helper.cpp
M src/units/helper.hpp
M src/units/id.cpp
M src/units/id.hpp
M src/units/make.cpp
M src/units/make.hpp
M src/units/map.cpp
M src/units/map.hpp
M src/units/ptr.hpp
M src/units/race.cpp
M src/units/race.hpp
M src/units/types.cpp
M src/units/types.hpp
M src/units/udisplay.cpp
M src/units/udisplay.hpp
M src/units/unit.cpp
M src/units/unit.hpp
M src/utils/const_clone.hpp
M src/utils/context_free_grammar_generator.cpp
M src/utils/context_free_grammar_generator.hpp
M src/utils/functional.hpp
M src/utils/general.hpp
M src/utils/irdya_datetime.cpp
M src/utils/irdya_datetime.hpp
M src/utils/iterable_pair.hpp
M src/utils/make_enum.cpp
M src/utils/make_enum.hpp
M src/utils/markov_generator.cpp
M src/utils/markov_generator.hpp
M src/utils/math.hpp
M src/utils/name_generator.hpp
M src/utils/name_generator_factory.cpp
M src/utils/name_generator_factory.hpp
M src/utils/reference_counter.hpp
M src/utils/scope_exit.hpp
M src/utils/type_trait_aliases.hpp
M src/variable.cpp
M src/variable.hpp
M src/variable_info.cpp
M src/variable_info.hpp
M src/variable_info_detail.hpp
M src/variable_info_private.hpp
M src/version.cpp
M src/version.hpp
M src/video.cpp
M src/video.hpp
M src/wesnoth.cpp
M src/wesnoth_lua_config.h
M src/wesnothd_connection.cpp
M src/wesnothd_connection.hpp
M src/wesnothd_connection_error.hpp
M src/whiteboard/action.cpp
M src/whiteboard/action.hpp
M src/whiteboard/attack.cpp
M src/whiteboard/attack.hpp
M src/whiteboard/highlighter.cpp
M src/whiteboard/highlighter.hpp
M src/whiteboard/manager.cpp
M src/whiteboard/manager.hpp
M src/whiteboard/mapbuilder.cpp
M src/whiteboard/mapbuilder.hpp
M src/whiteboard/move.cpp
M src/whiteboard/move.hpp
M src/whiteboard/recall.cpp
M src/whiteboard/recall.hpp
M src/whiteboard/recruit.cpp
M src/whiteboard/recruit.hpp
M src/whiteboard/side_actions.cpp
M src/whiteboard/side_actions.hpp
M src/whiteboard/suppose_dead.cpp
M src/whiteboard/suppose_dead.hpp
M src/whiteboard/typedefs.hpp
M src/whiteboard/utility.cpp
M src/whiteboard/utility.hpp
M src/whiteboard/visitor.hpp
M src/widgets/widget.cpp
M src/widgets/widget.hpp
M src/wml_exception.cpp
M src/wml_exception.hpp
M src/wml_separators.hpp
M src/xBRZ/config.hpp
M src/xBRZ/xbrz.cpp
M src/xBRZ/xbrz.hpp
M utils/ai_test/readme.txt
M utils/ai_test/wesnoth.php
M utils/ai_test/wesnoth_test.php
M utils/compare_images.py
M utils/prkill
M utils/tagfind
M utils/umc_dev/org.wesnoth/help/html/gettingstarted/wizards/campaign.html
M utils/umc_dev/org.wesnoth/help/html/gettingstarted/wizards/empty.html
M utils/umc_dev/org.wesnoth/help/html/gettingstarted/wizards/era.html
M utils/umc_dev/org.wesnoth/help/html/gettingstarted/wizards/faction.html
M utils/umc_dev/org.wesnoth/help/html/gettingstarted/wizards/launcher.html
M utils/umc_dev/org.wesnoth/help/html/gettingstarted/wizards/scenario.html
M utils/umc_dev/org.wesnoth/plugin.xml
M utils/umc_dev/org.wesnoth/plugin.xml_gen
M utils/umc_dev/org.wesnoth/src-gen/org/wesnoth/WML.ecore
M utils/umc_dev/org.wesnoth/src-gen/org/wesnoth/WML.xmi
M utils/umc_dev/org.wesnoth/src-gen/org/wesnoth/WMLStandaloneSetupGenerated.java
M utils/umc_dev/org.wesnoth/src-gen/org/wesnoth/wml/WmlPackage.java
M utils/umc_dev/org.wesnoth/src-gen/org/wesnoth/wml/impl/WmlFactoryImpl.java
M utils/umc_dev/org.wesnoth/src/org/wesnoth/WML.xtext
M utils/umc_dev/org.wesnoth/src/org/wesnoth/utils/ResourceUtils.java
M utils/update-language-percent
M utils/wescamp_import
M utils/wesnoth-optipng
M utils/wiki_grabber.py
M utils/wmlxgettext_perl
M utils/wxdiff
Log Message:
-----------
Migrate links to https if available - Fwd c18537edc0678f40a209797d72dfaba3e5e88545
(cherry-picked from commit bc4d22dc72e79c3d6a3364ac896e473afd298246)
Commit: 4b2f26b2c5a2020b98ad656e40f3bab9b696f718
https://github.com/wesnoth/wesnoth/commit/4b2f26b2c5a2020b98ad656e40f3bab9b696f718
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-ai/en_GB.po
M po/wesnoth-anl/en_GB.po
M po/wesnoth-aoi/en_GB.po
M po/wesnoth-did/en_GB.po
M po/wesnoth-dm/en_GB.po
M po/wesnoth-dw/en_GB.po
M po/wesnoth-editor/en_GB.po
M po/wesnoth-ei/en_GB.po
M po/wesnoth-help/en_GB.po
M po/wesnoth-httt/en_GB.po
M po/wesnoth-l/en_GB.po
M po/wesnoth-lib/en_GB.po
M po/wesnoth-low/en_GB.po
M po/wesnoth-manual/en_GB.po
M po/wesnoth-multiplayer/en_GB.po
M po/wesnoth-nr/en_GB.po
M po/wesnoth-sof/en_GB.po
M po/wesnoth-sota/en_GB.po
M po/wesnoth-sotbe/en_GB.po
M po/wesnoth-tb/en_GB.po
M po/wesnoth-test/en_GB.po
M po/wesnoth-thot/en_GB.po
M po/wesnoth-trow/en_GB.po
M po/wesnoth-tsg/en_GB.po
M po/wesnoth-tutorial/en_GB.po
M po/wesnoth-units/en_GB.po
M po/wesnoth-utbs/en_GB.po
M po/wesnoth/en_GB.po
Log Message:
-----------
updated British English translation
(cherry-picked from commit 6295e82238e44135ba88577f9c6213cd95f04347)
Commit: 624de09b1a9ff1458757e677453a6bc1e3f8f89a
https://github.com/wesnoth/wesnoth/commit/624de09b1a9ff1458757e677453a6bc1e3f8f89a
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M data/core/about_i18n.cfg
M po/wesnoth-ai/bg.po
M po/wesnoth-anl/bg.po
M po/wesnoth-aoi/bg.po
M po/wesnoth-did/bg.po
M po/wesnoth-dm/bg.po
M po/wesnoth-dw/bg.po
M po/wesnoth-editor/bg.po
M po/wesnoth-ei/bg.po
M po/wesnoth-help/bg.po
M po/wesnoth-httt/bg.po
M po/wesnoth-l/bg.po
M po/wesnoth-lib/bg.po
M po/wesnoth-low/bg.po
M po/wesnoth-manual/bg.po
M po/wesnoth-multiplayer/bg.po
M po/wesnoth-nr/bg.po
M po/wesnoth-sof/bg.po
M po/wesnoth-sota/bg.po
M po/wesnoth-sotbe/bg.po
M po/wesnoth-tb/bg.po
M po/wesnoth-test/bg.po
M po/wesnoth-thot/bg.po
M po/wesnoth-trow/bg.po
M po/wesnoth-tsg/bg.po
M po/wesnoth-tutorial/bg.po
M po/wesnoth-units/bg.po
M po/wesnoth-utbs/bg.po
M po/wesnoth/bg.po
Log Message:
-----------
updated Bulgarian translation
(cherry-picked from commit 111b5db7b435a6207132c1a3635b592c8127fd13)
Commit: aedd9b88b5cbceda129b44b8d860b9dfc14a4288
https://github.com/wesnoth/wesnoth/commit/aedd9b88b5cbceda129b44b8d860b9dfc14a4288
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/macros/unit-utils.cfg
Log Message:
-----------
Macro reference: Add hint to clear variable afterwards
[ci skip]
(cherry-picked from commit 0ca460efcdad42b5bce93a420fac725cd0105993)
Commit: 510e3a801db53932ca2f8c55e5110a521c80502a
https://github.com/wesnoth/wesnoth/commit/510e3a801db53932ca2f8c55e5110a521c80502a
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/VC14/README.md
Log Message:
-----------
VS: updated README
[ci skip]
(cherry-picked from commit 263ad96ad3421fe52bb836d2e179dad140c3c73a)
Commit: 7ac4234aabb75980ae7aea617e60500d93c63a8a
https://github.com/wesnoth/wesnoth/commit/7ac4234aabb75980ae7aea617e60500d93c63a8a
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-lib/en_GB.po
Log Message:
-----------
updated British English translation
(cherry-picked from commit 99cfb028d82b0520eb4feae3ae858b2a4760a058)
Commit: cdedb38aae467a9c46a1bbc205235151e67cae7b
https://github.com/wesnoth/wesnoth/commit/cdedb38aae467a9c46a1bbc205235151e67cae7b
Author: sigurdfdragon <jjwcoat at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M data/campaigns/Secrets_of_the_Ancients/maps/21_Against_the_World.map
M data/campaigns/Secrets_of_the_Ancients/scenarios/21_Against_the_World.cfg
Log Message:
-----------
SotA S21: Fix #3293: Nagas stealing villages
By having the nagas be able to recruit and put the gold to use.
Fits dialog better, improves play, & makes naga leader less suicidal.
(cherry-picked from commit f6f10936614ec1f9df69229fd415f91511599255)
Commit: cb4c5301ad672c6ecf2d182dcc6542c8e238342e
https://github.com/wesnoth/wesnoth/commit/cb4c5301ad672c6ecf2d182dcc6542c8e238342e
Author: Elvish_Hunter <elvish.hunter2010 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M data/tools/wmlindent
Log Message:
-----------
wmlindent: fixed crash on non-existent paths
Fixes #3346
(cherry-picked from commit af63d17e32d16fc33c39d49702bd88bcae6d0d47)
Commit: 1e58fc5d1ab7a0a0d3d2d16f79e8bb59af4375c4
https://github.com/wesnoth/wesnoth/commit/1e58fc5d1ab7a0a0d3d2d16f79e8bb59af4375c4
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/unit_recall.cpp
Log Message:
-----------
gui2/unit_recall: Fix i18n issues
The original commit adding the Rename Unit button marked two strings in
the C++ source for extraction without making them translatable.
(cherry-picked from commit bb86afcb728feef091d17a3156f1873f49fe8da7)
Commit: b62886d7a9da07ab8efeab356d97abc7c0d7a731
https://github.com/wesnoth/wesnoth/commit/b62886d7a9da07ab8efeab356d97abc7c0d7a731
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-ai/af.po
M po/wesnoth-ai/ang.po
M po/wesnoth-ai/ang at latin.po
M po/wesnoth-ai/ar.po
M po/wesnoth-ai/ast.po
M po/wesnoth-ai/ca.po
M po/wesnoth-ai/ca_ES at valencia.po
M po/wesnoth-ai/cs.po
M po/wesnoth-ai/da.po
M po/wesnoth-ai/de.po
M po/wesnoth-ai/el.po
M po/wesnoth-ai/en at shaw.po
M po/wesnoth-ai/eo.po
M po/wesnoth-ai/es.po
M po/wesnoth-ai/et.po
M po/wesnoth-ai/eu.po
M po/wesnoth-ai/fi.po
M po/wesnoth-ai/fr.po
M po/wesnoth-ai/fur_IT.po
M po/wesnoth-ai/ga.po
M po/wesnoth-ai/gd.po
M po/wesnoth-ai/gl.po
M po/wesnoth-ai/he.po
M po/wesnoth-ai/hr.po
M po/wesnoth-ai/hu.po
M po/wesnoth-ai/id.po
M po/wesnoth-ai/is.po
M po/wesnoth-ai/it.po
M po/wesnoth-ai/ja.po
M po/wesnoth-ai/ko.po
M po/wesnoth-ai/la.po
M po/wesnoth-ai/lt.po
M po/wesnoth-ai/lv.po
M po/wesnoth-ai/mk.po
M po/wesnoth-ai/mr.po
M po/wesnoth-ai/nb_NO.po
M po/wesnoth-ai/nl.po
M po/wesnoth-ai/pl.po
M po/wesnoth-ai/pt.po
M po/wesnoth-ai/pt_BR.po
M po/wesnoth-ai/racv.po
M po/wesnoth-ai/ro.po
M po/wesnoth-ai/ru.po
M po/wesnoth-ai/sk.po
M po/wesnoth-ai/sl.po
M po/wesnoth-ai/sr.po
M po/wesnoth-ai/sr at ijekavian.po
M po/wesnoth-ai/sr at ijekavianlatin.po
M po/wesnoth-ai/sr at latin.po
M po/wesnoth-ai/sv.po
M po/wesnoth-ai/tl.po
M po/wesnoth-ai/tr.po
M po/wesnoth-ai/uk.po
M po/wesnoth-ai/vi.po
M po/wesnoth-ai/zh_CN.po
M po/wesnoth-ai/zh_TW.po
M utils/pofix.py
Log Message:
-----------
pofix: Rule for an http:// → https:// conversion in translatable strings
(cherry-picked from commit 74cbae01c453f4fb99876c52e15c04d9ce28fd6c)
Commit: bcf3ba9034982b5f8ada5d82d0e7db4a1fec65d5
https://github.com/wesnoth/wesnoth/commit/bcf3ba9034982b5f8ada5d82d0e7db4a1fec65d5
Author: Martin Hrubý (hrubymar10) <hrubymar10 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/Xcode/README.md
Log Message:
-----------
Update README.md for Xcode builds
(cherry-picked from commit 097c89f916e2237bf5713c35accc932efaa96d77)
Commit: f05bcb7b61c1c3da890d0942df0e4eab6ab1e6e9
https://github.com/wesnoth/wesnoth/commit/f05bcb7b61c1c3da890d0942df0e4eab6ab1e6e9
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Changelog: fix issue #3277 being mistyped as 3722
(cherry-picked from commit aea5d67f93f1924a4a1520e10e05c117bf892596)
Commit: a380ba8231040197d98f5feb78879a55d0d92fcc
https://github.com/wesnoth/wesnoth/commit/a380ba8231040197d98f5feb78879a55d0d92fcc
Author: lilinitsy <33643427+lilinitsy at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/widgets/unit_preview_pane.cpp
M src/help/help_topic_generators.cpp
M src/reports.cpp
Log Message:
-----------
Sort the movement costs in the tooltip in ascending order (#3305)
Sort movement costs in tooltip, unit preview pane, and unit description alphabetically.
(cherry-picked from commit 61b7e7298b99e11746501e435e6301c7360e2d1c)
Commit: f245cd6285113b7c1d7bacf1e193330944208bd5
https://github.com/wesnoth/wesnoth/commit/f245cd6285113b7c1d7bacf1e193330944208bd5
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/VC14/wesnoth.vcxproj
M projectfiles/VC14/wesnoth.vcxproj.filters
M src/gui/widgets/unit_preview_pane.cpp
M src/help/help_topic_generators.cpp
M src/reports.cpp
A src/terrain/movement.hpp
Log Message:
-----------
Create a named struct for terrain name and movement pair
This allows the sorting logic top be shared between the sidebar and the
unit preview pane. It also means that we no longer need to create a lambda
to sort them.
I also refactored the generation of movement cost data in help. In
particular, we're no longer extracting the struct to named local variables.
(cherry-picked from commit d8e2498dded14e9df5abcd5e20ac8c8c252dca3a)
Commit: 2f7568d432f5ebc32516b449bffc69dd3cb3a54c
https://github.com/wesnoth/wesnoth/commit/2f7568d432f5ebc32516b449bffc69dd3cb3a54c
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Update changelog.md
(cherry-picked from commit 4801629ab1b265028c7b05c7bf7f7cd204990c1c)
Commit: 09522ccdf815b3a6c4d180ed910a57acb9a837ce
https://github.com/wesnoth/wesnoth/commit/09522ccdf815b3a6c4d180ed910a57acb9a837ce
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
fixup update changelog.md
(cherry-picked from commit b684c8b3aac75b986b016ce4e04ecfcc62e9bb31)
Commit: 0682be84e6f14d1e7349647b8e56705168aa295d
https://github.com/wesnoth/wesnoth/commit/0682be84e6f14d1e7349647b8e56705168aa295d
Author: Toom <public.ravana at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Fix 4801629ab1b265028c7b05c7bf7f7cd204990c1c typos
[ci skip]
(cherry-picked from commit c0727bacf3df30bd235b2048a3b8f9c2ab7cc9b8)
Commit: e67f464e66cdf1d1fb05c7cf7b49dd68362f015d
https://github.com/wesnoth/wesnoth/commit/e67f464e66cdf1d1fb05c7cf7b49dd68362f015d
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-ai/en_GB.po
M po/wesnoth-lib/en_GB.po
Log Message:
-----------
updated British English translation
(cherry-picked from commit 36ecc030a6c7eb88c3e11f1cb274518125b14262)
Commit: 075cfc54db8a8c815f640e857bfdf06d9a303e05
https://github.com/wesnoth/wesnoth/commit/075cfc54db8a8c815f640e857bfdf06d9a303e05
Author: Toom <public.ravana at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/widgets/generator.cpp
Log Message:
-----------
Show "failed to fit" message with single timestamp (#3367)
Before:
20180724 17:21:37 error gui/layout: Failed to fit vertical list to requested rect; expected bottom edge was 277
20180724 17:21:37 error gui/layout: , actual bottom edge was 195
20180724 17:21:37 error gui/layout: (top edge is 113)
After:
20180724 17:34:30 error gui/layout: Failed to fit vertical list to requested rect; expected bottom edge was 277, actual bottom edge was 195 (top edge is 113)
(cherry-picked from commit aab10daac44a3883e368ff457764d0659c69c39f)
Commit: b1c50044651c75d6aa97a77abcf31c5fccb4f33d
https://github.com/wesnoth/wesnoth/commit/b1c50044651c75d6aa97a77abcf31c5fccb4f33d
Author: ProditorMagnus <public.ravana at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/server/server.cpp
Log Message:
-----------
Make /q sl and status case insensitive
(cherry-picked from commit 625f18ab2e5d98765fd2b669da9f9697d331ab5d)
Commit: 06f2411c94109c289c236f1a4aa9c9035b65bfec
https://github.com/wesnoth/wesnoth/commit/06f2411c94109c289c236f1a4aa9c9035b65bfec
Author: sigurdfdragon <jjwcoat at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Delfadors_Memoirs/utils/deaths.cfg
Log Message:
-----------
DM: Generalize death message so it works when Delfador is young and old
(cherry-picked from commit 3cfa413cbcf0f4f5307ab05d008b4649ad7d933f)
Commit: a4831c75ae4b09aec3bc1c4bef0cd1480dddbb77
https://github.com/wesnoth/wesnoth/commit/a4831c75ae4b09aec3bc1c4bef0cd1480dddbb77
Author: sigurdfdragon <jjwcoat at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Delfadors_Memoirs/scenarios/15_Save_the_King.cfg
Log Message:
-----------
DM: Add last breath dialog for Zorlan
(cherry-picked from commit ee798121e4b4954402acb441e80e792c1763f95e)
Commit: 7eaa5666e9592156f2097e0dcf2a2615cfab4256
https://github.com/wesnoth/wesnoth/commit/7eaa5666e9592156f2097e0dcf2a2615cfab4256
Author: joeylmaalouf <joeylmaalouf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg
Log Message:
-----------
Tutorial: provide more detail about the Status Table
(cherry-picked from commit 9240d6d23d79394a68a4276b319f0f669a4ea5f9)
Commit: 009f8c0cf394c6c302f42ae7e9a0cb0dfad52e56
https://github.com/wesnoth/wesnoth/commit/009f8c0cf394c6c302f42ae7e9a0cb0dfad52e56
Author: joeylmaalouf <joeylmaalouf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg
Log Message:
-----------
Tutorial: standardize Menu references
(cherry-picked from commit 05c6e397ba87b249efde322532f5049367d27155)
Commit: 14a1ce2cbd4068f4bdf1f50773e3c138b2380732
https://github.com/wesnoth/wesnoth/commit/14a1ce2cbd4068f4bdf1f50773e3c138b2380732
Author: joeylmaalouf <joeylmaalouf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/about.cfg
Log Message:
-----------
updated contributors list
(cherry-picked from commit 96d8ee06b0faafde217124ea26ee660d3f459a07)
Commit: 5e7bf8fe0f39236eae4bdd6be8d6951fe4c3616f
https://github.com/wesnoth/wesnoth/commit/5e7bf8fe0f39236eae4bdd6be8d6951fe4c3616f
Author: jostephd <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/unit_list.cpp
M src/gui/dialogs/unit_recall.cpp
Log Message:
-----------
Fix sorting of units by level in Recall List and Unit List (#3370)
Now the triangle points down when the list is sorted by level descending.
(cherry-picked from commit 6e31c83c644b7265d68b999f9a5c763a03aee501)
Commit: 34b3775d4c8ff8a409bccf9228cb0869cfb34bb4
https://github.com/wesnoth/wesnoth/commit/34b3775d4c8ff8a409bccf9228cb0869cfb34bb4
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/unit_list.cpp
M src/gui/dialogs/unit_recall.cpp
Log Message:
-----------
Fix: we negate an unsigned integer
Negating an unsigned integer still returns an unsigned value
(in other words, always positive) which isn't what we want.
(cherry-picked from commit e961cc08993bb2b796891530d084da73ec212351)
Commit: 2d7654160fa784be41016f40bead949f49e647f8
https://github.com/wesnoth/wesnoth/commit/2d7654160fa784be41016f40bead949f49e647f8
Author: doofus-01 <doofus-01 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
A data/core/images/terrain/village/hut-snow-night.png
M data/core/images/terrain/village/hut-snow.png
A data/core/images/terrain/village/hut-snow2-night.png
M data/core/images/terrain/village/hut-snow2.png
A data/core/images/terrain/village/hut-snow3-night.png
A data/core/images/terrain/village/hut-snow3.png
A data/core/images/terrain/village/hut-snow4-night.png
A data/core/images/terrain/village/hut-snow4.png
M data/core/terrain-graphics.cfg
Log Message:
-----------
Additional village variations (#3342)
* revised and additional snowed hut villages, with night-light TOD variations
* remove spaces to keep column alignment
(cherry-picked from commit 9042b0beb75e637b786a659eb674cccc6d92be28)
Commit: 86680509713c5ee9f23e1f636deecc41fd4e88ee
https://github.com/wesnoth/wesnoth/commit/86680509713c5ee9f23e1f636deecc41fd4e88ee
Author: ln-zookeeper <lari.nieminen at iki.fi>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/images/terrain/village/hut-snow-hills-tile.png
M data/core/images/terrain/village/hut-snow-tile.png
Log Message:
-----------
Updated snowy hut tile icons
(cherry-picked from commit 386493790e1df329a7b98f384ee00366f3625ff1)
Commit: 120e8d991106fcd6c6b080492a3cd394d41c04bb
https://github.com/wesnoth/wesnoth/commit/120e8d991106fcd6c6b080492a3cd394d41c04bb
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M src/ai/lua/core.cpp
M src/lua/lbaselib.cpp
M src/scripting/application_lua_kernel.cpp
M src/scripting/lua_fileops.cpp
M src/scripting/lua_kernel_base.cpp
Log Message:
-----------
disallow loading lua bytecode via load/dofile (CVE-2018-1999023)
This could otherwise be used to escape the lua sandbox, as described in
multiple sources. For example one can use it to reenable the os.execute
function to do shell commands
The affected functions were
load,loadstring,wesnoth.dofile,wesnoth.require and various places in the
wesnoth source where lua chunks were loaded for example by the ai code.
This commit also changes the lua source to change luas load (which is
the same as loadstring), alternatively we could add a wrapper around the
original load function that always passes "t" as third parameter, i went
this way mostly because it was easier to implement, but also because i
was not 100% sure that is is impossible to query the upvalues of a
function via lua (wesnoth disables debug.getupvalue but still).
There is also an occurance in the application_lua_kernel that was not fixed
because i assumed that umc cannot contian application lua scipts.
As further security measure we might want to disable printing the function
adress in luas tostring for c functions, this cannot be exploited by itself
but it can be used to defeat ASLR in some cases.
(cherry-picked from commit 2554c166dd45bfdee8ee24431224bd25e52bab12)
Commit: a414703946491c1dd320d5cb4ae5f3d40d41d92b
https://github.com/wesnoth/wesnoth/commit/a414703946491c1dd320d5cb4ae5f3d40d41d92b
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
A data/test/scenarios/bytecode.lua
A data/test/scenarios/test_cve_2018_1999023.cfg
A data/test/scenarios/test_cve_2018_1999023_2.cfg
M wml_test_schedule
Log Message:
-----------
wml test for cve-2018-1999023
this test whether we succesfully prevent the exceution and parsing of
precompiled lua chunks, which can be used to break the lua sandbox.
This test does not cover all affected functions in particular not the ai
code that loads lua chunks.
(cherry-picked from commit 6b13a63bb0999e1c494a4236a5d565306db5a0b9)
Commit: eb36c60fba07e1641d932f0bed9fc41e3c02bf62
https://github.com/wesnoth/wesnoth/commit/eb36c60fba07e1641d932f0bed9fc41e3c02bf62
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/lua/lbaselib.cpp
M src/scripting/lua_kernel_base.cpp
Log Message:
-----------
Lua: implement our own load() instead of monkey-patching Lua code
Monkey-patching has multiple problems. The biggest problem for a security
fix like this is that it's way too easy to forget to re-apply when we
update Lua to a newer version.
Instead, we now have the implementation of load() under our control and can
update Lua without risk of reintroducing CVE-2018-1999023.
(cherry-picked from commit 52ae31efb21b31f5bb0763d1da24709e90393c59)
Commit: 790d13e937e835f432dd1f260a2d09b8dfcf0765
https://github.com/wesnoth/wesnoth/commit/790d13e937e835f432dd1f260a2d09b8dfcf0765
Author: loonycyborg <loonycyborg at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M SConstruct
M scons/cplusplus.py
Log Message:
-----------
scons: fix strict hardened builds on Gentoo
(cherry-picked from commit 0c3ba36d68754acc2328fd704e1b8df17383e8cd)
Commit: 81d69701958608491dbb8cd6f5386ae9219aea50
https://github.com/wesnoth/wesnoth/commit/81d69701958608491dbb8cd6f5386ae9219aea50
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
A data/test/scenarios/bytecode.bin
R data/test/scenarios/bytecode.lua
M data/test/scenarios/test_cve_2018_1999023.cfg
M utils/travis/check_utf8.sh
Log Message:
-----------
check_utf8.sh: don't check the Lua bytecode file
This avoids one of the two files which are currently causing macOS SCons
builds to fail in the master branch.
(cherry-picked from commit 8dc60ae98fa472d7a5fa124002f7b1a2f552e0f3)
Commit: 945a386c250ab42f08b939e148b40bfedb0ef926
https://github.com/wesnoth/wesnoth/commit/945a386c250ab42f08b939e148b40bfedb0ef926
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M utils/travis/check_utf8.sh
Log Message:
-----------
check_utf8.sh: don't check the second Lua bytecode test scenario
This avoids the other file with binary data.
(cherry-picked from commit 212601deab6ba803db3e0b4ed8ee5d0cbc3f3018)
Commit: ece2f79e4bb56dbcea5cabb1eb4ee8ecb270c587
https://github.com/wesnoth/wesnoth/commit/ece2f79e4bb56dbcea5cabb1eb4ee8ecb270c587
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_Hammer_of_Thursagan/scenarios/06_High_Pass.cfg
Log Message:
-----------
THoT S6: Rephrase Ratheln cue.
It didn't make sense for the dwarves to only notice "glowing" after night had ended.
[ci skip]
(cherry-picked from commit 5758c900e248baf3fc581e9932a2553d92120ac2)
Commit: 679232374a804d0f04744019501fa6dada4afcb0
https://github.com/wesnoth/wesnoth/commit/679232374a804d0f04744019501fa6dada4afcb0
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_Hammer_of_Thursagan/scenarios/10_The_Siege_of_Kal_Kartha.cfg
Log Message:
-----------
THoT S10: Clarify objectives.
[ci skip]
(cherry-picked from commit a08b7c3ab36047050872a0e4797a4b280bd2d22e)
Commit: 3c5b6b4441730da0bcf26d51dbe405166cf681b7
https://github.com/wesnoth/wesnoth/commit/3c5b6b4441730da0bcf26d51dbe405166cf681b7
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
A data/campaigns/Under_the_Burning_Suns/images/halo/eloh-halo-back.png
A data/campaigns/Under_the_Burning_Suns/images/halo/eloh-halo-bottom.png
M data/campaigns/Under_the_Burning_Suns/images/units/quenoth/eloh.png
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Divine_Avatar.cfg
Log Message:
-----------
UtBS: New graphics for Eloh by me
There are two layers of halos and they are applied in a somewhat
convoluted fashion. I should probably explain why.
The bottom halo is designed so it's drawn *below* the main unit sprite
so as to not muddle the colours on it. Halos are normally drawn *on top*
of sprites.
The back halo is specifically masked so it's drawn behind the main unit
sprite without overlapping any of its pixels, but it's asymmetrical and
supposed to flip along with the unit sprite depending on the direction
it's facing. Halos do not do that currently, at least not without using
animation WML conditionals. Unfortunately, for some reason, using a
standing animation that's nothing but conditionals causes the game to
crash at the moment.
Taking all this into consideration, using the blit IPF is a much easier
mechanism to avoid both issues at once, even if it makes the code
slightly awkward.
If someone can think of an alternative method, they're more than welcome
to change the code as long as the sprite's composition remains exactly
the same as it is now. I'm just the artist in this case.
[ci skip]
(cherry-picked from commit 6e1a861bdab92edcd24c297aa97367dfcb6c0876)
Commit: b02b3e5048a1e3b57684957f182f49701066d896
https://github.com/wesnoth/wesnoth/commit/b02b3e5048a1e3b57684957f182f49701066d896
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Sync 1.14 changelog
[ci skip]
(cherry-picked from commit c56e8aa69538f119bb89c5a1683770b165e75f5d)
Commit: 87c1ae6c3c2964a87dbfadeeb2c61929011a02d1
https://github.com/wesnoth/wesnoth/commit/87c1ae6c3c2964a87dbfadeeb2c61929011a02d1
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/units/quenoth/Divine_Avatar.cfg
Log Message:
-----------
UtBS: Improve Eloh's attack animation timings
Also remove a Kate modeline I didn't intend to push.
[ci skip]
(cherry-picked from commit 3b91481a0cba943812bb8c629217f266be5f4e05)
Commit: f1192706a9d9f7e17601ee8b0f205c9dfb7fc199
https://github.com/wesnoth/wesnoth/commit/f1192706a9d9f7e17601ee8b0f205c9dfb7fc199
Author: DisherProject <pycchio at tiscali.it>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Liberty/scenarios/05_Hide_and_Seek.cfg
M data/campaigns/Liberty/scenarios/06_The_Grey_Woods.cfg
Log Message:
-----------
Liberty S5-S6: Replace deprecated keys
"share_maps" and "share_view" have been replaced in
favour of "share_vision"
(cherry-picked from commit ddf9949cffbd7cf18704c0af95e75ad412dd0499)
Commit: 8eebc4b202ba75cbd71507c72b3128de048cedd3
https://github.com/wesnoth/wesnoth/commit/8eebc4b202ba75cbd71507c72b3128de048cedd3
Author: DisherProject <pycchio at tiscali.it>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Liberty/scenarios/01_The_Raid.cfg
Log Message:
-----------
Liberty S1: Filter event by condition instead of using an
if-then clause
(cherry-picked from commit cbe2bcef6b647a1cf4bba683f3c32a35b77d24e6)
Commit: 18c1b3f7fea129187dcf637c0fddb1f023a37723
https://github.com/wesnoth/wesnoth/commit/18c1b3f7fea129187dcf637c0fddb1f023a37723
Author: DisherProject <pycchio at tiscali.it>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Liberty/scenarios/01_The_Raid.cfg
M data/campaigns/Liberty/scenarios/07_The_Hunters.cfg
Log Message:
-----------
Liberty S1-S7: Fire victory when enemies are defeated
Instead of checking whether there are no enemy units left
every time one of them dies, use the "enemies defeated"
event.
(cherry-picked from commit 4ced6c752630d7703c1b73290417add9abb7e19e)
Commit: d222aaf8753bfc32487cb20ac4e1f9bed33adeab
https://github.com/wesnoth/wesnoth/commit/d222aaf8753bfc32487cb20ac4e1f9bed33adeab
Author: DisherProject <pycchio at tiscali.it>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Liberty/scenarios/08_Glory.cfg
Log Message:
-----------
Liberty S8: General fix and cleanup to the AI goals
All sides will now head to the central fortress. Orcs
should now be a bit smarter, and they should not suicide
during the morning or the afternoon. The humans in Halstead
will initially remain inside their fortress, until the enemy
arrival.
(cherry-picked from commit e63a15fc913de1d51ea8caf4330409109e1b2f0f)
Commit: 258f4e8faab32bf458ae9fc2f50064ea757b1155
https://github.com/wesnoth/wesnoth/commit/258f4e8faab32bf458ae9fc2f50064ea757b1155
Author: DisherProject <pycchio at tiscali.it>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Liberty/maps/08_Glory.map
M data/campaigns/Liberty/scenarios/08_Glory.cfg
Log Message:
-----------
Liberty S8: Remove unnecessary hidden side
Side 3 was composed by enemy reinforcements. Since they were
spawned on the right corner of the map, and since side 2
was blocked inside Halstead by and [avoid] tag, it was
necessary to add a new hidden side which could move freely
on the map.
If we upgrade the AI, removing the [avoid] tag, this hidden
side becomes unnecessary.
(cherry-picked from commit f32dfaa9170a998dbbacb54d73346cb67a32dd05)
Commit: 912dfcc9e68c4671bd37c3a11d5ce6a5de70cb3f
https://github.com/wesnoth/wesnoth/commit/912dfcc9e68c4671bd37c3a11d5ce6a5de70cb3f
Author: DisherProject <pycchio at tiscali.it>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Liberty/scenarios/08_Glory.cfg
Log Message:
-----------
Liberty S8: Fix some event filters
(cherry-picked from commit d13c451afb544db67732adc0af269e764068bec6)
Commit: 21999b1fc9e724d811cec298469409aab2686002
https://github.com/wesnoth/wesnoth/commit/21999b1fc9e724d811cec298469409aab2686002
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/test/scenarios/test_cve_2018_1999023.cfg
Log Message:
-----------
Extend the first CVE-2018-1999023 unit test to also try loadstring()
Like @gfgtdf pointed out, loadstring() is still supported by Lua in the
name of backwards compatibility, even though it was deprecated in Lua 5.2
and is no longer mentioned in Lua manual. Thus, as of committing this it's
actually possible to load Lua bytecode.
Let's unit test this to ensure that we don't reintroduce this
vulnerability.
(cherry-picked from commit aa73b836009ca98cade2d0dfca6b99cbf8d19e76)
Commit: 8a0dc8bdd90fc97295a89aa08c2aca866f3907fb
https://github.com/wesnoth/wesnoth/commit/8a0dc8bdd90fc97295a89aa08c2aca866f3907fb
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/scripting/lua_kernel_base.cpp
Log Message:
-----------
Lua: delete loadstring()
Fixes the vulnerability introduced in commit 52ae31efb21b31f5bb0763d1da24709e90393c59.
(cherry-picked from commit 6450bada57f95af55c490f9d7601ef5e073cdaf1)
Commit: 52fbbc2b405974266a7534e66da9ffd6e275f005
https://github.com/wesnoth/wesnoth/commit/52fbbc2b405974266a7534e66da9ffd6e275f005
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M run_wml_tests
Log Message:
-----------
WML unit tests: port ability to override strict mode from 1.14
The ability isn't needed in master because none of the unit tests call
deprecated functions here, but it may be useful in the future or make
cherry-picking of future changes easier.
(cherry-picked from commit 74d8cfa98e0f61ee22a536fc06c2019c9c89aede)
Commit: a39fe689cbc2df06be56e4efae7a44b1b6efd935
https://github.com/wesnoth/wesnoth/commit/a39fe689cbc2df06be56e4efae7a44b1b6efd935
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_Hammer_of_Thursagan/scenarios/06_High_Pass.cfg
Log Message:
-----------
THoT S6: Let a Scout be the first to smell Ratheln's cooking.
[ci skip]
(cherry-picked from commit f0ed45bde93aa040ac2031b5955d2b68c49e1cb6)
Commit: b51cb07d2a68f2e8b8df1dad9a3ecc497cf67d16
https://github.com/wesnoth/wesnoth/commit/b51cb07d2a68f2e8b8df1dad9a3ecc497cf67d16
Author: sigurdfdragon <jjwcoat at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Secrets_of_the_Ancients/scenarios/11_Battleground.cfg
M data/campaigns/Secrets_of_the_Ancients/scenarios/21_Against_the_World.cfg
Log Message:
-----------
Revert "SotA S11 & 21: Fix #3294"
This reverts commit a4bad90bad379feb77e17a4d8ab6cda1dc05e3cc.
It is supposed to be the male Saurians that get killed in S11, and the
females seek revenge in S21.
(cherry-picked from commit 7ced35839b83979b36f3d4236333667ee02d04ea)
Commit: 45078c4d5354288ca7e1c5939f47688ec9a60605
https://github.com/wesnoth/wesnoth/commit/45078c4d5354288ca7e1c5939f47688ec9a60605
Author: sigurdfdragon <jjwcoat at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Secrets_of_the_Ancients/scenarios/21_Against_the_World.cfg
Log Message:
-----------
SotA S21: Fix #3294 properly
It is the Saurians that have their males killed in S11, so the females
take revenge.
(cherry-picked from commit 32a630bd3f9a7fe30a0799d7039f37db8155382a)
Commit: 17011677da654e63630a4d48dcd175b92455cb14
https://github.com/wesnoth/wesnoth/commit/17011677da654e63630a4d48dcd175b92455cb14
Author: sigurdfdragon <jjwcoat at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Secrets_of_the_Ancients/scenarios/21_Against_the_World.cfg
Log Message:
-----------
SotA S21: Slight touchups
Only recruit level 2 to match what nagas arrive with.
(cherry-picked from commit 46cc9a528919df08d08f6df86c3d11a4545377ed)
Commit: 2dc3b198c9128246cacc411ecb386ae2c19bcb78
https://github.com/wesnoth/wesnoth/commit/2dc3b198c9128246cacc411ecb386ae2c19bcb78
Author: sigurdfdragon <jjwcoat at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Update changelog
(cherry-picked from commit c2cf0288fc3e5361e16407c5c5abcdbe2a3711a4)
Commit: 67269b00e7f74fed008eceda469be02f64981cda
https://github.com/wesnoth/wesnoth/commit/67269b00e7f74fed008eceda469be02f64981cda
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_Hammer_of_Thursagan/scenarios/06_High_Pass.cfg
Log Message:
-----------
THoT S6: Now that the player is told which hut to look at, don't trigger Ratheln if the player ignores the hint.
Suggested by @sevu.
(cherry-picked from commit 92bb1c263b5c42e4e4e50e77f842531d85deaec4)
Commit: 22fca78978993b53ea35346d9926e18ac23e73ac
https://github.com/wesnoth/wesnoth/commit/22fca78978993b53ea35346d9926e18ac23e73ac
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_Hammer_of_Thursagan/scenarios/06_High_Pass.cfg
Log Message:
-----------
THoT S6: Let the AI avoid the mage's hut
Until he is found. This also means one less villages for side 2, increased
their income thatfor,
[ci skip]
(cherry-picked from commit 390d66fda1f55f0b08b3ad950c7e96b38bb35994)
Commit: eeab6dc5f6ca495103c55a39722a239656fc9d93
https://github.com/wesnoth/wesnoth/commit/eeab6dc5f6ca495103c55a39722a239656fc9d93
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_Hammer_of_Thursagan/maps/06_High_Pass.map
M data/campaigns/The_Hammer_of_Thursagan/scenarios/06_High_Pass.cfg
Log Message:
-----------
THoT S6: minor changes for difficulty and map
Uses an Orcish castle instead of destroyes human. Troll would maybe fit best,
but it doesn't fit well with the surrounding. Has now only 2 castle hexes.
On easy difficulty, reduced turns by two, it should be enought turns.
Also added one more enemy, as there are less wolves spawned on easy.
And income for Gryphons once again increased by 1, they are very expensive.
Reminding events have been adjusted to turns.
[ci skip]
(cherry-picked from commit c2064827e4d65d819ee258ec40ef54b0c8875590)
Commit: 768f400516ccad4356cf431f5c9f2cbcd170736f
https://github.com/wesnoth/wesnoth/commit/768f400516ccad4356cf431f5c9f2cbcd170736f
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M utils/pofix.py
Log Message:
-----------
pofix: 1.14 announcement rules for 1.14.4
Also fixes a mistake from the 1.14.3 rules that caused "xxx MiB" to be
replaced with "xxx MB MiB" for all platforms. Oops. Nobody noticed
anyway (?).
[ci skip]
(cherry-picked from commit 12a3b973b9f357d0b1685df5b29fbcea0fefc7be)
Commit: 7ecf55b6ed17e7ec5d701bb87806dea34d4cf732
https://github.com/wesnoth/wesnoth/commit/7ecf55b6ed17e7ec5d701bb87806dea34d4cf732
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/scripting/game_lua_kernel.cpp
Log Message:
-----------
ignore [delay] during preload,prestart and initial lua.
as the ingame ui is not shown yet, [delay] would only result in showing a black screen,
Also in the case of initial lua it might result in crashes because of the threaded loadingscren, or simply because parts of the ui are not initialized yet.
(cherry-picked from commit 97b561269101e5e6d1637d00b44363fc6a1728fd)
Commit: e3b4e1d911ed3894304e24d0cffce71fb888c0ae
https://github.com/wesnoth/wesnoth/commit/e3b4e1d911ed3894304e24d0cffce71fb888c0ae
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/mouse_events.cpp
Log Message:
-----------
fix attacks beein wrongly disabled
as said in the comment, that get_special_bool might return the wrong value, as since https://github.com/wesnoth/wesnoth/commit/5f58cd7c6d39c35dcefa6fb9f71777a42ea5cb5e the bc_vector no longer contains disabled attacks we can just remove this code.
fixes #3324
(cherry-picked from commit 44734570dd1824a098252d78dafc0f5a561c13cf)
Commit: fabdf38a9eaa90c2e584c3c657510af5e85c9031
https://github.com/wesnoth/wesnoth/commit/fabdf38a9eaa90c2e584c3c657510af5e85c9031
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/server/simple_wml.cpp
M src/server/simple_wml.hpp
Log Message:
-----------
don't use std::pair
instead we use a custom struct. std::pair is bad becasue you never know
what "first" or "second" mean.
(cherry-picked from commit c4aacbe31f31799861e03f4b7f7b241bee64aa65)
Commit: 59a79348a6e156cda893abff306174dd9665654f
https://github.com/wesnoth/wesnoth/commit/59a79348a6e156cda893abff306174dd9665654f
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/server/simple_wml.cpp
M src/server/simple_wml.hpp
Log Message:
-----------
preserve traslatable strings in simple_wml.
previously it would happen that for example an attribute like
`side_name=_"female^Footpads"` in side would get its translatable mark (_)
removed after the game has started. This meant that observers that enterd
the game after it started would see the literal string "female^Footpads"
in the status side overview window.
The new code marks all translatable simple_wml attributes to make sure their
translatable mark is preserved along with their textdomain. It can still
happen though that attributes will appear in the the wrong textdomain area
after simple_wml processing though because in some cases note::output
might skip over textdomain markers. It is still not as bad as string like
"female^Footpads" appearing in the ui though.
An alterntive appraoch to fix this issue would be to carefully make sure
not to change any atributes of wml tags that can also contain translatable
attributes, which would probably imply not editing the wml objects received
by the client at all and instead storing the new information (in particular
side information like is_local=yes/no) in a seperate wml object. (that would
then be sended to the clients along with the original scenario wml objects.)
fixes #1420
(cherry-picked from commit eb23ac56461c8d57dc5d1aee018832c2dc7dcf36)
Commit: 80d0ab3ee85a276e3aec313dcef8158588bc4233
https://github.com/wesnoth/wesnoth/commit/80d0ab3ee85a276e3aec313dcef8158588bc4233
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/game_initialization/lobby_info.cpp
Log Message:
-----------
add comment
(cherry-picked from commit edc57d2388f798b392736bcf8b6e6b75bc4d68d6)
Commit: de0a5b6ed76453a3f32c951d5275c54ddb27c9c8
https://github.com/wesnoth/wesnoth/commit/de0a5b6ed76453a3f32c951d5275c54ddb27c9c8
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/game_initialization/lobby_info.cpp
M src/game_initialization/lobby_info.hpp
M src/gui/dialogs/multiplayer/lobby.cpp
Log Message:
-----------
don't process a corrupted gamelist_diff further
fixes #3017, assuming that the error is actually casued by the
'process_gamelist_diff failed'
As process_gamelist_diff simply returns after getting an error its quite
likeley that the gamelist is then in a corrupted state so we stop
processing it until we get a fresh gamelist.
(cherry-picked from commit 367aec2bb2d5fc5f5acbb53842441c6190c9d452)
Commit: 01816252a108b808ee4780ed237574942e8d0771
https://github.com/wesnoth/wesnoth/commit/01816252a108b808ee4780ed237574942e8d0771
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/game_initialization/lobby_data.cpp
Log Message:
-----------
mplobby: add debug info
(cherry-picked from commit 15c59037d32e956741243cdd0d33c293ea1e72b7)
Commit: b5b1065113049c37af015fc3830eb18247a758fe
https://github.com/wesnoth/wesnoth/commit/b5b1065113049c37af015fc3830eb18247a758fe
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/game_initialization/lobby_data.cpp
M src/server/server.cpp
Log Message:
-----------
fix require_scenario & require_era
previously both were broken:
1) 'require_scenario' was only checked if the scenario was installed
which obviously doesn't make any sense at all.
2) 'require_scenario' was read from the local scenario data instead from
the remote scenario.
3) 'require_era' was only checked when the scenario was not installed,
so people who do have an outated version of the era installed could not
join bacause it assumed require_era=yes in that case.
4) the server tried to read 'require_scenario' from the wrong wml node,
'require_scenario' is an attribute of [scenario] and not of savefile
toplevel.
(cherry-picked from commit eec8b674de6d04f13f5b875c1b1e6b953e45ef9e)
Commit: 649b01477090f063eb7011e95d8a931829a3a4c4
https://github.com/wesnoth/wesnoth/commit/649b01477090f063eb7011e95d8a931829a3a4c4
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/game_initialization/playcampaign.cpp
Log Message:
-----------
fix skip replay being active in later scenarios
in mp campaigns.
(cherry-picked from commit f84d79e0339cbde7c80194abc5c814ae634263c2)
Commit: cb6b7b4318dad454ed02c77023beba0253ad7f90
https://github.com/wesnoth/wesnoth/commit/cb6b7b4318dad454ed02c77023beba0253ad7f90
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/server/server.cpp
M src/server/server.hpp
Log Message:
-----------
add server notifications about outdated wesnoth versions.
(cherry-picked from commit 610e4f2969cc8f0b87a537a09138d64efbbf3a2b)
Commit: 4d736064e9a0c7907de1eb827c8db3e7f2891cd2
https://github.com/wesnoth/wesnoth/commit/4d736064e9a0c7907de1eb827c8db3e7f2891cd2
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/server/server.cpp
Log Message:
-----------
improve wesnoth version warning.
(cherry-picked from commit ba18e17e433bec13db77b82a5fdeaeaffa765fe4)
Commit: d3d7e8f29780bfbc2b06cac80eeaab7b1a991d91
https://github.com/wesnoth/wesnoth/commit/d3d7e8f29780bfbc2b06cac80eeaab7b1a991d91
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/server/server.cpp
Log Message:
-----------
improve wesnoth version warning further
(cherry-picked from commit 90fb50d70fc1a4847ea0098cb356798935b6bda8)
Commit: 66c07530000e72636b50579a4b2999570c85eb8e
https://github.com/wesnoth/wesnoth/commit/66c07530000e72636b50579a4b2999570c85eb8e
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/gui/window/tooltip_floating.cfg
Log Message:
-----------
fix game crashing when showing a too large tooltip
previously the game would go into an infinite loop at
https://github.com/wesnoth/wesnoth/blob/1.14.4/src/gui/widgets/window.cpp#L1046
when a tooltip doesn't fit on screen, this could in particular happen in
the mp lobby when hovering over the 'i' of a game that uses a ridiculous
amount of modifications.
I currently don't see any case where the game is actually able to 'fix'
a bad height that was reported from reevaluate_best_size. so i just
disable reevaluate_best_size for floating tooltips.
If there exists such a case, an alternative fix could be to change the
reevaluate loop in window::layout to also stop when a new iteration
returned the same size as the previous iteration.
(cherry-picked from commit 936516c83b6e0a6e76938c65158d2d6d98f94fba)
Commit: eaea7d0b3b7dfd978fae27e4f4c9e316067528a2
https://github.com/wesnoth/wesnoth/commit/eaea7d0b3b7dfd978fae27e4f4c9e316067528a2
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/menu_events.cpp
Log Message:
-----------
debug: Fix ":droid" always toggling droid on/off even when given two arguments (":droid <side> off").
(cherry-picked from commit 0f520ad8a6638a77ec6e56eb97ef001ae3adc324)
Commit: 4b4fdb391fb071b2fe2b85aa44b8661420b4c0e9
https://github.com/wesnoth/wesnoth/commit/4b4fdb391fb071b2fe2b85aa44b8661420b4c0e9
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/menu_events.cpp
Log Message:
-----------
debug: Give feedback for :droid.
#2819
(cherry-picked from commit 55e41472130829d6b322a68c7556a126e93b70b3)
Commit: 780dded3958f2f9e3b9208f6241380584ddffb66
https://github.com/wesnoth/wesnoth/commit/780dded3958f2f9e3b9208f6241380584ddffb66
Author: Konrad2 <39015360+Konrad22 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Sceptre_of_Fire/maps/1_A_Bargain_is_Struck.map
Log Message:
-----------
SoF S01: Added snowy mountains to right map edge (#3401) (fixes #3383)
New map for SoF - Sc1 to fix #3383 (removing the fast way to reach the elvish leader, by replacing some regular mountains with snowy mountains).
(cherry-picked from commit 87eb901c105c1fdd405a1a7fddf7d81fdf545b94)
Commit: a9f7ac8a19a50744e45f00aa926615c93c67f4c8
https://github.com/wesnoth/wesnoth/commit/a9f7ac8a19a50744e45f00aa926615c93c67f4c8
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-ai/fr.po
M po/wesnoth-anl/fr.po
M po/wesnoth-aoi/fr.po
M po/wesnoth-did/fr.po
M po/wesnoth-dm/fr.po
M po/wesnoth-dw/fr.po
M po/wesnoth-editor/fr.po
M po/wesnoth-ei/fr.po
M po/wesnoth-help/fr.po
M po/wesnoth-httt/fr.po
M po/wesnoth-l/fr.po
M po/wesnoth-lib/fr.po
M po/wesnoth-low/fr.po
M po/wesnoth-manual/fr.po
M po/wesnoth-multiplayer/fr.po
M po/wesnoth-nr/fr.po
M po/wesnoth-sof/fr.po
M po/wesnoth-sota/fr.po
M po/wesnoth-sotbe/fr.po
M po/wesnoth-tb/fr.po
M po/wesnoth-test/fr.po
M po/wesnoth-thot/fr.po
M po/wesnoth-trow/fr.po
M po/wesnoth-tsg/fr.po
M po/wesnoth-tutorial/fr.po
M po/wesnoth-units/fr.po
M po/wesnoth-utbs/fr.po
M po/wesnoth/fr.po
Log Message:
-----------
updated French translation
(cherry-picked from commit bcce3fb4ccb7edef994e5adc30793790b727e1f4)
Commit: b1f36c64833eaf81453d9956bc926cd36202211e
https://github.com/wesnoth/wesnoth/commit/b1f36c64833eaf81453d9956bc926cd36202211e
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-ai/it.po
M po/wesnoth-anl/it.po
M po/wesnoth-aoi/it.po
M po/wesnoth-did/it.po
M po/wesnoth-dm/it.po
M po/wesnoth-dw/it.po
M po/wesnoth-editor/it.po
M po/wesnoth-ei/it.po
M po/wesnoth-help/it.po
M po/wesnoth-httt/it.po
M po/wesnoth-l/it.po
M po/wesnoth-lib/it.po
M po/wesnoth-low/it.po
M po/wesnoth-manual/it.po
M po/wesnoth-multiplayer/it.po
M po/wesnoth-nr/it.po
M po/wesnoth-sof/it.po
M po/wesnoth-sota/it.po
M po/wesnoth-sotbe/it.po
M po/wesnoth-tb/it.po
M po/wesnoth-test/it.po
M po/wesnoth-thot/it.po
M po/wesnoth-trow/it.po
M po/wesnoth-tsg/it.po
M po/wesnoth-tutorial/it.po
M po/wesnoth-units/it.po
M po/wesnoth-utbs/it.po
M po/wesnoth/it.po
Log Message:
-----------
updated Italian translation
(cherry-picked from commit 8fb7429ca81afe74494aa1f7c7b06d8e718a6c4c)
Commit: f49fded31de89bd760dc38cef246cab38f88984d
https://github.com/wesnoth/wesnoth/commit/f49fded31de89bd760dc38cef246cab38f88984d
Author: joeylmaalouf <joeylmaalouf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg
Log Message:
-----------
NR S7: give Stalrag traits for consistency
(cherry-picked from commit 7c70c1d985eb5512ee32611213c326690f1ea3ec)
Commit: b82647a55d90e83ef157cf31ea37042321907824
https://github.com/wesnoth/wesnoth/commit/b82647a55d90e83ef157cf31ea37042321907824
Author: joeylmaalouf <joeylmaalouf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg
M data/campaigns/Northern_Rebirth/scenarios/08a_Elvish_Princess.cfg
Log Message:
-----------
NR S7-8: avoid recreating the new companions from scratch
(cherry-picked from commit 4befb3580d00ebc64709bd1e247571b193c9ae6b)
Commit: d37c6d693e6f686e17e7973b68fce610e09bd4d2
https://github.com/wesnoth/wesnoth/commit/d37c6d693e6f686e17e7973b68fce610e09bd4d2
Author: sigurdfdragon <jjwcoat at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Northern_Rebirth/scenarios/11a_The_Eastern_Flank.cfg
M data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg
M data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg
M data/campaigns/Northern_Rebirth/utils/utils.cfg
Log Message:
-----------
NR: Ensure Krash doesn't overwrite other units and is properly placed.
This could happen if a player has Krash and skipped S10a.
(cherry-picked from commit c6d2a0febc1f8ab7b9648d4319f6091c8675925a)
Commit: 87c87aee3e06d01def28e64033b3ef44a61fe73e
https://github.com/wesnoth/wesnoth/commit/87c87aee3e06d01def28e64033b3ef44a61fe73e
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/scripting/game_lua_kernel.cpp
Log Message:
-----------
Fix: halo (if any) remains when wesnoth.put_recall_unit() is used
Based on the suggested fix in #3425. Closes #3425.
(cherry-picked from commit 46bec21fa36c0ad0c2106ce25cccb6f28401abf1)
Commit: 01867f9a2c85db207e0f3dd03df4546a3e394825
https://github.com/wesnoth/wesnoth/commit/01867f9a2c85db207e0f3dd03df4546a3e394825
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/mouse_events.cpp
Log Message:
-----------
GUI: Fix check for no usable weapons.
Fixes #3424.
(cherry-picked from commit f293c7cb3226bc7b28dbb968419ab54ff4e180da)
Commit: 45b9fe1e5bc2847ce7e58b6a8af0658c387cd950
https://github.com/wesnoth/wesnoth/commit/45b9fe1e5bc2847ce7e58b6a8af0658c387cd950
Author: rrigby <ryan.rigby at griffithuni.edu.au>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M packaging/wesnoth.appdata.xml
Log Message:
-----------
Add categories to appdata
following https://standards.freedesktop.org/menu-spec/latest/apas02.html
(cherry-picked from commit 16e858263c86f579603d615db172aff732192ec0)
Commit: 90a87b134114cd373aca0057252abe7a34415bcd
https://github.com/wesnoth/wesnoth/commit/90a87b134114cd373aca0057252abe7a34415bcd
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/about.cfg
M data/core/about_i18n.cfg
Log Message:
-----------
Add new contributors since 1.14.0 to the credits
Anyone who prefers to be credited some other way (or whose name I misspelled) can feel free to open another PR
@Byteron @rrigby @DisherProject @Ferk @Konrad22 @lilinitsy @UnwiseOwl @bandita137 at Ordoviz
(cherry-picked from commit ff4e1b2e61ab99be12e1b36cbc954e3f66efa116)
Commit: e4f280977f2b5b80934747e4c0a5a2d1c2dcc781
https://github.com/wesnoth/wesnoth/commit/e4f280977f2b5b80934747e4c0a5a2d1c2dcc781
Author: Steve Cotton <steve at octalot.co.uk>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Sceptre_of_Fire/scenarios/4_Gathering_Materials.cfg
Log Message:
-----------
SoF S4: Improved the reminder to recruit miners (#3422) (fixes #3394)
Updated to [allow_undo], because the hint message shouldn't block undoing a
recall. Recruiting can't be undone, even with [allow_undo], so this isn't
allowing a cheater's opportunity to recruit units with desired traits.
(cherry-picked from commit 66c56403db61acd1621d2b4d78e8f848c826540b)
Commit: 81ea32e4d4749b6f0828c33e614e11ea9c32e4b7
https://github.com/wesnoth/wesnoth/commit/81ea32e4d4749b6f0828c33e614e11ea9c32e4b7
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/help.cfg
Log Message:
-----------
Help: document cores (#2703)
[ci skip]
(cherry-picked from commit 40205c55fbce222701eece3168b9c5d0ba4add1c)
Commit: f6eac474c34677eb5f3fef2852456190f76bd1f7
https://github.com/wesnoth/wesnoth/commit/f6eac474c34677eb5f3fef2852456190f76bd1f7
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/help.cfg
Log Message:
-----------
Help: update the "Installing Add-ons" page (addresses #2703)
[ci skip]
(cherry-picked from commit fb5f46c52a6732997fc4e265536ab510d86b084f)
Commit: f12fbb853d68977796badb2bc90b28c0ae4e82fb
https://github.com/wesnoth/wesnoth/commit/f12fbb853d68977796badb2bc90b28c0ae4e82fb
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/addon/manager.cpp
Log Message:
-----------
Addon Manager: Don't use "ascending" and "descending" to describe how dates are sorted.
(cherry-picked from commit 569e1d85a596a794096fafc65fdb7b4527ad1a5e)
Commit: 49bad2c7258b1b927111e2d264439c3fe3b892b3
https://github.com/wesnoth/wesnoth/commit/49bad2c7258b1b927111e2d264439c3fe3b892b3
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/addon/manager.cpp
Log Message:
-----------
Addon Manager: Unabbreviate "asc" and "desc".
@jyrkive https://github.com/wesnoth/wesnoth/pull/3418#issuecomment-410433850
(cherry-picked from commit ef71d0efcbe0823d323627a13432b284e090821f)
Commit: 34108fb31e33bd19548f7dcd58d6f8378e224349
https://github.com/wesnoth/wesnoth/commit/34108fb31e33bd19548f7dcd58d6f8378e224349
Author: Konrad2 <39015360+Konrad22 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/about.cfg
M data/core/about_i18n.cfg
Log Message:
-----------
Updated credits for @Konrad22 (#3430)
(cherry-picked from commit 37ddf43d3aaa1863eef5c1a33d41af2f6972c888)
Commit: 9ee025ccc3c061df668b74772751b86cc902281d
https://github.com/wesnoth/wesnoth/commit/9ee025ccc3c061df668b74772751b86cc902281d
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-ai/zh_TW.po
M po/wesnoth-anl/zh_TW.po
M po/wesnoth-aoi/zh_TW.po
M po/wesnoth-did/zh_TW.po
M po/wesnoth-dm/zh_TW.po
M po/wesnoth-dw/zh_TW.po
M po/wesnoth-editor/zh_TW.po
M po/wesnoth-ei/zh_TW.po
M po/wesnoth-help/zh_TW.po
M po/wesnoth-httt/zh_TW.po
M po/wesnoth-l/zh_TW.po
M po/wesnoth-lib/zh_TW.po
M po/wesnoth-low/zh_TW.po
M po/wesnoth-manual/zh_TW.po
M po/wesnoth-multiplayer/zh_TW.po
M po/wesnoth-nr/zh_TW.po
M po/wesnoth-sof/zh_TW.po
M po/wesnoth-sota/zh_TW.po
M po/wesnoth-sotbe/zh_TW.po
M po/wesnoth-tb/zh_TW.po
M po/wesnoth-test/zh_TW.po
M po/wesnoth-thot/zh_TW.po
M po/wesnoth-trow/zh_TW.po
M po/wesnoth-tsg/zh_TW.po
M po/wesnoth-tutorial/zh_TW.po
M po/wesnoth-units/zh_TW.po
M po/wesnoth-utbs/zh_TW.po
M po/wesnoth/zh_TW.po
Log Message:
-----------
updated Chinese (Traditional) translation
(cherry-picked from commit a3bb7b655fc3dadb5ce1b86fe3ae0ab7e327d94f)
Commit: cdd9a902a7258bbabe04c5386afd69060fbecede
https://github.com/wesnoth/wesnoth/commit/cdd9a902a7258bbabe04c5386afd69060fbecede
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M utils/pywmlx/state/machine.py
Log Message:
-----------
Fix #3436: pot-update failing
(cherry-picked from commit 5bbc7fedca1a7ab19cfe05e3b92fb49973e29972)
Commit: ad7227a318675d841678bfbafe18fe242596dc04
https://github.com/wesnoth/wesnoth/commit/ad7227a318675d841678bfbafe18fe242596dc04
Author: Steve Cotton <steve at octalot.co.uk>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Sceptre_of_Fire/scenarios/9_Caverns_of_Flame.cfg
Log Message:
-----------
SoF S9: Rephrase the intro text (fixes #3405) (#3437)
The original text that referred to Knalga was confusing if the
player thought of Knalga as "dwarvish territory", and most of
the campaign's scenarios have been somewhere in Knalga.
(cherry-picked from commit a6bd0c87ac9ee4066ddad2700182778a0658f4e2)
Commit: a73662c9e942be5361df824e86a7a0b75a3e3a5f
https://github.com/wesnoth/wesnoth/commit/a73662c9e942be5361df824e86a7a0b75a3e3a5f
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
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/widgets/chatbox.cpp
M src/gui/widgets/chatbox.hpp
Log Message:
-----------
Make chat room names localizable (#2709)
(cherry-picked from commit 1eec7ef8d989357c09a5a2057095939b042e1212)
Commit: 25e9087304d467f50dcb85a7383626ca6b026082
https://github.com/wesnoth/wesnoth/commit/25e9087304d467f50dcb85a7383626ca6b026082
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/widgets/chatbox.cpp
M src/gui/widgets/chatbox.hpp
Log Message:
-----------
Use localized chat room names (#2709)
Turns out that a t_string doesn't automatically obtain the correct
translated value. Thus, I'll simply get it by calling
translation::dsgettext() directly. I also changed the translated string to
be used in the tab label as well.
(cherry-picked from commit 395eaf5251d50373d23bd8f53b7b254683a3dfed)
Commit: f25f1316cc7ea561f44dd3d075ecce572d9cf365
https://github.com/wesnoth/wesnoth/commit/f25f1316cc7ea561f44dd3d075ecce572d9cf365
Author: Elvish_Hunter <elvish.hunter2010 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/tools/wmllint
Log Message:
-----------
wmllint: added a missing conversion rule for the Qatif-al-nar unit
(cherry-picked from commit 3caf1283784b9533f601e6c0a7f91a112d7ae69c)
Commit: 0ccf6ae1eaf5ac8704b629b0572c98f377f84c7c
https://github.com/wesnoth/wesnoth/commit/0ccf6ae1eaf5ac8704b629b0572c98f377f84c7c
Author: Elvish_Hunter <elvish.hunter2010 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/macros/names.cfg
Log Message:
-----------
Prevent wmllint from converting Dunefolk names similar to Khalifate units
(cherry-picked from commit de99a381723dad41153917696e5468b5e0a99894)
Commit: 8b32f89a1f488dbe72ed85ac382fc1895c7c683f
https://github.com/wesnoth/wesnoth/commit/8b32f89a1f488dbe72ed85ac382fc1895c7c683f
Author: Elvish_Hunter <elvish.hunter2010 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/tools/wmllint
Log Message:
-----------
wmllint: added side_name to the list of translatable keys
(cherry-picked from commit 8bea4198992d1c794688ef1dc97cc82a958a8004)
Commit: 4b81eb508163945d561969ef0245a330b2765e6a
https://github.com/wesnoth/wesnoth/commit/4b81eb508163945d561969ef0245a330b2765e6a
Author: Elvish_Hunter <elvish.hunter2010 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/tools/wmllint
Log Message:
-----------
wmllint: fixed a regex that didn't match augmentation tags
(cherry-picked from commit cc178ad4742472397685a39e93074139225767f1)
Commit: 8fe84b9815a36d9cb9665012bbae0a350fc74cfd
https://github.com/wesnoth/wesnoth/commit/8fe84b9815a36d9cb9665012bbae0a350fc74cfd
Author: Elvish_Hunter <elvish.hunter2010 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/tools/wmllint
Log Message:
-----------
wmllint: fixed 'unknown id' errors in [fire_event] referred to event IDs
(cherry-picked from commit c08963a2e736a185ee338e30a560d5949233705f)
Commit: ef51a288d8df5a83acabfdfde5af1ae57afa6674
https://github.com/wesnoth/wesnoth/commit/ef51a288d8df5a83acabfdfde5af1ae57afa6674
Author: Elvish_Hunter <elvish.hunter2010 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/tools/wmllint
Log Message:
-----------
wmllint: avoid inserting image=wesnoth-icon.png if there's already an image
(cherry-picked from commit 3b8a6845514f9a95365d9f80d8960e4590cbbefb)
Commit: 45c1f7a852ec6339194ce03573cf991901ee1193
https://github.com/wesnoth/wesnoth/commit/45c1f7a852ec6339194ce03573cf991901ee1193
Author: Martin Hrubý <hrubymar10 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/gui/window/preferences.cfg
Log Message:
-----------
Fix localised Multiplayer causes preferences window use scrollbar #2855
(cherry-picked from commit be0bd05ab0852770ac16e3e1516eb92b4a8d007d)
Commit: b6d06b19295445c0007b3f253cb7dbf995e84fdc
https://github.com/wesnoth/wesnoth/commit/b6d06b19295445c0007b3f253cb7dbf995e84fdc
Author: Martin Hrubý <hrubymar10 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/desktop/version.cpp
Log Message:
-----------
Better macOS version report
(cherry-picked from commit 0711e24d8e3765093afeb7c385f6247fb02e3353)
Commit: 751976ca37c0eeb12ec0f9b9580e6e5dc8662035
https://github.com/wesnoth/wesnoth/commit/751976ca37c0eeb12ec0f9b9580e6e5dc8662035
Author: Martin Hrubý (hrubymar10) <hrubymar10 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/desktop/version.cpp
Log Message:
-----------
Fix indentation
(cherry-picked from commit 19db23437a3ca20f15041bb9facf750ae34043e4)
Commit: 41b10b7d0012ac0131f851be13dd02f87a08c909
https://github.com/wesnoth/wesnoth/commit/41b10b7d0012ac0131f851be13dd02f87a08c909
Author: Martin Hrubý (hrubymar10) <hrubymar10 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/macosx/SDLMain.mm
Log Message:
-----------
Fix macOS specific warning "Class SDLApplication is implemented in both ..."
(cherry-picked from commit 4e6ffed7a581b6c861b46d18c37ea1341dd9cd66)
Commit: c9e64a08e5593a51957120dfda306fc7c5d63cdb
https://github.com/wesnoth/wesnoth/commit/c9e64a08e5593a51957120dfda306fc7c5d63cdb
Author: Martin Hrubý (hrubymar10) <hrubymar10 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
R projectfiles/Xcode/Resources/fonts.conf
M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
Log Message:
-----------
Remove old macOS specific fonts.conf
(cherry-picked from commit 9bbb1771fa81f3bc02ef4421b3b90e5574d1fe10)
Commit: b230c5973edd6e495c54bba072fa667eacd16bc5
https://github.com/wesnoth/wesnoth/commit/b230c5973edd6e495c54bba072fa667eacd16bc5
Author: Martin Hrubý (hrubymar10) <hrubymar10 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/macosx/SDLMain.mm
Log Message:
-----------
Use standart fonts.conf in macOS packages
(cherry-picked from commit 8114ec213f583cc4b753b46a35af91827c91986e)
Commit: ac30647efbe160b11d9fe0ac3d89c4c74503ceda
https://github.com/wesnoth/wesnoth/commit/ac30647efbe160b11d9fe0ac3d89c4c74503ceda
Author: Martin Hrubý (hrubymar10) <hrubymar10 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M .travis.yml
Log Message:
-----------
Remove xcode version definition from travis leaving it fallback to default version
(cherry-picked from commit 03be7cc5710f6752bb7bbb6f68e83bfa93a9c607)
Commit: aca247d57ac1422e89fdb444cdd94bdc0c5e960b
https://github.com/wesnoth/wesnoth/commit/aca247d57ac1422e89fdb444cdd94bdc0c5e960b
Author: Martin Hrubý (hrubymar10) <hrubymar10 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M .travis.yml
Log Message:
-----------
Remove xcode version definition from travis leaving it fallback to default version
(cherry-picked from commit 2226c4cd328d1fda4b4099ff77e67d1ba7a1df17)
Commit: 27f6be9a370d994dbfaaa4b90598fef131bbc1c6
https://github.com/wesnoth/wesnoth/commit/27f6be9a370d994dbfaaa4b90598fef131bbc1c6
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/multiplayer/scenarios/4p_Isars_Cross.cfg
M data/multiplayer/scenarios/4p_Loris_River.cfg
M data/multiplayer/scenarios/4p_Paths_of_Daggers.cfg
Log Message:
-----------
use & to denote team setup in MP
code it as & to avoid a pango warning in stderr
3ec26df changed it previously to '+' to work around that warning
also change it for the untranslatable strings in the credits
[ci skip]
(cherry-picked from commit cd5b3f785e137f66f9d282c8348a6ad877e48d2f)
Commit: bfbd5e342c268d09c93489ba37ae677d296cad2e
https://github.com/wesnoth/wesnoth/commit/bfbd5e342c268d09c93489ba37ae677d296cad2e
Author: Martin Hrubý <hrubymar10 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/team-colors.cfg
Log Message:
-----------
Fix for #3444 (#3449)
(cherry-picked from commit 7dcc0d46967d63e52e0ada0d1613498cb15d57cd)
Commit: 7e9b98b2756e7348747702195f02fc9b8e4ce155
https://github.com/wesnoth/wesnoth/commit/7e9b98b2756e7348747702195f02fc9b8e4ce155
Author: Martin Hrubý <hrubymar10 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
M src/CMakeLists.txt
M src/SConscript
A src/desktop/apple_version.hpp
A src/desktop/apple_version.mm
M src/desktop/version.cpp
Log Message:
-----------
Rewrite macOS version detection (#3448)
This new implementation works more reliably, avoids spawning subshells, and is faster.
(cherry-picked from commit 4282ee3fdc50223e62af2ad60b386b21b6fd690f)
Commit: 377c9dd15e7f4eb1c8e0b2cc65cef7d7d0c8f375
https://github.com/wesnoth/wesnoth/commit/377c9dd15e7f4eb1c8e0b2cc65cef7d7d0c8f375
Author: Martin Hrubý (hrubymar10) <hrubymar10 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Update changelog
(cherry-picked from commit 29c5d25e27253a19e236e6b8a0ba324e014a6cd8)
Commit: 01d599886629af15ddc15a696f61fdf3ceb64323
https://github.com/wesnoth/wesnoth/commit/01d599886629af15ddc15a696f61fdf3ceb64323
Author: Martin Hrubý (hrubymar10) <hrubymar10 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/macosx/SDLMain.mm
Log Message:
-----------
We no longer support OS X Lion - remove legacy code
(cherry-picked from commit b6507cbbf2d01ae84130e5db2a08796f98f1235c)
Commit: 87999f68b45543ab0ca8cbb07a465b9c6c9960fe
https://github.com/wesnoth/wesnoth/commit/87999f68b45543ab0ca8cbb07a465b9c6c9960fe
Author: Elvish_Hunter <elvish.hunter2010 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/tools/wmllint
Log Message:
-----------
wmllint: do not warn about unknown IDs in [aspect]
(cherry-picked from commit 9b5c0dda5c819e5ac6a40a78241a36e022a84f75)
Commit: 2b0bbd82801cda5814d7bd8214999c5d5435cdcb
https://github.com/wesnoth/wesnoth/commit/2b0bbd82801cda5814d7bd8214999c5d5435cdcb
Author: Elvish_Hunter <elvish.hunter2010 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/tools/wmllint
Log Message:
-----------
wmllint: do not warn about unknown IDs in [remove_event]
(cherry-picked from commit 2dda3280c1b3098aba146e2775e58577930d3e60)
Commit: 46f9d93c4cfa945a0ea351c19a0d4127610543d2
https://github.com/wesnoth/wesnoth/commit/46f9d93c4cfa945a0ea351c19a0d4127610543d2
Author: Elvish_Hunter <elvish.hunter2010 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/tools/wmllint
Log Message:
-----------
wmllint: do not warn about unknown IDs in [tunnel], except inside of [filter]
(cherry-picked from commit 2d045f2a6a47c58b5bb1d77d3c836119e5978708)
Commit: 236ca2583246b3174a837ad679fc88c176e40bb2
https://github.com/wesnoth/wesnoth/commit/236ca2583246b3174a837ad679fc88c176e40bb2
Author: Elvish_Hunter <elvish.hunter2010 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/tools/wmllint
Log Message:
-----------
wmllint: don't even try to convert _info.cfg
(cherry-picked from commit 6e696661fdc8710a4310d3a2fd7228e3f135e5ed)
Commit: 338d1905632cee63b72ddc494e2d8ac1c0440d34
https://github.com/wesnoth/wesnoth/commit/338d1905632cee63b72ddc494e2d8ac1c0440d34
Author: Elvish_Hunter <elvish.hunter2010 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/tools/wmllint
Log Message:
-----------
wmllint: added [lua] to the allowed children of [if]
(cherry-picked from commit b1ec52cab84a5a18bd1518449fec374f4be3492b)
Commit: 4c1f00e38602f54eeb11cc536ffce162eddb0bec
https://github.com/wesnoth/wesnoth/commit/4c1f00e38602f54eeb11cc536ffce162eddb0bec
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/playsingle_controller.cpp
Log Message:
-----------
fix game crashing on 'reset replay'
fixes #3439
(cherry-picked from commit 7bf37a1e64388304d583cdaa1fbba97fd61f9658)
Commit: 96eb02aecc88aa22b3e132960a55b4d4d7c8d316
https://github.com/wesnoth/wesnoth/commit/96eb02aecc88aa22b3e132960a55b4d4d7c8d316
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/server/game.cpp
Log Message:
-----------
fix oos when undoing after ally chat
previously the server would send [speak] commands that had no undo=no attributes so that the game would remove the speak command from the replay instead of the actual undoable action when undoing an action.
(cherry-picked from commit 02bed5c0335893542f5f3732ea013ab1ca705c55)
Commit: 920b34a2086519f2af0adbadf6027421361aa621
https://github.com/wesnoth/wesnoth/commit/920b34a2086519f2af0adbadf6027421361aa621
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/replay.cpp
Log Message:
-----------
fix oos when undoing after ally chat 2
for extra safety we add code to ensure undo=no for [speak] commands to the client aswell, this is not really needed as i just added a code that sets undo=yes to the server code, but it's an advantage to be able to safely connect to older servers aswell.
(cherry-picked from commit c685031d1c41d89897bbd380b50ef3e02984bcde)
Commit: 932edd30c5f2fd7c7f15a15aa2bf1bfa8baee2a8
https://github.com/wesnoth/wesnoth/commit/932edd30c5f2fd7c7f15a15aa2bf1bfa8baee2a8
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/server/simple_wml.cpp
Log Message:
-----------
fix segfault in wesnothd
broken in commit 'preserve traslatable strings in simple_wml.'
(cherry-picked from commit 7e0d63d7c32b4c280baa63cb60dc32c565ea0eae)
Commit: f517f3af74fa7799295d430541a94401cb5771d8
https://github.com/wesnoth/wesnoth/commit/f517f3af74fa7799295d430541a94401cb5771d8
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/server/server.cpp
Log Message:
-----------
fix missing map previews in the lobby
regression from 'fix require_scenario & require_era'
(cherry-picked from commit 9a3917dc3518455b0b8fa03f95ea71217a23550c)
Commit: 8f4c8540c32b5614b363848417aaede94dcc3191
https://github.com/wesnoth/wesnoth/commit/8f4c8540c32b5614b363848417aaede94dcc3191
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/server/server.cpp
Log Message:
-----------
improve wesnoth version warning 3
suggested by soliton
(cherry-picked from commit bd16aeec02ceeeca42b281cfe2bf46a5f3791bca)
Commit: 3e7c530c05edb402baa1de82debfd0438c4c81df
https://github.com/wesnoth/wesnoth/commit/3e7c530c05edb402baa1de82debfd0438c4c81df
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/multiplayer/mp_join_game.cpp
M src/gui/dialogs/multiplayer/mp_join_game.hpp
Log Message:
-----------
fix 'start game' locked when other players abort flg dialog #3452
(cherry-picked from commit f03e3e8d6df84163f403d5860be7638084bd1481)
Commit: 6b4e74e8259305b3cb9efb4b5a5be239fd0b73dd
https://github.com/wesnoth/wesnoth/commit/6b4e74e8259305b3cb9efb4b5a5be239fd0b73dd
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/actions/undo.cpp
M src/actions/undo.hpp
Log Message:
-----------
boost::ptr_vector -> std::vector<unique_ptr>
boost::ptr_vector has some nice features, but vector<unique_ptr> is still
easier to use for most people basicially becasue people know it better.
Also boost::ptr_vector does not support move ctors and also does not
use std::unique_ptr, probably because it tries to stay compatible with
c++03 so one has to use 'ptr_vector::auto_type' with it instead which
has a different interface than std::unique_ptr
(cherry-picked from commit 7e2dc296ba2fd3900a46ab3a0bbb120e856e0ada)
Commit: 1dff5db6047eb7ca64662717d4eb01c20eed5057
https://github.com/wesnoth/wesnoth/commit/1dff5db6047eb7ca64662717d4eb01c20eed5057
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/actions/undo.cpp
M src/actions/undo.hpp
Log Message:
-----------
fix game freezes on droiding when using dsu #3453
(cherry-picked from commit 1646a7b90672435551436c1fe272f5546f151ffb)
Commit: 8fbe9cb7437942e67e82ae3e67311e7343108130
https://github.com/wesnoth/wesnoth/commit/8fbe9cb7437942e67e82ae3e67311e7343108130
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/terrain/translation.cpp
Log Message:
-----------
remove outdated code
substr cannot throw bad_lexical_cast
(cherry-picked from commit e90f0fce13e74b53dbac92d7a588909948f6a93f)
Commit: 35e34c7331d00d62390f8e561c12f338bee349a5
https://github.com/wesnoth/wesnoth/commit/35e34c7331d00d62390f8e561c12f338bee349a5
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/map/map.cpp
Log Message:
-----------
add debug info
(cherry-picked from commit 9bb601e2da02b3b627b6673897c67c9c6f67a950)
Commit: a1ee3fb26e791d8ae383f3941f323b94e1b2b883
https://github.com/wesnoth/wesnoth/commit/a1ee3fb26e791d8ae383f3941f323b94e1b2b883
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/game_state.cpp
M src/generators/default_map_generator_job.cpp
M src/map/map.cpp
M src/terrain/terrain.cpp
M src/terrain/translation.cpp
M src/terrain/translation.hpp
M src/units/animation.cpp
Log Message:
-----------
deploy string_view
(cherry-picked from commit 8d6524c6e21a4c5bfc99963fe0b95b9f8956f8ce)
Commit: 6a10e12a6a359e8a5a9ef2a3dfd0d6d66ba65806
https://github.com/wesnoth/wesnoth/commit/6a10e12a6a359e8a5a9ef2a3dfd0d6d66ba65806
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/game_board.cpp
M src/game_board.hpp
M src/map/map.cpp
M src/map/map.hpp
M src/scripting/game_lua_kernel.cpp
M src/scripting/game_lua_kernel.hpp
Log Message:
-----------
add wesnoth.terrain_mask lua function
`[terrain_mask]` had multiple unexpected behviours, see for example #3364
in parituclar `wesnoth.wml_actions.terrain_mask { x =2, y=2, mask="Ww"}`
will change the tile at (1,2) instead of (2,2), so instead of reusing
the old terrain mask code i wrote a new function that behaves as one
would expect. `wesnoth.terrain_mask` does not have a `border=` parameter
but a `is_odd` parameter that specifies that a map is in the odd format
__ __
/00\__/20\__
\__/10\__/30\
/01\__/21\__/
\__/11\__/31\
/02\__/22\__/
\__/ \__/
instead of the even map format
__ __
__/10\__/30\
/00\__/20\__/
\__/11\__/31\
/01\__/21\__/
\__/12\__/32\
\__/ \__/
(Monospaced font required to see ascii images.)
The lua function also has a lua interfacte, meaning it does not take wml
tables but normal lua tables making it easier to use from lua code.
(cherry-picked from commit a3367ee8489608a6fff42a69fb026933571848b7)
Commit: e4c170f2490ffee3fd5bb6bd9ab3f82748e5f164
https://github.com/wesnoth/wesnoth/commit/e4c170f2490ffee3fd5bb6bd9ab3f82748e5f164
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/scripting/game_lua_kernel.cpp
M src/team.cpp
M src/team.hpp
Log Message:
-----------
fix villages after terrain_mask
(cherry-picked from commit 6cd9de1202d1f4f90d56ba9b7950aecfc1e5f3f4)
Commit: 42af4c337840e89fd35e7144da9591a549c091e5
https://github.com/wesnoth/wesnoth/commit/42af4c337840e89fd35e7144da9591a549c091e5
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/lua/wml-tags.lua
M src/editor/action/action.cpp
M src/game_board.cpp
M src/game_board.hpp
M src/game_events/action_wml.cpp
M src/map/map.cpp
M src/map/map.hpp
Log Message:
-----------
move [terrain_mask] to lua
and implement it using wesnoth.terrain_mask.
This also fixes an issue where [terrain_mask] would not remove
removed villages from the teams villages list after [terrain_mask].
This also adds an alignment parameter to [terrain_mask].
(cherry-picked from commit 09c56ef2fe40eaec53311918288431256aac63ff)
Commit: 3c86e3bc8fedf64de72752374c6ec794c7d770a1
https://github.com/wesnoth/wesnoth/commit/3c86e3bc8fedf64de72752374c6ec794c7d770a1
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/lua/wml-tags.lua
Log Message:
-----------
fixup [terrain_mask]
(cherry-picked from commit 7d44782e5c027c3aee6b0b0bf89cac3f874cd672)
Commit: 10638b42ff7496b976f70a4e696eafc6c0af9ecb
https://github.com/wesnoth/wesnoth/commit/10638b42ff7496b976f70a4e696eafc6c0af9ecb
Author: Pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/scripting/lua_audio.cpp
M src/sound_music_track.hpp
Log Message:
-----------
Fixes track titles not being set from WML.
The current implementation of the [music] tag sets the title after adding the track, however the title field was read only. This makes the field writable.
(cherry-picked from commit 0f5899b16301a22efaeab3bdc8f97c808596429f)
Commit: 341ad0821d1de1d457d872fe86808ec787bde3a4
https://github.com/wesnoth/wesnoth/commit/341ad0821d1de1d457d872fe86808ec787bde3a4
Author: newfrenchy83 <31768074+newfrenchy83 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/CodeBlocks/wesnoth.cbp
Log Message:
-----------
Update wesnoth.cbp
(cherry-picked from commit ae1149948650c9bb663b00407766a563aee13beb)
Commit: d9bac74c55b023e8f4a850c36599b1a338a54b65
https://github.com/wesnoth/wesnoth/commit/d9bac74c55b023e8f4a850c36599b1a338a54b65
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-multiplayer/en_GB.po
Log Message:
-----------
updated British English translation
(cherry-picked from commit 2f313455b86a709f104cebdbeab610fc1eb8363c)
Commit: 7aa185e53075181cf4271f102a443af0f760aaa7
https://github.com/wesnoth/wesnoth/commit/7aa185e53075181cf4271f102a443af0f760aaa7
Author: sigurdfdragon <jjwcoat at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/units.cfg
Log Message:
-----------
Help: Add Saurian race description (fix #3372)
[ci skip]
(cherry-picked from commit ed50b6bec4d47e76e048c0eb05ad24a1818cc60b)
Commit: 7027930cf1766e4c3d0c9e0138dbbc55adc4bfbe
https://github.com/wesnoth/wesnoth/commit/7027930cf1766e4c3d0c9e0138dbbc55adc4bfbe
Author: sigurdfdragon <jjwcoat at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M data/core/units/saurians/Ambusher.cfg
M data/core/units/saurians/Flanker.cfg
M data/core/units/saurians/Skirmisher.cfg
Log Message:
-----------
Units: Have Saurian warriors be female to fit lore in mainline
Fixes #3392 & goes along with #3372.
(cherry-picked from commit ce6826d80ecd174fe4609f9df571ffac02a6c8d7)
Commit: 35df7f6ba0a3f624d71672a956497093ed5b295e
https://github.com/wesnoth/wesnoth/commit/35df7f6ba0a3f624d71672a956497093ed5b295e
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/ai/micro_ais/cas/ca_fast_attack_utils.lua
Log Message:
-----------
Fast Micro AI: fix for chance-to-hit specials without id
All mainline chance-to-hit weapon specials have ids, but it is not required for UMC specials.
(cherry-picked from commit d4213371b1cc1ae1b7575e082b7edc69f6236db0)
Commit: af608e686ab937d56897a2b02166c10d1a9ea1f1
https://github.com/wesnoth/wesnoth/commit/af608e686ab937d56897a2b02166c10d1a9ea1f1
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Update changelog
(cherry-picked from commit c59a084f11f418e113cced9833439aca59d5dc39)
Commit: 6eaba3241364b0247fb0c6eb39d65b492adf7911
https://github.com/wesnoth/wesnoth/commit/6eaba3241364b0247fb0c6eb39d65b492adf7911
Author: sigurdfdragon <jjwcoat at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/units.cfg
Log Message:
-----------
Fixup ed50b6b
[ci skip]
(cherry-picked from commit 638fd4bda09fb355335f9d3d40c21d8c42a338ba)
Commit: 96bbebb514681c294c4e0084b5af2e720411355d
https://github.com/wesnoth/wesnoth/commit/96bbebb514681c294c4e0084b5af2e720411355d
Author: Martin Hrubý <hrubymar10 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/CodeBlocks-SCons/wesnoth.cbp
M projectfiles/CodeBlocks-SCons/wesnothd.cbp
M projectfiles/CodeBlocks/wesnoth.cbp
M projectfiles/CodeBlocks/wesnothd.cbp
M projectfiles/VC14/wesnoth.vcxproj
M projectfiles/VC14/wesnoth.vcxproj.filters
M projectfiles/VC14/wesnothlib.vcxproj
M projectfiles/VC14/wesnothlib.vcxproj.filters
M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
M source_lists/boost_unit_tests
M source_lists/libwesnoth
M source_lists/libwesnoth_core
M source_lists/wesnoth
M src/addon/info.cpp
M src/addon/info.hpp
M src/addon/manager.cpp
M src/ai/testing.cpp
M src/build_info.cpp
M src/campaign_server/campaign_server.cpp
M src/config.cpp
M src/config_cache.cpp
M src/cursor.cpp
M src/deprecation.cpp
M src/desktop/apple_version.hpp
M src/desktop/apple_version.mm
M src/display.hpp
M src/editor/controller/editor_controller.cpp
M src/editor/palette/tristate_button.cpp
M src/filesystem.cpp
M src/game_classification.cpp
M src/game_config.cpp
M src/game_config_manager.cpp
M src/game_initialization/configure_engine.cpp
M src/game_initialization/lobby_data.cpp
M src/game_initialization/mp_game_utils.cpp
M src/game_initialization/multiplayer.cpp
M src/game_launcher.hpp
A src/game_version.cpp
A src/game_version.hpp
M src/gui/auxiliary/old_markup.cpp
M src/gui/core/canvas.cpp
M src/gui/dialogs/addon/manager.cpp
M src/gui/dialogs/advanced_graphics_options.cpp
M src/gui/dialogs/game_load.cpp
R src/gui/dialogs/game_version.cpp
R src/gui/dialogs/game_version.hpp
A src/gui/dialogs/game_version_dialog.cpp
A src/gui/dialogs/game_version_dialog.hpp
M src/gui/dialogs/multiplayer/mp_create_game.cpp
M src/gui/dialogs/preferences_dialog.cpp
M src/gui/dialogs/screenshot_notification.cpp
M src/gui/dialogs/terrain_layers.cpp
M src/gui/dialogs/title_screen.cpp
M src/gui/widgets/image.cpp
M src/help/help_impl.cpp
M src/help/help_text_area.cpp
R src/image.cpp
R src/image.hpp
M src/image_modifications.cpp
A src/map_settings.cpp
A src/map_settings.hpp
M src/minimap.cpp
M src/mp_game_settings.hpp
A src/picture.cpp
A src/picture.hpp
M src/preferences/game.cpp
M src/savegame.cpp
M src/scripting/lua_kernel_base.cpp
M src/sdl/utils.hpp
M src/serialization/preprocessor.cpp
M src/serialization/preprocessor.hpp
M src/server/server.cpp
M src/server/server_base.cpp
R src/settings.cpp
R src/settings.hpp
M src/show_dialog.cpp
M src/storyscreen/parser.cpp
M src/terrain/builder.cpp
M src/tests/gui/test_gui2.cpp
M src/tests/test_config_cache.cpp
M src/tests/test_image_modifications.cpp
M src/tests/test_recall_list.cpp
M src/tests/test_unit_map.cpp
M src/tests/test_version.cpp
R src/tests/utils/game_config_manager.cpp
R src/tests/utils/game_config_manager.hpp
A src/tests/utils/game_config_manager_tests.cpp
A src/tests/utils/game_config_manager_tests.hpp
M src/units/frame.hpp
M src/units/unit.cpp
R src/version.cpp
R src/version.hpp
M src/video.cpp
M src/wesnoth.cpp
M src/widgets/button.cpp
M src/widgets/menu.cpp
M src/widgets/menu_style.cpp
M src/widgets/scrollbar.cpp
Log Message:
-----------
Fix building with Xcode 10 (#3460)
Resolves #3458.
(cherry-picked from commit 50301f84e33d828c39835bc47f04dd1107631960)
Commit: f434c0c427b96058a80d0a72f87a2100a4a32f15
https://github.com/wesnoth/wesnoth/commit/f434c0c427b96058a80d0a72f87a2100a4a32f15
Author: Konrad2 <39015360+Konrad22 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Sceptre_of_Fire/scenarios/8_The_Dragon.cfg
Log Message:
-----------
Made Thursagens words fit the timeframe
(cherry-picked from commit cf999f7365f3ba14bf724d34c32cc154d3918b26)
Commit: 0c0192c58deb26b3fa3d5366a6e1789ced4f3c37
https://github.com/wesnoth/wesnoth/commit/0c0192c58deb26b3fa3d5366a6e1789ced4f3c37
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M data/core/images/units/monsters/fire-dragon.png
M src/gui/dialogs/game_load.cpp
Log Message:
-----------
gui2/game_load: Constrain leader sprites to 72x72 using image path functions
Fixes #3474.
(cherry-picked from commit 36cf8c8d70198c6090119398f2b52cd542feceb7)
Commit: 635e17e03ae3b6f0d1ff74e4ecb72633944a92ed
https://github.com/wesnoth/wesnoth/commit/635e17e03ae3b6f0d1ff74e4ecb72633944a92ed
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/images/units/monsters/fire-dragon.png
Log Message:
-----------
Revert unwanted binary file change in previous commit
[ci skip]
(cherry-picked from commit d3650a78142e2f3cb9e29153c376c211b8776f61)
Commit: 6ac3ffd9134d21376bf89daeecaf41f537c089e5
https://github.com/wesnoth/wesnoth/commit/6ac3ffd9134d21376bf89daeecaf41f537c089e5
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/menu_events.cpp
Log Message:
-----------
Fix crash after hitting enter when no units match the recall list filter
Fixes #3475
(cherry-picked from commit a3047f37d3c2d225dfa403eda5220858be221cc2)
Commit: 027d50f06b8f1cc9ef0ea058ada717aa3ba3c614
https://github.com/wesnoth/wesnoth/commit/027d50f06b8f1cc9ef0ea058ada717aa3ba3c614
Author: joeylmaalouf <joeylmaalouf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Northern_Rebirth/maps/14a_Epilogue.map
Log Message:
-----------
NR S14: Update epilogue map to match previous scenario (fixes #3385)
(cherry-picked from commit 3d47ed8ab4570cbf0135ff8cf45f41107b5b8241)
Commit: 9fb1ee2308ef2a2ee96f9da5b45aaa7577baf946
https://github.com/wesnoth/wesnoth/commit/9fb1ee2308ef2a2ee96f9da5b45aaa7577baf946
Author: joeylmaalouf <joeylmaalouf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/units/dunefolk/Burner.cfg
M data/core/units/dunefolk/Firetrooper.cfg
M data/core/units/dunefolk/Scorcher.cfg
Log Message:
-----------
Make Dune Burner line naphtha icons consistent and remove outdated comment
(cherry-picked from commit df8a6f555723bc2f621e3325e7541e4266ca49d3)
Commit: e4da9d9af48661ee61a4b4c412e1c92faf9ee305
https://github.com/wesnoth/wesnoth/commit/e4da9d9af48661ee61a4b4c412e1c92faf9ee305
Author: Martin Hrubý (hrubymar10) <hrubymar10 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/Xcode/Fix_Xcode_Dependencies
M projectfiles/Xcode/README.md
Log Message:
-----------
Use MacCompileStuff for every macOS package
(cherry-picked from commit 6f8c5041210eba5daa59ca0e52dda5822c3ca005)
Commit: fe545d46240cb3e8cd885df7f28604b7fd7897e7
https://github.com/wesnoth/wesnoth/commit/fe545d46240cb3e8cd885df7f28604b7fd7897e7
Author: sigurdfdragon <jjwcoat at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Secrets_of_the_Ancients/scenarios/14_Entering_the_Northlands.cfg
Log Message:
-----------
SotA S14: Add hint about needing plenty of gold for the next scenario
(cherry-picked from commit 7aced8754818adf6e3151caa3663ca96dc346175)
Commit: 1efaa64a1bebbadc1f313bc8109a6b71962e88bf
https://github.com/wesnoth/wesnoth/commit/1efaa64a1bebbadc1f313bc8109a6b71962e88bf
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M packaging/wesnoth.desktop
Log Message:
-----------
Linux Packaging: Don't store log info which nobody will read
So it may not be saved in ~/.xession-errors
or cluttering up disk space another way
(cherry-picked from commit c998f13a4526d89840b3bf7e36e6a4ffd57d7c80)
Commit: bb680ba5f408d01ec57be1a5c506554393b3a566
https://github.com/wesnoth/wesnoth/commit/bb680ba5f408d01ec57be1a5c506554393b3a566
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/font/text.cpp
Log Message:
-----------
clarify that pango markup is the cause
changed as proposed by soliton
(cherry-picked from commit 6998885cc1d2f063c02f803b1f4f7644804e9626)
Commit: bd88e4d153a7117b618e7766c66f543e59ec7861
https://github.com/wesnoth/wesnoth/commit/bd88e4d153a7117b618e7766c66f543e59ec7861
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/font/text.cpp
Log Message:
-----------
Capitalize Pango
[ci skip]
(cherry-picked from commit 12369a2fa490b87bdf44a0cee34065a03a22e8e8)
Commit: 79fd02cd0f070180ce952706e17af64189d8ff4c
https://github.com/wesnoth/wesnoth/commit/79fd02cd0f070180ce952706e17af64189d8ff4c
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M utils/pofix.py
Log Message:
-----------
pofix: Genericize the Lua version number for the 1.14 announcement
Otherwise people will keep complaining that it doesn't reflect the
latest 1.14 version since the original number was valid for 1.14.0 and
1.14.4.
[ci skip]
(cherry-picked from commit c589e39098614b2180b4043db6b9faa71afe6c84)
Commit: 90956117ab7a7715fc869995ecaecf94212ad00f
https://github.com/wesnoth/wesnoth/commit/90956117ab7a7715fc869995ecaecf94212ad00f
Author: Nobun <darknobunaga at yahoo.it>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M utils/pywmlx/state/lua_states.py
Log Message:
-----------
wmlxgettext: fix #3469: lua plural strings not recognized in some context (#3481)
* bugfix: https://github.com/wesnoth/wesnoth/issues/3469
* wmlxgettext: removed a debug comment forgotten on the previous bugfix
(cherry-picked from commit 4b79c263d357fb23e4531ad8fbd37b2bfbc85c55)
Commit: 6f66e0d52f863848c66e3419d5cacc87049051da
https://github.com/wesnoth/wesnoth/commit/6f66e0d52f863848c66e3419d5cacc87049051da
Author: Wedge009 <wedge009 at wedge009.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Northern_Rebirth/scenarios/14a_Epilogue.cfg
Log Message:
-----------
Slightly rewrite dialogue (fixes #3386)
Some non-native English readers may find use of the word 'disposed' confusing.
(cherry-picked from commit 087a18a156096c8a7b9fb56359aca579a222011d)
Commit: a0eaf4e7a425c804f8977ff3b5451c47ed1b65c8
https://github.com/wesnoth/wesnoth/commit/a0eaf4e7a425c804f8977ff3b5451c47ed1b65c8
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/editor/palette/location_palette.cpp
Log Message:
-----------
fix editor cannot add starting location for > 9 players.
previously attempting to place a starting location for side 10 or higher would result in a "invalid location id" error.
(cherry-picked from commit cbf078a030305ac523ecd7472d3c7f32d566d20b)
Commit: 9cc105f01828172d660abeb026e58275c78c44b5
https://github.com/wesnoth/wesnoth/commit/9cc105f01828172d660abeb026e58275c78c44b5
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/game_config_manager.cpp
Log Message:
-----------
show add-on loading times on --log-debug=config
(cherry-picked from commit 6781fe17ca40e1f8af5f117c7e3645b3ab6f599c)
Commit: 3c8143539ea51a432aba08c11ece971bee1b2b89
https://github.com/wesnoth/wesnoth/commit/3c8143539ea51a432aba08c11ece971bee1b2b89
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/actions/undo.cpp
Log Message:
-----------
fixup 'fix game freezes on droiding when using dsu #3453'
fixes https://github.com/wesnoth/wesnoth/issues/3486
(cherry-picked from commit 08bb6a4e9600bfe1aa533d684cc5fa1f8a9ed0f4)
Commit: b6cce36c3492317c4166e168704ba73bde3afc0c
https://github.com/wesnoth/wesnoth/commit/b6cce36c3492317c4166e168704ba73bde3afc0c
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/server/simple_wml.cpp
M src/server/simple_wml.hpp
Log Message:
-----------
Revert "preserve traslatable strings in simple_wml."
This reverts commit 4f3ce6865cdd628634fc3ffe2154093d6ccbfba4.
This reverts commit 20128ac9914c971d759399dff6f7ed8edcb960c8.
see issue #3454, there were problems caused by simple_wml when
joining/observing games and this commit is the obvious suspect
so i'm reverting it until we can fix that one.
(cherry-picked from commit 6b58ce7c04d7f369f8fc5dd5cba0b58def2c2697)
Commit: 83ee54641f210eace5864bc1a8dfd1c6db457eac
https://github.com/wesnoth/wesnoth/commit/83ee54641f210eace5864bc1a8dfd1c6db457eac
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/encyclopedia/geography.cfg
Log Message:
-----------
Help: Fix typos.
(cherry-picked from commit 86eba2b600486055efcd1fb3c061edbd5b123ea8)
Commit: 5fad21a96599dc87853b1fd55385df8d716368c3
https://github.com/wesnoth/wesnoth/commit/5fad21a96599dc87853b1fd55385df8d716368c3
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_South_Guard/scenarios/04_Vale_of_Tears.cfg
Log Message:
-----------
TSG S4: Fix typo.
(cherry-picked from commit 59299ade4bbc2816dfa918c6c3a1f2783acd3688)
Commit: ee8b70abe583b8280c03b9f7d158033922d97ef5
https://github.com/wesnoth/wesnoth/commit/ee8b70abe583b8280c03b9f7d158033922d97ef5
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/units/wose/Ancient.cfg
Log Message:
-----------
Help: Re-fix Ancient Wose description.
Thanks @CelticMinstrel
(cherry-picked from commit 9e296b4c5b9147664c7b330de714a2dd09c0d47e)
Commit: e720ef657ae6c4d4242b3aade0f72e4163ae537b
https://github.com/wesnoth/wesnoth/commit/e720ef657ae6c4d4242b3aade0f72e4163ae537b
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Heir_To_The_Throne/scenarios/20b_Underground_Channels.cfg
Log Message:
-----------
HttT S20b: Fix typos
(cherry-picked from commit eb763789aec44b18eb55ed99cf212d6121adfea4)
Commit: 0b49f33874caca2a50eb23e1c4e3f2faeb64a12e
https://github.com/wesnoth/wesnoth/commit/0b49f33874caca2a50eb23e1c4e3f2faeb64a12e
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Heir_To_The_Throne/units/Battle_Princess.cfg
Log Message:
-----------
HttT units: Fix typo
Thanks 613TheEvil https://forums.wesnoth.org/viewtopic.php?p=619347#p619347
(cherry-picked from commit d27b09a3dc772429d3e9c45b741be9b0af15bf2b)
Commit: 8a90f814ba051e7e6f647cdef069f3fcf5b1c27f
https://github.com/wesnoth/wesnoth/commit/8a90f814ba051e7e6f647cdef069f3fcf5b1c27f
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/multiplayer/scenarios/ANL_utils/ANL_worker_options.cfg
Log Message:
-----------
ANL worker: converting to flatland is not the same as creating a farm
Farms have a multi turn cycle:
1) crate farm (converts to Re)
2) end turn on the filed to harvest (Re has been automatically converted)
3) convert to grasland [othrwise the fields remains unusable for building]
Step 3 was labeled the same as step 1.
[ci skip]
(cherry-picked from commit 1867274d25993d465c74dda528381895e79de7ae)
Commit: c2d09e9763789f79d8b6641114e7ce9d104a1834
https://github.com/wesnoth/wesnoth/commit/c2d09e9763789f79d8b6641114e7ce9d104a1834
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/multiplayer/scenarios/ANL_utils/ANL_worker_options.cfg
Log Message:
-----------
fixup, use same capitalization
[ci skip]
(cherry-picked from commit c3227f53d75512e2a2ea6fdbe18f499e2de6577b)
Commit: fa66bfdf329ecba28138f55e570612c447b4f365
https://github.com/wesnoth/wesnoth/commit/fa66bfdf329ecba28138f55e570612c447b4f365
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/game_load.cpp
Log Message:
-----------
Game Load: Show the user-name difficulty name instead of the internal name.
The internal name (Easy/Medium/Hard/Nightmare) will only be shown if the campaign
is not installed, or doesn't declare the saved difficulty.
(cherry-picked from commit 937e971e50788faf5519c169d95efc97cf873193)
Commit: 2d8f8ea53a04dd07653636f4ebb1e7bfa91daba6
https://github.com/wesnoth/wesnoth/commit/2d8f8ea53a04dd07653636f4ebb1e7bfa91daba6
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Liberty/utils/bigmap.cfg
M po/wesnoth-tsg/af.po
M po/wesnoth-tsg/ang.po
M po/wesnoth-tsg/ang at latin.po
M po/wesnoth-tsg/ar.po
M po/wesnoth-tsg/ast.po
M po/wesnoth-tsg/bg.po
M po/wesnoth-tsg/ca.po
M po/wesnoth-tsg/ca_ES at valencia.po
M po/wesnoth-tsg/cs.po
M po/wesnoth-tsg/da.po
M po/wesnoth-tsg/de.po
M po/wesnoth-tsg/el.po
M po/wesnoth-tsg/en at shaw.po
M po/wesnoth-tsg/en_GB.po
M po/wesnoth-tsg/eo.po
M po/wesnoth-tsg/es.po
M po/wesnoth-tsg/et.po
M po/wesnoth-tsg/eu.po
M po/wesnoth-tsg/fi.po
M po/wesnoth-tsg/fr.po
M po/wesnoth-tsg/fur_IT.po
M po/wesnoth-tsg/ga.po
M po/wesnoth-tsg/gd.po
M po/wesnoth-tsg/gl.po
M po/wesnoth-tsg/he.po
M po/wesnoth-tsg/hr.po
M po/wesnoth-tsg/hu.po
M po/wesnoth-tsg/id.po
M po/wesnoth-tsg/is.po
M po/wesnoth-tsg/it.po
M po/wesnoth-tsg/ja.po
M po/wesnoth-tsg/ko.po
M po/wesnoth-tsg/la.po
M po/wesnoth-tsg/lt.po
M po/wesnoth-tsg/lv.po
M po/wesnoth-tsg/mk.po
M po/wesnoth-tsg/mr.po
M po/wesnoth-tsg/nb_NO.po
M po/wesnoth-tsg/nl.po
M po/wesnoth-tsg/pl.po
M po/wesnoth-tsg/pt.po
M po/wesnoth-tsg/pt_BR.po
M po/wesnoth-tsg/racv.po
M po/wesnoth-tsg/ro.po
M po/wesnoth-tsg/ru.po
M po/wesnoth-tsg/sk.po
M po/wesnoth-tsg/sl.po
M po/wesnoth-tsg/sr.po
M po/wesnoth-tsg/sr at ijekavian.po
M po/wesnoth-tsg/sr at ijekavianlatin.po
M po/wesnoth-tsg/sr at latin.po
M po/wesnoth-tsg/sv.po
M po/wesnoth-tsg/tl.po
M po/wesnoth-tsg/tr.po
M po/wesnoth-tsg/uk.po
M po/wesnoth-tsg/vi.po
M po/wesnoth-tsg/zh_CN.po
M po/wesnoth-tsg/zh_TW.po
M utils/pofix.py
Log Message:
-----------
Add pofix entries for the recent typo fixes (resolves #3377)
Manual merge of pull request #3490. I also ran pofix.
[ci skip]
(cherry-picked from commit 217eba5f97f5593375c17daeb2ddb82c7da5f7b3)
Commit: 9a3084fbd50103c0bbcf11ce5218feba9d2493f5
https://github.com/wesnoth/wesnoth/commit/9a3084fbd50103c0bbcf11ce5218feba9d2493f5
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-aoi/af.po
M po/wesnoth-aoi/ang.po
M po/wesnoth-aoi/ang at latin.po
M po/wesnoth-aoi/ar.po
M po/wesnoth-aoi/ast.po
M po/wesnoth-aoi/bg.po
M po/wesnoth-aoi/ca.po
M po/wesnoth-aoi/ca_ES at valencia.po
M po/wesnoth-aoi/cs.po
M po/wesnoth-aoi/da.po
M po/wesnoth-aoi/de.po
M po/wesnoth-aoi/el.po
M po/wesnoth-aoi/en at shaw.po
M po/wesnoth-aoi/en_GB.po
M po/wesnoth-aoi/eo.po
M po/wesnoth-aoi/es.po
M po/wesnoth-aoi/et.po
M po/wesnoth-aoi/eu.po
M po/wesnoth-aoi/fi.po
M po/wesnoth-aoi/fr.po
M po/wesnoth-aoi/fur_IT.po
M po/wesnoth-aoi/ga.po
M po/wesnoth-aoi/gd.po
M po/wesnoth-aoi/gl.po
M po/wesnoth-aoi/he.po
M po/wesnoth-aoi/hr.po
M po/wesnoth-aoi/hu.po
M po/wesnoth-aoi/id.po
M po/wesnoth-aoi/is.po
M po/wesnoth-aoi/it.po
M po/wesnoth-aoi/ja.po
M po/wesnoth-aoi/ko.po
M po/wesnoth-aoi/la.po
M po/wesnoth-aoi/lt.po
M po/wesnoth-aoi/lv.po
M po/wesnoth-aoi/mk.po
M po/wesnoth-aoi/mr.po
M po/wesnoth-aoi/nb_NO.po
M po/wesnoth-aoi/nl.po
M po/wesnoth-aoi/pl.po
M po/wesnoth-aoi/pt.po
M po/wesnoth-aoi/pt_BR.po
M po/wesnoth-aoi/racv.po
M po/wesnoth-aoi/ro.po
M po/wesnoth-aoi/ru.po
M po/wesnoth-aoi/sk.po
M po/wesnoth-aoi/sl.po
M po/wesnoth-aoi/sr.po
M po/wesnoth-aoi/sr at ijekavian.po
M po/wesnoth-aoi/sr at ijekavianlatin.po
M po/wesnoth-aoi/sr at latin.po
M po/wesnoth-aoi/sv.po
M po/wesnoth-aoi/tl.po
M po/wesnoth-aoi/tr.po
M po/wesnoth-aoi/uk.po
M po/wesnoth-aoi/vi.po
M po/wesnoth-aoi/zh_CN.po
M po/wesnoth-aoi/zh_TW.po
M po/wesnoth-httt/af.po
M po/wesnoth-httt/ang.po
M po/wesnoth-httt/ang at latin.po
M po/wesnoth-httt/ar.po
M po/wesnoth-httt/ast.po
M po/wesnoth-httt/bg.po
M po/wesnoth-httt/ca.po
M po/wesnoth-httt/ca_ES at valencia.po
M po/wesnoth-httt/cs.po
M po/wesnoth-httt/da.po
M po/wesnoth-httt/de.po
M po/wesnoth-httt/el.po
M po/wesnoth-httt/en at shaw.po
M po/wesnoth-httt/en_GB.po
M po/wesnoth-httt/eo.po
M po/wesnoth-httt/es.po
M po/wesnoth-httt/et.po
M po/wesnoth-httt/eu.po
M po/wesnoth-httt/fi.po
M po/wesnoth-httt/fr.po
M po/wesnoth-httt/fur_IT.po
M po/wesnoth-httt/ga.po
M po/wesnoth-httt/gd.po
M po/wesnoth-httt/gl.po
M po/wesnoth-httt/he.po
M po/wesnoth-httt/hr.po
M po/wesnoth-httt/hu.po
M po/wesnoth-httt/id.po
M po/wesnoth-httt/is.po
M po/wesnoth-httt/it.po
M po/wesnoth-httt/ja.po
M po/wesnoth-httt/ko.po
M po/wesnoth-httt/la.po
M po/wesnoth-httt/lt.po
M po/wesnoth-httt/lv.po
M po/wesnoth-httt/mk.po
M po/wesnoth-httt/mr.po
M po/wesnoth-httt/nb_NO.po
M po/wesnoth-httt/nl.po
M po/wesnoth-httt/pl.po
M po/wesnoth-httt/pt.po
M po/wesnoth-httt/pt_BR.po
M po/wesnoth-httt/racv.po
M po/wesnoth-httt/ro.po
M po/wesnoth-httt/ru.po
M po/wesnoth-httt/sk.po
M po/wesnoth-httt/sl.po
M po/wesnoth-httt/sr.po
M po/wesnoth-httt/sr at ijekavian.po
M po/wesnoth-httt/sr at ijekavianlatin.po
M po/wesnoth-httt/sr at latin.po
M po/wesnoth-httt/sv.po
M po/wesnoth-httt/tl.po
M po/wesnoth-httt/tr.po
M po/wesnoth-httt/uk.po
M po/wesnoth-httt/vi.po
M po/wesnoth-httt/zh_CN.po
M po/wesnoth-httt/zh_TW.po
M po/wesnoth-l/af.po
M po/wesnoth-l/ang.po
M po/wesnoth-l/ang at latin.po
M po/wesnoth-l/ar.po
M po/wesnoth-l/ast.po
M po/wesnoth-l/bg.po
M po/wesnoth-l/ca.po
M po/wesnoth-l/ca_ES at valencia.po
M po/wesnoth-l/cs.po
M po/wesnoth-l/da.po
M po/wesnoth-l/de.po
M po/wesnoth-l/el.po
M po/wesnoth-l/en at shaw.po
M po/wesnoth-l/en_GB.po
M po/wesnoth-l/eo.po
M po/wesnoth-l/es.po
M po/wesnoth-l/et.po
M po/wesnoth-l/eu.po
M po/wesnoth-l/fi.po
M po/wesnoth-l/fr.po
M po/wesnoth-l/fur_IT.po
M po/wesnoth-l/ga.po
M po/wesnoth-l/gd.po
M po/wesnoth-l/gl.po
M po/wesnoth-l/he.po
M po/wesnoth-l/hr.po
M po/wesnoth-l/hu.po
M po/wesnoth-l/id.po
M po/wesnoth-l/is.po
M po/wesnoth-l/it.po
M po/wesnoth-l/ja.po
M po/wesnoth-l/ko.po
M po/wesnoth-l/la.po
M po/wesnoth-l/lt.po
M po/wesnoth-l/lv.po
M po/wesnoth-l/mk.po
M po/wesnoth-l/mr.po
M po/wesnoth-l/nb_NO.po
M po/wesnoth-l/nl.po
M po/wesnoth-l/pl.po
M po/wesnoth-l/pt.po
M po/wesnoth-l/pt_BR.po
M po/wesnoth-l/racv.po
M po/wesnoth-l/ro.po
M po/wesnoth-l/ru.po
M po/wesnoth-l/sk.po
M po/wesnoth-l/sl.po
M po/wesnoth-l/sr.po
M po/wesnoth-l/sr at ijekavian.po
M po/wesnoth-l/sr at ijekavianlatin.po
M po/wesnoth-l/sr at latin.po
M po/wesnoth-l/sv.po
M po/wesnoth-l/tl.po
M po/wesnoth-l/tr.po
M po/wesnoth-l/uk.po
M po/wesnoth-l/vi.po
M po/wesnoth-l/zh_CN.po
M po/wesnoth-l/zh_TW.po
M utils/pofix.py
Log Message:
-----------
Pofix fixes
The tool that generates .po files splits lines in order to limit line
length, and pofix can't track split strings. Thus, pofix search rules need
to be shorter so that pofix finds the affected strings.
I also moved the replacements to the right text domains, placed wesnoth-l
to the right spot, and removed the "Asheviere is the Queen of Wesnoth"
replacement because it isn't pofixable. (The second part of the string
becomes just "Queen of Wesnoth." and "queen of Wesnoth." with lowercase Q
is used legitimately elsewhere.)
[ci skip]
(cherry-picked from commit 3df91c9fc126ac3fd70ab9c0ea9e97eb3d008b33)
Commit: 7cfd22097625be550ddaa3333125df04be8e249d
https://github.com/wesnoth/wesnoth/commit/7cfd22097625be550ddaa3333125df04be8e249d
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-aoi/af.po
M po/wesnoth-aoi/ang.po
M po/wesnoth-aoi/ang at latin.po
M po/wesnoth-aoi/ar.po
M po/wesnoth-aoi/ast.po
M po/wesnoth-aoi/bg.po
M po/wesnoth-aoi/ca.po
M po/wesnoth-aoi/ca_ES at valencia.po
M po/wesnoth-aoi/cs.po
M po/wesnoth-aoi/da.po
M po/wesnoth-aoi/de.po
M po/wesnoth-aoi/el.po
M po/wesnoth-aoi/en at shaw.po
M po/wesnoth-aoi/en_GB.po
M po/wesnoth-aoi/eo.po
M po/wesnoth-aoi/es.po
M po/wesnoth-aoi/et.po
M po/wesnoth-aoi/eu.po
M po/wesnoth-aoi/fi.po
M po/wesnoth-aoi/fr.po
M po/wesnoth-aoi/fur_IT.po
M po/wesnoth-aoi/ga.po
M po/wesnoth-aoi/gd.po
M po/wesnoth-aoi/gl.po
M po/wesnoth-aoi/he.po
M po/wesnoth-aoi/hr.po
M po/wesnoth-aoi/hu.po
M po/wesnoth-aoi/id.po
M po/wesnoth-aoi/is.po
M po/wesnoth-aoi/it.po
M po/wesnoth-aoi/ja.po
M po/wesnoth-aoi/ko.po
M po/wesnoth-aoi/la.po
M po/wesnoth-aoi/lt.po
M po/wesnoth-aoi/lv.po
M po/wesnoth-aoi/mk.po
M po/wesnoth-aoi/mr.po
M po/wesnoth-aoi/nb_NO.po
M po/wesnoth-aoi/nl.po
M po/wesnoth-aoi/pl.po
M po/wesnoth-aoi/pt.po
M po/wesnoth-aoi/pt_BR.po
M po/wesnoth-aoi/racv.po
M po/wesnoth-aoi/ro.po
M po/wesnoth-aoi/ru.po
M po/wesnoth-aoi/sk.po
M po/wesnoth-aoi/sl.po
M po/wesnoth-aoi/sr.po
M po/wesnoth-aoi/sr at ijekavian.po
M po/wesnoth-aoi/sr at ijekavianlatin.po
M po/wesnoth-aoi/sr at latin.po
M po/wesnoth-aoi/sv.po
M po/wesnoth-aoi/tl.po
M po/wesnoth-aoi/tr.po
M po/wesnoth-aoi/uk.po
M po/wesnoth-aoi/vi.po
M po/wesnoth-aoi/zh_CN.po
M po/wesnoth-aoi/zh_TW.po
M utils/pofix.py
Log Message:
-----------
Fix another pofix mistake
That comma wasn't supposed to be replaced with a period, and I didn't
notice the mistake before pushing the commit.
[ci skip]
(cherry-picked from commit 20bfb35bdda3dca06a9e997812d50bea0e24f341)
Commit: 76c1da1f7c58e582bbb48a3f52efa27d7ded21d6
https://github.com/wesnoth/wesnoth/commit/76c1da1f7c58e582bbb48a3f52efa27d7ded21d6
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg
Log Message:
-----------
DiD S10: use self dacaying object
use one event with an object instead of two events
[ci skip]
(cherry-picked from commit bed35245678cb097dfea0b584d4a3ba2a86ceade)
Commit: b6c7dd163573303780029ed4dad828e8156fd044
https://github.com/wesnoth/wesnoth/commit/b6c7dd163573303780029ed4dad828e8156fd044
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Northern_Rebirth/scenarios/02_01_Infested_Caves.cfg
Log Message:
-----------
NR S02a: restrict movement by costs instead moves
because it is not obviously shown in the sidebar
[ci skip]
(cherry-picked from commit 4e11d419b55a1be21e467925301cdd1820f983fd)
Commit: f25243f0a39cf8585411386aa9228eaa293c6f3c
https://github.com/wesnoth/wesnoth/commit/f25243f0a39cf8585411386aa9228eaa293c6f3c
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Descent_Into_Darkness/utils/macros.cfg
Log Message:
-----------
DiD utils: use 1.13 syntax
It's now possible to have this logic as part of [role]
[ci skip]
(cherry-picked from commit 440efd25600245ce5a69561312494ff2cdd8332b)
Commit: d99e6598562c1b75355bef85fceefaeef2e86174
https://github.com/wesnoth/wesnoth/commit/d99e6598562c1b75355bef85fceefaeef2e86174
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg
Log Message:
-----------
TSG: S8b don't show the objectives when the mages arrive again
This is one of the few cases where it is not only a refactoring, but has
an actual advanatge to use [show_if] - the note can be removed from the
objectives witout showing them to the player.
[ci skip]
(cherry-picked from commit 844e56b8e0dc5d241f5ab640db4bf44ef2958e66)
Commit: 90776d8efed593bdf3719a3c2ea73dfe702366ed
https://github.com/wesnoth/wesnoth/commit/90776d8efed593bdf3719a3c2ea73dfe702366ed
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_South_Guard/scenarios/03_A_Desparate_Errand.cfg
Log Message:
-----------
TSG S3: Don't kill the elves at the end
This is a relict from when they had not their own side, and needed to be killed
to not be added to the recall list.
[ci skip]
(cherry-picked from commit baec30bb0c606f73826dace5ea771dc4c85ddf27)
Commit: b6616ffd2f4d9cf144a961563014b213a734e040
https://github.com/wesnoth/wesnoth/commit/b6616ffd2f4d9cf144a961563014b213a734e040
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_South_Guard/scenarios/03_A_Desparate_Errand.cfg
Log Message:
-----------
TSG S3: change side switch procedure for Ethiliel
Ethiliel remains on side 3, but a copy of her is added to the player's recall
list for next scenario. The loyal trait is obtained at that point.
[ci skip]
(cherry-picked from commit 101cb21a95836f9d96a511336c9a759bea850887)
Commit: 4e91a6dbebdacf0e688ee0d110592646268b864d
https://github.com/wesnoth/wesnoth/commit/4e91a6dbebdacf0e688ee0d110592646268b864d
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_South_Guard/scenarios/03_A_Desparate_Errand.cfg
Log Message:
-----------
TSG S3: support debug mode :n and :cl
[ci skip]
(cherry-picked from commit bbc31e623b38ec719b0c672deff8a2345f3571d1)
Commit: c1bdccc0101e89481e2dbc7e04e6ad9227a3ffbd
https://github.com/wesnoth/wesnoth/commit/c1bdccc0101e89481e2dbc7e04e6ad9227a3ffbd
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg
Log Message:
-----------
TSG S2: avoid the possibility of the AI neutralizing villages...
...which it neither burns or captures.
The AI has two sides which are presented as one to the player. It's not the best
approach, because it is possible that the player realizes it looking at the side
informations, e.g. how many units the enemy side has listed there.
This commit unifies both sides, while still keeping the units from formerly side
3 being unable to burn villages, but, as now being in a side with a leader, they
can capture them.
An advantage of having two sides was, that the units could have different AI
settings, and that the leaderless side was not interrested in villages.
The AI settings will be adressed in a seperate commit.
(bug #3032)
[ci skip]
(cherry-picked from commit d749005d21d3407a6bd1aff991df4ae3d0372d80)
Commit: 3f365015111c0b05db63174e15d80ffc7db8df4f
https://github.com/wesnoth/wesnoth/commit/3f365015111c0b05db63174e15d80ffc7db8df4f
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg
Log Message:
-----------
TSG S2: fix issues with killing the bandit leader first
- The peasants told Deoran to go for the already defeated bandit leader.
- The pesants were useless at that time - they are now instead spawned when
defeating the bandit leader or when Deoran arrives, whatever happens first.
They may still have a fight with remaining bandits – or provoke their attack.
- The dialogue when reaching the citadel after having defeated the bandits got a
slight change, to better switch to the victory dance event.
(issue #1954)
[ci skip]
(cherry-picked from commit 0c5467c28a3ca2e6be2bd2cb72e5c9266d91a3d4)
Commit: f993caaa0497a51f06abc35addd98bfba5d51950
https://github.com/wesnoth/wesnoth/commit/f993caaa0497a51f06abc35addd98bfba5d51950
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_and_Ill.cfg
M data/campaigns/The_South_Guard/scenarios/07a_Into_the_Depths.cfg
M data/campaigns/The_South_Guard/scenarios/08a_Return_to_Kerlath.cfg
M data/campaigns/The_South_Guard/scenarios/09a_Vengeance.cfg
Log Message:
-----------
TSG S7a-S9a: prepare to let Hylas die
(FR #3316)
This includes changing when the overlays and ellipses for the hero units are
changed, and for better testing part of the event is split into a victory event
in S6a.
[ci skip]
(cherry-picked from commit b681ad8cd98d4ee3168257ee6116a2ac513f28ab)
Commit: 3435adc255c365504784e72592b23170d86a98d4
https://github.com/wesnoth/wesnoth/commit/3435adc255c365504784e72592b23170d86a98d4
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Northern_Rebirth/scenarios/02_01_Infested_Caves.cfg
M data/campaigns/Northern_Rebirth/utils/herodeaths.cfg
M data/campaigns/Northern_Rebirth/utils/utils.cfg
Log Message:
-----------
NR: use 1.13 syntax for finding suitable units for [role]
[ci skip]
(cherry-picked from commit 0dd48bf5818e11d7914cbd70a8fcfdf7ba8c51e2)
Commit: db9576670e0ad5f17aaf42a4225bcd90ff48368b
https://github.com/wesnoth/wesnoth/commit/db9576670e0ad5f17aaf42a4225bcd90ff48368b
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_South_Guard/scenarios/07a_Into_the_Depths.cfg
Log Message:
-----------
TSG S7a: duplicate less WML
use monstrous event instead of monstrous macro
[ci skip]
(cherry-picked from commit 00574c0814a5acf4cb9c85115b150b84ce6536db)
Commit: fe0613b394474b747faf70324a680df6dda4fe0b
https://github.com/wesnoth/wesnoth/commit/fe0613b394474b747faf70324a680df6dda4fe0b
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg
Log Message:
-----------
TSG S2: adjust AI settings
This follows the earlier commit which unified side 2 and 3.
In the first rounds the AI behaves like former side 3, later like side 2.
This is seemlessly possible, because side 3's AI settings were having practical
effect at the beginning of the game, and side 2's conflicing settings don't come
into action before the recruited troops met the ones of the player.
(bug #3032)
[ci skip]
(cherry-picked from commit ee09bc3b6309950c10ed8e0800952ce3c6cd6607)
Commit: 252fa8ccd36a9edcceda7ebe12438e76cd9937fe
https://github.com/wesnoth/wesnoth/commit/252fa8ccd36a9edcceda7ebe12438e76cd9937fe
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg
Log Message:
-----------
TSG S8b: allow while mages to be loyal and have random gender
[ci skip]
(cherry-picked from commit 7c89b101b8606f5e16521e8482b5e48ff3da6ed5)
Commit: e8455cc0a5d20684fb691806e84e72ca581972da
https://github.com/wesnoth/wesnoth/commit/e8455cc0a5d20684fb691806e84e72ca581972da
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_South_Guard/maps/05_Choice_in_the_Fog.map
M data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg
Log Message:
-----------
TSG S5: Duo leader setup for the zombies
This adds on the one hand a second leader with secons keep in the same caslte.
for the same side, on the other hand ich changes the speack when they die.
They adverturers are not assuming they killed the undead masters anymore if they
saw the lich before.
(mentioned in #1954)
[ci skip]
(cherry-picked from commit f1a465b3779c0194613971fbbcae4fe43a69dd26)
Commit: b0bd8a78517ec9a2f0d107d2b61158b1fd831703
https://github.com/wesnoth/wesnoth/commit/b0bd8a78517ec9a2f0d107d2b61158b1fd831703
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_South_Guard/scenarios/04_Vale_of_Tears.cfg
Log Message:
-----------
TSG S4: Avoid submerging Rangers
If no suitable forest hex is found, the radius of the locations considered is
extended instead of placing the unit next to Ethiliel.
Also, a change of behaviour:
* non-free hexes will not be considered
* the bodyguards won't be placed adjacent to other units, like the ambush
ability works normally
* this includes Ethiliel
In general that means that units may be placed farther away than before.
[ci skip]
(cherry-picked from commit e43b3507fa18e79b6e2a4893f73b8c75160d7959)
Commit: 1eae58dbd825d56abebeaabfbee7527025fd3e4e
https://github.com/wesnoth/wesnoth/commit/1eae58dbd825d56abebeaabfbee7527025fd3e4e
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_South_Guard/scenarios/04_Vale_of_Tears.cfg
Log Message:
-----------
TSG S4: add female name string
For some reason they never had one.
[ci skip]
(cherry-picked from commit 4fecc83f1762a3744bdb59e890566c8303b3474f)
Commit: 89c5dace003a6bcdfd196364a7ee7f345b5df874
https://github.com/wesnoth/wesnoth/commit/89c5dace003a6bcdfd196364a7ee7f345b5df874
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_and_Ill.cfg
M data/campaigns/The_South_Guard/scenarios/07a_Into_the_Depths.cfg
M data/campaigns/The_South_Guard/scenarios/08a_Return_to_Kerlath.cfg
M data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg
M data/campaigns/The_South_Guard/scenarios/09a_Vengeance.cfg
M data/campaigns/The_South_Guard/utils/sg_deaths.cfg
Log Message:
-----------
TSG: change inclusion of death events
That way less events need to be duplicated in scenarios.
It also does not include the full Hylas death event in S7a to S9a.
Previously the Jarek event was not present in one of the final scenarios,
now both include it, but the shorter variant of it.
[ci skip]
(cherry-picked from commit 29b4196556dbe401766f48d0f46faa6a9245d351)
Commit: e772f6ea37f394fc49342ce1fa7d411b74f2b1e4
https://github.com/wesnoth/wesnoth/commit/e772f6ea37f394fc49342ce1fa7d411b74f2b1e4
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_South_Guard/maps/07b_Pebbles_in_the_Flood.map
M data/campaigns/The_South_Guard/maps/08b_The_Tides_of_War.map
Log Message:
-----------
TSG S7b & S8b: use undead encampments instead of ordinary ones
[ci skip]
(cherry-picked from commit 8960da0591bf5b5523800648e726f97d666ee1a7)
Commit: 0ee46faf346255c3294eceec40980fa9f8556177
https://github.com/wesnoth/wesnoth/commit/0ee46faf346255c3294eceec40980fa9f8556177
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg
Log Message:
-----------
TSG S5: Beast of the Lake is now loyal
It shall not hinder the recruiting capabilities of side 3 if the player spawns
the monster.
[ci skip]
(cherry-picked from commit 63333c688e700de41cee571346142b7dd7d00ef6)
Commit: b5f7e8b5aa5f8cc14660f5729ae618ed495f3542
https://github.com/wesnoth/wesnoth/commit/b5f7e8b5aa5f8cc14660f5729ae618ed495f3542
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_South_Guard/scenarios/04_Vale_of_Tears.cfg
Log Message:
-----------
TSG S4: minor optimizations
Made it impossible that the undead leader can advance to a lich - though you do
sth. badly wrong if he advances at all. Also, some more 1.13 syntactic sugar.
[ci skip]
(cherry-picked from commit a46d3f1eb394af158062690e9f3a98933f90e8d9)
Commit: 21dfccf7bba2d29f693cb2cb044e5c018fe2d6ff
https://github.com/wesnoth/wesnoth/commit/21dfccf7bba2d29f693cb2cb044e5c018fe2d6ff
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg
Log Message:
-----------
TSG 5: ensure no additional event is triggered during allying
Ensure that allying with the bandits does not trigger the lich sighted event.
It's unlikely that the bandits advanced that far though.
[ci skip]
(cherry-picked from commit 657bf305f528016c0bc6b5218c3e18587fd792d3)
Commit: d3f791ae7a325d4a8622ef3ccb55a3c0e1500754
https://github.com/wesnoth/wesnoth/commit/d3f791ae7a325d4a8622ef3ccb55a3c0e1500754
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_and_Ill.cfg
Log Message:
-----------
TSG S6a: may the queen be always female and have a more prominent ellipse
And remove one mention of Mebrin before meeting him in S7b.
[ci skip]
(cherry-picked from commit 18db086025a76cc700a542aa582a6d782466a011)
Commit: 6c37f2c05635ff6f5d4e68dc1d67c0b4e2500522
https://github.com/wesnoth/wesnoth/commit/6c37f2c05635ff6f5d4e68dc1d67c0b4e2500522
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg
Log Message:
-----------
TSG S2: add female strings for the units placed at start
On the other hand, all these units could as well use custom names.
[ci skip]
(cherry-picked from commit f04cdd3803d7381fb178b94f0a20a7d75cb16ce0)
Commit: c1b5edbed2b5d6a6d0962a7e920675c4f184cd4c
https://github.com/wesnoth/wesnoth/commit/c1b5edbed2b5d6a6d0962a7e920675c4f184cd4c
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg
Log Message:
-----------
TSG S5: reformat comments, add translation hint
[ci skip]
(cherry-picked from commit c030249043e62d6a878a052a29037889ae0fcde1)
Commit: 4ae3afb512ab88713d2310eeda1b0fa4f38b624f
https://github.com/wesnoth/wesnoth/commit/4ae3afb512ab88713d2310eeda1b0fa4f38b624f
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_South_Guard/scenarios/09a_Vengeance.cfg
Log Message:
-----------
TSG 9a: gender handling
[ci skip]
(cherry-picked from commit 07c2125afc714f035edbbc877ec37e3c6e590468)
Commit: b1ab098935e08a8e388823bee91a6ffaf29a0f20
https://github.com/wesnoth/wesnoth/commit/b1ab098935e08a8e388823bee91a6ffaf29a0f20
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_and_Ill.cfg
Log Message:
-----------
TSG S6a: Mermen will leave afterwards
The text has already been prepared for this in 1.13
[ci skip]
(cherry-picked from commit f84d6808e9fa7a17a1065b2587e3fb8847df66b7)
Commit: 260339ad64c0db491449003a63c2ea14f917ee6d
https://github.com/wesnoth/wesnoth/commit/260339ad64c0db491449003a63c2ea14f917ee6d
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_South_Guard/scenarios/07b_Pebbles_in_the_Flood.cfg
Log Message:
-----------
TSG S7b: use 1.13 code and make it debug safe
The invulnerable status is player-visible and does not insert new events which
are checked at each attack.
[ci skip]
(cherry-picked from commit ddc763f3244f5fff731f61a26553566226494679)
Commit: f6e2a9f28f079ac270795d82cd7201f4fd52dda4
https://github.com/wesnoth/wesnoth/commit/f6e2a9f28f079ac270795d82cd7201f4fd52dda4
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_South_Guard/scenarios/08a_Return_to_Kerlath.cfg
Log Message:
-----------
TSG S8a: add redraw calls
Recalling units may increase the vision area when playing with shroud/fog.
[ci skip]
(cherry-picked from commit 5f7b1853dd61154183ad4042bd4c41510943f4d9)
Commit: a3d9b7f11b2580bc3ec022ee4941a82e5bbb4949
https://github.com/wesnoth/wesnoth/commit/a3d9b7f11b2580bc3ec022ee4941a82e5bbb4949
Author: jostephd <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/game_display.cpp
M src/menu_events.cpp
M src/units/unit.hpp
Log Message:
-----------
Don't scroll to an enemy leader that has an effective [hides] ability (#3492)
(cherry-picked from commit 24cb784d4bc8f7910d015ff1753ab945a2be9dc9)
Commit: 1ab3ec0464b1bf464d3782d709d9bfd53429a3a1
https://github.com/wesnoth/wesnoth/commit/1ab3ec0464b1bf464d3782d709d9bfd53429a3a1
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/game_display.cpp
M src/menu_events.cpp
Log Message:
-----------
Attempted build fix
(cherry-picked from commit 8f40b51a77ce3520d7fea560043efcf3974ad0b9)
Commit: 25b2024ee8122991311263af7fd46202e0e2ae6d
https://github.com/wesnoth/wesnoth/commit/25b2024ee8122991311263af7fd46202e0e2ae6d
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/ai/lua/ai_helper.lua
M data/ai/lua/battle_calcs.lua
M data/ai/lua/ca_high_xp_attack.lua
M data/ai/lua/generic_recruit_engine.lua
M data/ai/lua/generic_rush_engine.lua
M data/ai/lua/retreat.lua
M data/ai/micro_ais/cas/ca_assassin_move.lua
M data/ai/micro_ais/cas/ca_bottleneck_move.lua
M data/ai/micro_ais/cas/ca_fast_attack_utils.lua
M data/ai/micro_ais/cas/ca_fast_move.lua
M data/ai/micro_ais/cas/ca_goto.lua
M data/ai/micro_ais/cas/ca_healer_move.lua
M data/ai/micro_ais/cas/ca_herding_sheep_move.lua
M data/ai/micro_ais/cas/ca_messenger_move.lua
M data/ai/micro_ais/cas/ca_protect_unit_move.lua
M data/ai/micro_ais/cas/ca_stationed_guardian.lua
M data/ai/micro_ais/cas/ca_zone_guardian.lua
M data/campaigns/The_Rise_Of_Wesnoth/ai/ca_aggressive_attack_no_suicide.lua
Log Message:
-----------
Lua AIs: use unit methods instead of wesnoth functions
(cherry-picked from commit a6866390dfa64097fa4cb099b39736c3e2220ce4)
Commit: 5bc44fcc0d75b70c037e1cae660905a88b758e33
https://github.com/wesnoth/wesnoth/commit/5bc44fcc0d75b70c037e1cae660905a88b758e33
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/ai/micro_ais/cas/ca_messenger_move.lua
Log Message:
-----------
Messenger MAI Lua code: change proxy unit location directly
(cherry-picked from commit b3058e8e8eb119db883a1543143bd4523c93f239)
Commit: 98e5f0892eb20964a986976384a9ba6b056cc9e5
https://github.com/wesnoth/wesnoth/commit/98e5f0892eb20964a986976384a9ba6b056cc9e5
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/ai/lua/battle_calcs.lua
M data/ai/lua/generic_rush_engine.lua
M data/campaigns/Eastern_Invasion/ai/ca_ogres_flee.lua
M data/campaigns/Son_Of_The_Black_Eye/ai/ca_transport_S6.lua
M data/campaigns/The_Rise_Of_Wesnoth/ai/ca_aggressive_attack_no_suicide.lua
M data/campaigns/The_Rise_Of_Wesnoth/ai/ca_retreat.lua
Log Message:
-----------
Lua AIs: remove unused debug output
(cherry-picked from commit 83c4ef24189c9986eae7535b10ba4babb921e3b8)
Commit: fbbbcfc67efe36977a6fa456879f3d04d55465bd
https://github.com/wesnoth/wesnoth/commit/fbbbcfc67efe36977a6fa456879f3d04d55465bd
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/ai/lua/ai_helper.lua
M data/ai/lua/battle_calcs.lua
M data/ai/lua/generic_recruit_engine.lua
M data/ai/lua/generic_rush_engine.lua
Log Message:
-----------
Lua AIs: replace print() by std_print()
(cherry-picked from commit 3f54908b0ba69173442107105889caeb891b922d)
Commit: 6800ccd95ab733faa1452edc6fc49f1dfd5b9c06
https://github.com/wesnoth/wesnoth/commit/6800ccd95ab733faa1452edc6fc49f1dfd5b9c06
Author: jostephd <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/gui/window/game_load.cfg
M src/gui/dialogs/game_load.cpp
M src/save_index.cpp
Log Message:
-----------
Game Load: Show list of enabled modifications (#3495)
(cherry-picked from commit 6f670556a1c6fb01b1bfdf3650ad7a82e726a318)
Commit: 1166bfb4856a625fbe7af570b4192db96fe6d3b7
https://github.com/wesnoth/wesnoth/commit/1166bfb4856a625fbe7af570b4192db96fe6d3b7
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-aoi/af.po
M po/wesnoth-aoi/ang.po
M po/wesnoth-aoi/ang at latin.po
M po/wesnoth-aoi/ar.po
M po/wesnoth-aoi/ast.po
M po/wesnoth-aoi/bg.po
M po/wesnoth-aoi/ca.po
M po/wesnoth-aoi/ca_ES at valencia.po
M po/wesnoth-aoi/cs.po
M po/wesnoth-aoi/da.po
M po/wesnoth-aoi/de.po
M po/wesnoth-aoi/el.po
M po/wesnoth-aoi/en at shaw.po
M po/wesnoth-aoi/en_GB.po
M po/wesnoth-aoi/eo.po
M po/wesnoth-aoi/es.po
M po/wesnoth-aoi/et.po
M po/wesnoth-aoi/eu.po
M po/wesnoth-aoi/fi.po
M po/wesnoth-aoi/fr.po
M po/wesnoth-aoi/fur_IT.po
M po/wesnoth-aoi/ga.po
M po/wesnoth-aoi/gd.po
M po/wesnoth-aoi/gl.po
M po/wesnoth-aoi/he.po
M po/wesnoth-aoi/hr.po
M po/wesnoth-aoi/hu.po
M po/wesnoth-aoi/id.po
M po/wesnoth-aoi/is.po
M po/wesnoth-aoi/it.po
M po/wesnoth-aoi/ja.po
M po/wesnoth-aoi/ko.po
M po/wesnoth-aoi/la.po
M po/wesnoth-aoi/lt.po
M po/wesnoth-aoi/lv.po
M po/wesnoth-aoi/mk.po
M po/wesnoth-aoi/mr.po
M po/wesnoth-aoi/nb_NO.po
M po/wesnoth-aoi/nl.po
M po/wesnoth-aoi/pl.po
M po/wesnoth-aoi/pt.po
M po/wesnoth-aoi/pt_BR.po
M po/wesnoth-aoi/racv.po
M po/wesnoth-aoi/ro.po
M po/wesnoth-aoi/ru.po
M po/wesnoth-aoi/sk.po
M po/wesnoth-aoi/sl.po
M po/wesnoth-aoi/sr.po
M po/wesnoth-aoi/sr at ijekavian.po
M po/wesnoth-aoi/sr at ijekavianlatin.po
M po/wesnoth-aoi/sr at latin.po
M po/wesnoth-aoi/sv.po
M po/wesnoth-aoi/tl.po
M po/wesnoth-aoi/tr.po
M po/wesnoth-aoi/uk.po
M po/wesnoth-aoi/vi.po
M po/wesnoth-aoi/zh_CN.po
M po/wesnoth-aoi/zh_TW.po
M utils/pofix.py
Log Message:
-----------
Pofix: fix incorrect removal of a space
Thanks to @jostephd for pointing out that it shouldn't be removed.
[ci skip]
(cherry-picked from commit c59ae5204affcdc6f4e2ac68535c212ab0f46611)
Commit: b5c8c60ad04edad065d4bd1698ca35dff2ea8160
https://github.com/wesnoth/wesnoth/commit/b5c8c60ad04edad065d4bd1698ca35dff2ea8160
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/ai/lua/battle_calcs.lua
M data/ai/lua/ca_high_xp_attack.lua
M data/ai/lua/generic_rush_engine.lua
Log Message:
-----------
Lua AIs: get unit cost/level directly from proxy unit
These used to be accessible only through unit.__cfg or wesnoth.unit_types. The Fast Micro AI is not included here as it requires a larger clean-up.
(cherry-picked from commit 8af988c6972abe75e985d0e43bd8186fe4826cb6)
Commit: 695fa692388e7d6ae4052aeb64ddc1b20f29a87e
https://github.com/wesnoth/wesnoth/commit/695fa692388e7d6ae4052aeb64ddc1b20f29a87e
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/ai/micro_ais/micro_ai_unit_variables.lua
Log Message:
-----------
Micro AIs: simplify unit variable handling functions
The main reason for doing this, besides simplifying the code, is to avoid using the WML table dump __cfg, which is slow. This includes a change of the format in which the variables are stored, but since these are internal Micro AI utility functions, that does not matter.
(cherry-picked from commit 133568efe6851944f0b9ddaaf75ccaff0cad6a4d)
Commit: cbeb882d6064161dd99890fe334052a61b3a0fca
https://github.com/wesnoth/wesnoth/commit/cbeb882d6064161dd99890fe334052a61b3a0fca
Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/color.hpp
M src/map/location.hpp
Log Message:
-----------
Fix error: missing noexcept
GCC 8.2.0 -Wnoexcept flags two functions which should be marked as not throwing.
(cherry-picked from commit 3826c263b1ac203c5487c1a81000c3111bda263b)
Commit: 2d0996982ef506851d079ede3a939065ef563326
https://github.com/wesnoth/wesnoth/commit/2d0996982ef506851d079ede3a939065ef563326
Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/server/server.cpp
Log Message:
-----------
Fix error: no previous declaration
No used outside the source file, so marked as a static function.
(cherry-picked from commit 616ae9b47285fd84c458efbe72df18c540a14a0e)
Commit: 3906d78abd91fe1ddb439ef9f8c1571469f27eab
https://github.com/wesnoth/wesnoth/commit/3906d78abd91fe1ddb439ef9f8c1571469f27eab
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/ai/lua/battle_calcs.lua
M data/ai/lua/generic_recruit_engine.lua
Log Message:
-----------
Lua AIs: avoid using __cfg for accessing weapon specials
(cherry-picked from commit aa59ac54557bc24615cb3f990bcd1dbf6f5d1ea9)
Commit: 6ad4c7e42d3c84aea11aae0b417a3090fa4105b7
https://github.com/wesnoth/wesnoth/commit/6ad4c7e42d3c84aea11aae0b417a3090fa4105b7
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/ai/lua/battle_calcs.lua
Log Message:
-----------
Lua AI utility functions: fix for chance-to-hit specials without id
All mainline chance-to-hit weapon specials have ids, but it is not required for UMC specials.
(cherry-picked from commit 5335a2af335ffdce65097e26359e96a0cbe2c733)
Commit: 08825afce52151048dc0335ae97b1c511873bbbd
https://github.com/wesnoth/wesnoth/commit/08825afce52151048dc0335ae97b1c511873bbbd
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/ai/lua/generic_recruit_engine.lua
M data/ai/lua/generic_rush_engine.lua
M data/ai/micro_ais/cas/ca_forest_animals_move.lua
M data/ai/micro_ais/cas/ca_forest_animals_new_rabbit.lua
Log Message:
-----------
Lua AIs: remove inclusions of unused libraries
(cherry-picked from commit 8a996c55b968b14b04a551db46b7ab3de735696f)
Commit: 02c830a6dfbb830fc1931ff619bf1b8db4b0bfe8
https://github.com/wesnoth/wesnoth/commit/02c830a6dfbb830fc1931ff619bf1b8db4b0bfe8
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/ai/micro_ais/micro_ai_helper.lua
Log Message:
-----------
Lua AIs: remove another unused library inclusion
(cherry-picked from commit 1680436f729a42ede1bd2e1898ef4583c36b14d3)
Commit: 613ccd859a33473ad250f7598809291c88253cd1
https://github.com/wesnoth/wesnoth/commit/613ccd859a33473ad250f7598809291c88253cd1
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/ai/micro_ais/cas/ca_fast_attack_utils.lua
M data/ai/micro_ais/cas/ca_fast_combat.lua
M data/ai/micro_ais/cas/ca_fast_combat_leader.lua
M data/ai/micro_ais/cas/ca_fast_move.lua
Log Message:
-----------
Fast Micro AI: code cleanup
Most of the Fast MAI attack utils had been taken from a more general codebase and included things not needed here. This AI is supposed to be a slimmed down version doing only the absolutely necessary in as fast as possible a fashion.
(cherry-picked from commit f4f2a441e41cea635861630eb555af9f510c9b52)
Commit: 37e83f126205952f544dd32cce4f4601ecbe7f75
https://github.com/wesnoth/wesnoth/commit/37e83f126205952f544dd32cce4f4601ecbe7f75
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/ai/lua/ai_helper.lua
M data/ai/lua/battle_calcs.lua
M data/ai/lua/generic_rush_engine.lua
M data/ai/lua/retreat.lua
M data/ai/micro_ais/cas/ca_big_animals.lua
M data/ai/micro_ais/cas/ca_bottleneck_attack.lua
M data/ai/micro_ais/cas/ca_bottleneck_move.lua
M data/ai/micro_ais/cas/ca_coward.lua
M data/ai/micro_ais/cas/ca_fast_combat.lua
M data/ai/micro_ais/cas/ca_fast_combat_leader.lua
M data/ai/micro_ais/cas/ca_fast_move.lua
M data/ai/micro_ais/cas/ca_forest_animals_move.lua
M data/ai/micro_ais/cas/ca_forest_animals_tusker_attack.lua
M data/ai/micro_ais/cas/ca_forest_animals_tusklet_move.lua
M data/ai/micro_ais/cas/ca_goto.lua
M data/ai/micro_ais/cas/ca_hang_out.lua
M data/ai/micro_ais/cas/ca_healer_move.lua
M data/ai/micro_ais/cas/ca_herding_attack_close_enemy.lua
M data/ai/micro_ais/cas/ca_herding_herd_sheep.lua
M data/ai/micro_ais/cas/ca_hunter.lua
M data/ai/micro_ais/cas/ca_messenger_attack.lua
M data/ai/micro_ais/cas/ca_messenger_escort_move.lua
M data/ai/micro_ais/cas/ca_messenger_f_next_waypoint.lua
M data/ai/micro_ais/cas/ca_messenger_move.lua
M data/ai/micro_ais/cas/ca_protect_unit_attack.lua
M data/ai/micro_ais/cas/ca_protect_unit_move.lua
M data/ai/micro_ais/cas/ca_simple_attack.lua
M data/ai/micro_ais/cas/ca_stationed_guardian.lua
M data/ai/micro_ais/cas/ca_wolves_move.lua
M data/ai/micro_ais/cas/ca_wolves_multipacks_attack.lua
M data/ai/micro_ais/cas/ca_wolves_multipacks_functions.lua
M data/ai/micro_ais/cas/ca_wolves_multipacks_wander.lua
M data/ai/micro_ais/cas/ca_wolves_wander.lua
M data/ai/micro_ais/cas/ca_zone_guardian.lua
M data/campaigns/Eastern_Invasion/ai/ca_ogres_flee.lua
M data/campaigns/Son_Of_The_Black_Eye/ai/ca_transport_S6.lua
M data/campaigns/The_Rise_Of_Wesnoth/ai/ca_aggressive_attack_no_suicide.lua
M data/campaigns/Two_Brothers/lua/muff_toras_move.lua
Log Message:
-----------
Lua AIs: use math.huge to initialize extrema variables
(cherry-picked from commit cb423b2fbd40fdf5e14549a301fee06237bf4626)
Commit: 3c558c73601f0c5d017c347cef403c42273259bc
https://github.com/wesnoth/wesnoth/commit/3c558c73601f0c5d017c347cef403c42273259bc
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/ai/micro_ais/cas/ca_herding_attack_close_enemy.lua
Log Message:
-----------
Herding Micro AI: fix variabls not being local
(cherry-picked from commit 80ae232935f2bbe5d0eb97c5a15136f8dc625068)
Commit: f761493c755ad6092a2ab6a833c2c17203950768
https://github.com/wesnoth/wesnoth/commit/f761493c755ad6092a2ab6a833c2c17203950768
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/ai/lua/generic_recruit_engine.lua
M data/ai/lua/generic_rush_engine.lua
M data/ai/lua/retreat.lua
M data/campaigns/Eastern_Invasion/ai/ca_ogres_flee.lua
Log Message:
-----------
Lua AIs: no need to set variables to nil explicitely
This is mostly done for consistency across the Lua AI code
(cherry-picked from commit 0e7c09f7b549bb43aec248bad04fcf0bffef17d5)
Commit: 5301d0714ae88b9d86999776068341fed990c15e
https://github.com/wesnoth/wesnoth/commit/5301d0714ae88b9d86999776068341fed990c15e
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/lua_interpreter.cpp
Log Message:
-----------
Lua Console: Print an error message when not opening the console because :debug hasn't been run.
(cherry-picked from commit 012142a3c63746fbbfd56292f894fe39fc519fb8)
Commit: e09a765a1cbef243155d4903d8210e20bd1a7234
https://github.com/wesnoth/wesnoth/commit/e09a765a1cbef243155d4903d8210e20bd1a7234
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Liberty/scenarios/03_A_Strategy_Of_Hope.cfg
Log Message:
-----------
Liberty S3: Add a story part
(cherry-picked from commit e2c591edbda28a3318ace5efb37f4f93463c3e5b)
Commit: 1ca80da7634415cf0666a8557ed38dc518380d3c
https://github.com/wesnoth/wesnoth/commit/1ca80da7634415cf0666a8557ed38dc518380d3c
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/An_Orcish_Incursion/scenarios/03_Wasteland.cfg
M data/campaigns/Liberty/scenarios/02_Civil_Disobedience.cfg
M data/campaigns/Liberty/scenarios/03_A_Strategy_Of_Hope.cfg
M data/campaigns/Liberty/scenarios/06_The_Grey_Woods.cfg
M data/campaigns/Liberty/scenarios/09_Epilogue.cfg
M data/campaigns/Liberty/units/Rogue_Mage.cfg
M data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Lord.cfg
Log Message:
-----------
Fix various typos.
AOI S3: Address Erlornas as "lord" in lowercase as done elsewhere in the
scenario.
(cherry-picked from commit 6a1b59327e776ba187609501bf29de0b4a745fd7)
Commit: 7ea5bd4350b5f6c5a5162b0ecfaea324ff8ff2ef
https://github.com/wesnoth/wesnoth/commit/7ea5bd4350b5f6c5a5162b0ecfaea324ff8ff2ef
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Liberty/scenarios/03_A_Strategy_Of_Hope.cfg
Log Message:
-----------
Liberty S3: Play orcish war drums
(cherry-picked from commit 8fd1b822dbddf5eb363da20ad878a63383405e6b)
Commit: 8e77bae5af5b8c161bf7abb53942820370ac6310
https://github.com/wesnoth/wesnoth/commit/8e77bae5af5b8c161bf7abb53942820370ac6310
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/server/game.cpp
Log Message:
-----------
fixup "fix oos when undoing after ally chat"
this also caused errors later when saving replays because the server would concatinate all [turn] leading to dublicate undo=no attributes.
(cherry-picked from commit 144e8a1f8d13a023261f32ff251b756eb1730845)
Commit: 706740220957a9313909f5cc358ba5aba3bf4118
https://github.com/wesnoth/wesnoth/commit/706740220957a9313909f5cc358ba5aba3bf4118
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/config.cpp
M src/config.hpp
M src/saved_game.cpp
M src/saved_game.hpp
Log Message:
-----------
put [resource] before other content; fixes #3345
Now content that is loaded via [load_resource] is placed to the position
where the [load_resource] was. This fixes a problem where previously one could
not use lua variables/functions created by the [resource][lua] because the
engine would put the [lua] tags from the [resource] after the [resource] from the
scenario.
(cherry-picked from commit 1ac635ec63e775dcd1aa90d04b9adf3f061ef476)
Commit: e68a6eaba0f1d6b66c491a5da9df67625c72c47f
https://github.com/wesnoth/wesnoth/commit/e68a6eaba0f1d6b66c491a5da9df67625c72c47f
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/ai/lua/generic_rush_engine.lua
M data/ai/micro_ais/cas/ca_forest_animals_tusklet_move.lua
M data/campaigns/Eastern_Invasion/ai/ca_ogres_flee.lua
M data/campaigns/Son_Of_The_Black_Eye/ai/ca_transport_S6.lua
M data/campaigns/The_Rise_Of_Wesnoth/ai/ca_aggressive_attack_no_suicide.lua
Log Message:
-----------
Lua AIs: don't initiate variables as empty tables
... if they might not be needed.
(cherry-picked from commit a23f06dc2052ece4d6de9fc1d80008f82761be4f)
Commit: 8799772621d27e830e1c8b6b0783d6b8b2176d87
https://github.com/wesnoth/wesnoth/commit/8799772621d27e830e1c8b6b0783d6b8b2176d87
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/ai/lua/generic_recruit_engine.lua
M data/ai/micro_ais/cas/ca_hang_out.lua
Log Message:
-----------
Lua AIs: don't compare variables with nil
... unless there is a difference between nil and false. Done mostly for consistency with all the other uses.
(cherry-picked from commit 35d257f8fd35fad70539dfdc57da69e38bc10536)
Commit: 98b8023072f7b9a5f9df2acd1ad9b7400726dd9e
https://github.com/wesnoth/wesnoth/commit/98b8023072f7b9a5f9df2acd1ad9b7400726dd9e
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
A data/campaigns/Two_Brothers/ai/ca_muff_toras_move.lua
R data/campaigns/Two_Brothers/lua/muff_toras_move.lua
M data/campaigns/Two_Brothers/scenarios/02_The_Chase.cfg
Log Message:
-----------
AToTB S2: rename custom AI file
For consistency with the other mainline campaigns
(cherry-picked from commit 1040dbe5c9e58ce2ac592b126e0b4b9b033f722c)
Commit: 59c7162b51b6ce3393860967e6edfcb1bbe3526b
https://github.com/wesnoth/wesnoth/commit/59c7162b51b6ce3393860967e6edfcb1bbe3526b
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/ai/lua/generic_recruit_engine.lua
M data/ai/lua/generic_rush_engine.lua
M data/ai/lua/move_to_any_target.lua
Log Message:
-----------
Experimental AI: fix eval/exec debug output
This involves making the output independent of the stats CA (which is not used any more) and adding missing output to some CAs.
(cherry-picked from commit c2635abde1c6eea8bb74019ab78c61bddb219fff)
Commit: 251d3e633eaa8dd26801df9e6ba762b428573aaf
https://github.com/wesnoth/wesnoth/commit/251d3e633eaa8dd26801df9e6ba762b428573aaf
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/about_i18n.cfg
M po/wesnoth-ai/uk.po
M po/wesnoth-anl/uk.po
M po/wesnoth-aoi/uk.po
M po/wesnoth-did/uk.po
M po/wesnoth-dm/uk.po
M po/wesnoth-dw/uk.po
M po/wesnoth-editor/uk.po
M po/wesnoth-ei/uk.po
M po/wesnoth-help/uk.po
M po/wesnoth-httt/uk.po
M po/wesnoth-l/uk.po
M po/wesnoth-lib/uk.po
M po/wesnoth-low/uk.po
M po/wesnoth-manual/uk.po
M po/wesnoth-multiplayer/uk.po
M po/wesnoth-nr/uk.po
M po/wesnoth-sof/uk.po
M po/wesnoth-sota/uk.po
M po/wesnoth-sotbe/uk.po
M po/wesnoth-tb/uk.po
M po/wesnoth-test/uk.po
M po/wesnoth-thot/uk.po
M po/wesnoth-trow/uk.po
M po/wesnoth-tsg/uk.po
M po/wesnoth-tutorial/uk.po
M po/wesnoth-units/uk.po
M po/wesnoth-utbs/uk.po
M po/wesnoth/uk.po
Log Message:
-----------
updated Ukrainian translation
(cherry-picked from commit ff861673a4e823ca00d54e0e2f4dd87a615c4709)
Commit: 21c2e5933b012cd6ab7808db34b8475d727ee575
https://github.com/wesnoth/wesnoth/commit/21c2e5933b012cd6ab7808db34b8475d727ee575
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-aoi/zh_TW.po
M po/wesnoth-did/zh_TW.po
M po/wesnoth-dm/zh_TW.po
M po/wesnoth-dw/zh_TW.po
M po/wesnoth-httt/zh_TW.po
M po/wesnoth-l/zh_TW.po
M po/wesnoth-lib/zh_TW.po
M po/wesnoth-manual/zh_TW.po
M po/wesnoth-sotbe/zh_TW.po
M po/wesnoth-tsg/zh_TW.po
Log Message:
-----------
updated Chinese (Traditional) translation
(cherry-picked from commit 2436d700f2f4349f002ea385604e5aa89bf32b54)
Commit: 800947594c4d101779bc17c0b4dea321cb55e116
https://github.com/wesnoth/wesnoth/commit/800947594c4d101779bc17c0b4dea321cb55e116
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
A data/ai/lua/ca_castle_switch.lua
A data/ai/lua/ca_grab_villages.lua
A data/ai/lua/ca_move_to_any_enemy.lua
A data/ai/lua/ca_place_healers.lua
A data/ai/lua/ca_recruit_rushers.lua
A data/ai/lua/ca_retreat_injured.lua
A data/ai/lua/ca_spread_poison.lua
A data/ai/lua/ca_village_hunt.lua
R data/ai/lua/generic_rush_engine.lua
R data/ai/lua/move_to_any_target.lua
M data/core/macros/ai.cfg
Log Message:
-----------
Experimental AI: convert to using external CAs
(cherry-picked from commit 547478571871ffe59c5cf7ff59339a72a61c07dc)
Commit: e32e6d62d11811033b3a37b7e6b0d3032dec1daa
https://github.com/wesnoth/wesnoth/commit/e32e6d62d11811033b3a37b7e6b0d3032dec1daa
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Liberty/scenarios/08_Glory.cfg
Log Message:
-----------
Liberty S8: Fix ambiguous pronoun
(cherry-picked from commit 4c612400cf51c4881c01101f9f5e555c50eb8462)
Commit: 896593993910292fcd6526f6099ea892a854f82d
https://github.com/wesnoth/wesnoth/commit/896593993910292fcd6526f6099ea892a854f82d
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Liberty/scenarios/08_Glory.cfg
Log Message:
-----------
Liberty S8: Fix family reference
According to po comments in S1, Baldras is Harper's mother's brother.
Also change "mom"/"dad" to "mother"/"father" to match the general
medieval setting of dialogs.
(cherry-picked from commit bcb6153b89edafc15453358b5754f6e34f39b830)
Commit: 2b6b1ed4fe80d43269af0bce0893cfc0fb671c47
https://github.com/wesnoth/wesnoth/commit/2b6b1ed4fe80d43269af0bce0893cfc0fb671c47
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/ai/lua/ca_spread_poison.lua
M data/ai/micro_ais/cas/ca_healer_move.lua
Log Message:
-----------
Lua AIs: avoid calling wesnoth.get_terrain() more than needed
It probably doen't make a noticeable difference for these AIs, but in general we should not call the slow functions more than necessary.
(cherry-picked from commit 42b443084125ab7a989465e5f7f19835a17ba85b)
Commit: 7fe7047ba91738e9bb140659d742972f0c4f541c
https://github.com/wesnoth/wesnoth/commit/7fe7047ba91738e9bb140659d742972f0c4f541c
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M src/gui/dialogs/unit_create.cpp
Log Message:
-----------
gui2/unit_create: Fix segfault on empty list when updating unit preview
This happens when the list comes up empty because of a non-matching
filter, e.g. "Elvish Archer222" and the user clicks on one of the gender
options in this state.
Ideally we should clear the preview pane and disable the options and OK
button here, but the former appears impossible and for some reason
changing the pane's visibility in filter_text_changed() doesn't work
reliably.
(cherry-picked from commit 26629d4a621b74e90513842db577d5bd03a415de)
Commit: dce867921c30a4eccd031bd3c482cb0af6dc9f94
https://github.com/wesnoth/wesnoth/commit/dce867921c30a4eccd031bd3c482cb0af6dc9f94
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M src/gui/dialogs/unit_create.cpp
Log Message:
-----------
gui2/unit_create: Allow searching by race name as well
(cherry-picked from commit b7c7fca8b10003d7d6445710a51ed0f740e9425c)
Commit: 71c3a565db0748179ff6eee34381d1f11c334464
https://github.com/wesnoth/wesnoth/commit/71c3a565db0748179ff6eee34381d1f11c334464
Author: DisherProject <pycchio at tiscali.it>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Eastern_Invasion/scenarios/02_The_Escape_Tunnel.cfg
M data/campaigns/Eastern_Invasion/utils/animations.cfg
Log Message:
-----------
EI: Remove old TODO and add a new one
(cherry-picked from commit e07819619c73e63dd5986dedb0cda4d971a09ad6)
Commit: ba22ab7a73aba6040b3dd4450332e331e766e11c
https://github.com/wesnoth/wesnoth/commit/ba22ab7a73aba6040b3dd4450332e331e766e11c
Author: DisherProject <pycchio at tiscali.it>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Eastern_Invasion/scenarios/08_Training_the_Ogres.cfg
Log Message:
-----------
EI S8: Fix event not being fired
The second event took as filtered unit an ogre that has reached
the border of the map. Unfortunately, he was removed by the map
before such event was fired, causing it to never happen.
(cherry-picked from commit 643f1336dd92982850b4f61b9af6ce2d6a8c5d77)
Commit: 3c1dd4d55593e2fa8ec0cf80768745aeaf1f7126
https://github.com/wesnoth/wesnoth/commit/3c1dd4d55593e2fa8ec0cf80768745aeaf1f7126
Author: DisherProject <pycchio at tiscali.it>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Eastern_Invasion/scenarios/12_Evacuation.cfg
M data/campaigns/Eastern_Invasion/scenarios/16_Weldyn_under_Attack.cfg
Log Message:
-----------
EI S12-S16: Split objectives into main and alternative ones
Also adds a new objective in S16, which was not stated but
actually makes you win.
(cherry-picked from commit 50e4cc5d3fddc7f7d47c9437b3133567aa0e3dde)
Commit: fdfdb0a200c962f7fa37733494496eeaa968d140
https://github.com/wesnoth/wesnoth/commit/fdfdb0a200c962f7fa37733494496eeaa968d140
Author: DisherProject <pycchio at tiscali.it>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Eastern_Invasion/scenarios/13_The_Drowned_Plains.cfg
Log Message:
-----------
EI S13: Rewrite dragon's AI
Most part of the old AI had no evident effect: the dragon just
moved here and there without attacking you, and since he flied
over shallow water, it was impossible to chase him. The micro
ai makes Khrakhras wander around and attack you when you
approach his castle.
(cherry-picked from commit 64917b70b5eb484ed132df2b43ca26b3af47a690)
Commit: 6dd55e46b0049c65d17c0a45ce0401db659ee99b
https://github.com/wesnoth/wesnoth/commit/6dd55e46b0049c65d17c0a45ce0401db659ee99b
Author: DisherProject <pycchio at tiscali.it>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/An_Orcish_Incursion/scenarios/03_Wasteland.cfg
Log Message:
-----------
AOI S3: Clear all enemies on victory
... for consistency with the previous message stating that
all orcs are killed by the elves.
(cherry-picked from commit 34f417c4eb488966a779bcfa9a0e32f933d3960e)
Commit: b9f0cd174ddaf98eaa33ba8a575bf0d117d353a1
https://github.com/wesnoth/wesnoth/commit/b9f0cd174ddaf98eaa33ba8a575bf0d117d353a1
Author: DisherProject <pycchio at tiscali.it>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/An_Orcish_Incursion/scenarios/02_Assassins.cfg
Log Message:
-----------
AOI S2: Prefer "id" to "speaker" in non-[message]'s SUFs
(cherry-picked from commit 240d2350592a4bd1ea69e5ccea97c39d827f34f7)
Commit: 8b627d4391ba8b7fa539de7b1d4f1d1fe3986c4e
https://github.com/wesnoth/wesnoth/commit/8b627d4391ba8b7fa539de7b1d4f1d1fe3986c4e
Author: DisherProject <pycchio at tiscali.it>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/An_Orcish_Incursion/scenarios/01_Defend_the_Forest.cfg
M data/campaigns/An_Orcish_Incursion/scenarios/02_Assassins.cfg
M data/campaigns/An_Orcish_Incursion/scenarios/03_Wasteland.cfg
M data/campaigns/An_Orcish_Incursion/scenarios/04_Valley_of_Trolls.cfg
M data/campaigns/An_Orcish_Incursion/scenarios/05_Linaera_the_Quick.cfg
M data/campaigns/An_Orcish_Incursion/scenarios/06_A_Detour_through_the_Swamp.cfg
M data/campaigns/An_Orcish_Incursion/scenarios/07_Showdown.cfg
Log Message:
-----------
AOI: General AI rewrite
Removes all the default values and improves the syntax where
possible
(cherry-picked from commit 9086e17b1565e8866b2d42eb53fd101cece506e1)
Commit: b47d6e3bdbcf0af5ad82b574a85548039a265550
https://github.com/wesnoth/wesnoth/commit/b47d6e3bdbcf0af5ad82b574a85548039a265550
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/ai/micro_ais/cas/ca_protect_unit_move.lua
Log Message:
-----------
Protect Unit MAI: remove unused configuration variables
They cannot be set for the MAI, and they would have to be set through 'cfg' not 'data' anyway.
(cherry-picked from commit 62625fd5e2821472181c53932ffe7f6b264373c5)
Commit: 740bd456ab54f8c1e55967c87bb374b21a78d3b1
https://github.com/wesnoth/wesnoth/commit/740bd456ab54f8c1e55967c87bb374b21a78d3b1
Author: Martin Hrubý (hrubymar10) <hrubymar10 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/Xcode/Fix_Xcode_Dependencies
Log Message:
-----------
Fix bug in Fix_Xcode_Dependencies
(cherry-picked from commit 6b5edeb9a85cb72b7aebc1f6a8f3d1c9366a92b5)
Commit: ed406495d74710567ef96b1f85cddfe43d1aae12
https://github.com/wesnoth/wesnoth/commit/ed406495d74710567ef96b1f85cddfe43d1aae12
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/ai/lua/ca_castle_switch.lua
M data/ai/lua/ca_grab_villages.lua
M data/ai/lua/ca_high_xp_attack.lua
M data/ai/lua/ca_move_to_any_enemy.lua
M data/ai/lua/ca_retreat_injured.lua
M data/ai/lua/ca_spread_poison.lua
M data/ai/micro_ais/cas/ca_bottleneck_attack.lua
M data/ai/micro_ais/cas/ca_bottleneck_move.lua
M data/ai/micro_ais/cas/ca_fast_combat.lua
M data/ai/micro_ais/cas/ca_fast_combat_leader.lua
M data/campaigns/The_Rise_Of_Wesnoth/ai/ca_aggressive_attack_no_suicide.lua
M data/campaigns/The_Rise_Of_Wesnoth/ai/ca_retreat.lua
Log Message:
-----------
Lua AIs: do not use engine's 'data' variable unless necessary
Now that all the AIs use external CAs, there is no need to use the persistent 'data' variable any more, unless information is to be exchanged between different CAs or is supposed to be persistent across save/load cycles.
(cherry-picked from commit 3bfd59f28ba7f70a6ac32782e98cba9ca6c2a44a)
Commit: c52ce11e493b8127983a5999b9d21e4b26047f24
https://github.com/wesnoth/wesnoth/commit/c52ce11e493b8127983a5999b9d21e4b26047f24
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/ai/lua/ca_castle_switch.lua
M data/ai/micro_ais/cas/ca_forest_animals_move.lua
M data/ai/micro_ais/cas/ca_forest_animals_new_rabbit.lua
M data/campaigns/Son_Of_The_Black_Eye/ai/ca_transport_S6.lua
Log Message:
-----------
Lua AIs: replace tabs with spaces
(cherry-picked from commit 45a3bf93636fb7b34b27a3411784d0484eeb18d6)
Commit: b96ff34df4eb217e1ef124dab7e80648671569ff
https://github.com/wesnoth/wesnoth/commit/b96ff34df4eb217e1ef124dab7e80648671569ff
Author: joeylmaalouf <joeylmaalouf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/multiplayer/eras.lua
Log Message:
-----------
Allow ties to be reported as such in the turns_over_advantage calculation (fixes #1341)
(cherry-picked from commit 3d481c1b8b918a4b3914465679c98d4a3c9dbd28)
Commit: 8f087902d8f617ef7589a1b8f1a66a0cdee1d69b
https://github.com/wesnoth/wesnoth/commit/8f087902d8f617ef7589a1b8f1a66a0cdee1d69b
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg
Log Message:
-----------
NR S13: slight bonus for AI controlled sides:
- allied AI leaders, whose death causes defeat, use passive_leader=yes
- increased amount of money which the lich brothers have, if one has not the
alternative leaders who can recall units
- also increased Krash's gold to the same amount of as Eryssa has (they are the
alternative leaders)
[ci skip]
(cherry-picked from commit 79993ea601f34d07aa7f26251bc87b52da4338de)
Commit: 3265026db80f775844fe33ec1c7080b48a212317
https://github.com/wesnoth/wesnoth/commit/3265026db80f775844fe33ec1c7080b48a212317
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg
Log Message:
-----------
NR S12: hide empty sides
There has been a report that some scenario would be nearly unbeatable if they
are empty in the first place, so this has the side effect of not showing the
player that he misses something. (Nevertheless, they should be hidden)
[ci skip]
(cherry-picked from commit 47c3947d0aa651fd32545d6292d5cfed9fd02864)
Commit: a7b81912142ed46cb2a561cbf4fa0120fa008b37
https://github.com/wesnoth/wesnoth/commit/a7b81912142ed46cb2a561cbf4fa0120fa008b37
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Northern_Rebirth/utils/herodeaths.cfg
Log Message:
-----------
NR deaths: use one event for both lich brothers
They text is the same, whoever of them dies
[ci skip]
(cherry-picked from commit 2e7d9015172d32935b6d658eb6d7c4593da1beb7)
Commit: 89c633fdaa0d5153b2e2d17cf94fac135adb38e0
https://github.com/wesnoth/wesnoth/commit/89c633fdaa0d5153b2e2d17cf94fac135adb38e0
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Delfadors_Memoirs/scenarios/21_Clash_at_the_Manor.cfg
Log Message:
-----------
DM S21: use type_adv_tree
the one usage of type is left deliberately, to point out that it affects 3
instad of 2 or 4 types.
[ci skip]
(cherry-picked from commit ce056894dab0285fb7596deb69445a1184a9cd19)
Commit: aea3a4f7cb7e3d30fa8ed840348ce3585d9ba258
https://github.com/wesnoth/wesnoth/commit/aea3a4f7cb7e3d30fa8ed840348ce3585d9ba258
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/ai/lua/ca_recruit_rushers.lua
Log Message:
-----------
recruit_rushers CA: check if castle_switch CA is present
So that it is possible to use the recruit_rushers CA without the castle_switch CA.
(cherry-picked from commit 0bcb98cf5026710871d8b90919752c90808c56d0)
Commit: e78237c2a923b81aac2a9f53643f708774fff13f
https://github.com/wesnoth/wesnoth/commit/e78237c2a923b81aac2a9f53643f708774fff13f
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/ai/lua/ca_recruit_rushers.lua
M data/ai/lua/generic_recruit_engine.lua
Log Message:
-----------
recruit_rushers CA: don't reserve village for passive leader
(cherry-picked from commit b92d8e822639a90ca8bbfeaf8dea606e7cf4c8f2)
Commit: d40aa8406c948f40c8c9858c0dfa37ec85b31baa
https://github.com/wesnoth/wesnoth/commit/d40aa8406c948f40c8c9858c0dfa37ec85b31baa
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M packaging/wesnoth.desktop
Log Message:
-----------
Desktop file: start from a shell
output redirection is only possible when starting from a shell
[ci skip]
(cherry-picked from commit a46c6edd5a945082a07722a50f79679d427cfacd)
Commit: 4999b20bd1f0d2d9036c059d0bf4363e5e1040d7
https://github.com/wesnoth/wesnoth/commit/4999b20bd1f0d2d9036c059d0bf4363e5e1040d7
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
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_recruit_rushers.lua
M data/ai/lua/ca_retreat_injured.lua
M data/ai/lua/generic_recruit_engine.lua
Log Message:
-----------
Experimental AI: adjustments to candidate action scores
The relative ranking of the CA scores is not changed, except for one case when two CAs had the same score.
Reasons:
- All scores should be lower than the scores of the default Goto CA (200,000) and the default scores of most Micro AIs (300,000).
- Break tie, resulting in uncertain order of execution, of place_healers and retreat_injured CA. Healers should be placed first, to allow retreating injured units to adjacent hexes.
- Set default for generic_recruit_engine to slightly above default AI recruiting score. That way it takes effect even if the default CA is not removed.
- Increase move_to_any_enemy CA score from 1 to 1,000. It is still the lowest score that way, but allows for setting up custom CAs with even lower scores (even if it is just for end-of-turn statistics or the like).
(cherry-picked from commit 35ba82050954c2cee86321e05d6706993c08e143)
Commit: 9e5ec5f0605ce949decac0759f2e8148efc8312c
https://github.com/wesnoth/wesnoth/commit/9e5ec5f0605ce949decac0759f2e8148efc8312c
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
A data/ai/ais/ai_experimental.cfg
R data/ai/ais/ai_generic_rush.cfg
M data/ai/aliases/dev_multiplayer.cfg
Log Message:
-----------
Experimental AI: rename config file
This stopped being a rush AI long ago.
(cherry-picked from commit ec45b53fe29d00d25204f67a8c1ea95c86f01d9e)
Commit: 98e760d60cba4ab6621f490bfddc95cbcc273162
https://github.com/wesnoth/wesnoth/commit/98e760d60cba4ab6621f490bfddc95cbcc273162
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/ai/default/ca.cpp
Log Message:
-----------
fix crash in ai code when a side has multiple leaders
see https://github.com/wesnoth/wesnoth/issues/3240
Just fixing the crash, not sure how the code should behave in this case, it would be nice if someone who knows more about the ai code would either implement that todo or remove the second warning. An alternative fix would be to move the 'calculate_moves' inside the ai_leaders loop.
(cherry-picked from commit 18526e499a082d849295f0db93cdc9b5ea223df7)
Commit: 56130d1e0a96cf8719e5f220b4a6c7dfed225cd1
https://github.com/wesnoth/wesnoth/commit/56130d1e0a96cf8719e5f220b4a6c7dfed225cd1
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M packaging/wesnoth.appdata.xml
Log Message:
-----------
Appdata: change license identifier
former one is valid but deprecated
[ci skip]
(cherry-picked from commit d133b510c97cbb1d6b070c27700e3cfd03ada1c2)
Commit: b044b289e5566172e702b288f2833c90f66f592e
https://github.com/wesnoth/wesnoth/commit/b044b289e5566172e702b288f2833c90f66f592e
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M packaging/wesnoth.desktop
Log Message:
-----------
Add keywords to the desktop file
They are as well used in the software centre.
Having keywords is a bonus, even if they are not matched.
[ci skip]
(cherry-picked from commit 76e7c8d19f8626dca5edd33b8c66ef3a0385f93f)
Commit: 7e63932c8ebe6d4889cc66ecd57e41fcc543fe9f
https://github.com/wesnoth/wesnoth/commit/7e63932c8ebe6d4889cc66ecd57e41fcc543fe9f
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/ai/lua/ai_helper.lua
M data/ai/lua/generic_recruit_engine.lua
M data/campaigns/Eastern_Invasion/ai/ca_ogres_flee.lua
Log Message:
-----------
Lua AIs: remove commented-out debug code
(cherry-picked from commit 23f35546fc31c6345acc24624039f16a92bbb8b7)
Commit: a2b4ce4ee12619ccea14e4b7af76c7c3b746c949
https://github.com/wesnoth/wesnoth/commit/a2b4ce4ee12619ccea14e4b7af76c7c3b746c949
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M packaging/wesnoth.appdata.xml
Log Message:
-----------
remove superfluous space
[ci skip]
(cherry-picked from commit eabf6e2635fd7191aa31677dd9f324fa3a49e358)
Commit: ad594688bef2f97c4d9527f06071b76608c75aed
https://github.com/wesnoth/wesnoth/commit/ad594688bef2f97c4d9527f06071b76608c75aed
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
forwardport changelog entries
[ci skip]
(cherry-picked from commit d3d2decac9cdabe206e5134211ea5f5656ff966d)
Commit: fc6d71b023641f1f49bef7eabe6c98617bf72231
https://github.com/wesnoth/wesnoth/commit/fc6d71b023641f1f49bef7eabe6c98617bf72231
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/ai/micro_ais/cas/ca_herding_herd_sheep.lua
M data/campaigns/Two_Brothers/ai/ca_muff_toras_move.lua
Log Message:
-----------
Lua AIs: use ai_helper.robust_move_and_attack()
ai_helper.robust_move_and_attack() does the stop_unit_moves automatically if the unit is at the destination hex.
(cherry-picked from commit fdc3249496e7c2418a8ab8c7ec19b85bba3f79fb)
Commit: fa7ccab4c02df63dd6deb36169f7cf20a1921e51
https://github.com/wesnoth/wesnoth/commit/fa7ccab4c02df63dd6deb36169f7cf20a1921e51
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M src/gui/dialogs/unit_create.cpp
Log Message:
-----------
gui2/unit_create: Use unit type ids as filtering criteria as well
(cherry-picked from commit 444d6d63f6f059fc831e18a47fe0ef92e7db69db)
Commit: a89780f13bb0d837172c1c26d020d83db6e4e3a5
https://github.com/wesnoth/wesnoth/commit/a89780f13bb0d837172c1c26d020d83db6e4e3a5
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M packaging/wesnoth.appdata.xml
Log Message:
-----------
add textdomains to appdata file:
One must compile wesnoth with -DLOCALEDIR=/usr/share/locale, as that's the place
where the system looks for translations.
(One can test it with gettext -s -d wesnoth "poisoned")
This is according to the docs, needs more testing if it works.
Doesn't work with Arch, though Arch doesn't support software centres well.
[ci skip]
(cherry-picked from commit 60f2158dfaa88eca47e4f2bdb0a4a64f28db8ba1)
Commit: f09160ae7507489a224df2797af6355ef5630bc2
https://github.com/wesnoth/wesnoth/commit/f09160ae7507489a224df2797af6355ef5630bc2
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-manual/zh_TW.po
Log Message:
-----------
fix syntax error in Chinese manual
In Markup, only the normal quotes are allowed.
[ci skip]
(cherry-picked from commit b9396cd1162d798f28fc965f7bfcef130c6de818)
Commit: 44ceaa18747e7b7e581edc30907db12413c653d7
https://github.com/wesnoth/wesnoth/commit/44ceaa18747e7b7e581edc30907db12413c653d7
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/ai/lua/ai_helper.lua
Log Message:
-----------
ai_helper: get_unit functions should only return live units
Live beiing defined as in get_live_units(), that is, non-petrified units
(cherry-picked from commit a7d80240f2ca11b01e14120f80cd9ecace3eaa85)
Commit: 46efcf15fdc5201a52a3e63462f84450e3aeebf5
https://github.com/wesnoth/wesnoth/commit/46efcf15fdc5201a52a3e63462f84450e3aeebf5
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/ai/lua/ca_grab_villages.lua
M data/ai/lua/ca_move_to_any_enemy.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/campaigns/Eastern_Invasion/ai/ca_ogres_flee.lua
M data/campaigns/The_Rise_Of_Wesnoth/ai/ca_aggressive_attack_no_suicide.lua
M data/campaigns/The_Rise_Of_Wesnoth/ai/ca_retreat.lua
Log Message:
-----------
Lua AIs: use ai_helper get_unit functions where applicable
The ai_helper functions are optimized for speed (as much as possible in a general setting) and do all the necessary tests. For example, get_units_with_attacks() checks both whether the unit has attacks left, and whether it has any attacks in the first place.
(cherry-picked from commit 75843541bcf92e743b911ef49046c54a050e8a0f)
Commit: 647cdea397c74cf584ef1dfe8921344e5e898a21
https://github.com/wesnoth/wesnoth/commit/647cdea397c74cf584ef1dfe8921344e5e898a21
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/saved_game.cpp
Log Message:
-----------
fix #3515 : random start time
(cherry-picked from commit 8ed601461eac824f96eb9e6c02cf07a7fcf16f48)
Commit: d8b26a92fb716a9d9c90ce6939a021df91710d71
https://github.com/wesnoth/wesnoth/commit/d8b26a92fb716a9d9c90ce6939a021df91710d71
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/saved_game.cpp
Log Message:
-----------
Fix build
Regression from commit ca6e7aef7db9e5625e4b5db8e9b30f863b83c582.
(cherry-picked from commit 9f43c4a10e536ef1ce496ac7371c8c8956d09445)
Commit: ee3e842cbc4a0291fa8c6ebbc398c895dc96a739
https://github.com/wesnoth/wesnoth/commit/ee3e842cbc4a0291fa8c6ebbc398c895dc96a739
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/lua/wml/animate_unit.lua
Log Message:
-----------
[animate_unit]: clear the animation after playing it
This avoids a reference to the unit from being leaked, which prevented the
unit's halo (if any) from disappearing when the unit died.
Fixes #3509. Closes #3520.
(cherry-picked from commit e63bd35f9d209f355400a743732ea2c4b91d5da4)
Commit: 98bec00face315051bf38a39fb3022df4ef85ba2
https://github.com/wesnoth/wesnoth/commit/98bec00face315051bf38a39fb3022df4ef85ba2
Author: newfrenchy83 <31768074+newfrenchy83 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/lua/wml/heal_unit.lua
Log Message:
-----------
[heal_unit]: clear the animation after playing it (#3526)
Fixes another case of unit halo remaining after death.
(cherry-picked from commit 354162919741f1b5360120286bf389ecd963be79)
Commit: 319c98d616e9d9ad7bcf349c66bf23091c757584
https://github.com/wesnoth/wesnoth/commit/319c98d616e9d9ad7bcf349c66bf23091c757584
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/ai/lua/ai_helper.lua
Log Message:
-----------
ai_helper: new function get_locations_no_borders()
(cherry-picked from commit 10463fdf608ade3ff223a58ad7cc43a1e475b803)
Commit: 56934ad576bdcb5bd3f0f21c26a40eb20bdb3d81
https://github.com/wesnoth/wesnoth/commit/56934ad576bdcb5bd3f0f21c26a40eb20bdb3d81
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/ai/lua/ai_helper.lua
M data/ai/lua/ca_castle_switch.lua
M data/ai/lua/generic_recruit_engine.lua
M data/ai/micro_ais/cas/ca_forest_animals_move.lua
M data/ai/micro_ais/cas/ca_goto.lua
M data/ai/micro_ais/cas/ca_hang_out.lua
M data/ai/micro_ais/cas/ca_wolves_multipacks_wander.lua
M data/ai/micro_ais/cas/ca_zone_guardian.lua
Log Message:
-----------
Lua AIs: use ai_helper.get_locations_no_borders()
(cherry-picked from commit dcadab91a418f4f7392bab2544367df580d46ecf)
Commit: c5e41497e1431938d5dfdb14549c0c206292f8ed
https://github.com/wesnoth/wesnoth/commit/c5e41497e1431938d5dfdb14549c0c206292f8ed
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/ai/lua/generic_recruit_engine.lua
Log Message:
-----------
generic_recruit_engine: remove unnecessary variable assignment
(cherry-picked from commit a7811395363f9edd1a40adb11e0748bd0b81c385)
Commit: b8f1604366d269d8dac77ede77d5d8e15c960e2c
https://github.com/wesnoth/wesnoth/commit/b8f1604366d269d8dac77ede77d5d8e15c960e2c
Author: mattsc <mattsc000 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Eastern_Invasion/ai/ca_ogres_flee.lua
Log Message:
-----------
EI custom ogre AI: remove a commented out line
(cherry-picked from commit 2591e435a5c71b0d840174c486fa2bde392d352a)
Commit: 6714ef32e00fd16c6768daf0fd0ed739f09e9651
https://github.com/wesnoth/wesnoth/commit/6714ef32e00fd16c6768daf0fd0ed739f09e9651
Author: Pentarctagon <pentarctagon at tutamail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M CMakeLists.txt
M SConstruct
Log Message:
-----------
Fixes #3518
Certain distro/compiler combinations will apparently warn about not optimizing when _FORTIFY_SOURCE is set.
(cherry-picked from commit 09fcc6b0519d458cbc3e16788576000a8484020b)
Commit: 49f6ef4aa71686765804d623b675a72970334ab0
https://github.com/wesnoth/wesnoth/commit/49f6ef4aa71686765804d623b675a72970334ab0
Author: Martin Hrubý (hrubymar10) <hrubymar10 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
Log Message:
-----------
Fix unit tests in Xcode
(cherry-picked from commit 1af805ecf74b1da30c916acac00b924f1016de79)
Commit: b71bb46d0b0ef05602951abadd0c5b0511f57444
https://github.com/wesnoth/wesnoth/commit/b71bb46d0b0ef05602951abadd0c5b0511f57444
Author: Rikard Falkeborn <rikard.falkeborn at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/generators/default_map_generator_job.cpp
Log Message:
-----------
Bugfix generate random map unique names
The used names was never set so the check for duplicated names did not
work. Detected by cppcheck.
(cherry-picked from commit cc98bcd9d015a852dbec2053f300ce4682c4765d)
Commit: 42c48d1483c55f0ab52821d2b291847aa637d751
https://github.com/wesnoth/wesnoth/commit/42c48d1483c55f0ab52821d2b291847aa637d751
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/tools/GUI.pyw
A data/tools/pywmlx/__init__.py
A data/tools/pywmlx/autof.py
A data/tools/pywmlx/nodemanip.py
A data/tools/pywmlx/postring.py
A data/tools/pywmlx/state/__init__.py
A data/tools/pywmlx/state/lua_states.py
A data/tools/pywmlx/state/machine.py
A data/tools/pywmlx/state/state.py
A data/tools/pywmlx/state/wml_states.py
A data/tools/pywmlx/wmlerr.py
A data/tools/wmlxgettext
M po/CMakeLists.txt
M po/SConscript
R utils/pywmlx/__init__.py
R utils/pywmlx/autof.py
R utils/pywmlx/nodemanip.py
R utils/pywmlx/postring.py
R utils/pywmlx/state/__init__.py
R utils/pywmlx/state/lua_states.py
R utils/pywmlx/state/machine.py
R utils/pywmlx/state/state.py
R utils/pywmlx/state/wml_states.py
R utils/pywmlx/wmlerr.py
R utils/wmlxgettext
Log Message:
-----------
Move wmlxgettext to the data/tools directory so that it's automatically included in official packages
(cherry-picked from commit 59e78e556593cea7650998611640aeff3a6b288f)
Commit: 1606fdd6b6ab5a7b63dd70014b87021d9d830211
https://github.com/wesnoth/wesnoth/commit/1606fdd6b6ab5a7b63dd70014b87021d9d830211
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/terrain/filter.cpp
Log Message:
-----------
Allow lists in SLF location_id key (closes #3493)
(cherry-picked from commit 354f24e926eec0c1e60cc1fab65dda223cfe15f5)
Commit: 489e958d9ff35a0631fe56ce87b169b4f564e78b
https://github.com/wesnoth/wesnoth/commit/489e958d9ff35a0631fe56ce87b169b4f564e78b
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Sync 1.14.4+dev changelog section
[ci skip]
(cherry-picked from commit 6eba0cbace9ac43f3680f2c0a57c0f26a04421d6)
Commit: c1a70068d56fe8053d1c513c2542748358239abf
https://github.com/wesnoth/wesnoth/commit/c1a70068d56fe8053d1c513c2542748358239abf
Author: newfrenchy83 <31768074+newfrenchy83 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/lua/wml/animate_unit.lua
M data/lua/wml/heal_unit.lua
M data/lua/wml/kill.lua
M src/scripting/game_lua_kernel.cpp
Log Message:
-----------
Lua API: implicitly clear animator after playing it (#3536)
This prevents the animator from holding a strong reference to the target unit, which was keeping the unit object alive and thus preventing the unit halo, if any, from disappearing.
(cherry-picked from commit 7d6e2b2a10a61e1704c38ea7ee6aa34178a29b38)
Commit: 5aaccf2d2a18025adaea6906053b2ee7144d1884
https://github.com/wesnoth/wesnoth/commit/5aaccf2d2a18025adaea6906053b2ee7144d1884
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/multiplayer/scenarios/2p_Tombs_of_Kesorak.cfg
Log Message:
-----------
MP Tombs of Kesorak: adjust comment, avoid darkening overlay
A better image is needed, I remove the darkening overlay, because it would be
missleading when a Mage of Light affects this field.
[ci skip]
(cherry-picked from commit 0ef3c0d5f94f895c65598aee36d9ffde63d5766b)
Commit: 5ad321654b88407ac2f27f9f07cca805606e1b88
https://github.com/wesnoth/wesnoth/commit/5ad321654b88407ac2f27f9f07cca805606e1b88
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/macros/utils.cfg
Log Message:
-----------
core macros: don't clear nonexistant variable
A leftover from the switch from {FOREACH} to [foreach]
[ci skip]
(cherry-picked from commit 001b444b10977051962572a991233553bd605384)
Commit: 4d15d7e60198377bce68a7b07268d6eecb6339d0
https://github.com/wesnoth/wesnoth/commit/4d15d7e60198377bce68a7b07268d6eecb6339d0
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/multiplayer/scenarios/ANL_utils/ANL_auto_working.cfg
Log Message:
-----------
ANL: remove superfluous temp variables
The other variables in that event are not needed either, left them in for
readability for the time being.
[ci skip]
(cherry-picked from commit 7a29fc15b4a09837f4eaa2242ab5db4b230f4ef0)
Commit: b881c0ec1a971341257170c4f4e448c6ca0a9072
https://github.com/wesnoth/wesnoth/commit/b881c0ec1a971341257170c4f4e448c6ca0a9072
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg
Log Message:
-----------
TSG S5: fix typo in comment
[ci skip]
(cherry-picked from commit f358beda512f526992c7bd9d4fe3fbff685a7c3b)
Commit: c48735c0fbf9e30ce00eb469c0928dd32a660f85
https://github.com/wesnoth/wesnoth/commit/c48735c0fbf9e30ce00eb469c0928dd32a660f85
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/macros/ai.cfg
Log Message:
-----------
Core Macro Reference: Fix hint
[ci skip]
(cherry-picked from commit 00e41b9857e8dfdb5f603fe7d91a1a6e0725b8c7)
Commit: 21e6b399e8bc1c796aa47e94fe844f77fcdfdc6c
https://github.com/wesnoth/wesnoth/commit/21e6b399e8bc1c796aa47e94fe844f77fcdfdc6c
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/scripting/game_lua_kernel.cpp
Log Message:
-----------
fix #3396 lua_function= doesn't work in [effect][filter]
unfortunately this adds an annoying const_cast. The old code 'worked around'
this by getting a nonconst reference to the same unit via the unit map,
which i think is not better just hides the issue.
(cherry-picked from commit 08b7d1b1ac2e469bab55c37fe73a40f0df603b04)
Commit: bc89512a5c000e0546676a3d0ae0f1be20b31731
https://github.com/wesnoth/wesnoth/commit/bc89512a5c000e0546676a3d0ae0f1be20b31731
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/lua/wml/harm_unit.lua
M src/actions/attack.cpp
M src/ai/default/attack.cpp
M src/ai/simulated_actions.cpp
M src/attack_prediction.cpp
M src/game_config.cpp
M src/game_config.hpp
M src/scripting/game_lua_kernel.cpp
M src/scripting/lua_kernel_base.cpp
Log Message:
-----------
add game_config.combat experience
and make [harm_unit] use these values instead of hardcoded 8*level for
killing and level for combat.
(cherry-picked from commit 3591e82586896c8923de1d45cf9c30d25c522a3f)
Commit: 9d6613a8cc7391ad2fd672ed472395e90906de29
https://github.com/wesnoth/wesnoth/commit/9d6613a8cc7391ad2fd672ed472395e90906de29
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/scripting/lua_common.cpp
Log Message:
-----------
fix 3541 : crash in lua tstring comparision
(cherry-picked from commit 69cdbe8da76e37d4bb827dad97ce99d4ef16cde2)
Commit: b46fedcd35de95405a624d3c8da4f07a10878c45
https://github.com/wesnoth/wesnoth/commit/b46fedcd35de95405a624d3c8da4f07a10878c45
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg
Log Message:
-----------
HttT S6: Allow canceling attack orders.
(cherry-picked from commit e50b6fa7bd72287e57517740e24b47de4079d35a)
Commit: 8e37c39f50217ce54e9f00fc7cb3a777d8d68c41
https://github.com/wesnoth/wesnoth/commit/8e37c39f50217ce54e9f00fc7cb3a777d8d68c41
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg
Log Message:
-----------
HttT S6: Trigger the additional undead as soon as the player touches the cave entry.
Seen in :debug with a Nightgaunt. Not sure if it can happen in normal play.
(cherry-picked from commit 9509eecced0b46435870d06d47a322408064e09a)
Commit: f1e1a99bbd38ea4a8656adf4cdde4c41e415ba45
https://github.com/wesnoth/wesnoth/commit/f1e1a99bbd38ea4a8656adf4cdde4c41e415ba45
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg
Log Message:
-----------
HttT S6: Support unlikely player behavior.
Trigger the undead reinforcements even if the player skips the main cave entrance.
(cherry-picked from commit 95b3ccd9fe0ba5f185f749ceac88188be7b591d9)
Commit: 969fb71440ae1ce0632f73bf0337c422bd40df14
https://github.com/wesnoth/wesnoth/commit/969fb71440ae1ce0632f73bf0337c422bd40df14
Author: loonycyborg <loonycyborg at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/server/forum_user_handler.cpp
Log Message:
-----------
Prevent C++ exception from escaping from is_user_banned()
(cherry-picked from commit 0b9565375f4c27f59043ede643f2d360f2d3eec2)
Commit: 74d5c427c11ffbf2329e154866066f1d6d9243f6
https://github.com/wesnoth/wesnoth/commit/74d5c427c11ffbf2329e154866066f1d6d9243f6
Author: gfgtdf <daniel.gfgtdf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/server/game.cpp
M src/server/game.hpp
M src/server/server.cpp
Log Message:
-----------
fix #3532 : oos error in mp campaigns.
previously it would cause oos when a player that has not yet advanced to
the currrent scenario sends random seed requests.
(cherry-picked from commit d0c0f406f25ce7a24184e44194b5b22071ebbd53)
Commit: cfb8a63bfeff57133090c6956f14e292d0f0135f
https://github.com/wesnoth/wesnoth/commit/cfb8a63bfeff57133090c6956f14e292d0f0135f
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Changelog entries for changes I committed
(cherry-picked from commit 6234faa1002a1364c5893683b26770736e050c4f)
Commit: 2a21549bcb338833f2b0cb941233db2f28db779d
https://github.com/wesnoth/wesnoth/commit/2a21549bcb338833f2b0cb941233db2f28db779d
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg
Log Message:
-----------
HttT S17: Explain the lava mechanic
Gameplay is not affected. The player can still lose units to {EXPAND_LAVA}.
(cherry picked from commit a3be91248753f9ddbc0d647a4d918e4f160b7d56)
(cherry-picked from commit de9541fd76fca9bd50e4bc71b85b2c95ded0e134)
Commit: 1bbd40b7fb92c23c5eaeaad73ba39f85ec38039f
https://github.com/wesnoth/wesnoth/commit/1bbd40b7fb92c23c5eaeaad73ba39f85ec38039f
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg
Log Message:
-----------
HttT S17: Add po comment
(cherry picked from commit b7c431e7b39418b23666e55f6286b1ad768e5979)
(cherry-picked from commit f1d20c1edb6872f63fb84286067782a2d29310f2)
Commit: 13b00364e31d835d6c9588225566be3f3bdb05ab
https://github.com/wesnoth/wesnoth/commit/13b00364e31d835d6c9588225566be3f3bdb05ab
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/core/units/elves/High_Lord.cfg
Log Message:
-----------
units: Add a po comment in Elvish High Lord.
(cherry picked from commit 1f0c466a3d806a89ce8069b464e357797799f06e)
(cherry-picked from commit 9072934d45a2db49053d511c2d8c5db8b707f34d)
Commit: 083514231c6a314de635b4c965a7bcfd513e5e5b
https://github.com/wesnoth/wesnoth/commit/083514231c6a314de635b4c965a7bcfd513e5e5b
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg
Log Message:
-----------
HttT S17: Fix "naught" and explain why only high-level mages.
(cherry picked from commit 7ed9f2db9ad958286fb896d0930952c03614a954)
(cherry-picked from commit fff478112c6e7d790cee2df2103a4e55924cb3be)
Commit: 983972d9499a4f61f711b39e1ad6da072c3a933d
https://github.com/wesnoth/wesnoth/commit/983972d9499a4f61f711b39e1ad6da072c3a933d
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg
Log Message:
-----------
fixup
(cherry picked from commit 62eb450da6319413f1f7adec75a30177aba00dc9)
(cherry-picked from commit 2c9aeec8b0eb47fd8d16d3242b47e27981395bc6)
Commit: d456fe07b624284c1f0d7bc5f5cc772aa43c1e05
https://github.com/wesnoth/wesnoth/commit/d456fe07b624284c1f0d7bc5f5cc772aa43c1e05
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg
Log Message:
-----------
HttT S17: Explain why Mages of Light aren't considered by the filter.
(cherry picked from commit 4c2f4f7eda28cfaacd512153099df056100e602c)
(cherry-picked from commit 0a0920fe79960d8886fc63d70e05c80a4d88826b)
Commit: 1e4c51faf058460b321dded4a2738fd455276d45
https://github.com/wesnoth/wesnoth/commit/1e4c51faf058460b321dded4a2738fd455276d45
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg
Log Message:
-----------
https://github.com/wesnoth/wesnoth/pull/3473#discussion_r211090169
(cherry picked from commit bc52143390debcc165aa234616c174072aeb1b97)
(cherry-picked from commit c97fe98801b6629797afbb6ae797c444a24df034)
Commit: d10c833c4b6cfac149e365fd03fd16785f8ee41f
https://github.com/wesnoth/wesnoth/commit/d10c833c4b6cfac149e365fd03fd16785f8ee41f
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg
Log Message:
-----------
HttT S17: Change again due to an ambiguity.
(cherry picked from commit 18e886d82e3a192a82baea6d6f036e656836dc7f)
(cherry-picked from commit 25791d64e579de1ba2fe53043598923fd32282fc)
Commit: cebe98cc16df0c8faec352c9a093d00620b23f86
https://github.com/wesnoth/wesnoth/commit/cebe98cc16df0c8faec352c9a093d00620b23f86
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg
Log Message:
-----------
HttT S17: Add a po comments
(cherry picked from commit edcccc56a7b9bffdb78d20aa6cf10086e5f9da5b)
(cherry-picked from commit 960a8fcc9fcc694898e934a990f3c29cfffebec3)
Commit: 778080121f973398c9b1135c001f78128b9685b4
https://github.com/wesnoth/wesnoth/commit/778080121f973398c9b1135c001f78128b9685b4
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg
Log Message:
-----------
HttT S17: Correct pronoun.
(cherry picked from commit 96387a55d559de4e4aba4c81e788ee1b50f27a88)
(cherry-picked from commit 0e9e3b30f97300adec6e344be0fd11b4b3bb874d)
Commit: 5787a8e4c87148876386620d4e2a96c463de0bc4
https://github.com/wesnoth/wesnoth/commit/5787a8e4c87148876386620d4e2a96c463de0bc4
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg
Log Message:
-----------
HttT S17: Further tweak dwarf's dialog.
(cherry picked from commit 3e3bd320c9488a0a0bc71a636d442d64f24a8c0a)
(cherry-picked from commit 865dcbf3a4fff005b7a5c74d5286cb163a4842b5)
Commit: 657100ff097d029e213782d7e25c06797420c172
https://github.com/wesnoth/wesnoth/commit/657100ff097d029e213782d7e25c06797420c172
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg
Log Message:
-----------
HttT S17: Further updates to dialog
- Improve Konrad's line
- Use variant portraits for Konrad and Li'sar
- Update the mage's dialog to match the dwarf's
(cherry picked from commit f7d8d0d25723e84f5fb2cf1a4a5343c263090410)
(cherry-picked from commit 15acd756361a907b9796450f0dd0560b7b20b78b)
Commit: 1001e45dfacc92036b62a78f1ee46769f7d28421
https://github.com/wesnoth/wesnoth/commit/1001e45dfacc92036b62a78f1ee46769f7d28421
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg
M data/campaigns/Heir_To_The_Throne/scenarios/25_HttT_Epilogue.cfg
Log Message:
-----------
HttT S17: Add comic relief.
(cherry picked from commit f3407fddc909fa05a34d34aee4afd2df7d30849e)
(cherry-picked from commit 7b2289f81843d5d9a040765cd071b50dc08ff9b8)
Commit: d209d6eedb74d84ae4b0dc68a6ad5506c8a2c9b6
https://github.com/wesnoth/wesnoth/commit/d209d6eedb74d84ae4b0dc68a6ad5506c8a2c9b6
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg
Log Message:
-----------
HttT S17: Make Li'sar's dialog unconditional.
(cherry picked from commit 6ea39b33e690f796073e687896febb60785fb4d2)
(cherry-picked from commit c006072356737ef8199cb5a40e6aa626292e2553)
Commit: b69baf5793f90fe672ac0c19ac4a110a8d5edf05
https://github.com/wesnoth/wesnoth/commit/b69baf5793f90fe672ac0c19ac4a110a8d5edf05
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Heir_To_The_Throne/scenarios/15_The_Lost_General.cfg
M data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg
Log Message:
-----------
HttT S17: Show the 'Comic relief' comment to translators, too.
(cherry picked from commit 31d333cc62b4a54c8d57bcbfc1ef425fd6b24d7d)
(cherry-picked from commit 046b141366bc1ef80d15447d46fc9d9fb33d0c10)
Commit: 317ef288c5a551c0edc98dd1326dabf80a653ce1
https://github.com/wesnoth/wesnoth/commit/317ef288c5a551c0edc98dd1326dabf80a653ce1
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Update changelog
(cherry-picked from commit 100565c7d8eb0f67473a8b370495449397fd69af)
Commit: 1c57944c8732be07603a2d98d742febf69034d55
https://github.com/wesnoth/wesnoth/commit/1c57944c8732be07603a2d98d742febf69034d55
Author: Łukasz Hryniuk <code at hryniuk.pl>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/gui/dialogs/unit_list.cpp
M src/gui/dialogs/unit_recall.cpp
M src/gui/widgets/unit_preview_pane.cpp
M src/reports.cpp
Log Message:
-----------
gui2: indicate that unit cannot advance
(cherry-picked from commit 7cf478e8d91eaefccce110d281790a8e3a4574e4)
Commit: 1f1770362e0de35c673b1c510d6ac785523c3f98
https://github.com/wesnoth/wesnoth/commit/1f1770362e0de35c673b1c510d6ac785523c3f98
Author: joeylmaalouf <joeylmaalouf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/An_Orcish_Incursion/_main.cfg
M data/campaigns/Dead_Water/_main.cfg
M data/campaigns/Delfadors_Memoirs/_main.cfg
M data/campaigns/Descent_Into_Darkness/_main.cfg
M data/campaigns/Eastern_Invasion/_main.cfg
M data/campaigns/Heir_To_The_Throne/_main.cfg
M data/campaigns/Legend_of_Wesmere/_main.cfg
M data/campaigns/Liberty/_main.cfg
M data/campaigns/Northern_Rebirth/_main.cfg
M data/campaigns/Sceptre_of_Fire/_main.cfg
M data/campaigns/Secrets_of_the_Ancients/_main.cfg
M data/campaigns/Son_Of_The_Black_Eye/_main.cfg
M data/campaigns/The_Hammer_of_Thursagan/_main.cfg
M data/campaigns/The_Rise_Of_Wesnoth/_main.cfg
M data/campaigns/The_South_Guard/_main.cfg
M data/campaigns/Two_Brothers/_main.cfg
M data/campaigns/Under_the_Burning_Suns/_main.cfg
Log Message:
-----------
Menu: re-order and re-rank campaigns (including new ranks) (fixes #1222)
(cherry-picked from commit a3a9b723115ae0cd5a5cf51ec1fd46af833b1ea3)
Commit: 23df7b262f289323c4c63a2a48d0aaefe067e1af
https://github.com/wesnoth/wesnoth/commit/23df7b262f289323c4c63a2a48d0aaefe067e1af
Author: joeylmaalouf <joeylmaalouf at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Legend_of_Wesmere/_main.cfg
M data/campaigns/Northern_Rebirth/_main.cfg
M data/campaigns/Secrets_of_the_Ancients/_main.cfg
M data/campaigns/The_Rise_Of_Wesnoth/_main.cfg
M data/campaigns/Under_the_Burning_Suns/_main.cfg
Log Message:
-----------
Menu: campaign order tweaks
(cherry-picked from commit 243a542eddb6f4938563b1e4a83968ac1112a9cd)
Commit: b7964a10020a78a3d34792e8ca26a9cdd5f43710
https://github.com/wesnoth/wesnoth/commit/b7964a10020a78a3d34792e8ca26a9cdd5f43710
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/gui/window/wml_message.cfg
Log Message:
-----------
WML [message]: Add left padding when the portrait is shown on the right.
The text is now shown at exactly the same place regardless of which side
the portrait is on.
Fixes #1938.
(cherry-picked from commit fc9e5f0484bf4718390ed3ab01d5ae418f9cfacf)
Commit: 6cc6fe8527814ea241cba5cd8fefbba24ac07f16
https://github.com/wesnoth/wesnoth/commit/6cc6fe8527814ea241cba5cd8fefbba24ac07f16
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/gui/window/wml_message.cfg
Log Message:
-----------
WML [message]: Limit the text width for messages with portraits on both sides as already done for messages with one portrait.
(cherry-picked from commit 3809b64cf4ae2148f29e0f6bf621a7901d2698cb)
Commit: ccaa9b75ed7ccf212ca1f706a529ee527f8d133f
https://github.com/wesnoth/wesnoth/commit/ccaa9b75ed7ccf212ca1f706a529ee527f8d133f
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/ai/micro_ais/maps/animals.map
M data/ai/micro_ais/maps/bottleneck_defense.map
M data/ai/micro_ais/maps/lurkers.map
M data/ai/micro_ais/maps/messenger_escort.map
M data/ai/micro_ais/maps/protect_unit.map
Log Message:
-----------
Micro AI Demos: save maps in new format
[ci skip]
(cherry-picked from commit c5d353988045c6f8099948a14c935507f80a7a39)
Commit: a10888ca5bbc015270761ff032176365548d5389
https://github.com/wesnoth/wesnoth/commit/a10888ca5bbc015270761ff032176365548d5389
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/ai/micro_ais/maps/lurkers.map
Log Message:
-----------
Micro AI Demos: use Cme instead of Chw for lurkers map
[ci skip]
(cherry-picked from commit c5cabd960b257c258fda8e40d927ed427c595df9)
Commit: 10185854488ebaf7280e0bcc41f002e05776bf8d
https://github.com/wesnoth/wesnoth/commit/10185854488ebaf7280e0bcc41f002e05776bf8d
Author: DisherProject <pycchio at tiscali.it>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Sceptre_of_Fire/maps/2t_In_the_Dwarven_City.map
M data/campaigns/Sceptre_of_Fire/maps/3t_The_Council_Regathers.map
M data/campaigns/Sceptre_of_Fire/maps/4t_The_Jeweler.map
M data/campaigns/Sceptre_of_Fire/scenarios/2t_In_the_Dwarven_City.cfg
M data/campaigns/Sceptre_of_Fire/scenarios/3t_The_Council_Regathers.cfg
M data/campaigns/Sceptre_of_Fire/scenarios/4t_The_Jeweler.cfg
Log Message:
-----------
SoF S2t,S3t,S4t - Move scenery items to map file
The braziers will also be animated, while they were still
images before
(cherry-picked from commit effb8650408c51bcd10c09c3f9448bdb953cc2b3)
Commit: 0844dfb8a37fc1f88bbd4a97fc13caa918f0dcd3
https://github.com/wesnoth/wesnoth/commit/0844dfb8a37fc1f88bbd4a97fc13caa918f0dcd3
Author: DisherProject <pycchio at tiscali.it>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg
M data/campaigns/Sceptre_of_Fire/scenarios/2_Closing_the_Gates.cfg
M data/campaigns/Sceptre_of_Fire/scenarios/3_Searching_for_the_Runecrafter.cfg
M data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg
M data/campaigns/Sceptre_of_Fire/scenarios/7_Outriding_the_Outriders.cfg
M data/campaigns/Sceptre_of_Fire/scenarios/8_The_Dragon.cfg
M data/campaigns/Sceptre_of_Fire/scenarios/9_Caverns_of_Flame.cfg
M data/campaigns/Sceptre_of_Fire/scenarios/Epilogue.cfg
Log Message:
-----------
SoF: General cleanup
1) Clear variables and macros
2) Remove default AI values
3) S7: Remove the ghost ship
(cherry-picked from commit 9e8fb2d3e09b8c50a9eb1abd976efaf7d316ca66)
Commit: 201765740e13cafebc422ebc5dc2ab8937ea1904
https://github.com/wesnoth/wesnoth/commit/201765740e13cafebc422ebc5dc2ab8937ea1904
Author: DisherProject <pycchio at tiscali.it>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg
Log Message:
-----------
SoF S1: Remove Caravans' upkeep cost
In exchange, the player will have 2 starting villages
less than before
(cherry-picked from commit 76f081addf6772ab81c0921b1cf18e0def81ed9c)
Commit: 0f073b22de86c7cbc37a0dda7c9402973fe8150c
https://github.com/wesnoth/wesnoth/commit/0f073b22de86c7cbc37a0dda7c9402973fe8150c
Author: DisherProject <pycchio at tiscali.it>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Sceptre_of_Fire/scenarios/2_Closing_the_Gates.cfg
Log Message:
-----------
SoF S2: Place glyphs during prestart
So we can see them while our ally is talking about them
(cherry-picked from commit 29cec1a77015fea916798890c362ea7573e10d32)
Commit: 95b3b954c7e82eb51b93afb44823c2e111fa7239
https://github.com/wesnoth/wesnoth/commit/95b3b954c7e82eb51b93afb44823c2e111fa7239
Author: DisherProject <pycchio at tiscali.it>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Sceptre_of_Fire/scenarios/4_Gathering_Materials.cfg
Log Message:
-----------
SoF S4: Add the tunnel the dwarves came from to reach the mines
(cherry-picked from commit 49d12cf1ef60bcd34dc1d7094408cee33355f87b)
Commit: b14cbfb715a1211319424f3b82ee3fd99cf448d4
https://github.com/wesnoth/wesnoth/commit/b14cbfb715a1211319424f3b82ee3fd99cf448d4
Author: DisherProject <pycchio at tiscali.it>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Sceptre_of_Fire/maps/5_Hills_of_the_Shorbear_Clan.map
M data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg
Log Message:
-----------
SoF S5: Place the elvish encampment when the leader arrives
So remove his starting castle from the map; otherwise the user
would see an empty keep and would know where the enemy is
going to spawn
(cherry-picked from commit 5dc6b796d3183df9a41369c5380063245df9b9d7)
Commit: 9ab08eb1f38d9872f9a179a0a0e1da212cfe6aba
https://github.com/wesnoth/wesnoth/commit/9ab08eb1f38d9872f9a179a0a0e1da212cfe6aba
Author: DisherProject <pycchio at tiscali.it>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Sceptre_of_Fire/scenarios/6_Towards_the_Caves.cfg
Log Message:
-----------
SoF S6: Set correct speaker for [message]
Alanin addresses Rugnur, and not Thursagan
(cherry-picked from commit 20cd56324c771ac55111778fbda7df14f1a7e279)
Commit: b90d6aaa6bfdac6607ecd62d1954618d2a2d1180
https://github.com/wesnoth/wesnoth/commit/b90d6aaa6bfdac6607ecd62d1954618d2a2d1180
Author: DisherProject <pycchio at tiscali.it>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Sceptre_of_Fire/scenarios/7_Outriding_the_Outriders.cfg
Log Message:
-----------
SoF S7: Don't let the player kill all of the enemies
(cherry-picked from commit 5013a9f3e5616665f080f3fb35018cdc48f0d119)
Commit: 8d8a46e157c07fea68c6fe6efbdf1f1a4bb87735
https://github.com/wesnoth/wesnoth/commit/8d8a46e157c07fea68c6fe6efbdf1f1a4bb87735
Author: DisherProject <pycchio at tiscali.it>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Sceptre_of_Fire/scenarios/9_Caverns_of_Flame.cfg
Log Message:
-----------
SoF S9: Fix some events and add TODOs
(cherry-picked from commit bc4a5e832b3a241435869f63fc70f1856dde8bdf)
Commit: 6814f85b5cb221dce688a067013f9151b4b5070c
https://github.com/wesnoth/wesnoth/commit/6814f85b5cb221dce688a067013f9151b4b5070c
Author: DisherProject <pycchio at tiscali.it>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Sceptre_of_Fire/scenarios/3_Searching_for_the_Runecrafter.cfg
M data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg
Log Message:
-----------
SoF: Postpone Gryphon Riders availability
(cherry-picked from commit 67f49712c62d295a74a41ebe1aa138ab37c08e34)
Commit: c28b24196e753a85506cbcbdc13adca3d4cebb79
https://github.com/wesnoth/wesnoth/commit/c28b24196e753a85506cbcbdc13adca3d4cebb79
Author: DisherProject <pycchio at tiscali.it>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg
M data/campaigns/Sceptre_of_Fire/scenarios/2_Closing_the_Gates.cfg
M data/campaigns/Sceptre_of_Fire/scenarios/3_Searching_for_the_Runecrafter.cfg
M data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg
M data/campaigns/Sceptre_of_Fire/scenarios/6_Towards_the_Caves.cfg
M data/campaigns/Sceptre_of_Fire/scenarios/8_The_Dragon.cfg
Log Message:
-----------
SoF: add [show_if] to the objectives
(cherry-picked from commit 648035fa1e89860a596b6a119e86c51227691faf)
Commit: ab1db38a37102f9fc58eb5840ff58506e910e959
https://github.com/wesnoth/wesnoth/commit/ab1db38a37102f9fc58eb5840ff58506e910e959
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-ai/cs.po
M po/wesnoth-anl/cs.po
M po/wesnoth-aoi/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-test/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-utbs/cs.po
M po/wesnoth/cs.po
Log Message:
-----------
updated Czech translation
(cherry-picked from commit 918a812027f4d7e5219b71a46a795fc3bf1473fd)
Commit: 3f44f76e21db1ea528908e04ad613391b26abfac
https://github.com/wesnoth/wesnoth/commit/3f44f76e21db1ea528908e04ad613391b26abfac
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-aoi/en_GB.po
M po/wesnoth-dm/en_GB.po
M po/wesnoth-help/en_GB.po
M po/wesnoth-httt/en_GB.po
M po/wesnoth-l/en_GB.po
M po/wesnoth-lib/en_GB.po
M po/wesnoth-manpages/en_GB.po
M po/wesnoth-multiplayer/en_GB.po
M po/wesnoth-nr/en_GB.po
M po/wesnoth-sof/en_GB.po
M po/wesnoth-sota/en_GB.po
M po/wesnoth-thot/en_GB.po
M po/wesnoth-tsg/en_GB.po
M po/wesnoth-tutorial/en_GB.po
M po/wesnoth-units/en_GB.po
M po/wesnoth/en_GB.po
Log Message:
-----------
updated British English translation
(cherry-picked from commit eadbb1e086ca8ffb18f02a310d4d7316c34b8e51)
Commit: 2ccd30b7edcad2f0d24d0d3385c2d68788564dd2
https://github.com/wesnoth/wesnoth/commit/2ccd30b7edcad2f0d24d0d3385c2d68788564dd2
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-ai/fr.po
M po/wesnoth-aoi/fr.po
M po/wesnoth-dm/fr.po
M po/wesnoth-dw/fr.po
M po/wesnoth-editor/fr.po
M po/wesnoth-help/fr.po
M po/wesnoth-httt/fr.po
M po/wesnoth-l/fr.po
M po/wesnoth-lib/fr.po
M po/wesnoth-manpages/fr.po
M po/wesnoth-multiplayer/fr.po
M po/wesnoth-tsg/fr.po
M po/wesnoth-tutorial/fr.po
M po/wesnoth-units/fr.po
M po/wesnoth/fr.po
Log Message:
-----------
updated French translation
(cherry-picked from commit 235a54a050d3d431b4c8c0896c1d474b5b2c0bca)
Commit: f6390ac2e527328c7e00bf696545a88c30bc9adc
https://github.com/wesnoth/wesnoth/commit/f6390ac2e527328c7e00bf696545a88c30bc9adc
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-ai/gd.po
M po/wesnoth-anl/gd.po
M po/wesnoth-aoi/gd.po
M po/wesnoth-did/gd.po
M po/wesnoth-dm/gd.po
M po/wesnoth-dw/gd.po
M po/wesnoth-editor/gd.po
M po/wesnoth-ei/gd.po
M po/wesnoth-help/gd.po
M po/wesnoth-httt/gd.po
M po/wesnoth-l/gd.po
M po/wesnoth-lib/gd.po
M po/wesnoth-low/gd.po
M po/wesnoth-manual/gd.po
M po/wesnoth-multiplayer/gd.po
M po/wesnoth-nr/gd.po
M po/wesnoth-sof/gd.po
M po/wesnoth-sota/gd.po
M po/wesnoth-sotbe/gd.po
M po/wesnoth-tb/gd.po
M po/wesnoth-test/gd.po
M po/wesnoth-thot/gd.po
M po/wesnoth-trow/gd.po
M po/wesnoth-tsg/gd.po
M po/wesnoth-tutorial/gd.po
M po/wesnoth-units/gd.po
M po/wesnoth-utbs/gd.po
M po/wesnoth/gd.po
Log Message:
-----------
updated Scottish Gaelic translation
(cherry-picked from commit 7ac40296b1193d966d0135122769e5f913be7fb3)
Commit: a98e7af336464b5977cc0a9c9c578a5f470e27ed
https://github.com/wesnoth/wesnoth/commit/a98e7af336464b5977cc0a9c9c578a5f470e27ed
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-ai/ja.po
M po/wesnoth-anl/ja.po
M po/wesnoth-aoi/ja.po
M po/wesnoth-did/ja.po
M po/wesnoth-dm/ja.po
M po/wesnoth-dw/ja.po
M po/wesnoth-editor/ja.po
M po/wesnoth-ei/ja.po
M po/wesnoth-help/ja.po
M po/wesnoth-httt/ja.po
M po/wesnoth-l/ja.po
M po/wesnoth-lib/ja.po
M po/wesnoth-low/ja.po
M po/wesnoth-manpages/ja.po
M po/wesnoth-manual/ja.po
M po/wesnoth-multiplayer/ja.po
M po/wesnoth-nr/ja.po
M po/wesnoth-sof/ja.po
M po/wesnoth-sota/ja.po
M po/wesnoth-sotbe/ja.po
M po/wesnoth-tb/ja.po
M po/wesnoth-test/ja.po
M po/wesnoth-thot/ja.po
M po/wesnoth-trow/ja.po
M po/wesnoth-tsg/ja.po
M po/wesnoth-tutorial/ja.po
M po/wesnoth-units/ja.po
M po/wesnoth-utbs/ja.po
M po/wesnoth/ja.po
Log Message:
-----------
updated Japanese translation
(cherry-picked from commit 389cd9a8315fbd4f1d8abbba04db23428dbd1819)
Commit: 4b29bd7fa23a190c00c22a5473c3b2b48647dcb6
https://github.com/wesnoth/wesnoth/commit/4b29bd7fa23a190c00c22a5473c3b2b48647dcb6
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/menu_events.cpp
M src/play_controller.cpp
M src/play_controller.hpp
Log Message:
-----------
Reevaluate [show_if] conditions and delayed variable expansions before displaying objectives at start.
Fixes #3544.
(cherry-picked from commit d99f5b8a7689ab939f76d47535d1ff0ce6d625cf)
Commit: 19479d70bdbb256c03c1f13cc70ce3fdfa9df4eb
https://github.com/wesnoth/wesnoth/commit/19479d70bdbb256c03c1f13cc70ce3fdfa9df4eb
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/play_controller.cpp
M src/play_controller.hpp
Log Message:
-----------
Add const annotation to new function
(cherry-picked from commit 9f58a8063561a1ce4897fa88c1982e68dece33bc)
Commit: f6f75721267ef5c7c12c217baeaa63bcb02f997b
https://github.com/wesnoth/wesnoth/commit/f6f75721267ef5c7c12c217baeaa63bcb02f997b
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/multiplayer/scenarios/4p_A_New_Land.cfg
Log Message:
-----------
ANL: fix village gold being too low
[ci skip]
(cherry-picked from commit 09f418bdd84838d0230e3d01779c4f567637ece2)
Commit: 3d556e0a300789eb74c3cdcbb35c0f9cde30016f
https://github.com/wesnoth/wesnoth/commit/3d556e0a300789eb74c3cdcbb35c0f9cde30016f
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-ai/hu.po
M po/wesnoth-anl/hu.po
M po/wesnoth-aoi/hu.po
M po/wesnoth-did/hu.po
M po/wesnoth-dm/hu.po
M po/wesnoth-dw/hu.po
M po/wesnoth-editor/hu.po
M po/wesnoth-ei/hu.po
M po/wesnoth-help/hu.po
M po/wesnoth-httt/hu.po
M po/wesnoth-l/hu.po
M po/wesnoth-lib/hu.po
M po/wesnoth-low/hu.po
M po/wesnoth-manual/hu.po
M po/wesnoth-multiplayer/hu.po
M po/wesnoth-nr/hu.po
M po/wesnoth-sof/hu.po
M po/wesnoth-sota/hu.po
M po/wesnoth-sotbe/hu.po
M po/wesnoth-tb/hu.po
M po/wesnoth-test/hu.po
M po/wesnoth-thot/hu.po
M po/wesnoth-trow/hu.po
M po/wesnoth-tsg/hu.po
M po/wesnoth-tutorial/hu.po
M po/wesnoth-units/hu.po
M po/wesnoth-utbs/hu.po
M po/wesnoth/hu.po
Log Message:
-----------
updated Hungarian translation
(cherry-picked from commit c1ffe4ce395e922f99099da99cbb1e41d602f78f)
Commit: 13f2adf0f38d8712692d93e9f1c7f4fd60ca56a0
https://github.com/wesnoth/wesnoth/commit/13f2adf0f38d8712692d93e9f1c7f4fd60ca56a0
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Synchronized changelog with 1.14
[ci skip]
(cherry-picked from commit 57709d4ae4845d43c512da292dc95de8f2fc2ea6)
Commit: c4f8f759e043b888988bf589fe67bf88670620e7
https://github.com/wesnoth/wesnoth/commit/c4f8f759e043b888988bf589fe67bf88670620e7
Author: Andras Szell <szell.andris at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg
Log Message:
-----------
Tutorial S1: display an undo message if impossible to reach next target
Fixes #3039
Until the elves attack the quintain it is not allowed to end turns
before completing the given tasks. Display a message how to undo if
there is not enough MP remaining to reach the current destination or
an enemy by either unit.
[ci skip]
(cherry-picked from commit b16b7f032a6be74451016be3b3f3d69cd229de00)
Commit: 7b36ccc82365a907250b2138f33d3a7c17cc2ded
https://github.com/wesnoth/wesnoth/commit/7b36ccc82365a907250b2138f33d3a7c17cc2ded
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_Hammer_of_Thursagan/utils/macros.cfg
Log Message:
-----------
THoT: add potential workaround for #3547
It's anyway a good idea to change this code.
[ci skip]
(cherry-picked from commit 56111818e972332391d520ad900cccfdb4a23ec0)
Commit: 4c6de5988d745cd17bc636e61ce92f7686538540
https://github.com/wesnoth/wesnoth/commit/4c6de5988d745cd17bc636e61ce92f7686538540
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_Hammer_of_Thursagan/utils/macros.cfg
Log Message:
-----------
fixup
[ci skip]
(cherry-picked from commit e5b4fcdfd35804390d5e5ae760055219e5d214bd)
Commit: 72e3e495ed1d6aa6f81e71dbd21ee6eea0237db5
https://github.com/wesnoth/wesnoth/commit/72e3e495ed1d6aa6f81e71dbd21ee6eea0237db5
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/The_Hammer_of_Thursagan/utils/macros.cfg
Log Message:
-----------
THoT: replace [filter_wml]
[ci skip]
(cherry-picked from commit b8d8be3436dc415a5f8ad924599bfa67bbd51743)
Commit: daf40f637c242f761e16ca8b45b39bc1ab190d02
https://github.com/wesnoth/wesnoth/commit/daf40f637c242f761e16ca8b45b39bc1ab190d02
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Fix changelog indentation
[ci skip]
(cherry-picked from commit a38466d0b50326ba3d5027f7253096340580848e)
Commit: c3446eba221db4b14becc223930133bf5fabac5d
https://github.com/wesnoth/wesnoth/commit/c3446eba221db4b14becc223930133bf5fabac5d
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Multiple fixes to the changelog to make it look good on Steam
[ci skip]
(cherry-picked from commit 7bb419abbf76ca2b88fd3fee4b66a5152732133e)
Commit: 7e4d12e10d98cc5254d245ac34ce91b55b1ffd75
https://github.com/wesnoth/wesnoth/commit/7e4d12e10d98cc5254d245ac34ce91b55b1ffd75
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M utils/pofix.py
Log Message:
-----------
pofix: 1.14 announcement rules for 1.14.5
[ci skip]
(cherry-picked from commit 2ea2a4da4968ffc274757271ebe006a795cae955)
Commit: 20177dbe5ea8b38330b755c2d188b47017f9697c
https://github.com/wesnoth/wesnoth/commit/20177dbe5ea8b38330b755c2d188b47017f9697c
Author: V N <n1m5spm at yandex.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/lua/on_event.lua
Log Message:
-----------
prevent double execution of on_event.lua
makes it safe to dofile("on_event.lua")
(cherry-picked from commit 6010ffe98ee2dd4450ec8fa42e89d6e0557c8dad)
Commit: ea3ba4ac340f8ed099e396cd19b86017194aecef
https://github.com/wesnoth/wesnoth/commit/ea3ba4ac340f8ed099e396cd19b86017194aecef
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-ai/it.po
M po/wesnoth-aoi/it.po
M po/wesnoth-dw/it.po
M po/wesnoth-help/it.po
M po/wesnoth-httt/it.po
M po/wesnoth-l/it.po
M po/wesnoth-lib/it.po
M po/wesnoth-manpages/it.po
M po/wesnoth-manual/it.po
M po/wesnoth-multiplayer/it.po
M po/wesnoth-nr/it.po
M po/wesnoth-sota/it.po
M po/wesnoth-sotbe/it.po
M po/wesnoth-tsg/it.po
M po/wesnoth-tutorial/it.po
M po/wesnoth-units/it.po
M po/wesnoth-utbs/it.po
M po/wesnoth/it.po
Log Message:
-----------
updated Italian translation
(cherry-picked from commit 9acb15674f62e437d3f663d4fe3e6f793ea00965)
Commit: 20539018f7a6816ffa946145fba5fefa545ee69d
https://github.com/wesnoth/wesnoth/commit/20539018f7a6816ffa946145fba5fefa545ee69d
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M po/wesnoth-ai/es.po
M po/wesnoth-anl/es.po
M po/wesnoth-aoi/es.po
M po/wesnoth-did/es.po
M po/wesnoth-dm/es.po
M po/wesnoth-dw/es.po
M po/wesnoth-editor/es.po
M po/wesnoth-ei/es.po
M po/wesnoth-help/es.po
M po/wesnoth-httt/es.po
M po/wesnoth-l/es.po
M po/wesnoth-lib/es.po
M po/wesnoth-low/es.po
M po/wesnoth-manpages/es.po
M po/wesnoth-manual/es.po
M po/wesnoth-multiplayer/es.po
M po/wesnoth-nr/es.po
M po/wesnoth-sof/es.po
M po/wesnoth-sota/es.po
M po/wesnoth-sotbe/es.po
M po/wesnoth-tb/es.po
M po/wesnoth-test/es.po
M po/wesnoth-thot/es.po
M po/wesnoth-trow/es.po
M po/wesnoth-tsg/es.po
M po/wesnoth-tutorial/es.po
M po/wesnoth-units/es.po
M po/wesnoth-utbs/es.po
M po/wesnoth/es.po
Log Message:
-----------
updated Spanish translation
(cherry-picked from commit 639c5087b9cc44fd426685f4d3e5e2e6b839553a)
Commit: d443df9be13ade6fe8d20627b79f0172157dea9b
https://github.com/wesnoth/wesnoth/commit/d443df9be13ade6fe8d20627b79f0172157dea9b
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M doc/man/wesnoth.6
M src/commandline_options.cpp
M src/commandline_options.hpp
M src/game_launcher.cpp
M src/game_launcher.hpp
M src/playsingle_controller.cpp
M src/saved_game.cpp
M src/saved_game.hpp
M src/tests/test_commandline_options.cpp
Log Message:
-----------
Commandline: Add --campaign-skip-story option
Fixes #3472
(cherry-picked from commit f7be872da24474a47894becd7c6d5f013c495a2f)
Commit: a8bded63ada6ec88fe1920327e1197f7a520d349
https://github.com/wesnoth/wesnoth/commit/a8bded63ada6ec88fe1920327e1197f7a520d349
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/play_controller.cpp
M src/play_controller.hpp
M src/playsingle_controller.cpp
Log Message:
-----------
Commandline: Encapsulate skip_story in play_controller
(cherry-picked from commit 1d1d26035091108e33ea8af57754ba520ec27d35)
Commit: d5238ac5cba0faf01e3f69a54a73b829dec6cb87
https://github.com/wesnoth/wesnoth/commit/d5238ac5cba0faf01e3f69a54a73b829dec6cb87
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/play_controller.cpp
M src/scripting/game_lua_kernel.cpp
Log Message:
-----------
Commandline: --campaign-skip-story skips [message]s during prestart and start events
(cherry-picked from commit b64f4b42d659d90ec33fd0cfc139e0a058b52f04)
Commit: e766cdc7cc4cd3b7560a85e01a93660477409434
https://github.com/wesnoth/wesnoth/commit/e766cdc7cc4cd3b7560a85e01a93660477409434
Author: jostephd <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M changelog.md
M data/lua/wml/items.lua
M src/display.cpp
M src/scripting/game_lua_kernel.cpp
Log Message:
-----------
WML: Support [filter_side] in [item]. (#3533)
* WML: Support [filter_side] in [item].
If [filter_side] is present then "team_name" is ignored.
Fixes #1477.
* WML: Compare [item]team_name to [side]team_name using intersection.
Fixes problems with substrings and when one or the other is a
comma-separated list. See #3533
* WML: Rename [item][filter_side] to [item][filter_team]
* Add changelog entry
(cherry-picked from commit 3a3b752881f50ad34742c5962d40d96556adf1a1)
Commit: f55e11e7331ea1c2e1aa3e2bcbc312b31f38facc
https://github.com/wesnoth/wesnoth/commit/f55e11e7331ea1c2e1aa3e2bcbc312b31f38facc
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/campaign_server/campaign_server.cpp
Log Message:
-----------
Fix #3567: error when trying to send an error message to the client
Simple_wml requires double quotes to be duplicated like this.
(cherry-picked from commit 9536f3825e867d30b7adc71d6b53bd2230c31cab)
Commit: d8869b8d2b6104bead2974da835ebd75f4349daa
https://github.com/wesnoth/wesnoth/commit/d8869b8d2b6104bead2974da835ebd75f4349daa
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/actions/attack.cpp
Log Message:
-----------
Fix: Chance to hit wasn't protected from becoming negative
Manual merge of pull request #3550. Credit to @newfrenchy83.
(cherry-picked from commit 79206d92d5390d82a9a79cd6018b575de3aafea0)
Commit: 9514298858f69714c36e0ad92652aa6cc83a00a1
https://github.com/wesnoth/wesnoth/commit/9514298858f69714c36e0ad92652aa6cc83a00a1
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/gui/window/mp_create_game.cfg
Log Message:
-----------
MP Create Game: Increase slider step size
Requested on the forums https://forums.wesnoth.org/viewtopic.php?t=48680
(cherry-picked from commit 9abdc20841ac12db3bb8cf9338a7f7b4b205bb41)
Commit: 50c85f4691fb6359a56da05e642d863f340baf30
https://github.com/wesnoth/wesnoth/commit/50c85f4691fb6359a56da05e642d863f340baf30
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/units/udisplay.cpp
Log Message:
-----------
Unit Display: When the recruiting or recruited units is invisible, don't scroll to it.
When the enemy leader and the unit it recruits are both invisible,
scrolling to them would leak their location to the player.
(cherry-picked from commit 4db974431dfdc2c5fc75a97536cc4edc24163404)
Commit: 8086df21961ee38fc6ab970ab7787f979726d512
https://github.com/wesnoth/wesnoth/commit/8086df21961ee38fc6ab970ab7787f979726d512
Author: newfrenchy83 <31768074+newfrenchy83 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M projectfiles/CodeBlocks/wesnoth.cbp
Log Message:
-----------
Update Code::Blocks project (#3566)
(cherry-picked from commit e3957063093ef2cd055af803fa2943c011e57dcd)
Commit: c54f4e6f19dff905e661d26460cac928a630a0ec
https://github.com/wesnoth/wesnoth/commit/c54f4e6f19dff905e661d26460cac928a630a0ec
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/help/help_impl.cpp
Log Message:
-----------
Help: Hide abilities with empty names.
Fixes empty name abilities in help in Liberty S1.
(cherry-picked from commit c88a799b90f7d92ed993d7cf1eca98cef31ba583)
Commit: 9f45e8ed1f2f4898d4f2dd7e855bd56777d17337
https://github.com/wesnoth/wesnoth/commit/9f45e8ed1f2f4898d4f2dd7e855bd56777d17337
Author: jostephd <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M src/commandline_options.cpp
Log Message:
-----------
Commandline: Fix documentation of --render-image
(cherry-picked from commit c55b0c6adbd770345bd2e08f8e501b1e1b2e0de6)
Commit: 97d1fcd3bc2077b6697a3ef43ab6c772e51e7094
https://github.com/wesnoth/wesnoth/commit/97d1fcd3bc2077b6697a3ef43ab6c772e51e7094
Author: josteph <josteph at fastmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M doc/man/wesnoth.6
Log Message:
-----------
manpage: Fix option name typos and update documentation of --render-image.
(cherry-picked from commit ae4ef058ed28981eb29d79eb6f6586ef6dcc75a1)
Commit: da95fedcadc2c9162fb812fc170b1131597c1622
https://github.com/wesnoth/wesnoth/commit/da95fedcadc2c9162fb812fc170b1131597c1622
Author: newfrenchy83 <31768074+newfrenchy83 at users.noreply.github.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
A packaging/windows/campaignd.rc
A projectfiles/CodeBlocks/campaignd.cbp
M projectfiles/CodeBlocks/wesnoth.cbp
M projectfiles/CodeBlocks/wesnoth.workspace
M projectfiles/CodeBlocks/wesnothd.cbp
Log Message:
-----------
Update Code::Blocks project (#3585)
(cherry-picked from commit 248af054c70f7e924b6caf24b95d7ff0617f5a12)
Commit: 196764ffe8e06f2086b833d206ec158c6a4b3b6d
https://github.com/wesnoth/wesnoth/commit/196764ffe8e06f2086b833d206ec158c6a4b3b6d
Author: sigurdfdragon <jjwcoat at gmail.com>
Date: 2018-10-07 (Sun, 07 Oct 2018)
Changed paths:
M data/campaigns/Delfadors_Memoirs/scenarios/08_Ur_Thorodor.cfg
Log Message:
-----------
DM S08: Cleanup & improve ending sequence, fixing #3575
Removes final black screen that could be mistaken for a bug.
Shows Delfador disappearing in front of the orcs more clearly.
[ci skip]
(cherry-picked from commit 75ab69d885163dd4bb40259cf91123394e2c12ee)
Commit: fe26f513b8ee2b5392d825037aae6124517bd9b5
https://github.com/wesnoth/wesnoth/commit/fe26f513b8ee2b5392d825037aae6124517bd9b5
Author: Elvish_Hunter <elvish.hunter2010 at gmail.com>
Date: 2018-10-14 (Sun, 14 Oct 2018)
Changed paths:
M data/tools/wmllint
Log Message:
-----------
wmllint: add translation mark only after the first equal sign
Fixes #3489
Commit: fd26be92e0aa80efe6a363698640c3e35ee531bc
https://github.com/wesnoth/wesnoth/commit/fd26be92e0aa80efe6a363698640c3e35ee531bc
Author: Elvish_Hunter <elvish.hunter2010 at gmail.com>
Date: 2018-10-14 (Sun, 14 Oct 2018)
Changed paths:
M data/tools/wmllint
Log Message:
-----------
wmllint: fixed non-empty tagstack errors due to [modify_ai] paths
Commit: 2addd69a34385e12c4e26364f0cc865340c62794
https://github.com/wesnoth/wesnoth/commit/2addd69a34385e12c4e26364f0cc865340c62794
Author: Elvish_Hunter <elvish.hunter2010 at gmail.com>
Date: 2018-10-14 (Sun, 14 Oct 2018)
Changed paths:
M data/tools/wmllint
Log Message:
-----------
wmllint: fixed a bug that caused misfires in translation mark warnings
wmllint was checking for line instead of lines[i]
Commit: a1adce8ca30b9f0474d1938945303ce28e858e82
https://github.com/wesnoth/wesnoth/commit/a1adce8ca30b9f0474d1938945303ce28e858e82
Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
Date: 2018-10-14 (Sun, 14 Oct 2018)
Changed paths:
M doc/man/wesnoth.6
Log Message:
-----------
manpage: add missing options
fixes #3537
[ci skip]
Commit: b8540570540ec11cb39525a5fd725361b9531686
https://github.com/wesnoth/wesnoth/commit/b8540570540ec11cb39525a5fd725361b9531686
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-14 (Sun, 14 Oct 2018)
Changed paths:
M po/wesnoth-aoi/zh_TW.po
M po/wesnoth-l/zh_TW.po
M po/wesnoth-multiplayer/zh_TW.po
M po/wesnoth-sof/zh_TW.po
Log Message:
-----------
updated Chinese (Traditional) translation
Commit: 80f4bd839fec2e77b15e8b11b9d6697403bcc8d8
https://github.com/wesnoth/wesnoth/commit/80f4bd839fec2e77b15e8b11b9d6697403bcc8d8
Author: Joseph Gelfand <j.n.gelfand at gmail.com>
Date: 2018-10-14 (Sun, 14 Oct 2018)
Changed paths:
M src/image_modifications.cpp
M src/tests/test_image_modifications.cpp
Log Message:
-----------
Made Blitting more permissive (#3584)
Made Blitting more permissive
SDL_BlitSurface's documentation (https://wiki.libsdl.org/SDL_BlitSurface) notes that "Blits with negative dstrect coordinates will be clipped properly".
Looking at the source code for SDL_UpperBlit() convinced me that dstrect coordinates that were too big would also be handled appropriately.
Fixes #2225.
Commit: 1fd668bb1e3c8b22b5031d9478b61755d9fdcfa5
https://github.com/wesnoth/wesnoth/commit/1fd668bb1e3c8b22b5031d9478b61755d9fdcfa5
Author: Jyrki Vesterinen <sandgtx at gmail.com>
Date: 2018-10-14 (Sun, 14 Oct 2018)
Changed paths:
M data/core/about.cfg
Log Message:
-----------
Add @JGelfand to credits
Commit: 71c6cdaa53768b8aa3aa7c730b92925f1a9c42b0
https://github.com/wesnoth/wesnoth/commit/71c6cdaa53768b8aa3aa7c730b92925f1a9c42b0
Author: ln-zookeeper <lari.nieminen at iki.fi>
Date: 2018-10-14 (Sun, 14 Oct 2018)
Changed paths:
M data/campaigns/Under_the_Burning_Suns/_main.cfg
M data/core/about.cfg
Log Message:
-----------
Updated Kwandulin's credits
Commit: d371d57561517ad80c61f1f525a1d975a9858375
https://github.com/wesnoth/wesnoth/commit/d371d57561517ad80c61f1f525a1d975a9858375
Author: Nils Kneuper <crazy-ivanovic at gmx.net>
Date: 2018-10-14 (Sun, 14 Oct 2018)
Changed paths:
M po/wesnoth-httt/fr.po
M po/wesnoth-nr/fr.po
Log Message:
-----------
updated French translation
Commit: 9e4210c6ce16f558524785d9318ff3db17122a71
https://github.com/wesnoth/wesnoth/commit/9e4210c6ce16f558524785d9318ff3db17122a71
Author: Charles Dang <exodia339 at gmail.com>
Date: 2018-10-14 (Sun, 14 Oct 2018)
Changed paths:
M changelog.md
Log Message:
-----------
Sync changelog with 1.14
[ci skip]
Commit: 9c2bdf7ada00824bacf3b621f5f2262b16947a1a
https://github.com/wesnoth/wesnoth/commit/9c2bdf7ada00824bacf3b621f5f2262b16947a1a
Author: Iris Morelle <shadowm at wesnoth.org>
Date: 2018-10-14 (Sun, 14 Oct 2018)
Changed paths:
M src/server/forum_user_handler.cpp
Log Message:
-----------
wesnothd/fuh: Do not consider stale temporary bans from phpBB's banlist table
It turns out that as of phpBB 3.2.2 these are only cleared on the next
call to user_ban()/user_unban(), so they may linger around for long
after they've expired. Fixed this by making FUH aware of the existence
of the ban_end column.
Compare: https://github.com/wesnoth/wesnoth/compare/43053105f358^...9c2bdf7ada00
**NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/
Functionality will be removed from GitHub.com on January 31st, 2019.
More information about the Commits
mailing list