[Commits] [wesnoth/wesnoth] e9f77d: Fast Micro AI: add optional parameters for attacks...
GitHub
noreply at github.com
Fri Sep 11 06:25:49 UTC 2015
Branch: refs/heads/sdl2
Home: https://github.com/wesnoth/wesnoth
Commit: e9f77d1dbff7f977907489f8158aa0d0b277612a
https://github.com/wesnoth/wesnoth/commit/e9f77d1dbff7f977907489f8158aa0d0b277612a
Author: mattsc <mattsc at MSMB.local>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Changed paths:
M data/ai/micro_ais/cas/ca_fast_combat_leader.lua
M data/ai/micro_ais/micro_ai_wml_tag.lua
Log Message:
-----------
Fast Micro AI: add optional parameters for attacks by AI leader
The willingness of the AI leader to come out for attacks can be
adjusted with these.
Commit: 74b54da6911c97c7ec029fd882ec122a6b03d55d
https://github.com/wesnoth/wesnoth/commit/74b54da6911c97c7ec029fd882ec122a6b03d55d
Author: mattsc <mattsc at MSMB.local>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Changed paths:
M data/ai/micro_ais/cas/ca_fast_combat_leader.lua
M data/ai/micro_ais/micro_ai_wml_tag.lua
Log Message:
-----------
Fast Micro AI: fix a typo in a parameter name
Commit: 00516dddbe660349e18e5a0e05267e00b968792a
https://github.com/wesnoth/wesnoth/commit/00516dddbe660349e18e5a0e05267e00b968792a
Author: Elias Pschernig <elias at users.sourceforge.net>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Changed paths:
M data/tools/unit_tree/update-wmlunits
Log Message:
-----------
[units.wesnoth.org] always clean up error log
Commit: fe3f317cbc71c6ce73d3ad6bb0ebe5ea3dd6ede7
https://github.com/wesnoth/wesnoth/commit/fe3f317cbc71c6ce73d3ad6bb0ebe5ea3dd6ede7
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Changed paths:
M src/carryover.cpp
M src/carryover.hpp
Log Message:
-----------
use config object to store menu items in carryover
the carryover code does not modify the menu items to there is no need to
deserialize them. Using config objects here simplyfies the code becasue
carryover is now independent from the wmi_container's class.
Commit: 402a97e1fc9404618dd2d387839781d49c094eac
https://github.com/wesnoth/wesnoth/commit/402a97e1fc9404618dd2d387839781d49c094eac
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Changed paths:
M src/game_events/wmi_container.cpp
Log Message:
-----------
fix some code formatting
Commit: adc5eca399236715e471844bfb2dea84d995243e
https://github.com/wesnoth/wesnoth/commit/adc5eca399236715e471844bfb2dea84d995243e
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Changed paths:
M src/config.cpp
M src/config.hpp
Log Message:
-----------
add optional string key parameter to config::append_children
Commit: 368a4ab284ec7cb56a9c9b9513b60cef13cd053c
https://github.com/wesnoth/wesnoth/commit/368a4ab284ec7cb56a9c9b9513b60cef13cd053c
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Changed paths:
M src/reports.hpp
Log Message:
-----------
fix indention
Commit: 12e839b9b7abafabe0e9469ef79de02b099453ea
https://github.com/wesnoth/wesnoth/commit/12e839b9b7abafabe0e9469ef79de02b099453ea
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Changed paths:
M src/game_state.cpp
M src/play_controller.cpp
M src/replay_controller.cpp
M src/scripting/game_lua_kernel.cpp
M src/scripting/game_lua_kernel.hpp
Log Message:
-----------
remove level_ member of game_lua_kernel
the intention is to be able to remove the level cfg.
Commit: 4103ae29f50cc0ebb373d75c61e15f3b07604b2c
https://github.com/wesnoth/wesnoth/commit/4103ae29f50cc0ebb373d75c61e15f3b07604b2c
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Changed paths:
M src/play_controller.cpp
M src/play_controller.hpp
Log Message:
-----------
remove unused play_controller::start_turn_ variable
Commit: 4afe65b4da308637f17caa04dd4e5cdd236aa995
https://github.com/wesnoth/wesnoth/commit/4afe65b4da308637f17caa04dd4e5cdd236aa995
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Changed paths:
M src/play_controller.cpp
M src/play_controller.hpp
M src/playsingle_controller.cpp
M src/replay_controller.cpp
M src/tod_manager.cpp
M src/tod_manager.hpp
Log Message:
-----------
move it_is_a_new_turn_ variable to tod_manager
it_is_a_new_turn_ is part of the gamestate so it should be part of the game_state object.
Commit: 12b901933a1fd4f7de3ce4bc9a7aeb30cfe604a5
https://github.com/wesnoth/wesnoth/commit/12b901933a1fd4f7de3ce4bc9a7aeb30cfe604a5
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Changed paths:
M src/actions/undo.cpp
M src/game_board.cpp
M src/game_board.hpp
M src/game_initialization/multiplayer.cpp
M src/game_state.cpp
M src/game_state.hpp
M src/play_controller.cpp
M src/replay_controller.cpp
M src/synced_context.cpp
M src/tests/test_unit_map.cpp
M src/unit.cpp
M src/unit_id.cpp
M src/unit_id.hpp
M src/unit_map.cpp
Log Message:
-----------
make the unit id manager a member of game_board
previously it was a singleton
the next unit id counter is part of the gamestate so it should be part of the game_state object.
Commit: 41e363a3fd71faf332bf9167a0926dc3954c5387
https://github.com/wesnoth/wesnoth/commit/41e363a3fd71faf332bf9167a0926dc3954c5387
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Changed paths:
M src/reports.cpp
Log Message:
-----------
fix a segfault caused by wesnoth.theme_items
http://gna.org/bugs/?23856
previously reports::register_generator sometimes created two shared_ptr
from one generator * which caused that generator to be freed twice (or
worse).
Commit: 9ac0434c1d185486153ba853aeceb1e3a802959a
https://github.com/wesnoth/wesnoth/commit/9ac0434c1d185486153ba853aeceb1e3a802959a
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Changed paths:
M src/play_controller.cpp
Log Message:
-----------
use play_controller::player_number_ to write [snapshot]playing_team=
Commit: 58874bdd0bec90542255b46bf74898a90b28afd7
https://github.com/wesnoth/wesnoth/commit/58874bdd0bec90542255b46bf74898a90b28afd7
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Changed paths:
M src/game_state.cpp
M src/game_state.hpp
M src/play_controller.cpp
Log Message:
-----------
remove level_ from game_state class
The intention is to remove the level config (mainly to decrease memory usage)
Commit: d2545777625f16ceeb0cc6708cb184dd2e264688
https://github.com/wesnoth/wesnoth/commit/d2545777625f16ceeb0cc6708cb184dd2e264688
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Changed paths:
M src/playsingle_controller.cpp
Log Message:
-----------
simplify fallback_ai_to_human_exception handling
the effect is sligltly different (the side is now permanently changed to
human) but since it quiet easy to change a side back to ai using debug
commands this shouldnt be that bad.
Commit: 1172369dca92111024ec253028629cd92e475dab
https://github.com/wesnoth/wesnoth/commit/1172369dca92111024ec253028629cd92e475dab
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Changed paths:
M src/playsingle_controller.cpp
Log Message:
-----------
refactor playsingle_controller::play_side()
Commit: ded13b1cc84eea20066e56a2a1ceedb82a55bab5
https://github.com/wesnoth/wesnoth/commit/ded13b1cc84eea20066e56a2a1ceedb82a55bab5
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Changed paths:
M src/playsingle_controller.cpp
Log Message:
-----------
refactor playsingle_controller::before_human_turn
Also removed a raise_turn_started event at the beginning of human turns
which didn't fire at the beginning of networked turns.
I don't know what the raise_turn_started did if this actually breaks
anything feel free to read it but please add a comment on why it fires
on human turns but not on networked turns.
Commit: edd32073fafcb00597e8629914fa986f4d4464c7
https://github.com/wesnoth/wesnoth/commit/edd32073fafcb00597e8629914fa986f4d4464c7
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Changed paths:
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:
-----------
move play_side to play_controller
the intention is that replay_controller can also use this function later
Commit: d74b85fffc47cc52cc665366d18b184e69e99aca
https://github.com/wesnoth/wesnoth/commit/d74b85fffc47cc52cc665366d18b184e69e99aca
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Changed paths:
M src/play_controller.cpp
Log Message:
-----------
set "side_number" in play_controller::do_init_side
instead of in play_controller::init_side_begin, the prviosul
implementation could change the value of this wml variable when
reloading.
Commit: c910dc6533ea6b117997105bc9788dd891ca1bb5
https://github.com/wesnoth/wesnoth/commit/c910dc6533ea6b117997105bc9788dd891ca1bb5
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Changed paths:
M src/playsingle_controller.cpp
Log Message:
-----------
remove a unneeded if
Commit: 11daa5113a2013f0489d1effcb94147bd2fe7886
https://github.com/wesnoth/wesnoth/commit/11daa5113a2013f0489d1effcb94147bd2fe7886
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Changed paths:
M src/play_controller.cpp
M src/playturn.cpp
Log Message:
-----------
refactor maybe_do_init_side
we now check for nit_side_done everytime the controller type changes
to that we don't have to check for that when recieveing a conroller
change in playturn.cpp
This also contains a unrelated fix (to the function that checks
which side can be seen) that got accidently merged into this commit.
Commit: c8f9b2b530786abddc5ce78e54cfc6175c3e2954
https://github.com/wesnoth/wesnoth/commit/c8f9b2b530786abddc5ce78e54cfc6175c3e2954
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Changed paths:
M src/play_controller.cpp
M src/play_controller.hpp
M src/playsingle_controller.cpp
M src/playsingle_controller.hpp
M src/replay.cpp
Log Message:
-----------
move function play_turn from playsingle_controller to play_controller
the intention is that we can use those function in replay_controller.cpp
Commit: 9d9422a4232459b766dff300326a6a0f166d74b9
https://github.com/wesnoth/wesnoth/commit/9d9422a4232459b766dff300326a6a0f166d74b9
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Changed paths:
M src/replay_controller.cpp
M src/replay_controller.hpp
Log Message:
-----------
refactor replay_controller
Instead of implementing its own game loop,
replay_controller now uses play_controller game loop.
This prepares a patch to use replay functionality in mp games.
Commit: 942220da801cdcf230c38ddab177671cbc855c97
https://github.com/wesnoth/wesnoth/commit/942220da801cdcf230c38ddab177671cbc855c97
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Changed paths:
M src/play_controller.cpp
M src/play_controller.hpp
Log Message:
-----------
remove unused parameter
Commit: fab8b9dc303d3be2ee5f1232443d0ce408e258ba
https://github.com/wesnoth/wesnoth/commit/fab8b9dc303d3be2ee5f1232443d0ce408e258ba
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Changed paths:
M src/game_initialization/playcampaign.cpp
M src/play_controller.cpp
M src/play_controller.hpp
M src/playmp_controller.cpp
M src/playsingle_controller.cpp
M src/playsingle_controller.hpp
M src/replay_controller.cpp
M src/replay_controller.hpp
Log Message:
-----------
dont keep [scenario]/[snapshot] config during play
the intention is to save some ram usage.
Commit: 99c75bf9ae5af4bbb504d41efdaa725c8c9d7370
https://github.com/wesnoth/wesnoth/commit/99c75bf9ae5af4bbb504d41efdaa725c8c9d7370
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Changed paths:
M src/play_controller.cpp
M src/play_controller.hpp
M src/playmp_controller.cpp
M src/playsingle_controller.cpp
M src/replay_controller.cpp
Log Message:
-----------
use scoped_ptr for gamestate_
Commit: 20fafdee28c7f63d647f9025a946162eef0b30a0
https://github.com/wesnoth/wesnoth/commit/20fafdee28c7f63d647f9025a946162eef0b30a0
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Changed paths:
M src/CMakeLists.txt
M src/SConscript
M src/actions/create.cpp
M src/actions/create.hpp
A src/actions/unit_creator.cpp
A src/actions/unit_creator.hpp
M src/game_board.hpp
M src/game_state.cpp
M src/game_state.hpp
M src/pathfind/pathfind.cpp
M src/pathfind/pathfind.hpp
M src/play_controller.cpp
M src/play_controller.hpp
M src/playsingle_controller.cpp
M src/replay_controller.cpp
M src/teambuilder.cpp
M src/teambuilder.hpp
M src/unit.cpp
M src/unit.hpp
Log Message:
-----------
simplify game_state construction
instead of calling constructor and init you now only have to call the
constructor.
In order to make this work this commit removes the uses of
resources::gameboard/units during team construction. while doing that i
moved the unit_creator class to a new file.
This commit also removes the ticks parameter from game_startes
constructor and replaces it with a ticks() function in play_controller,
other classes were also changed to use the play_controller::ticks()
function.
Commit: 8e875b845864f04662111f9b5c900a52ded9e324
https://github.com/wesnoth/wesnoth/commit/8e875b845864f04662111f9b5c900a52ded9e324
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Changed paths:
M src/game_state.cpp
M src/game_state.hpp
M src/play_controller.cpp
M src/play_controller.hpp
M src/replay_controller.cpp
Log Message:
-----------
move init_side_done_ to game_state class
Commit: 941f00e49164e7bc343dcc13dce6ac3fc9f56238
https://github.com/wesnoth/wesnoth/commit/941f00e49164e7bc343dcc13dce6ac3fc9f56238
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Changed paths:
M src/game_state.cpp
M src/game_state.hpp
M src/play_controller.cpp
M src/play_controller.hpp
M src/playmp_controller.cpp
M src/playsingle_controller.cpp
M src/replay_controller.cpp
Log Message:
-----------
move player_number_ to game_state
Commit: ec8bf1e1f7415277e743dcb9e159edfc67f42335
https://github.com/wesnoth/wesnoth/commit/ec8bf1e1f7415277e743dcb9e159edfc67f42335
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Changed paths:
M src/display.cpp
M src/display.hpp
M src/game_display.cpp
M src/game_display.hpp
M src/game_state.cpp
M src/game_state.hpp
M src/play_controller.cpp
M src/play_controller.hpp
M src/replay_controller.cpp
Log Message:
-----------
move reset_gamestate function (reset_replay) to play_controller
Commit: cdb324c9d1f2df2297e233c6fdce694ca7489d1d
https://github.com/wesnoth/wesnoth/commit/cdb324c9d1f2df2297e233c6fdce694ca7489d1d
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Changed paths:
M src/replay_controller.cpp
M src/replay_controller.hpp
Log Message:
-----------
fix wml unit tests
Commit: 910641db40ebbe272fd06215df30bc72750b2787
https://github.com/wesnoth/wesnoth/commit/910641db40ebbe272fd06215df30bc72750b2787
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Changed paths:
M src/play_controller.cpp
M src/play_controller.hpp
M src/playsingle_controller.cpp
M src/playsingle_controller.hpp
M src/replay_controller.cpp
M src/replay_controller.hpp
Log Message:
-----------
fix view beeing temporarily reset in replay viewer
Commit: d85a711446468fa59c4afe3ba3cd17ae698afe20
https://github.com/wesnoth/wesnoth/commit/d85a711446468fa59c4afe3ba3cd17ae698afe20
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Changed paths:
M src/hotkey_handler_replay.cpp
M src/replay_controller.cpp
M src/replay_controller.hpp
Log Message:
-----------
improve replay button state check
This changes the the function that calculates whether the
play replay button should be greyed out to always make it greyed
out if the replay is already running (not stopped).
previously it could theoretically happen that if this function was
called between two actions it wouldn't be greyed out.
Commit: dbe107fa4bbff3b8c62e158bd2f124e4dd4455ee
https://github.com/wesnoth/wesnoth/commit/dbe107fa4bbff3b8c62e158bd2f124e4dd4455ee
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Changed paths:
M src/replay_controller.hpp
Log Message:
-----------
remove undefined function
Commit: 769d79a354b4f97b5c082dfed45d5248bbc9d7f5
https://github.com/wesnoth/wesnoth/commit/769d79a354b4f97b5c082dfed45d5248bbc9d7f5
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Changed paths:
M src/replay_controller.cpp
Log Message:
-----------
simplify replay_controller::update_teams
Commit: b97bb35de91d2eda526224c7af1bb9cdc124476b
https://github.com/wesnoth/wesnoth/commit/b97bb35de91d2eda526224c7af1bb9cdc124476b
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Changed paths:
M src/play_controller.cpp
M src/play_controller.hpp
M src/replay_controller.cpp
Log Message:
-----------
refactor play_controller::reset_gamestate
Commit: 7b9b85cd63cd7c1d98c88a78700a88cd9a3b06b6
https://github.com/wesnoth/wesnoth/commit/7b9b85cd63cd7c1d98c88a78700a88cd9a3b06b6
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Changed paths:
M src/game_state.cpp
M src/game_state.hpp
M src/play_controller.cpp
M src/play_controller.hpp
Log Message:
-----------
move loading_game_ member to game_state class
Commit: 78755019c98e9b21ce2f53abd9760bad7e4cbb2f
https://github.com/wesnoth/wesnoth/commit/78755019c98e9b21ce2f53abd9760bad7e4cbb2f
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Changed paths:
M src/CMakeLists.txt
M src/SConscript
M src/controller_base.hpp
A src/mp_replay_controller.cpp
A src/mp_replay_controller.hpp
M src/play_controller.hpp
Log Message:
-----------
add mp_replay_controller class
Commit: 81b6c3ab9957b25261c2ac683b49ec1e30279fb8
https://github.com/wesnoth/wesnoth/commit/81b6c3ab9957b25261c2ac683b49ec1e30279fb8
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Changed paths:
M src/hotkey_handler.cpp
M src/hotkey_handler.hpp
M src/hotkey_handler_sp.cpp
M src/hotkey_handler_sp.hpp
M src/play_controller.cpp
M src/playsingle_controller.cpp
M src/playsingle_controller.hpp
Log Message:
-----------
enable back to turn buttons in networked mp
When using the back to turn button in networked mp, the game now resets
the gamestate to that turn and replays the game (using the replay gui)
until the current turn.
Commit: 02990bafbfc206aacb31d38eaffce39bf450f83a
https://github.com/wesnoth/wesnoth/commit/02990bafbfc206aacb31d38eaffce39bf450f83a
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Changed paths:
M src/game_state.cpp
M src/game_state.hpp
M src/play_controller.cpp
M src/play_controller.hpp
Log Message:
-----------
fix some compiler warnings
Commit: 47cf5acf791aed73a7065a569da071e016882c3f
https://github.com/wesnoth/wesnoth/commit/47cf5acf791aed73a7065a569da071e016882c3f
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Changed paths:
M src/tests/test_recall_list.cpp
M src/tests/test_unit_map.cpp
Log Message:
-----------
disable broken test
Commit: 41d65f1d7505a90b985c30ea867afdafa9f4b836
https://github.com/wesnoth/wesnoth/commit/41d65f1d7505a90b985c30ea867afdafa9f4b836
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Changed paths:
M src/whiteboard/highlighter.cpp
M src/whiteboard/highlighter.hpp
M src/whiteboard/manager.cpp
Log Message:
-----------
fix a segfault when resetting replay
Commit: 7fc78c5586599c4f1a5b8d26585dab903685a796
https://github.com/wesnoth/wesnoth/commit/7fc78c5586599c4f1a5b8d26585dab903685a796
Author: gfgtdf <tischpapier at gmail.com>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Changed paths:
M src/CMakeLists.txt
M src/SConscript
M src/actions/create.cpp
M src/actions/create.hpp
A src/actions/unit_creator.cpp
A src/actions/unit_creator.hpp
M src/controller_base.hpp
M src/display.cpp
M src/display.hpp
M src/game_board.hpp
M src/game_display.cpp
M src/game_display.hpp
M src/game_initialization/playcampaign.cpp
M src/game_state.cpp
M src/game_state.hpp
M src/hotkey_handler.cpp
M src/hotkey_handler.hpp
M src/hotkey_handler_replay.cpp
M src/hotkey_handler_sp.cpp
M src/hotkey_handler_sp.hpp
A src/mp_replay_controller.cpp
A src/mp_replay_controller.hpp
M src/pathfind/pathfind.cpp
M src/pathfind/pathfind.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/replay.cpp
M src/replay_controller.cpp
M src/replay_controller.hpp
M src/teambuilder.cpp
M src/teambuilder.hpp
M src/tests/test_recall_list.cpp
M src/tests/test_unit_map.cpp
M src/unit.cpp
M src/unit.hpp
M src/whiteboard/highlighter.cpp
M src/whiteboard/highlighter.hpp
M src/whiteboard/manager.cpp
Log Message:
-----------
Merge pull request #487 from gfgtdf/mp_replay_turn
Replay turns in networked multiplayer
Commit: 90566fd08257bf649b2ddb431acc185085e1e6a2
https://github.com/wesnoth/wesnoth/commit/90566fd08257bf649b2ddb431acc185085e1e6a2
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-10 (Thu, 10 Sep 2015)
Changed paths:
M src/game_state.cpp
M src/game_state.hpp
M src/play_controller.cpp
M src/play_controller.hpp
Log Message:
-----------
store the server request counter in the snapshot
this fixes sone OOS that can happen when using the mp replay feature
(reset_gamestate)
Commit: 0f3d262946b0d3b0841e7196f11f8ff50acc19d5
https://github.com/wesnoth/wesnoth/commit/0f3d262946b0d3b0841e7196f11f8ff50acc19d5
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2015-09-10 (Thu, 10 Sep 2015)
Changed paths:
M src/playsingle_controller.cpp
Log Message:
-----------
add a comment
Commit: 7a314517da83e345b72ecb2d7f5812e1645f3e23
https://github.com/wesnoth/wesnoth/commit/7a314517da83e345b72ecb2d7f5812e1645f3e23
Author: gfgtdf <tischpapier at gmail.com>
Date: 2015-09-10 (Thu, 10 Sep 2015)
Changed paths:
M RELEASE_NOTES
Log Message:
-----------
Update RELEASE_NOTES
Commit: 348f3b480b3d371dde5f5c4e270326f3946082a3
https://github.com/wesnoth/wesnoth/commit/348f3b480b3d371dde5f5c4e270326f3946082a3
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Changed paths:
M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
Log Message:
-----------
Update XCode project
Commit: 480a2a746c4eb346336f493d58a834a5948274a5
https://github.com/wesnoth/wesnoth/commit/480a2a746c4eb346336f493d58a834a5948274a5
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Changed paths:
M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
Log Message:
-----------
XCode project: Remove -Werror setting
Commit: 3ab3db3166ed6eab05f157c2e04ed248ef2aa2c2
https://github.com/wesnoth/wesnoth/commit/3ab3db3166ed6eab05f157c2e04ed248ef2aa2c2
Author: Elias Pschernig <elias at users.sourceforge.net>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Changed paths:
M data/tools/unit_tree/animations.py
M data/tools/unit_tree/helpers.py
M data/tools/unit_tree/html_output.py
M data/tools/unit_tree/overview.py
M data/tools/unit_tree/wiki_output.py
M data/tools/wesnoth/wmlparser2.py
A data/tools/wesnoth/wmlparser3.py
M data/tools/wmlunits
Log Message:
-----------
[units.wesnoth.org] Converted the script to Python 3.
Basically ran all .py files through 2to3. I made a copy of wmlparser2.py
called wmlparser3.py for the Python3 version, so as to not inconvenience anyone
who may be using it in their old Python2 scripts.
Commit: 9ca044abdb4f1aa459a8ae95e49871354fc9b26b
https://github.com/wesnoth/wesnoth/commit/9ca044abdb4f1aa459a8ae95e49871354fc9b26b
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-09-10 (Thu, 10 Sep 2015)
Changed paths:
M projectfiles/CodeBlocks/wesnoth.cbp
Log Message:
-----------
Updated codeblock projectfile
Commit: 4f078f26ef1328ef4b480938f6bc5bcc9c0a19a8
https://github.com/wesnoth/wesnoth/commit/4f078f26ef1328ef4b480938f6bc5bcc9c0a19a8
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-09-10 (Thu, 10 Sep 2015)
Changed paths:
M data/tools/GUI.pyw
Log Message:
-----------
GUI.pyw: small label tweaks
Commit: 58e17f3e210315aa51d5c5ef7a565620256c808d
https://github.com/wesnoth/wesnoth/commit/58e17f3e210315aa51d5c5ef7a565620256c808d
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-09-10 (Thu, 10 Sep 2015)
Changed paths:
M data/campaigns/tutorial/maps/01_Tutorial_part_1.map
Log Message:
-----------
T S1: removed two extra villages near map border to prevent confusion
Commit: 19e7adfe52fb5254bcc1220585775bb9828aded0
https://github.com/wesnoth/wesnoth/commit/19e7adfe52fb5254bcc1220585775bb9828aded0
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-09-10 (Thu, 10 Sep 2015)
Changed paths:
M data/core/terrain-graphics.cfg
Log Message:
-----------
Use overgrown base for Ruined Human Castle (Chr)
Commit: 2cf8bcdecb626886f61c841b5e29a9fe18c51a1d
https://github.com/wesnoth/wesnoth/commit/2cf8bcdecb626886f61c841b5e29a9fe18c51a1d
Author: gfgtdf <tischpapier at gmail.com>
Date: 2015-09-10 (Thu, 10 Sep 2015)
Changed paths:
M changelog
Log Message:
-----------
Update changelog
Commit: f8fb04093ab1209584d9afd0402db71ca04beca7
https://github.com/wesnoth/wesnoth/commit/f8fb04093ab1209584d9afd0402db71ca04beca7
Author: Elias Pschernig <elias at users.sourceforge.net>
Date: 2015-09-10 (Thu, 10 Sep 2015)
Changed paths:
M data/tools/unit_tree/html_output.py
M data/tools/unit_tree/update-wmlunits
M data/tools/wesnoth/wmlparser3.py
M data/tools/wmlunits
Log Message:
-----------
[units.wesnoth.org] fix some small issues
Commit: 0bb02fb548690f2fa086a0831bda460eca0f57b1
https://github.com/wesnoth/wesnoth/commit/0bb02fb548690f2fa086a0831bda460eca0f57b1
Author: Andreas Löf <andreas at alternating.net>
Date: 2015-09-11 (Fri, 11 Sep 2015)
Changed paths:
M RELEASE_NOTES
M changelog
M data/ai/micro_ais/cas/ca_fast_combat_leader.lua
M data/ai/micro_ais/micro_ai_wml_tag.lua
M data/campaigns/tutorial/maps/01_Tutorial_part_1.map
M data/core/terrain-graphics.cfg
M data/tools/GUI.pyw
M data/tools/unit_tree/animations.py
M data/tools/unit_tree/helpers.py
M data/tools/unit_tree/html_output.py
M data/tools/unit_tree/overview.py
M data/tools/unit_tree/update-wmlunits
M data/tools/unit_tree/wiki_output.py
M data/tools/wesnoth/wmlparser2.py
A data/tools/wesnoth/wmlparser3.py
M data/tools/wmlunits
M projectfiles/CodeBlocks/wesnoth.cbp
M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
M src/CMakeLists.txt
M src/SConscript
M src/actions/create.cpp
M src/actions/create.hpp
M src/actions/undo.cpp
A src/actions/unit_creator.cpp
A src/actions/unit_creator.hpp
M src/carryover.cpp
M src/carryover.hpp
M src/config.cpp
M src/config.hpp
M src/controller_base.hpp
M src/display.cpp
M src/display.hpp
M src/game_board.cpp
M src/game_board.hpp
M src/game_display.cpp
M src/game_display.hpp
M src/game_events/wmi_container.cpp
M src/game_initialization/multiplayer.cpp
M src/game_initialization/playcampaign.cpp
M src/game_state.cpp
M src/game_state.hpp
M src/hotkey_handler.cpp
M src/hotkey_handler.hpp
M src/hotkey_handler_replay.cpp
M src/hotkey_handler_sp.cpp
M src/hotkey_handler_sp.hpp
A src/mp_replay_controller.cpp
A src/mp_replay_controller.hpp
M src/pathfind/pathfind.cpp
M src/pathfind/pathfind.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/replay.cpp
M src/replay_controller.cpp
M src/replay_controller.hpp
M src/reports.cpp
M src/reports.hpp
M src/scripting/game_lua_kernel.cpp
M src/scripting/game_lua_kernel.hpp
M src/synced_context.cpp
M src/teambuilder.cpp
M src/teambuilder.hpp
M src/tests/test_recall_list.cpp
M src/tests/test_unit_map.cpp
M src/tod_manager.cpp
M src/tod_manager.hpp
M src/unit.cpp
M src/unit.hpp
M src/unit_id.cpp
M src/unit_id.hpp
M src/unit_map.cpp
M src/whiteboard/highlighter.cpp
M src/whiteboard/highlighter.hpp
M src/whiteboard/manager.cpp
Log Message:
-----------
Merge branch 'master' into sdl2
Compare: https://github.com/wesnoth/wesnoth/compare/763db0efe945...0bb02fb54869
More information about the Commits
mailing list