[Commits] [wesnoth/wesnoth] 004af1: DiD S10: make Volk hang out around his castle and ...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 004af104d9eb913101cda2db0e2964162bdb16ca
      https://github.com/wesnoth/wesnoth/commit/004af104d9eb913101cda2db0e2964162bdb16ca
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2014-12-24 (Wed, 24 Dec 2014)

  Changed paths:
    M data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg

  Log Message:
  -----------
  DiD S10: make Volk hang out around his castle and adjacent villages, not just his keep


  Commit: 2398906fd84562228a2494f69da6a5c9bfc013c2
      https://github.com/wesnoth/wesnoth/commit/2398906fd84562228a2494f69da6a5c9bfc013c2
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2014-12-24 (Wed, 24 Dec 2014)

  Changed paths:
    M .travis.yml
    M data/core/_main.cfg
    M data/lua/wml-tags.lua
    M src/game_events/action_wml.cpp
    M src/scripting/game_lua_kernel.cpp
    M src/scripting/game_lua_kernel.hpp
    M src/scripting/lua_gui2.cpp
    M src/scripting/lua_gui2.hpp

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


Compare: https://github.com/wesnoth/wesnoth/compare/75767d3a7755...2398906fd845