[Commits] [wesnoth/wesnoth] 729126: add "disallow_shuffle" attribute to [side]

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 729126e033abd14da59e13053b015ad4ed518c81
      https://github.com/wesnoth/wesnoth/commit/729126e033abd14da59e13053b015ad4ed518c81
  Author: Chris Beck <render787 at gmail.com>
  Date:   2015-04-08 (Wed, 08 Apr 2015)

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

  Log Message:
  -----------
  add "disallow_shuffle" attribute to [side]

which causes them to be ignored by the "shuffle_sides" phase,
regardless of the heuristic used by the connect engine


  Commit: c959645f44c1bb2f75ca05603dfecbf21b8e6260
      https://github.com/wesnoth/wesnoth/commit/c959645f44c1bb2f75ca05603dfecbf21b8e6260
  Author: Chris Beck <render787 at gmail.com>
  Date:   2015-04-09 (Thu, 09 Apr 2015)

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

  Log Message:
  -----------
  Merge branch 'disallow_shuffle'


Compare: https://github.com/wesnoth/wesnoth/compare/be0d04d4fc25...c959645f44c1