[Commits] [wesnoth/wesnoth] 72d91d: fixup [filter_vision] tags

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 72d91daed0f0a1839d988beb4fc27d37c5cf20c2
      https://github.com/wesnoth/wesnoth/commit/72d91daed0f0a1839d988beb4fc27d37c5cf20c2
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-07-12 (Sat, 12 Jul 2014)

  Changed paths:
    A data/test/scenarios/filter_vision.cfg
    M src/terrain_filter.cpp
    M src/unit_filter.cpp
    M wml_test_schedule

  Log Message:
  -----------
  fixup [filter_vision] tags

This is the master version of PR #237, with unit tests.


  Commit: 5a64d43faeeeb54b92bfb69bda7259bc665d50f4
      https://github.com/wesnoth/wesnoth/commit/5a64d43faeeeb54b92bfb69bda7259bc665d50f4
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-07-12 (Sat, 12 Jul 2014)

  Changed paths:
    A data/test/scenarios/has_ally.cfg
    M src/side_filter.cpp
    M src/side_filter.hpp
    M wml_test_schedule

  Log Message:
  -----------
  add [has_ally],[has_enemy] tags for standard side filter

Unlike [allied_with] and [enemy_of], these will match if only if
there is *any* ally or enemy matching the filter. The other versions
of the tag match only if all sides matching the filter are
allied / opposed.

This commit also adds a unit test that checks that it works as
expected.


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

  Changed paths:
    M changelog

  Log Message:
  -----------
  update changelog


  Commit: 6cb9c518c75c431ac7675ba9410fd75831030811
      https://github.com/wesnoth/wesnoth/commit/6cb9c518c75c431ac7675ba9410fd75831030811
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-07-12 (Sat, 12 Jul 2014)

  Changed paths:
    A data/test/scenarios/has_ally.cfg
    M src/side_filter.cpp
    M src/side_filter.hpp
    M wml_test_schedule

  Log Message:
  -----------
  Merge branch 'has_ally_master'

Conflicts:
	wml_test_schedule


  Commit: 9ea67b8ae6ec2d5a29e2ab9202c2dcc74c70b665
      https://github.com/wesnoth/wesnoth/commit/9ea67b8ae6ec2d5a29e2ab9202c2dcc74c70b665
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-07-12 (Sat, 12 Jul 2014)

  Changed paths:
    M changelog

  Log Message:
  -----------
  update changelog


  Commit: 2acd33bf24ed085f4678db6afce1acc456d58974
      https://github.com/wesnoth/wesnoth/commit/2acd33bf24ed085f4678db6afce1acc456d58974
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-07-12 (Sat, 12 Jul 2014)

  Changed paths:
    M changelog

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

Conflicts:
	changelog


Compare: https://github.com/wesnoth/wesnoth/compare/2d19e2223bca...2acd33bf24ed