[wesnoth-commits] [wesnoth/wesnoth] fe9041: DW: change mermen to merfolk/mer

Tue Apr 16 23:29:23 UTC 2019

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: fe904140dfa72babb702793222e41986917c750c
      https://github.com/wesnoth/wesnoth/commit/fe904140dfa72babb702793222e41986917c750c
  Author: nemaara <nemaara at gmail.com>
  Date:   2019-04-14 (Sun, 14 Apr 2019)

  Changed paths:
    M data/campaigns/Dead_Water/scenarios/01_Invasion.cfg
    M data/campaigns/Dead_Water/scenarios/05_Tirigaz.cfg
    M data/campaigns/Dead_Water/scenarios/10_The_Flaming_Sword.cfg
    M data/campaigns/Dead_Water/scenarios/12_Revenge.cfg
    M data/campaigns/Dead_Water/units/Child_King.cfg

  Log Message:
  -----------
  DW: change mermen to merfolk/mer


  Commit: 0cd6f5238d24e5decd1cbe885fd50299f84e04db
      https://github.com/wesnoth/wesnoth/commit/0cd6f5238d24e5decd1cbe885fd50299f84e04db
  Author: nemaara <nemaara at gmail.com>
  Date:   2019-04-14 (Sun, 14 Apr 2019)

  Changed paths:
    M data/core/images/portraits/ARTISTS
    M data/multiplayer/scenarios/Random_Scenario.cfg
    M data/multiplayer/scenarios/Random_Scenario_Desert.cfg
    M data/multiplayer/scenarios/Random_Scenario_Marsh.cfg
    M data/multiplayer/scenarios/test_lua_mapgen.lua
    M data/scenario-test.cfg

  Log Message:
  -----------
  Change various references of mermen to merfolk


  Commit: dc0ac483e68b30355303d6a4bdbe503978600431
      https://github.com/wesnoth/wesnoth/commit/dc0ac483e68b30355303d6a4bdbe503978600431
  Author: nemaara <nemaara at gmail.com>
  Date:   2019-04-14 (Sun, 14 Apr 2019)

  Changed paths:
    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/05_Choice_In_The_Fog.cfg

  Log Message:
  -----------
  TSG: change references of mermen to merfolk


  Commit: 9ce614675ddfa89f395a29ee00b29064c0757dcf
      https://github.com/wesnoth/wesnoth/commit/9ce614675ddfa89f395a29ee00b29064c0757dcf
  Author: nemaara <nemaara at gmail.com>
  Date:   2019-04-14 (Sun, 14 Apr 2019)

  Changed paths:
    M data/core/units/merfolk/Entangler.cfg
    M data/core/units/merfolk/Hunter.cfg
    M data/core/units/merfolk/Javelineer.cfg
    M data/core/units/merfolk/Netcaster.cfg
    M data/core/units/merfolk/Spearman.cfg
    M data/core/units/merfolk/Warrior.cfg

  Log Message:
  -----------
  Merfolk: change references of mermen to merfolk/mer


  Commit: 7457ef59e5e2b8dfe78ff84d5377d1d6d17832ef
      https://github.com/wesnoth/wesnoth/commit/7457ef59e5e2b8dfe78ff84d5377d1d6d17832ef
  Author: nemaara <nemaara at gmail.com>
  Date:   2019-04-14 (Sun, 14 Apr 2019)

  Changed paths:
    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/19c_Cliffs_of_Thoria.cfg

  Log Message:
  -----------
  HttT: change mermen to merfolk/mer


  Commit: 4ed96cef1a38052c6018172d389ad74286065ccb
      https://github.com/wesnoth/wesnoth/commit/4ed96cef1a38052c6018172d389ad74286065ccb
  Author: nemaara <nemaara at gmail.com>
  Date:   2019-04-14 (Sun, 14 Apr 2019)

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/08_The_Princess_of_Wesnoth.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/16_Hasty_Alliance.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/18_A_Choice_Must_Be_Made.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/19a_Snow_Plains.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/19b_Swamp_Of_Dread.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/scenarios/20b_Underground_Channels.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/21_Elven_Council.cfg

  Log Message:
  -----------
  HttT: remove Princess as a direct address


  Commit: 0251e4673da8aebd3b552cb04bf83af1aacb3436
      https://github.com/wesnoth/wesnoth/commit/0251e4673da8aebd3b552cb04bf83af1aacb3436
  Author: nemaara <nemaara at gmail.com>
  Date:   2019-04-14 (Sun, 14 Apr 2019)

  Changed paths:
    M data/campaigns/Northern_Rebirth/scenarios/09a_Introductions.cfg
    M data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg
    M data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg

  Log Message:
  -----------
  NR: remove Princess as a direct address


  Commit: acfeeccf3b484bda380d03db00a1d1d1938cd1a2
      https://github.com/wesnoth/wesnoth/commit/acfeeccf3b484bda380d03db00a1d1d1938cd1a2
  Author: nemaara <nemaara at users.noreply.github.com>
  Date:   2019-04-16 (Tue, 16 Apr 2019)

  Changed paths:
    M data/campaigns/Dead_Water/scenarios/12_Revenge.cfg

  Log Message:
  -----------
  DW S12: change reference to mermen


  Commit: 61d73a4c9336793495b6ae2f6116522dc0a534c0
      https://github.com/wesnoth/wesnoth/commit/61d73a4c9336793495b6ae2f6116522dc0a534c0
  Author: nemaara <nemaara at users.noreply.github.com>
  Date:   2019-04-16 (Tue, 16 Apr 2019)

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/03_The_Isle_of_Alduin.cfg

  Log Message:
  -----------
  HttT S3: proper noun capitalization


  Commit: 0a47e519449516e7b63688834faf35d0b9a045a3
      https://github.com/wesnoth/wesnoth/commit/0a47e519449516e7b63688834faf35d0b9a045a3
  Author: nemaara <nemaara at gmail.com>
  Date:   2019-04-16 (Tue, 16 Apr 2019)

  Changed paths:
    M changelog.md

  Log Message:
  -----------
  Update changelog with prose fixes


  Commit: b91cbf6040cab1fe45b0e7865dc73fd4413e1374
      https://github.com/wesnoth/wesnoth/commit/b91cbf6040cab1fe45b0e7865dc73fd4413e1374
  Author: nemaara <nemaara at users.noreply.github.com>
  Date:   2019-04-16 (Tue, 16 Apr 2019)

  Changed paths:
    M changelog.md
    M data/campaigns/Dead_Water/scenarios/01_Invasion.cfg
    M data/campaigns/Dead_Water/scenarios/05_Tirigaz.cfg
    M data/campaigns/Dead_Water/scenarios/10_The_Flaming_Sword.cfg
    M data/campaigns/Dead_Water/scenarios/12_Revenge.cfg
    M data/campaigns/Dead_Water/units/Child_King.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/08_The_Princess_of_Wesnoth.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/16_Hasty_Alliance.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/18_A_Choice_Must_Be_Made.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/19a_Snow_Plains.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/19b_Swamp_Of_Dread.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/scenarios/20b_Underground_Channels.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/21_Elven_Council.cfg
    M data/campaigns/Northern_Rebirth/scenarios/09a_Introductions.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/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/05_Choice_In_The_Fog.cfg
    M data/core/images/portraits/ARTISTS
    M data/core/units/merfolk/Entangler.cfg
    M data/core/units/merfolk/Hunter.cfg
    M data/core/units/merfolk/Javelineer.cfg
    M data/core/units/merfolk/Netcaster.cfg
    M data/core/units/merfolk/Spearman.cfg
    M data/core/units/merfolk/Warrior.cfg
    M data/multiplayer/scenarios/Random_Scenario.cfg
    M data/multiplayer/scenarios/Random_Scenario_Desert.cfg
    M data/multiplayer/scenarios/Random_Scenario_Marsh.cfg
    M data/multiplayer/scenarios/test_lua_mapgen.lua
    M data/scenario-test.cfg

  Log Message:
  -----------
  Merge pull request #4023 from nemaara/prose

Campaign/core prose fixes


Compare: https://github.com/wesnoth/wesnoth/compare/3a5b8aca5e54...b91cbf6040ca