[Commits] [wesnoth/wesnoth] eb1e35: Fixed bug #23059

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: eb1e35d8dfa046e6d4b06f10f8b14ff1ab233352
      https://github.com/wesnoth/wesnoth/commit/eb1e35d8dfa046e6d4b06f10f8b14ff1ab233352
  Author: ln-zookeeper <lari.nieminen at iki.fi>
  Date:   2014-12-13 (Sat, 13 Dec 2014)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/09a_Vengeance.cfg

  Log Message:
  -----------
  Fixed bug #23059

bug #23059: SG: Vengeance - message using "name" doesn't display


  Commit: 6e89a7519277242c308d34f3f7db052d556819f5
      https://github.com/wesnoth/wesnoth/commit/6e89a7519277242c308d34f3f7db052d556819f5
  Author: ln-zookeeper <lari.nieminen at iki.fi>
  Date:   2014-12-13 (Sat, 13 Dec 2014)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/09a_Vengeance.cfg

  Log Message:
  -----------
  Revert "Fixed bug #23059"

This reverts commit eb1e35d8dfa046e6d4b06f10f8b14ff1ab233352.


  Commit: ea2f41f4383bae7c3a79d7bee8078382ea1118e9
      https://github.com/wesnoth/wesnoth/commit/ea2f41f4383bae7c3a79d7bee8078382ea1118e9
  Author: ln-zookeeper <lari.nieminen at iki.fi>
  Date:   2014-12-13 (Sat, 13 Dec 2014)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/09a_Vengeance.cfg

  Log Message:
  -----------
  Fixed bug #23059

bug #23059: SG: Vengeance - message using "name" doesn't display


  Commit: ceb01fa68db19ede5ff0de54036d57209ee76fff
      https://github.com/wesnoth/wesnoth/commit/ceb01fa68db19ede5ff0de54036d57209ee76fff
  Author: ln-zookeeper <lari.nieminen at iki.fi>
  Date:   2014-12-13 (Sat, 13 Dec 2014)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/09a_Vengeance.cfg

  Log Message:
  -----------
  Ensure that at least one elf is spawned every time


  Commit: 18d2c81527055674ffd3cccf8a3a5b214b1e4da5
      https://github.com/wesnoth/wesnoth/commit/18d2c81527055674ffd3cccf8a3a5b214b1e4da5
  Author: ln-zookeeper <lari.nieminen at iki.fi>
  Date:   2014-12-13 (Sat, 13 Dec 2014)

  Changed paths:
    M data/scenario-test.cfg
    M src/attack_prediction_display.cpp
    M src/attack_prediction_display.hpp
    M src/construct_dialog.hpp
    M src/controller_base.hpp
    M src/dialogs.cpp
    M src/dialogs.hpp
    M src/display.cpp
    M src/display.hpp
    M src/editor/controller/editor_controller.cpp
    M src/editor/controller/editor_controller.hpp
    M src/editor/editor_display.cpp
    M src/editor/editor_display.hpp
    M src/editor/palette/common_palette.hpp
    M src/editor/palette/editor_palettes.cpp
    M src/editor/palette/editor_palettes.hpp
    M src/editor/palette/palette_manager.cpp
    M src/editor/palette/palette_manager.hpp
    M src/events.cpp
    M src/events.hpp
    M src/font.cpp
    M src/font.hpp
    M src/game_display.cpp
    M src/game_display.hpp
    M src/game_events/action_wml.cpp
    M src/game_events/handlers.cpp
    M src/game_events/pump.cpp
    M src/game_events/pump.hpp
    M src/game_initialization/multiplayer_wait.cpp
    M src/game_initialization/multiplayer_wait.hpp
    M src/game_preferences_display.cpp
    M src/gui/auxiliary/event/handler.cpp
    M src/hotkey/command_executor.hpp
    M src/hotkey/hotkey_preferences_display.cpp
    M src/map_label.cpp
    M src/map_label.hpp
    M src/menu_events.cpp
    M src/play_controller.cpp
    M src/play_controller.hpp
    M src/preferences_display.cpp
    M src/replay_controller.cpp
    M src/reports.cpp
    M src/reports.hpp
    M src/scripting/game_lua_kernel.cpp
    M src/scripting/game_lua_kernel.hpp
    M src/sdl/utils.cpp
    M src/sdl/utils.hpp
    M src/show_dialog.hpp
    M src/sound.cpp
    M src/synced_commands.cpp
    M src/tests/utils/fake_display.cpp
    M src/tooltips.cpp
    M src/tooltips.hpp
    M src/unit_animation.cpp
    M src/widgets/scrollarea.cpp
    M src/widgets/scrollarea.hpp
    M src/widgets/scrollbar.cpp
    M src/widgets/scrollbar.hpp
    M src/widgets/widget.cpp
    M src/widgets/widget.hpp

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/wesnoth/wesnoth


Compare: https://github.com/wesnoth/wesnoth/compare/1e2a6ff5e4fc...18d2c8152705