[Commits] [wesnoth/wesnoth] 7a5ba3: Change [advance] modifications to [advancement]

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 7a5ba33f5ad7732c6f0ad4bed74a4850fee26fc3
      https://github.com/wesnoth/wesnoth/commit/7a5ba33f5ad7732c6f0ad4bed74a4850fee26fc3
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-08-22 (Sat, 22 Aug 2015)

  Changed paths:
    M src/actions/attack.cpp
    M src/ai/simulated_actions.cpp
    M src/scripting/game_lua_kernel.cpp
    M src/unit.cpp

  Log Message:
  -----------
  Change [advance] modifications to [advancement]

This change maintains backwards compatibility
- [advance] will still work if present
- attempts to add [advance] via Lua will instead add [advancement].


  Commit: 78fd51ffab8e3b7fcfddfad501db7f050607bb2d
      https://github.com/wesnoth/wesnoth/commit/78fd51ffab8e3b7fcfddfad501db7f050607bb2d
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-08-22 (Sat, 22 Aug 2015)

  Changed paths:
    M src/unit.cpp

  Log Message:
  -----------
  Add exclude_amla key to disable an advancement if other advancements are already present


  Commit: f0d0a8eb342c5305966165bf54311064c9828303
      https://github.com/wesnoth/wesnoth/commit/f0d0a8eb342c5305966165bf54311064c9828303
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-08-22 (Sat, 22 Aug 2015)

  Changed paths:
    M changelog

  Log Message:
  -----------
  Update changelog


  Commit: e7fc906f41c7e1f27a641ecd5cee83011926dfd2
      https://github.com/wesnoth/wesnoth/commit/e7fc906f41c7e1f27a641ecd5cee83011926dfd2
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-08-22 (Sat, 22 Aug 2015)

  Changed paths:
    M src/unit.cpp

  Log Message:
  -----------
  Generalization of exclude_amla=

Now, if an exclusion is listed multiple times, this AMLA is only excluded if the unit has that many instances of the excluded AMLA.


  Commit: f0c051d68850a42a72db76547c23873982fc2252
      https://github.com/wesnoth/wesnoth/commit/f0c051d68850a42a72db76547c23873982fc2252
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-08-22 (Sat, 22 Aug 2015)

  Changed paths:
    M src/unit.cpp

  Log Message:
  -----------
  Better variable names


  Commit: ad62e1d4fd67da199df166e6d79fa0d6d50f62b9
      https://github.com/wesnoth/wesnoth/commit/ad62e1d4fd67da199df166e6d79fa0d6d50f62b9
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-08-22 (Sat, 22 Aug 2015)

  Changed paths:
    M src/scripting/game_lua_kernel.cpp
    M src/unit.cpp

  Log Message:
  -----------
  Add deprecated warnings for [advance]


  Commit: df9908932dbe7a049350b71a1a01cb4b4182792d
      https://github.com/wesnoth/wesnoth/commit/df9908932dbe7a049350b71a1a01cb4b4182792d
  Author: Ignacio R. Morelle <shadowm at wesnoth.org>
  Date:   2015-08-23 (Sun, 23 Aug 2015)

  Changed paths:
    M changelog
    M src/actions/attack.cpp
    M src/ai/simulated_actions.cpp
    M src/scripting/game_lua_kernel.cpp
    M src/unit.cpp

  Log Message:
  -----------
  Merge branch 'amla' of https://github.com/CelticMinstrel/wesnoth into staging/pr-468


Compare: https://github.com/wesnoth/wesnoth/compare/80ec273c990a...df9908932dbe