[Commits] [wesnoth/wesnoth] af6d30: Add new "category" and "creator" properties to map...

Sat Aug 8 04:29:17 UTC 2015

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: af6d3060e246a59c24c78502069109ceac44cc44
      https://github.com/wesnoth/wesnoth/commit/af6d3060e246a59c24c78502069109ceac44cc44
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-08-06 (Thu, 06 Aug 2015)

  Changed paths:
    M data/gui/default/window/editor_edit_label.cfg
    M src/ai/formula/function_table.cpp
    M src/ai/testing/ca_global_fallback.cpp
    M src/display_context.hpp
    M src/editor/action/action_label.cpp
    M src/editor/action/action_label.hpp
    M src/editor/action/mouse/mouse_action_map_label.cpp
    M src/editor/editor_display.cpp
    M src/editor/map/map_context.hpp
    M src/game_board.hpp
    M src/gui/dialogs/editor/editor_edit_label.cpp
    M src/gui/dialogs/editor/editor_edit_label.hpp
    M src/map_label.cpp
    M src/map_label.hpp
    M src/menu_events.cpp
    M src/pathfind/teleport.cpp
    M src/replay.cpp
    M src/scripting/game_lua_kernel.cpp

  Log Message:
  -----------
  Add new "category" and "creator" properties to map labels
- The "category" property is mainly for use by scenario designers; players will be able to hide labels based on this
- The "creator" property is meant to allow players to hide labels placed by specific other players
- Map editor allows setting the "category" property


  Commit: 1c578590e1e46624ddfe4c1eb4c060c0d71d43b6
      https://github.com/wesnoth/wesnoth/commit/1c578590e1e46624ddfe4c1eb4c060c0d71d43b6
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-08-06 (Thu, 06 Aug 2015)

  Changed paths:
    M data/gui/default/window/editor_edit_label.cfg
    M src/editor/action/mouse/mouse_action_map_label.cpp
    M src/gui/dialogs/editor/editor_edit_label.cpp
    M src/gui/dialogs/editor/editor_edit_label.hpp

  Log Message:
  -----------
  Add sliders to set colour of label in map editor
- Needs work, not very user-friendly in my opinion


  Commit: 819eab2f96f206852e16e82f5159d7ab247f087d
      https://github.com/wesnoth/wesnoth/commit/819eab2f96f206852e16e82f5159d7ab247f087d
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-08-07 (Fri, 07 Aug 2015)

  Changed paths:
    A data/gui/default/window/label_settings.cfg
    M data/themes/classic.cfg
    M data/themes/default.cfg
    M data/themes/pandora.cfg
    M data/themes/unit_box.cfg
    M data/themes/widescreen.cfg
    M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
    M src/display_context.cpp
    M src/display_context.hpp
    A src/gui/dialogs/label_settings.cpp
    A src/gui/dialogs/label_settings.hpp
    M src/hotkey/command_executor.cpp
    M src/hotkey/command_executor.hpp
    M src/hotkey/hotkey_command.cpp
    M src/hotkey/hotkey_command.hpp
    M src/hotkey_handler.cpp
    M src/hotkey_handler_replay.cpp
    M src/hotkey_handler_sp.cpp
    M src/hotkey_handler_sp.hpp
    M src/map_label.cpp
    M src/map_label.hpp
    M src/menu_events.cpp
    M src/menu_events.hpp

  Log Message:
  -----------
  Add dialog to allow user to customize which label groups are displayed


  Commit: e2a0648a159f427fac8da9d7645d4c95eee8c416
      https://github.com/wesnoth/wesnoth/commit/e2a0648a159f427fac8da9d7645d4c95eee8c416
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-08-07 (Fri, 07 Aug 2015)

  Changed paths:
    M src/gui/dialogs/label_settings.cpp

  Log Message:
  -----------
  Use team colors for player label categories


  Commit: af3eae9d0b51bf500a290b210311f585b9198051
      https://github.com/wesnoth/wesnoth/commit/af3eae9d0b51bf500a290b210311f585b9198051
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-08-07 (Fri, 07 Aug 2015)

  Changed paths:
    M src/generators/default_map_generator.cpp

  Log Message:
  -----------
  Assign a label category to village names


  Commit: d657c30a5038c258d73441a49050ccf6f0298413
      https://github.com/wesnoth/wesnoth/commit/d657c30a5038c258d73441a49050ccf6f0298413
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-08-07 (Fri, 07 Aug 2015)

  Changed paths:
    M src/game_state.cpp

  Log Message:
  -----------
  Labels from players in your ignore list default to hidden


  Commit: e130a960cbe174574b83c650c96e94e322e59eeb
      https://github.com/wesnoth/wesnoth/commit/e130a960cbe174574b83c650c96e94e322e59eeb
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-08-07 (Fri, 07 Aug 2015)

  Changed paths:
    M changelog
    M data/core/about.cfg
    M players_changelog

  Log Message:
  -----------
  Update credits and changelog


  Commit: f619b4cc6393e03194882abf910c138d4757168d
      https://github.com/wesnoth/wesnoth/commit/f619b4cc6393e03194882abf910c138d4757168d
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-08-07 (Fri, 07 Aug 2015)

  Changed paths:
    M projectfiles/CodeBlocks/wesnoth.cbp
    M projectfiles/CodeLite/wesnoth.project
    M projectfiles/VC9/wesnoth.vcproj
    M src/CMakeLists.txt
    M src/SConscript
    M src/tests/gui/test_gui2.cpp

  Log Message:
  -----------
  Update build stuff

(Sconscript, CMakeLists, tests, project files)


  Commit: 74a81069b9937fa1f7780b32d5dec2b4ad9156f1
      https://github.com/wesnoth/wesnoth/commit/74a81069b9937fa1f7780b32d5dec2b4ad9156f1
  Author: Ignacio R. Morelle <shadowm at wesnoth.org>
  Date:   2015-08-08 (Sat, 08 Aug 2015)

  Changed paths:
    M changelog
    M data/core/about.cfg
    M data/gui/default/window/editor_edit_label.cfg
    A data/gui/default/window/label_settings.cfg
    M data/themes/classic.cfg
    M data/themes/default.cfg
    M data/themes/pandora.cfg
    M data/themes/unit_box.cfg
    M data/themes/widescreen.cfg
    M players_changelog
    M projectfiles/CodeBlocks/wesnoth.cbp
    M projectfiles/CodeLite/wesnoth.project
    M projectfiles/VC9/wesnoth.vcproj
    M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
    M src/CMakeLists.txt
    M src/SConscript
    M src/ai/formula/function_table.cpp
    M src/ai/testing/ca_global_fallback.cpp
    M src/display_context.cpp
    M src/display_context.hpp
    M src/editor/action/action_label.cpp
    M src/editor/action/action_label.hpp
    M src/editor/action/mouse/mouse_action_map_label.cpp
    M src/editor/editor_display.cpp
    M src/editor/map/map_context.hpp
    M src/game_board.hpp
    M src/game_state.cpp
    M src/generators/default_map_generator.cpp
    M src/gui/dialogs/editor/editor_edit_label.cpp
    M src/gui/dialogs/editor/editor_edit_label.hpp
    A src/gui/dialogs/label_settings.cpp
    A src/gui/dialogs/label_settings.hpp
    M src/hotkey/command_executor.cpp
    M src/hotkey/command_executor.hpp
    M src/hotkey/hotkey_command.cpp
    M src/hotkey/hotkey_command.hpp
    M src/hotkey_handler.cpp
    M src/hotkey_handler_replay.cpp
    M src/hotkey_handler_sp.cpp
    M src/hotkey_handler_sp.hpp
    M src/map_label.cpp
    M src/map_label.hpp
    M src/menu_events.cpp
    M src/menu_events.hpp
    M src/pathfind/teleport.cpp
    M src/replay.cpp
    M src/scripting/game_lua_kernel.cpp
    M src/tests/gui/test_gui2.cpp

  Log Message:
  -----------
  Merge pull request #447 from CelticMinstrel/master

Interface to fine-tune displayed labels (and some other label stuff)


Compare: https://github.com/wesnoth/wesnoth/compare/79b7bf1777b8...74a81069b993