[Commits] [wesnoth/wesnoth] 7f2ca9: blindfold_enabled => skip_replay enabled, in playm...

[GitHub]

  Branch: refs/heads/1.12
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 7f2ca9e8441248cf26f33bd8a6172f1f9f40d2ef
      https://github.com/wesnoth/wesnoth/commit/7f2ca9e8441248cf26f33bd8a6172f1f9f40d2ef
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-03-15 (Sat, 15 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: 2beded88a2dbdabef4037e0e6329527a28cd8576
      https://github.com/wesnoth/wesnoth/commit/2beded88a2dbdabef4037e0e6329527a28cd8576
  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: e6473a58d7c42eb55daca1fdcc62b256c600a2eb
      https://github.com/wesnoth/wesnoth/commit/e6473a58d7c42eb55daca1fdcc62b256c600a2eb
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-03-16 (Sun, 16 Mar 2014)

  Changed paths:
    M changelog
    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/gui/default/window/message.cfg
    M data/gui/default/window/transient_message.cfg
    M l10n-track
    M po/wesnoth-dw/de.po
    M po/wesnoth-dw/sk.po
    M po/wesnoth-help/sk.po
    M projectfiles/VC9/wesnoth.vcproj
    M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
    M src/about.cpp
    M src/game_events/action_wml.cpp
    M src/gui/dialogs/message.cpp
    M src/gui/dialogs/transient_message.cpp
    M src/gui/dialogs/transient_message.hpp
    M src/gui/widgets/text.cpp
    M src/image_modifications.cpp
    M src/menu_events.cpp
    M src/serialization/preprocessor.cpp
    M src/sound.cpp

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


Compare: https://github.com/wesnoth/wesnoth/compare/531af4c95429...e6473a58d7c4