[wesnoth-commits] [wesnoth/wesnoth] f4e7f4: reset ellipse on unit advancing

gfgtdf noreply at github.com
Sun Aug 25 20:33:18 UTC 2019


  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: f4e7f417e4f40b566e3c46d499a6d047f300b150
      https://github.com/wesnoth/wesnoth/commit/f4e7f417e4f40b566e3c46d499a6d047f300b150
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2019-08-24 (Sat, 24 Aug 2019)

  Changed paths:
    M src/units/unit.cpp

  Log Message:
  -----------
  reset ellipse on unit advancing

same reason as for the overlays= change, in particular this fixes
remove_object of objects that set ellipses.


  Commit: a86df6c984f33b1ca6d1173916b890f434c710c3
      https://github.com/wesnoth/wesnoth/commit/a86df6c984f33b1ca6d1173916b890f434c710c3
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2019-08-25 (Sun, 25 Aug 2019)

  Changed paths:
    M data/campaigns/Under_the_Burning_Suns/utils/dehydration-utils.cfg

  Log Message:
  -----------
  utbs: use [object] for dehydration implementation

this in particular makes it compatible the umc code that uses [remove_object]
It also makes the implementation a bit easier since we don't have to compute
things manually anymore, also duration=scenario takes care of cleanup at
scenario end.


  Commit: 26c2f941f2bcdd89528481e114c0375ad2a46271
      https://github.com/wesnoth/wesnoth/commit/26c2f941f2bcdd89528481e114c0375ad2a46271
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2019-08-25 (Sun, 25 Aug 2019)

  Changed paths:
    M data/campaigns/Dead_Water/scenarios/08_Talking_to_Tyegea.cfg
    M data/campaigns/Dead_Water/utils/items.cfg
    M data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/05_The_Saurian_Treasury.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/4_Gathering_Materials.cfg

  Log Message:
  -----------
  use [remove_object] over [remove_unit_overlay] if possible

this just prevents the units wml from getting cuttered with many [objects]
(generated by the [unit_overlay] implementation) that cancel each other out.
(in the cases here it shouldn't really be a problem though, i still did it
because it feels clener this way)


  Commit: 5cb93694c6cb86117476c0075e311932fcdd6fde
      https://github.com/wesnoth/wesnoth/commit/5cb93694c6cb86117476c0075e311932fcdd6fde
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2019-08-25 (Sun, 25 Aug 2019)

  Changed paths:
    M data/ai/micro_ais/scenarios/The_Elves_Besieged.cfg
    M data/campaigns/An_Orcish_Incursion/scenarios/01_Defend_the_Forest.cfg
    M data/campaigns/An_Orcish_Incursion/scenarios/07_Showdown.cfg
    M data/campaigns/Dead_Water/scenarios/01_Invasion.cfg
    M data/campaigns/Dead_Water/scenarios/02_Flight.cfg
    M data/campaigns/Dead_Water/scenarios/04_Slavers.cfg
    M data/campaigns/Dead_Water/scenarios/05_Tirigaz.cfg
    M data/campaigns/Dead_Water/scenarios/06_Uncharted_Islands.cfg
    M data/campaigns/Dead_Water/scenarios/09_The_Mage.cfg
    M data/campaigns/Dead_Water/scenarios/10_The_Flaming_Sword.cfg
    M data/campaigns/Dead_Water/scenarios/11_Getting_Help.cfg
    M data/campaigns/Dead_Water/scenarios/12_Revenge.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/12_Terror_at_the_Ford_of_Parthyn.cfg
    M data/campaigns/Delfadors_Memoirs/utils/characters.cfg
    M data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg
    M data/campaigns/Descent_Into_Darkness/utils/characters.cfg
    M data/campaigns/Eastern_Invasion/scenarios/04c_Mal-Ravanals_Capital.cfg
    M data/campaigns/Eastern_Invasion/scenarios/05_Northern_Outpost.cfg
    M data/campaigns/Eastern_Invasion/scenarios/07a_The_Crossing.cfg
    M data/campaigns/Eastern_Invasion/scenarios/12_Evacuation.cfg
    M data/campaigns/Eastern_Invasion/scenarios/16_Weldyn_under_Attack.cfg
    M data/campaigns/Eastern_Invasion/utils/character-definitions.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/03_The_Isle_of_Alduin.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/14_Plunging_Into_the_Darkness.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/15_The_Lost_General.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/16_Hasty_Alliance.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/20a_North_Elves.cfg
    M data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter1/03_Kalian_under_Attack.cfg
    M data/campaigns/Legend_of_Wesmere/utils/characters.cfg
    M data/campaigns/Liberty/scenarios/01_The_Raid.cfg
    M data/campaigns/Northern_Rebirth/scenarios/01_Breaking_the_Chains.cfg
    M data/campaigns/Northern_Rebirth/scenarios/03_To_the_Mines.cfg
    M data/campaigns/Northern_Rebirth/scenarios/05a_01_The_Pursuit.cfg
    M data/campaigns/Northern_Rebirth/scenarios/05a_02_Dealings.cfg
    M data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg
    M data/campaigns/Northern_Rebirth/scenarios/08a_Elvish_Princess.cfg
    M data/campaigns/Northern_Rebirth/scenarios/08b_Ray_of_Hope.cfg
    M data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg
    M data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg
    M data/campaigns/Northern_Rebirth/utils/characters.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/2_Closing_the_Gates.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/2t_In_the_Dwarven_City.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/3_Searching_for_the_Runecrafter.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/3t_The_Council_Regathers.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/4t_The_Jeweler.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/7_Outriding_the_Outriders.cfg
    M data/campaigns/Secrets_of_the_Ancients/utils/characters.cfg
    M data/campaigns/Son_Of_The_Black_Eye/scenarios/03_Toward_Mountains_of_Haag.cfg
    M data/campaigns/Son_Of_The_Black_Eye/scenarios/04_The_Siege_of_Barag_Gor.cfg
    M data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/01_At_the_East_Gate.cfg
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/09_The_Underlevels.cfg
    M data/campaigns/The_Hammer_of_Thursagan/utils/characters.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/02_The_Fall.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/03_A_Harrowing_Escape.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/04a_The_Swamp_of_Esten.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/04b_The_Midlands.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/07_Return_to_Oldwood.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/22_The_Rise_of_Wesnoth.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/utils/trow-macros.cfg
    M data/campaigns/The_South_Guard/scenarios/01_Born_to_the_Banner.cfg
    M data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg
    M data/campaigns/The_South_Guard/scenarios/03_A_Desparate_Errand.cfg
    M data/campaigns/The_South_Guard/scenarios/04_Vale_of_Tears.cfg
    M data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg
    M data/campaigns/The_South_Guard/scenarios/06b_The_Long_March.cfg
    M data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg
    M data/campaigns/Two_Brothers/scenarios/02_The_Chase.cfg
    M data/campaigns/Two_Brothers/utils/characters.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/06a_In_the_Tunnels_of_Trolls.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/07a_Dealing_with_Dwarves.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/07b_Talking_with_Trolls.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/11_Battle_for_Zocthanol_Isle.cfg
    M data/campaigns/Under_the_Burning_Suns/utils/character-definitions.cfg
    M data/campaigns/Wings_of_Victory/scenarios/03_The_Contention.cfg
    M data/campaigns/Wings_of_Victory/scenarios/06_The_Three_Sisters.cfg
    M data/campaigns/Wings_of_Victory/scenarios/11_Fire_Meets_Steel.cfg
    M data/campaigns/Wings_of_Victory/scenarios/12_Confrontation.cfg
    M data/campaigns/Wings_of_Victory/utils/characters.cfg
    M data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg
    M data/core/macros/deprecated-utils.cfg
    M data/core/macros/image-utils.cfg
    M data/core/macros/traits.cfg
    M data/core/macros/unit-utils.cfg
    M data/multiplayer/scenarios/2p_Hornshark_Island.cfg

  Log Message:
  -----------
  move loyal overlays to the loyal trait

since the recent changes to overlays= in particular 1a7724e5472,
e71033374c35 and b2cd1cf6c [unit]overlays= is no longer the
recommended way to add an overlay and the use of the
apply_to=overlay effect is reccomended instead, so adding it
to the [trait] is the most natural option here.

this in particular fixes #4058 . Also people simply forgetting the
IS_LOYAL macro was a not-so-uncommon cause of bugs.

In some cases people want to give the LOYAL trait without giving the
loyal overlays for those cases i added a optional OVERLAY parameter to
the {TRAIT_LOYAL} macro, also heroes should now use {TRAIT_LOYAL_HERO}
instead which uses the hero overlay. The IS_LOYAL and IS_HERO macros are
no longer needed in combination with those traits.


  Commit: f4ad4f11c711e551e439d9fc060d2ad8c720808d
      https://github.com/wesnoth/wesnoth/commit/f4ad4f11c711e551e439d9fc060d2ad8c720808d
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2019-08-25 (Sun, 25 Aug 2019)

  Changed paths:
    M data/campaigns/Dead_Water/scenarios/10_The_Flaming_Sword.cfg
    M data/campaigns/Dead_Water/scenarios/11_Getting_Help.cfg

  Log Message:
  -----------
  use [remove_trait] to remove loyal


  Commit: aa07ec7915b028925954555d43f9d8aeb8e7f5ae
      https://github.com/wesnoth/wesnoth/commit/aa07ec7915b028925954555d43f9d8aeb8e7f5ae
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2019-08-25 (Sun, 25 Aug 2019)

  Changed paths:
    M data/campaigns/Liberty/scenarios/08_Glory.cfg
    M data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/3_Searching_for_the_Runecrafter.cfg
    M data/core/macros/image-utils.cfg

  Log Message:
  -----------
  add new macors to replace loyal trait.


  Commit: ef066344858318b0c4d7acca833771e4bbbf1c91
      https://github.com/wesnoth/wesnoth/commit/ef066344858318b0c4d7acca833771e4bbbf1c91
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2019-08-25 (Sun, 25 Aug 2019)

  Changed paths:
    M data/ai/micro_ais/scenarios/messenger_escort.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/19_Showdown_in_the_Northern_Swamp.cfg
    M data/campaigns/Delfadors_Memoirs/utils/sides.cfg
    M data/campaigns/Liberty/scenarios/03_A_Strategy_Of_Hope.cfg
    M data/campaigns/Northern_Rebirth/utils/utils.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/02_The_Fall.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/07_Return_to_Oldwood.cfg
    M data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg
    M data/campaigns/The_South_Guard/scenarios/07b_Pebbles_in_the_Flood.cfg
    M data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg
    M data/core/macros/image-utils.cfg

  Log Message:
  -----------
  use overlay effect over [unit] overlays=


  Commit: 8610cc0a15b64f9fdf7e49b03b0c5cd2e0ee8b8e
      https://github.com/wesnoth/wesnoth/commit/8610cc0a15b64f9fdf7e49b03b0c5cd2e0ee8b8e
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2019-08-25 (Sun, 25 Aug 2019)

  Changed paths:
    M data/campaigns/Dead_Water/scenarios/05_Tirigaz.cfg
    M data/campaigns/Dead_Water/scenarios/06_Uncharted_Islands.cfg
    M data/campaigns/Dead_Water/scenarios/11_Getting_Help.cfg
    M data/campaigns/Dead_Water/scenarios/12_Revenge.cfg
    M data/campaigns/Dead_Water/units/Brawler.cfg
    M data/campaigns/Descent_Into_Darkness/scenarios/08_A_Small_Favor2.cfg
    M data/campaigns/Descent_Into_Darkness/scenarios/09_A_Small_Favor3.cfg
    M data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg

  Log Message:
  -----------
  use [modify_unit] over store+unstore


  Commit: 6ba25a8c643b4762e17aaf66c47e26a7b4bd3e09
      https://github.com/wesnoth/wesnoth/commit/6ba25a8c643b4762e17aaf66c47e26a7b4bd3e09
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2019-08-25 (Sun, 25 Aug 2019)

  Changed paths:
    M data/campaigns/Liberty/scenarios/02_Civil_Disobedience.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg

  Log Message:
  -----------
  overlay= related wml cleanups


  Commit: 66fb021a6f7669ac515f3e238a52e852c72db125
      https://github.com/wesnoth/wesnoth/commit/66fb021a6f7669ac515f3e238a52e852c72db125
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2019-08-25 (Sun, 25 Aug 2019)

  Changed paths:
    M data/ai/micro_ais/scenarios/The_Elves_Besieged.cfg
    M data/ai/micro_ais/scenarios/messenger_escort.cfg
    M data/campaigns/An_Orcish_Incursion/scenarios/01_Defend_the_Forest.cfg
    M data/campaigns/An_Orcish_Incursion/scenarios/07_Showdown.cfg
    M data/campaigns/Dead_Water/scenarios/01_Invasion.cfg
    M data/campaigns/Dead_Water/scenarios/02_Flight.cfg
    M data/campaigns/Dead_Water/scenarios/04_Slavers.cfg
    M data/campaigns/Dead_Water/scenarios/05_Tirigaz.cfg
    M data/campaigns/Dead_Water/scenarios/06_Uncharted_Islands.cfg
    M data/campaigns/Dead_Water/scenarios/08_Talking_to_Tyegea.cfg
    M data/campaigns/Dead_Water/scenarios/09_The_Mage.cfg
    M data/campaigns/Dead_Water/scenarios/10_The_Flaming_Sword.cfg
    M data/campaigns/Dead_Water/scenarios/11_Getting_Help.cfg
    M data/campaigns/Dead_Water/scenarios/12_Revenge.cfg
    M data/campaigns/Dead_Water/units/Brawler.cfg
    M data/campaigns/Dead_Water/utils/items.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/12_Terror_at_the_Ford_of_Parthyn.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/19_Showdown_in_the_Northern_Swamp.cfg
    M data/campaigns/Delfadors_Memoirs/utils/characters.cfg
    M data/campaigns/Delfadors_Memoirs/utils/sides.cfg
    M data/campaigns/Descent_Into_Darkness/scenarios/08_A_Small_Favor2.cfg
    M data/campaigns/Descent_Into_Darkness/scenarios/09_A_Small_Favor3.cfg
    M data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg
    M data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg
    M data/campaigns/Descent_Into_Darkness/utils/characters.cfg
    M data/campaigns/Eastern_Invasion/scenarios/04c_Mal-Ravanals_Capital.cfg
    M data/campaigns/Eastern_Invasion/scenarios/05_Northern_Outpost.cfg
    M data/campaigns/Eastern_Invasion/scenarios/07a_The_Crossing.cfg
    M data/campaigns/Eastern_Invasion/scenarios/12_Evacuation.cfg
    M data/campaigns/Eastern_Invasion/scenarios/16_Weldyn_under_Attack.cfg
    M data/campaigns/Eastern_Invasion/utils/character-definitions.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/03_The_Isle_of_Alduin.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/14_Plunging_Into_the_Darkness.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/15_The_Lost_General.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/16_Hasty_Alliance.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/20a_North_Elves.cfg
    M data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter1/03_Kalian_under_Attack.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/05_The_Saurian_Treasury.cfg
    M data/campaigns/Legend_of_Wesmere/utils/characters.cfg
    M data/campaigns/Liberty/scenarios/01_The_Raid.cfg
    M data/campaigns/Liberty/scenarios/02_Civil_Disobedience.cfg
    M data/campaigns/Liberty/scenarios/03_A_Strategy_Of_Hope.cfg
    M data/campaigns/Liberty/scenarios/08_Glory.cfg
    M data/campaigns/Northern_Rebirth/scenarios/01_Breaking_the_Chains.cfg
    M data/campaigns/Northern_Rebirth/scenarios/03_To_the_Mines.cfg
    M data/campaigns/Northern_Rebirth/scenarios/05a_01_The_Pursuit.cfg
    M data/campaigns/Northern_Rebirth/scenarios/05a_02_Dealings.cfg
    M data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg
    M data/campaigns/Northern_Rebirth/scenarios/08a_Elvish_Princess.cfg
    M data/campaigns/Northern_Rebirth/scenarios/08b_Ray_of_Hope.cfg
    M data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg
    M data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg
    M data/campaigns/Northern_Rebirth/utils/characters.cfg
    M data/campaigns/Northern_Rebirth/utils/utils.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/2_Closing_the_Gates.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/2t_In_the_Dwarven_City.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/3_Searching_for_the_Runecrafter.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/3t_The_Council_Regathers.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/4_Gathering_Materials.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/4t_The_Jeweler.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/7_Outriding_the_Outriders.cfg
    M data/campaigns/Secrets_of_the_Ancients/utils/characters.cfg
    M data/campaigns/Son_Of_The_Black_Eye/scenarios/03_Toward_Mountains_of_Haag.cfg
    M data/campaigns/Son_Of_The_Black_Eye/scenarios/04_The_Siege_of_Barag_Gor.cfg
    M data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/01_At_the_East_Gate.cfg
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/09_The_Underlevels.cfg
    M data/campaigns/The_Hammer_of_Thursagan/utils/characters.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/02_The_Fall.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/03_A_Harrowing_Escape.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/04a_The_Swamp_of_Esten.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/04b_The_Midlands.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/07_Return_to_Oldwood.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/22_The_Rise_of_Wesnoth.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/utils/trow-macros.cfg
    M data/campaigns/The_South_Guard/scenarios/01_Born_to_the_Banner.cfg
    M data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg
    M data/campaigns/The_South_Guard/scenarios/03_A_Desparate_Errand.cfg
    M data/campaigns/The_South_Guard/scenarios/04_Vale_of_Tears.cfg
    M data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg
    M data/campaigns/The_South_Guard/scenarios/06b_The_Long_March.cfg
    M data/campaigns/The_South_Guard/scenarios/07b_Pebbles_in_the_Flood.cfg
    M data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg
    M data/campaigns/Two_Brothers/scenarios/02_The_Chase.cfg
    M data/campaigns/Two_Brothers/utils/characters.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/06a_In_the_Tunnels_of_Trolls.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/07a_Dealing_with_Dwarves.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/07b_Talking_with_Trolls.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/11_Battle_for_Zocthanol_Isle.cfg
    M data/campaigns/Under_the_Burning_Suns/utils/character-definitions.cfg
    M data/campaigns/Under_the_Burning_Suns/utils/dehydration-utils.cfg
    M data/campaigns/Wings_of_Victory/scenarios/03_The_Contention.cfg
    M data/campaigns/Wings_of_Victory/scenarios/06_The_Three_Sisters.cfg
    M data/campaigns/Wings_of_Victory/scenarios/11_Fire_Meets_Steel.cfg
    M data/campaigns/Wings_of_Victory/scenarios/12_Confrontation.cfg
    M data/campaigns/Wings_of_Victory/utils/characters.cfg
    M data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg
    M data/core/macros/deprecated-utils.cfg
    M data/core/macros/image-utils.cfg
    M data/core/macros/traits.cfg
    M data/core/macros/unit-utils.cfg
    M data/multiplayer/scenarios/2p_Hornshark_Island.cfg
    M src/units/unit.cpp

  Log Message:
  -----------
  Merge pull request #4088 from gfgtdf/fix_remove_overlay

wml changes for overlays= change

* move loyal overlays to the loyal trait
* other wml improvments.

Fix [remove_object] for effects that change ellipse


Compare: https://github.com/wesnoth/wesnoth/compare/3be0f751cc26...66fb021a6f76



More information about the Commits mailing list