[Commits] [wesnoth/wesnoth] 404666: fixup lines with two closers on a line in wml test...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 4046666bee764463ecfd0464c43f534361deab68
      https://github.com/wesnoth/wesnoth/commit/4046666bee764463ecfd0464c43f534361deab68
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-07-02 (Wed, 02 Jul 2014)

  Changed paths:
    M data/test/scenarios/break_replay_with_lua_random.cfg
    M data/test/scenarios/event_handlers_in_events.cfg
    M data/test/scenarios/move_skip_sighted.cfg
    M data/test/scenarios/test_unit_map.cfg
    M data/test/scenarios/units_offmap_goto_recall.cfg

  Log Message:
  -----------
  fixup lines with two closers on a line in wml test directory

wmlindent chokes on these

commit made with the following command:

find data/test/scenarios/ -type f -print0 | xargs -0 sed -i
"s|^\([[:space:]]*\[\/.*\]\)[[:space:]]*)\}[[:space:]]*$|\1\n)}|"


  Commit: d803cde06a9d673be055eb3728f97374544ab0b9
      https://github.com/wesnoth/wesnoth/commit/d803cde06a9d673be055eb3728f97374544ab0b9
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-07-03 (Thu, 03 Jul 2014)

  Changed paths:
    M projectfiles/CodeBlocks/wesnoth.cbp
    M projectfiles/VC9/wesnoth.vcproj
    M src/CMakeLists.txt
    M src/SConscript
    M src/actions/create.cpp
    M src/ai/composite/goal.cpp
    M src/ai/recruitment/recruitment.cpp
    M src/ai/testing/aspect_attacks.cpp
    M src/game_events/action_wml.cpp
    M src/game_events/conditional_wml.cpp
    M src/game_events/entity_location.cpp
    M src/pathfind/teleport.cpp
    M src/scripting/lua.cpp
    M src/side_filter.cpp
    M src/terrain_filter.cpp
    M src/unit.cpp
    M src/unit.hpp
    M src/unit_abilities.cpp
    M src/unit_animation.cpp
    M src/unit_display.cpp
    A src/unit_filter.cpp
    A src/unit_filter.hpp

  Log Message:
  -----------
  move unit_filter implementation out of unit

The purpose is to simplify the unit class, and perhaps allow for
some optimizations regarding how unit filters are impemented.


  Commit: d86b59f08a8b84fe5d42e2d717084a6b06bca735
      https://github.com/wesnoth/wesnoth/commit/d86b59f08a8b84fe5d42e2d717084a6b06bca735
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-07-03 (Thu, 03 Jul 2014)

  Changed paths:
    M src/actions/create.cpp
    M src/ai/composite/goal.cpp
    M src/ai/recruitment/recruitment.cpp
    M src/ai/testing/aspect_attacks.cpp
    M src/display.cpp
    M src/display.hpp
    A src/filter_context.hpp
    M src/game_board.hpp
    M src/game_display.hpp
    M src/game_events/action_wml.cpp
    M src/game_events/conditional_wml.cpp
    M src/game_events/entity_location.cpp
    M src/game_state.hpp
    M src/pathfind/teleport.cpp
    M src/play_controller.cpp
    M src/play_controller.hpp
    M src/resources.cpp
    M src/resources.hpp
    M src/scripting/lua.cpp
    M src/side_filter.cpp
    M src/terrain_filter.cpp
    M src/unit.cpp
    M src/unit_abilities.cpp
    M src/unit_animation.cpp
    M src/unit_display.cpp
    M src/unit_filter.cpp
    M src/unit_filter.hpp

  Log Message:
  -----------
  add filter_context class, use in unit_filter

The filter context is, game_board + tod manager.
game_display can (and now does) implement this interface,
also game_state. This permits both animations and engine
components to use it.


  Commit: 35b23ec3214d757597948c1942de27fb7dd26ff1
      https://github.com/wesnoth/wesnoth/commit/35b23ec3214d757597948c1942de27fb7dd26ff1
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-07-03 (Thu, 03 Jul 2014)

  Changed paths:
    M src/game_events/action_wml.cpp
    M src/game_events/pump.cpp
    M src/scripting/lua.cpp
    M src/side_filter.cpp
    M src/side_filter.hpp
    M src/terrain_filter.cpp
    M src/unit_filter.cpp

  Log Message:
  -----------
  side_filter uses filter_context


  Commit: 18159f0a6b4056ff4609ee4dcc8be4ff0018494f
      https://github.com/wesnoth/wesnoth/commit/18159f0a6b4056ff4609ee4dcc8be4ff0018494f
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-07-03 (Thu, 03 Jul 2014)

  Changed paths:
    M src/ai/composite/goal.cpp
    M src/ai/composite/value_translator.hpp
    M src/ai/contexts.cpp
    M src/ai/lua/lua_object.hpp
    M src/game_events/action_wml.cpp
    M src/game_events/conditional_wml.cpp
    M src/game_events/menu_item.cpp
    M src/pathfind/teleport.cpp
    M src/scripting/lua.cpp
    M src/terrain_filter.cpp
    M src/terrain_filter.hpp
    M src/unit_abilities.cpp
    M src/unit_display.cpp
    M src/unit_filter.cpp

  Log Message:
  -----------
  terrain_filter uses filter_context instead of resources


  Commit: 383046b469b9d53c3583f7748672a3d2a84f8198
      https://github.com/wesnoth/wesnoth/commit/383046b469b9d53c3583f7748672a3d2a84f8198
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-07-03 (Thu, 03 Jul 2014)

  Changed paths:
    M src/actions/create.cpp
    M src/ai/composite/goal.cpp
    M src/ai/recruitment/recruitment.cpp
    M src/ai/testing/aspect_attacks.cpp
    M src/game_events/action_wml.cpp
    M src/game_events/conditional_wml.cpp
    M src/game_events/entity_location.cpp
    M src/pathfind/teleport.cpp
    M src/scripting/lua.cpp
    M src/side_filter.cpp
    M src/terrain_filter.cpp
    M src/unit.cpp
    M src/unit_abilities.cpp
    M src/unit_animation.cpp
    M src/unit_display.cpp
    M src/unit_filter.cpp
    M src/unit_filter.hpp

  Log Message:
  -----------
  replace unit filter with a function object

This allows us to separate the parsing of the filter from its
invocation, similar to the side filter and terrain filter, and
can speed things up if we move it outside of key loops


  Commit: f40b446f8727b37a9aee75b0b3ad60ad4eae2453
      https://github.com/wesnoth/wesnoth/commit/f40b446f8727b37a9aee75b0b3ad60ad4eae2453
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-07-03 (Thu, 03 Jul 2014)

  Changed paths:
    M src/unit_filter.cpp

  Log Message:
  -----------
  preprocess conditional children of unit filters


  Commit: cee687478617c633bd8c73460184ab120c149a4b
      https://github.com/wesnoth/wesnoth/commit/cee687478617c633bd8c73460184ab120c149a4b
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-07-03 (Thu, 03 Jul 2014)

  Changed paths:
    M data/test/scenarios/break_replay_with_lua_random.cfg
    M data/test/scenarios/event_handlers_in_events.cfg
    M data/test/scenarios/move_skip_sighted.cfg
    M data/test/scenarios/test_unit_map.cfg
    M data/test/scenarios/units_offmap_goto_recall.cfg
    M projectfiles/CodeBlocks/wesnoth.cbp
    M projectfiles/VC9/wesnoth.vcproj
    M src/CMakeLists.txt
    M src/SConscript
    M src/actions/create.cpp
    M src/ai/composite/goal.cpp
    M src/ai/composite/value_translator.hpp
    M src/ai/contexts.cpp
    M src/ai/lua/lua_object.hpp
    M src/ai/recruitment/recruitment.cpp
    M src/ai/testing/aspect_attacks.cpp
    M src/display.cpp
    M src/display.hpp
    A src/filter_context.hpp
    M src/game_board.hpp
    M src/game_display.hpp
    M src/game_events/action_wml.cpp
    M src/game_events/conditional_wml.cpp
    M src/game_events/entity_location.cpp
    M src/game_events/menu_item.cpp
    M src/game_events/pump.cpp
    M src/game_state.hpp
    M src/pathfind/teleport.cpp
    M src/play_controller.cpp
    M src/play_controller.hpp
    M src/resources.cpp
    M src/resources.hpp
    M src/scripting/lua.cpp
    M src/side_filter.cpp
    M src/side_filter.hpp
    M src/terrain_filter.cpp
    M src/terrain_filter.hpp
    M src/unit.cpp
    M src/unit.hpp
    M src/unit_abilities.cpp
    M src/unit_animation.cpp
    M src/unit_display.cpp
    A src/unit_filter.cpp
    A src/unit_filter.hpp

  Log Message:
  -----------
  Merge branch 'refactor_unit_filter'


Compare: https://github.com/wesnoth/wesnoth/compare/ee2f9810699c...cee687478617