[Commits] [wesnoth/wesnoth] f96f86: Improvements in the map and name generators

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: f96f86245e6448df9314bc0ac9b00d562b79967a
      https://github.com/wesnoth/wesnoth/commit/f96f86245e6448df9314bc0ac9b00d562b79967a
  Author: Spixi <marius.spix at web.de>
  Date:   2016-07-17 (Sun, 17 Jul 2016)

  Changed paths:
    M changelog
    M data/core/macros/names.cfg
    M data/english.cfg
    M src/CMakeLists.txt
    M src/SConscript
    M src/formula/string_utils.cpp
    M src/formula/string_utils.hpp
    M src/generators/default_map_generator_job.cpp
    M src/generators/default_map_generator_job.hpp
    M src/scripting/game_lua_kernel.cpp
    M src/units/race.cpp
    M src/units/race.hpp
    M src/utils/context_free_grammar_generator.cpp
    M src/utils/context_free_grammar_generator.hpp
    M src/utils/name_generator.hpp
    A src/utils/name_generator_factory.cpp
    A src/utils/name_generator_factory.hpp

  Log Message:
  -----------
  Improvements in the map and name generators
- Implement a way to escape special characters {|} in the CFG generator
- Eliminate null pointers to name generators
- Invalid generators now throw exceptions
- Name generating rules for different terrain elements can now be specified
  (The defaults in english.cfg are still used)


  Commit: 649b50d93b922bb0b4657acd6645d89e470ab55d
      https://github.com/wesnoth/wesnoth/commit/649b50d93b922bb0b4657acd6645d89e470ab55d
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2016-07-17 (Sun, 17 Jul 2016)

  Changed paths:
    M data/english.cfg
    M src/generators/default_map_generator_job.cpp

  Log Message:
  -----------
  Shorten one of the map name generator keys


  Commit: 275adafa86d2a57cf2405d98724b0836598f5774
      https://github.com/wesnoth/wesnoth/commit/275adafa86d2a57cf2405d98724b0836598f5774
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2016-07-18 (Mon, 18 Jul 2016)

  Changed paths:
    M src/generators/default_map_generator_job.cpp
    M src/utils/name_generator.hpp
    M src/utils/name_generator_factory.cpp

  Log Message:
  -----------
  Style

Fixes a few style issues introduced by #661 and also some that were already there


  Commit: 01e9f11cfb489df89548a151a8abee3ec84adca5
      https://github.com/wesnoth/wesnoth/commit/01e9f11cfb489df89548a151a8abee3ec84adca5
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2016-07-18 (Mon, 18 Jul 2016)

  Changed paths:
    M src/utils/name_generator.hpp
    M src/utils/name_generator_factory.cpp

  Log Message:
  -----------
  Eliminate string_utils include in name_generator.hpp


  Commit: ab504f4458d01f19c6b7070b7ff4798cbd0b03b7
      https://github.com/wesnoth/wesnoth/commit/ab504f4458d01f19c6b7070b7ff4798cbd0b03b7
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2016-07-18 (Mon, 18 Jul 2016)

  Changed paths:
    M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj

  Log Message:
  -----------
  Update XCode project


  Commit: 7286ea8e0f3cd9a0e8917337d0abbb4f453225b3
      https://github.com/wesnoth/wesnoth/commit/7286ea8e0f3cd9a0e8917337d0abbb4f453225b3
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2016-07-18 (Mon, 18 Jul 2016)

  Changed paths:
    M changelog
    M data/core/macros/names.cfg
    M data/english.cfg
    M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
    M src/CMakeLists.txt
    M src/SConscript
    M src/formula/string_utils.cpp
    M src/formula/string_utils.hpp
    M src/generators/default_map_generator_job.cpp
    M src/generators/default_map_generator_job.hpp
    M src/scripting/lua_kernel_base.cpp
    M src/units/race.cpp
    M src/units/race.hpp
    M src/utils/context_free_grammar_generator.cpp
    M src/utils/context_free_grammar_generator.hpp
    M src/utils/name_generator.hpp
    A src/utils/name_generator_factory.cpp
    A src/utils/name_generator_factory.hpp

  Log Message:
  -----------
  Merge pull request #661 from spixi/name_and_map_generator

Improvements in the name and map generators


Compare: https://github.com/wesnoth/wesnoth/compare/36eeed413c08...7286ea8e0f3c