[wesnoth-commits] [wesnoth/wesnoth] 087a18: Slightly rewrite dialogue (fixes #3386)

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 087a18a156096c8a7b9fb56359aca579a222011d
      https://github.com/wesnoth/wesnoth/commit/087a18a156096c8a7b9fb56359aca579a222011d
  Author: Wedge009 <wedge009 at wedge009.net>
  Date:   2018-08-22 (Wed, 22 Aug 2018)

  Changed paths:
    M data/campaigns/Northern_Rebirth/scenarios/14a_Epilogue.cfg

  Log Message:
  -----------
  Slightly rewrite dialogue (fixes #3386)

Some non-native English readers may find use of the word 'disposed' confusing.


  Commit: cbf078a030305ac523ecd7472d3c7f32d566d20b
      https://github.com/wesnoth/wesnoth/commit/cbf078a030305ac523ecd7472d3c7f32d566d20b
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-08-22 (Wed, 22 Aug 2018)

  Changed paths:
    M src/editor/palette/location_palette.cpp

  Log Message:
  -----------
  fix editor cannot add starting location for > 9 players.

previously attempting to place a starting location for side 10 or higher would result in a "invalid location id" error.


  Commit: 6781fe17ca40e1f8af5f117c7e3645b3ab6f599c
      https://github.com/wesnoth/wesnoth/commit/6781fe17ca40e1f8af5f117c7e3645b3ab6f599c
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-08-22 (Wed, 22 Aug 2018)

  Changed paths:
    M src/game_config_manager.cpp

  Log Message:
  -----------
  show add-on loading times on --log-debug=config


  Commit: 08bb6a4e9600bfe1aa533d684cc5fa1f8a9ed0f4
      https://github.com/wesnoth/wesnoth/commit/08bb6a4e9600bfe1aa533d684cc5fa1f8a9ed0f4
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-08-22 (Wed, 22 Aug 2018)

  Changed paths:
    M src/actions/undo.cpp

  Log Message:
  -----------
  fixup 'fix game freezes on droiding when using dsu #3453'

fixes https://github.com/wesnoth/wesnoth/issues/3486


  Commit: 6b58ce7c04d7f369f8fc5dd5cba0b58def2c2697
      https://github.com/wesnoth/wesnoth/commit/6b58ce7c04d7f369f8fc5dd5cba0b58def2c2697
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-08-22 (Wed, 22 Aug 2018)

  Changed paths:
    M src/server/simple_wml.cpp
    M src/server/simple_wml.hpp

  Log Message:
  -----------
  Revert "preserve traslatable strings in simple_wml."

This reverts commit 4f3ce6865cdd628634fc3ffe2154093d6ccbfba4.
This reverts commit 20128ac9914c971d759399dff6f7ed8edcb960c8.

see issue #3454, there were problems caused by simple_wml when
joining/observing games and this commit is the obvious suspect
so i'm reverting it until we can fix that one.


  Commit: 86eba2b600486055efcd1fb3c061edbd5b123ea8
      https://github.com/wesnoth/wesnoth/commit/86eba2b600486055efcd1fb3c061edbd5b123ea8
  Author: josteph <josteph at fastmail.com>
  Date:   2018-08-22 (Wed, 22 Aug 2018)

  Changed paths:
    M data/core/encyclopedia/geography.cfg

  Log Message:
  -----------
  Help: Fix typos.


  Commit: 59299ade4bbc2816dfa918c6c3a1f2783acd3688
      https://github.com/wesnoth/wesnoth/commit/59299ade4bbc2816dfa918c6c3a1f2783acd3688
  Author: josteph <josteph at fastmail.com>
  Date:   2018-08-22 (Wed, 22 Aug 2018)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/04_Vale_of_Tears.cfg

  Log Message:
  -----------
  TSG S4: Fix typo.


  Commit: 9e296b4c5b9147664c7b330de714a2dd09c0d47e
      https://github.com/wesnoth/wesnoth/commit/9e296b4c5b9147664c7b330de714a2dd09c0d47e
  Author: josteph <josteph at fastmail.com>
  Date:   2018-08-22 (Wed, 22 Aug 2018)

  Changed paths:
    M data/core/units/wose/Ancient.cfg

  Log Message:
  -----------
  Help: Re-fix Ancient Wose description.

Thanks @CelticMinstrel


  Commit: eb763789aec44b18eb55ed99cf212d6121adfea4
      https://github.com/wesnoth/wesnoth/commit/eb763789aec44b18eb55ed99cf212d6121adfea4
  Author: josteph <josteph at fastmail.com>
  Date:   2018-08-22 (Wed, 22 Aug 2018)

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/20b_Underground_Channels.cfg

  Log Message:
  -----------
  HttT S20b: Fix typos


  Commit: d27b09a3dc772429d3e9c45b741be9b0af15bf2b
      https://github.com/wesnoth/wesnoth/commit/d27b09a3dc772429d3e9c45b741be9b0af15bf2b
  Author: josteph <josteph at fastmail.com>
  Date:   2018-08-22 (Wed, 22 Aug 2018)

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/units/Battle_Princess.cfg

  Log Message:
  -----------
  HttT units: Fix typo

Thanks 613TheEvil https://forums.wesnoth.org/viewtopic.php?p=619347#p619347


Compare: https://github.com/wesnoth/wesnoth/compare/4b79c263d357...d27b09a3dc77
      **NOTE:** This service has 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.