[Commits] [wesnoth/wesnoth] 38010f: Revert "remove unused queued_event parameter from ...

GitHub noreply at github.com
Mon Apr 4 19:57:31 UTC 2016


  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 38010fd991388895bcddf4830999370c34abef01
      https://github.com/wesnoth/wesnoth/commit/38010fd991388895bcddf4830999370c34abef01
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2016-04-04 (Mon, 04 Apr 2016)

  Changed paths:
    M src/game_events/action_wml.cpp
    M src/game_events/action_wml.hpp
    M src/scripting/game_lua_kernel.cpp

  Log Message:
  -----------
  Revert "remove unused queued_event parameter from WML_HANDLER_FUNCTION"

This reverts commit 310ba26704873a89268d7dfef10f384a12ab2559.


  Commit: ff3e1bf83a3253f99c97de1bdd831b0f9e2a32b4
      https://github.com/wesnoth/wesnoth/commit/ff3e1bf83a3253f99c97de1bdd831b0f9e2a32b4
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2016-04-04 (Mon, 04 Apr 2016)

  Changed paths:
    M src/ai/default/recruitment.cpp
    M src/carryover.cpp
    M src/config.hpp
    M src/game_initialization/connect_engine.cpp
    M src/gui/dialogs/gamestate_inspector.cpp

  Log Message:
  -----------
  Variadic config methods to combine remove_attribute or clear_children calls


  Commit: ca6ec3b900105fa4bd07b3ef6ba58d98da3979f4
      https://github.com/wesnoth/wesnoth/commit/ca6ec3b900105fa4bd07b3ef6ba58d98da3979f4
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2016-04-04 (Mon, 04 Apr 2016)

  Changed paths:
    M src/formula/callable_objects.cpp
    M src/scripting/lua_formula_bridge.cpp
    M src/scripting/lua_formula_bridge.hpp

  Log Message:
  -----------
  NULL -> nullptr


  Commit: 4f2367648e00df9eff554807a3c73d488dfc9289
      https://github.com/wesnoth/wesnoth/commit/4f2367648e00df9eff554807a3c73d488dfc9289
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2016-04-04 (Mon, 04 Apr 2016)

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

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


  Commit: 1bdce5b937325de25ac9a9fd94fc52a8e665b5ab
      https://github.com/wesnoth/wesnoth/commit/1bdce5b937325de25ac9a9fd94fc52a8e665b5ab
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2016-04-04 (Mon, 04 Apr 2016)

  Changed paths:
    M src/game_launcher.cpp
    M src/gui/dialogs/campaign_selection.cpp
    M src/gui/dialogs/editor/custom_tod.cpp
    M src/gui/dialogs/game_cache_options.cpp
    M src/gui/dialogs/game_load.cpp
    M src/gui/dialogs/game_load.hpp
    M src/gui/dialogs/multiplayer/mp_connect.cpp
    M src/gui/dialogs/preferences_dialog.cpp
    M src/gui/dialogs/screenshot_notification.cpp
    M src/gui/dialogs/unit_create.cpp
    M src/gui/dialogs/unit_create.hpp
    M src/hotkey/command_executor.cpp
    M src/preferences_display.cpp
    M src/preferences_display.hpp
    M src/tod_manager.cpp
    M src/utils/functional.hpp

  Log Message:
  -----------
  Fix build

This fixes my build and should also fix the Travis builds.


  Commit: 74fd5395a9b4cd08ec5001ce35f003c98396cfe2
      https://github.com/wesnoth/wesnoth/commit/74fd5395a9b4cd08ec5001ce35f003c98396cfe2
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2016-04-04 (Mon, 04 Apr 2016)

  Changed paths:
    M src/preferences_display.cpp

  Log Message:
  -----------
  Fix "set wesnothd path" preference


Compare: https://github.com/wesnoth/wesnoth/compare/0a7190c60567...74fd5395a9b4


More information about the Commits mailing list