[Commits] [wesnoth/wesnoth] af383e: workaround for bug #21797

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: af383e8ebb01094f47ec4712db47ea31adf8fc22
      https://github.com/wesnoth/wesnoth/commit/af383e8ebb01094f47ec4712db47ea31adf8fc22
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-03-16 (Sun, 16 Mar 2014)

  Changed paths:
    M src/multiplayer_connect_engine.cpp

  Log Message:
  -----------
  workaround for bug #21797

when the side engine in multiplayer_connect_engine.cpp loads a side,
if the game is a save game, the side is not allowed to have a human
player, and it is listed as "network", then we set it to ai,
assuming that it "should" be a "network_ai" if bug #18829 is ever
fixed


  Commit: db153ed19c533f7bd05c858df9035cb7e934f5c8
      https://github.com/wesnoth/wesnoth/commit/db153ed19c533f7bd05c858df9035cb7e934f5c8
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-03-16 (Sun, 16 Mar 2014)

  Changed paths:
    M src/playmp_controller.cpp

  Log Message:
  -----------
  blindfold_enabled => skip_replay enabled, in playmp_controller

this was suggested by Wintermute, as it is hard to see why you
wouldn't want the replays to go fast if you can't see anything.


  Commit: ce06371a99888f4e99451bd12d57f0deb6be42bd
      https://github.com/wesnoth/wesnoth/commit/ce06371a99888f4e99451bd12d57f0deb6be42bd
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-03-16 (Sun, 16 Mar 2014)

  Changed paths:
    M changelog
    M data/campaigns/Legend_of_Wesmere/maps/Kalian.map
    M data/campaigns/Legend_of_Wesmere/maps/Kalian_map.cfg
    M data/campaigns/Legend_of_Wesmere/masks/07_Elves_Last_Stand.mask
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/07_Elves_Last_Stand.cfg
    M data/core/team-colors.cfg
    M data/core/units/khalifate/Arif.cfg
    M data/core/units/khalifate/Batal.cfg
    M data/core/units/khalifate/Elder_Falcon.cfg
    M data/core/units/khalifate/Falcon.cfg
    M data/core/units/khalifate/Ghazi.cfg
    M data/core/units/khalifate/Hakim.cfg
    M data/core/units/khalifate/Jundi.cfg
    M data/core/units/khalifate/Khalid.cfg
    M data/core/units/khalifate/Mighwar.cfg
    M data/core/units/khalifate/Monawish.cfg
    M data/core/units/khalifate/Mudafi.cfg
    M data/core/units/khalifate/Muharib.cfg
    M data/core/units/khalifate/Naffat.cfg
    M data/core/units/khalifate/Qatif-al-nar.cfg
    M data/core/units/khalifate/Rasikh.cfg
    M data/core/units/khalifate/Shuja.cfg
    M data/core/units/khalifate/Tabib.cfg
    M data/core/units/khalifate/Tineen.cfg
    M data/game_config.cfg
    A images/buttons/misc/orb-pressed.png
    A images/buttons/misc/orb.png
    M players_changelog
    M projectfiles/VC9/wesnoth.vcproj
    M src/about.cpp
    M src/display.cpp
    M src/game_config.cpp
    M src/game_config.hpp
    M src/game_preferences_display.cpp
    M src/map.cpp
    M src/minimap.cpp
    M src/preferences.cpp
    M src/preferences.hpp
    M src/unit.cpp
    M src/widgets/button.cpp
    M src/widgets/button.hpp

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/wesnoth/wesnoth


Compare: https://github.com/wesnoth/wesnoth/compare/f5323b627ccb...ce06371a9988