[wesnoth-commits] [wesnoth/wesnoth] a1d92d: Prose: the Storm Trident's description uses "merfo...

[GitHub]

  Branch: refs/heads/1.14
  Home:   https://github.com/wesnoth/wesnoth
  Commit: a1d92d466ee2f2bebf03e446321949f206822f15
      https://github.com/wesnoth/wesnoth/commit/a1d92d466ee2f2bebf03e446321949f206822f15
  Author: Steve Cotton <steve at octalot.co.uk>
  Date:   2018-06-15 (Fri, 15 Jun 2018)

  Changed paths:
    M data/campaigns/Dead_Water/utils/items.cfg
    M data/core/macros/items.cfg

  Log Message:
  -----------
  Prose: the Storm Trident's description uses "merfolk" (issue #2936)

Also update Dead Water's copy of it to use race= instead of a
list of unit types (as done for the core object in 613dd431).


  Commit: 9a6b07f3b047fc27a5d0897aef87f2f93d1752b6
      https://github.com/wesnoth/wesnoth/commit/9a6b07f3b047fc27a5d0897aef87f2f93d1752b6
  Author: Steve Cotton <steve at octalot.co.uk>
  Date:   2018-06-15 (Fri, 15 Jun 2018)

  Changed paths:
    M data/campaigns/Dead_Water/scenarios/07_Bilheld.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/scenarios/13_Epilogue.cfg
    M data/campaigns/Dead_Water/units/Citizen.cfg

  Log Message:
  -----------
  Dead Water: Change "mermen" to "merfolk" (part of #2940)

This commit excludes changes to S05 Tirigaz, I think changing the dialogue
there is going to be more complicated, and it's better for that to have a
separate PR.


  Commit: eba32fd8da21d1a63f4c82edf5fdffd3ebfca6a5
      https://github.com/wesnoth/wesnoth/commit/eba32fd8da21d1a63f4c82edf5fdffd3ebfca6a5
  Author: Steve Cotton <steve at octalot.co.uk>
  Date:   2018-06-15 (Fri, 15 Jun 2018)

  Changed paths:
    M data/campaigns/Dead_Water/utils/dw-utils.cfg

  Log Message:
  -----------
  DW: Change the team name from Merman Forces to Merfolk


Compare: https://github.com/wesnoth/wesnoth/compare/5f4dac29e400...eba32fd8da21
      **NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.