[Commits] [wesnoth/wesnoth] f36c55: fix custom faction not available for remote player...

Sun Jun 5 12:51:20 UTC 2016

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: f36c554bf15dd4de01c0e41ecc5ee415e6b7bc70
      https://github.com/wesnoth/wesnoth/commit/f36c554bf15dd4de01c0e41ecc5ee415e6b7bc70
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2016-06-05 (Sun, 05 Jun 2016)

  Changed paths:
    M src/game_initialization/connect_engine.cpp
    M src/game_initialization/flg_manager.cpp
    M src/game_initialization/flg_manager.hpp
    M src/team.cpp
    M src/tests/test_mp_connect.cpp

  Log Message:
  -----------
  fix custom faction not available for remote players if it was changed by the host.

or a previous player of that side.

  Commit: 62a589e9ce8334dedc152e0f755aac1ad8c088f9
      https://github.com/wesnoth/wesnoth/commit/62a589e9ce8334dedc152e0f755aac1ad8c088f9
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2016-06-05 (Sun, 05 Jun 2016)

  Changed paths:
    M src/editor/controller/editor_controller.cpp
    M src/leader_scroll_dialog.cpp
    M src/leader_scroll_dialog.hpp

  Log Message:
  -----------
  remove duplicate leader_scroll_dialog code

this code was the same as the leader_scroll_dialog code in
menu_events.cpp and it was never used because the side overview window
doesn't work in the editor.

  Commit: 80517e2ab55f4232b0cbf41ea0069fbf7262c3f3
      https://github.com/wesnoth/wesnoth/commit/80517e2ab55f4232b0cbf41ea0069fbf7262c3f3
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2016-06-05 (Sun, 05 Jun 2016)

  Changed paths:
    M src/game_events/action_wml.cpp

  Log Message:
  -----------
  remove an include

  Commit: 39b01d9518e8592c9f03748b7dbd0bae588c5e6d
      https://github.com/wesnoth/wesnoth/commit/39b01d9518e8592c9f03748b7dbd0bae588c5e6d
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2016-06-05 (Sun, 05 Jun 2016)

  Changed paths:
    M src/menu_events.cpp
    M src/team.cpp
    M src/team.hpp

  Log Message:
  -----------
  also show allied human sides in sp in side overview.

  Commit: 660b1c1adf8d0ccf966529b897cff38fcf9e2f59
      https://github.com/wesnoth/wesnoth/commit/660b1c1adf8d0ccf966529b897cff38fcf9e2f59
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2016-06-05 (Sun, 05 Jun 2016)

  Changed paths:
    M src/game_initialization/multiplayer.cpp

  Log Message:
  -----------
  remove old simple_server code

this code was a leftover form a time when it was possible to do mp games
without wesnothd.

  Commit: 50a2357461b5a0c0c3468ab021d73c1133cf6972
      https://github.com/wesnoth/wesnoth/commit/50a2357461b5a0c0c3468ab021d73c1133cf6972
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2016-06-05 (Sun, 05 Jun 2016)

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

  Log Message:
  -----------
  remove unused dialog::network_send_dialog

  Commit: 52f0e3ecd65ac39f0a3304c13f752f62ef6c835d
      https://github.com/wesnoth/wesnoth/commit/52f0e3ecd65ac39f0a3304c13f752f62ef6c835d
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2016-06-05 (Sun, 05 Jun 2016)

  Changed paths:
    M src/CMakeLists.txt
    M src/SConscript
    M src/actions/attack.cpp
    A src/chat_command_handler.cpp
    A src/chat_command_handler.hpp
    A src/chat_events.cpp
    M src/chat_events.hpp
    M src/game_initialization/multiplayer_ui.cpp
    M src/game_initialization/multiplayer_ui.hpp
    M src/gui/dialogs/lobby/lobby.cpp
    M src/gui/dialogs/lobby/lobby.hpp
    M src/hotkey/hotkey_handler.cpp
    M src/hotkey/hotkey_handler_mp.cpp
    M src/hotkey/hotkey_handler_sp.cpp
    A src/map_command_handler.hpp
    M src/menu_events.cpp
    M src/menu_events.hpp
    M src/persist_var.cpp
    M src/play_controller.hpp
    M src/playmp_controller.cpp
    M src/playmp_controller.hpp
    M src/playsingle_controller.cpp
    M src/playturn.cpp
    M src/replay.cpp
    M src/side_filter.cpp
    M src/synced_context.cpp
    M src/synced_user_choice.cpp
    M src/team.cpp
    M src/tod_manager.cpp
    M src/whiteboard/manager.cpp

  Log Message:
  -----------
  refactor mp and menu_events code

This adds play_controller::is_networked_mp() and
play_controller::send_to_wesnothd() which are now used to comminucate
with wesnothd during a game instead of using network::send_data and
network::nconnections() directly.

The main intention is to make future changes to this code easier
specially:
1) to have more than one connection during a game, for example to check
for updates
2) to replace the clientsided network code with boost asio.

In order to do that i needed a little change to the chat_handler class
which is used both ingame and in the mp lobby. And to do that i
had to cleanup up the menu_events.cpp file and move huge helper
classes into their own files.

  Commit: d27851801c562abd435cede8bd0b567f2b68dbbd
      https://github.com/wesnoth/wesnoth/commit/d27851801c562abd435cede8bd0b567f2b68dbbd
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2016-06-05 (Sun, 05 Jun 2016)

  Changed paths:
    M src/variable_info.cpp

  Log Message:
  -----------
  fix [set_variables]

http://gna.org/bugs/?24718

  Commit: c27a026608e56cf464db96afbe6df94ccf94b222
      https://github.com/wesnoth/wesnoth/commit/c27a026608e56cf464db96afbe6df94ccf94b222
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2016-06-05 (Sun, 05 Jun 2016)

  Changed paths:
    M src/synced_context.cpp

  Log Message:
  -----------
  add a comment

  Commit: a6b114f6ae50a5241951988616c4952983a7a516
      https://github.com/wesnoth/wesnoth/commit/a6b114f6ae50a5241951988616c4952983a7a516
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2016-06-05 (Sun, 05 Jun 2016)

  Changed paths:
    M src/CMakeLists.txt
    M src/SConscript
    M src/addon/client.cpp
    M src/dialogs.cpp
    M src/dialogs.hpp
    M src/game_initialization/connect_engine.cpp
    M src/game_initialization/connect_engine.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/multiplayer_configure.cpp
    M src/game_initialization/multiplayer_configure.hpp
    M src/game_initialization/multiplayer_connect.cpp
    M src/game_initialization/multiplayer_connect.hpp
    M src/game_initialization/multiplayer_create.cpp
    M src/game_initialization/multiplayer_create.hpp
    M src/game_initialization/multiplayer_lobby.cpp
    M src/game_initialization/multiplayer_lobby.hpp
    M src/game_initialization/multiplayer_ui.cpp
    M src/game_initialization/multiplayer_ui.hpp
    M src/game_initialization/multiplayer_wait.cpp
    M src/game_initialization/multiplayer_wait.hpp
    M src/game_initialization/playcampaign.cpp
    M src/game_initialization/playcampaign.hpp
    M src/game_initialization/singleplayer.cpp
    M src/gui/dialogs/network_transmission.cpp
    M src/gui/dialogs/network_transmission.hpp
    M src/play_controller.hpp
    M src/playmp_controller.cpp
    M src/playmp_controller.hpp
    M src/playsingle_controller.cpp
    M src/playturn.cpp
    M src/playturn_network_adapter.cpp
    M src/playturn_network_adapter.hpp
    M src/replay.cpp
    A src/wesnothd_connection.cpp
    A src/wesnothd_connection.hpp

  Log Message:
  -----------
  use boost asio on clientside wesnothd connection

The main advantage is that the new code is much shorter and easier to
understand then the preivous one.

It currently still used the network::error class on some places

This also removed support for 'ping' packages, the plan is to replace it
with SO_KEEPALIVE

Also this temporaily breaks the gui2 lobby since it still uses the old
network code.

  Commit: dca57bd5b0b3c44582d986b16bc8b0398c4c8245
      https://github.com/wesnoth/wesnoth/commit/dca57bd5b0b3c44582d986b16bc8b0398c4c8245
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2016-06-05 (Sun, 05 Jun 2016)

  Changed paths:
    M src/addon/manager_ui.cpp
    M src/dialogs.hpp
    M src/game_initialization/connect_engine.cpp
    M src/game_initialization/connect_engine.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_connect.cpp
    M src/game_initialization/multiplayer_connect.hpp
    M src/game_initialization/multiplayer_ui.cpp
    M src/game_initialization/multiplayer_ui.hpp
    M src/game_launcher.cpp
    M src/game_preferences.cpp
    M src/gui/dialogs/lobby/data.cpp
    M src/gui/dialogs/lobby/info.cpp
    M src/gui/dialogs/lobby/info.hpp
    M src/gui/dialogs/lobby/lobby.cpp
    M src/gui/dialogs/lobby/lobby.hpp
    M src/playmp_controller.cpp
    M src/playsingle_controller.cpp
    M src/playturn.cpp
    M src/playturn_network_adapter.cpp
    M src/synced_context.cpp
    M src/wesnoth.cpp
    M src/wesnothd_connection.hpp
    A src/wesnothd_connection_error.hpp

  Log Message:
  -----------
  remove uses of network::error and fix gui2 mp lobby

  Commit: 033f3c97b34c2aa36a9c5d6a6625287dc36dd4f7
      https://github.com/wesnoth/wesnoth/commit/033f3c97b34c2aa36a9c5d6a6625287dc36dd4f7
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2016-06-05 (Sun, 05 Jun 2016)

  Changed paths:
    A src/configr_assign.hpp
    M src/serialization/parser.cpp
    M src/serialization/parser.hpp
    M src/wesnothd_connection.cpp
    M src/wesnothd_connection.hpp

  Log Message:
  -----------
  allow to write multiple configs in a network package.

It is now possible to write multiple config objects in a single package,
the server reads them then as one big config. Prevoulsy if people wanted
to do that they had to copy both configs into a new config which is
slow, specially if those configs are very big becasue they contain a
whole scenario or an era.

  Commit: 8c4ca5318059bc30970893b3fd8f3cac22706b0d
      https://github.com/wesnoth/wesnoth/commit/8c4ca5318059bc30970893b3fd8f3cac22706b0d
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2016-06-05 (Sun, 05 Jun 2016)

  Changed paths:
    M src/tests/gui/test_gui2.cpp

  Log Message:
  -----------
  fix gui2 tests

  Commit: a85170b691e98a6dedbedf181f4d2e405434b339
      https://github.com/wesnoth/wesnoth/commit/a85170b691e98a6dedbedf181f4d2e405434b339
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2016-06-05 (Sun, 05 Jun 2016)

  Changed paths:
    M src/dialogs.cpp

  Log Message:
  -----------
  fix dialogs::network_connect_dialog in nogui mode

Compare: https://github.com/wesnoth/wesnoth/compare/03ef9d8d37d3...a85170b691e9