[Commits] [wesnoth/wesnoth] 9b51a3: Implement temporary weapon swap in DM 21

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 9b51a3a877ad51dc27ca70c7159f74819cc19003
      https://github.com/wesnoth/wesnoth/commit/9b51a3a877ad51dc27ca70c7159f74819cc19003
  Author: aquileia <sk.aquileia at gmail.com>
  Date:   2014-05-26 (Mon, 26 May 2014)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/21_Clash_at_the_Manor.cfg

  Log Message:
  -----------
  Implement temporary weapon swap in DM 21

As Kalenz puts it, "We have acquired orcish weapons". All elvish swords
are replaced by orcish ones for the duration of the scenario.


  Commit: 71190a0b051b06924e727096803e9791d0717c0b
      https://github.com/wesnoth/wesnoth/commit/71190a0b051b06924e727096803e9791d0717c0b
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-05-26 (Mon, 26 May 2014)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/21_Clash_at_the_Manor.cfg

  Log Message:
  -----------
  Merge remote-tracking branch 'aquileia/DM_fix'


  Commit: 7cc62266e98dd0b26bd04c4d90e058d1d7d7582a
      https://github.com/wesnoth/wesnoth/commit/7cc62266e98dd0b26bd04c4d90e058d1d7d7582a
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-05-26 (Mon, 26 May 2014)

  Changed paths:
    A data/test/scenarios/prestart_settings.cfg
    M wml_test_schedule

  Log Message:
  -----------
  unit tests for giving gold in prestart


  Commit: 0c504c54342db9687213979be1eafe6e9d79d964
      https://github.com/wesnoth/wesnoth/commit/0c504c54342db9687213979be1eafe6e9d79d964
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-05-26 (Mon, 26 May 2014)

  Changed paths:
    M src/playmp_controller.cpp
    M src/playturn.hpp

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


Compare: https://github.com/wesnoth/wesnoth/compare/52f271a39003...0c504c54342d