[Commits] [wesnoth/wesnoth] 1aac72: Split off server_base class from server class in o...

[GitHub]

  Branch: refs/heads/campaignd_asio
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 1aac722378ec1f3abf3cd18451a791b2b56eac69
      https://github.com/wesnoth/wesnoth/commit/1aac722378ec1f3abf3cd18451a791b2b56eac69
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2016-06-09 (Thu, 09 Jun 2016)

  Changed paths:
    M src/SConscript
    M src/server/player_connection.hpp
    A src/server/send_receive_wml_helpers.ipp
    M src/server/server.cpp
    M src/server/server.hpp
    A src/server/server_base.cpp
    A src/server/server_base.hpp

  Log Message:
  -----------
  Split off server_base class from server class in order to reuse it for campaignd


  Commit: 358bf3f9f8d2ed17403961c4a1cac2d499ebf133
      https://github.com/wesnoth/wesnoth/commit/358bf3f9f8d2ed17403961c4a1cac2d499ebf133
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2016-06-15 (Wed, 15 Jun 2016)

  Changed paths:
    M SConstruct
    M src/SConscript
    M src/campaign_server/campaign_server.cpp
    M src/campaign_server/campaign_server.hpp
    M src/color_range.cpp
    M src/color_range.hpp
    M src/game_config.cpp
    M src/server/send_receive_wml_helpers.ipp
    M src/server/server.cpp
    M src/server/server_base.cpp
    M src/server/server_base.hpp

  Log Message:
  -----------
  Switch campaignd to use asio by reusing wesnothd code via server_base class


  Commit: bd304cb307b32fe198c39f7e7370d6c695fd5142
      https://github.com/wesnoth/wesnoth/commit/bd304cb307b32fe198c39f7e7370d6c695fd5142
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2016-06-17 (Fri, 17 Jun 2016)

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

  Log Message:
  -----------
  Factor server start into separate function

Needed to allow campaignd to load config before starting server.


  Commit: 31bbedd94e1b3529499953817022dda8785285b2
      https://github.com/wesnoth/wesnoth/commit/31bbedd94e1b3529499953817022dda8785285b2
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2016-06-17 (Fri, 17 Jun 2016)

  Changed paths:
    M SConstruct
    M data/campaigns/Eastern_Invasion/scenarios/04c_Mal-Ravanals_Capital.cfg
    M data/campaigns/Eastern_Invasion/scenarios/05_Northern_Outpost.cfg
    M data/campaigns/Eastern_Invasion/scenarios/09_Xenophobia.cfg
    M data/campaigns/Eastern_Invasion/utils/character-definitions.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter1/01_The_Uprooting.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter1/02_Hostile_Mountains.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter1/03_Kalian_under_Attack.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/04_The_Elvish_Treasury.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/05_The_Saurian_Treasury.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/06_Acquaintance_in_Need.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/07_Elves_Last_Stand.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/08_Council_of_Hard_Choices.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter3/09_Bounty_Hunters.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter3/10_Cliffs_of_Thoria.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter3/11_Battle_of_the_Book.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter3/12_Revelations.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter4/13_News_from_the_Front.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter5/22_Northern_Battle.cfg
    M data/campaigns/Legend_of_Wesmere/utils/low-macros.cfg
    M data/tools/GUI.pyw
    M data/tools/unit_tree/html_output.py
    M data/tools/wmllint
    M projectfiles/CodeBlocks/wesnoth.cbp
    M scons/boost.py
    M src/actions/undo.cpp
    M src/addon/client.cpp
    M src/dialogs.cpp
    M src/game_launcher.cpp
    M src/game_launcher.hpp
    M src/gui/dialogs/loadscreen.cpp
    M src/gui/dialogs/multiplayer/synced_choice_wait.cpp
    M src/scripting/lua_common.cpp
    M src/server/server_base.cpp
    M utils/compare_images.py
    M utils/pywmlx/__init__.py
    M utils/pywmlx/wmlerr.py
    M utils/wmlxgettext

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


  Commit: be47acce267b588bcd9444c432fe1afa094c7799
      https://github.com/wesnoth/wesnoth/commit/be47acce267b588bcd9444c432fe1afa094c7799
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2016-06-17 (Fri, 17 Jun 2016)

  Changed paths:
    M src/campaign_server/campaign_server.cpp

  Log Message:
  -----------
  Fix ostringstream misuse


  Commit: 702a98d50920d61d19ccea67b993d45ea9072dbf
      https://github.com/wesnoth/wesnoth/commit/702a98d50920d61d19ccea67b993d45ea9072dbf
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2016-06-17 (Fri, 17 Jun 2016)

  Changed paths:
    M src/campaign_server/campaign_server.cpp

  Log Message:
  -----------
  Add missing newlines to log messages


  Commit: 977e76d7b137fd056a866f3678cbbd5b0f259566
      https://github.com/wesnoth/wesnoth/commit/977e76d7b137fd056a866f3678cbbd5b0f259566
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2016-06-18 (Sat, 18 Jun 2016)

  Changed paths:
    M src/campaign_server/campaign_server.cpp

  Log Message:
  -----------
  Made send_message and send_error properly maintain connection


  Commit: 7a09f0fd946d4be03514750cdd2bcd4704054012
      https://github.com/wesnoth/wesnoth/commit/7a09f0fd946d4be03514750cdd2bcd4704054012
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2016-06-18 (Sat, 18 Jun 2016)

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

  Log Message:
  -----------
  Reimplement flushing config to disk every 10 minutes


  Commit: 0039bb544251b1eb8cc55806a6f1065118c6aed4
      https://github.com/wesnoth/wesnoth/commit/0039bb544251b1eb8cc55806a6f1065118c6aed4
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2016-06-18 (Sat, 18 Jun 2016)

  Changed paths:
    M src/campaign_server/campaign_server.cpp

  Log Message:
  -----------
  Cleanup


  Commit: e33f622377889e9fc2b9aa54620e22af4b674db2
      https://github.com/wesnoth/wesnoth/commit/e33f622377889e9fc2b9aa54620e22af4b674db2
  Author: loonycyborg <loonycyborg at gmail.com>
  Date:   2016-06-18 (Sat, 18 Jun 2016)

  Changed paths:
    M src/team.hpp

  Log Message:
  -----------
  Fix breakage caused by dropping sdl dep on some files


Compare: https://github.com/wesnoth/wesnoth/compare/1aac722378ec^...e33f62237788