[Commits] [wesnoth/wesnoth] 22c702: Resolved overlapping hotkey definitions.

Mon Jul 14 23:09:21 UTC 2014

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 22c702514881db3d7c98b3041455d7e02174153f
      https://github.com/wesnoth/wesnoth/commit/22c702514881db3d7c98b3041455d7e02174153f
  Author: fendrin <fabianmueller5 at gmx.de>
  Date:   2014-07-14 (Mon, 14 Jul 2014)

  Changed paths:
    M data/core/hotkeys.cfg

  Log Message:
  -----------
  Resolved overlapping hotkey definitions.

Refresh editor display: ctrl+e ---> ctrl+d

New Map: ctrl+n ---> ctrl+m

  Commit: 5a1a735ed82f9cfb0edf2a3c015ec30f97608ace
      https://github.com/wesnoth/wesnoth/commit/5a1a735ed82f9cfb0edf2a3c015ec30f97608ace
  Author: fendrin <fabianmueller5 at gmx.de>
  Date:   2014-07-14 (Mon, 14 Jul 2014)

  Changed paths:
    M src/minimap.cpp

  Log Message:
  -----------
  Made the classic minimap satellite view the default.

  Commit: e10e0c6e96b09beafc2674c194f7f065add9b516
      https://github.com/wesnoth/wesnoth/commit/e10e0c6e96b09beafc2674c194f7f065add9b516
  Author: fendrin <fabianmueller5 at gmx.de>
  Date:   2014-07-14 (Mon, 14 Jul 2014)

  Changed paths:
    M src/display.cpp
    M src/minimap.cpp

  Log Message:
  -----------
  Made the classic minimap color coding the default.

  Commit: 0d77516b620a38b79f2a2073ff929a9a30277bcb
      https://github.com/wesnoth/wesnoth/commit/0d77516b620a38b79f2a2073ff929a9a30277bcb
  Author: fendrin <fabianmueller5 at gmx.de>
  Date:   2014-07-14 (Mon, 14 Jul 2014)

  Changed paths:
    M data/campaigns/Liberty/scenarios/01_The_Raid.cfg
    M data/campaigns/Liberty/scenarios/02_Civil_Disobedience.cfg
    M data/campaigns/Liberty/scenarios/06_The_Grey_Woods.cfg
    M data/campaigns/Liberty/scenarios/07_The_Hunters.cfg
    M data/campaigns/Liberty/scenarios/08_Glory.cfg

  Log Message:
  -----------
  Liberty: Put the DEFAULT_SCHEDULE_* macros in use.

  Commit: 1fc045a8a2c9ccc9695ce5930eb255c92a3822bd
      https://github.com/wesnoth/wesnoth/commit/1fc045a8a2c9ccc9695ce5930eb255c92a3822bd
  Author: fendrin <fabianmueller5 at gmx.de>
  Date:   2014-07-14 (Mon, 14 Jul 2014)

  Changed paths:
    M data/campaigns/Eastern_Invasion/scenarios/10_Lake_Vrug.cfg
    M data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg
    M data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_and_Ill.cfg
    M data/campaigns/The_South_Guard/scenarios/06b_The_Long_March.cfg
    M data/campaigns/The_South_Guard/scenarios/08a_Return_to_Kerlath.cfg
    M data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg
    M data/campaigns/The_South_Guard/scenarios/09a_Vengeance.cfg
    M data/campaigns/Two_Brothers/scenarios/02_The_Chase.cfg

  Log Message:
  -----------
  EI, TSG, TB: Put DEFAULT_SCHEDULE_* macros in use.

  Commit: f0003e97e1ebca65c168a17709bd76665b0988fd
      https://github.com/wesnoth/wesnoth/commit/f0003e97e1ebca65c168a17709bd76665b0988fd
  Author: fendrin <fabianmueller5 at gmx.de>
  Date:   2014-07-14 (Mon, 14 Jul 2014)

  Changed paths:
    M src/editor/palette/unit_palette.hpp

  Log Message:
  -----------
  Disable the swap palette button when the unit palette is active.

  Commit: dc526f0459d9cd3a98eab86001d8562702848c27
      https://github.com/wesnoth/wesnoth/commit/dc526f0459d9cd3a98eab86001d8562702848c27
  Author: fendrin <fabianmueller5 at gmx.de>
  Date:   2014-07-14 (Mon, 14 Jul 2014)

  Changed paths:
    M src/editor/editor_controller.cpp
    M src/hotkey/hotkey_command.cpp
    M src/hotkey/hotkey_command.hpp

  Log Message:
  -----------
  Disable playlist and schedule menues for pure maps.

Conflicts:
	src/hotkey/hotkey_command.cpp

  Commit: 046a7b66ca88d926f9b4b1a99e3079fadd1d6c92
      https://github.com/wesnoth/wesnoth/commit/046a7b66ca88d926f9b4b1a99e3079fadd1d6c92
  Author: fendrin <fabianmueller5 at gmx.de>
  Date:   2014-07-14 (Mon, 14 Jul 2014)

  Changed paths:
    M data/multiplayer/maps/2p_Hornshark_Island.map

  Log Message:
  -----------
  Fix two border tiles.

  Commit: ea3fd99a81bd148012729a92c79fcedc5ed702d1
      https://github.com/wesnoth/wesnoth/commit/ea3fd99a81bd148012729a92c79fcedc5ed702d1
  Author: fendrin <fabianmueller5 at gmx.de>
  Date:   2014-07-14 (Mon, 14 Jul 2014)

  Changed paths:
    M data/themes/editor.cfg
    M src/editor/editor_controller.cpp
    M src/editor/editor_controller.hpp

  Log Message:
  -----------
  Enabled the terrain description dialog in the editor.

Conflicts:
	data/themes/editor.cfg
	src/editor/editor_controller.cpp

  Commit: 12bad80fa656c2a744abf557810178d810fcf969
      https://github.com/wesnoth/wesnoth/commit/12bad80fa656c2a744abf557810178d810fcf969
  Author: fendrin <fabianmueller5 at gmx.de>
  Date:   2014-07-14 (Mon, 14 Jul 2014)

  Changed paths:
    M data/multiplayer/scenarios/2p_Dark_Forecast.cfg
    M data/multiplayer/scenarios/9p_Merkwuerdigliebe.cfg

  Log Message:
  -----------
  Put the DEFAULT_SCHEDULE_* macros in use.

  Commit: e826f8cabefc3466d1ac4244cf37bba85a07d028
      https://github.com/wesnoth/wesnoth/commit/e826f8cabefc3466d1ac4244cf37bba85a07d028
  Author: fendrin <fabianmueller5 at gmx.de>
  Date:   2014-07-14 (Mon, 14 Jul 2014)

  Changed paths:
    M src/hotkey/hotkey_command.cpp
    M src/hotkey/hotkey_command.hpp

  Log Message:
  -----------
  2x change from return by copy to return by reference on const strings.

  Commit: 51ebcda9871e59666826d8eb6d039ce9da83fbef
      https://github.com/wesnoth/wesnoth/commit/51ebcda9871e59666826d8eb6d039ce9da83fbef
  Author: fendrin <fabianmueller5 at gmx.de>
  Date:   2014-07-14 (Mon, 14 Jul 2014)

  Changed paths:
    M src/hotkey/hotkey_preferences_display.cpp

  Log Message:
  -----------
  Display the tooltip for hovered hotkey actions.

  Commit: 50ee046766c5c7e57191d5e6abdab3d9114a2660
      https://github.com/wesnoth/wesnoth/commit/50ee046766c5c7e57191d5e6abdab3d9114a2660
  Author: fendrin <fabianmueller5 at gmx.de>
  Date:   2014-07-14 (Mon, 14 Jul 2014)

  Changed paths:
    M src/hotkey/hotkey_preferences_display.cpp

  Log Message:
  -----------
  Enabled the corresponding action icons to be shown in the list.

  Commit: 5c4694c4082cc9eb000f7b7f58cf3156c1f3fa20
      https://github.com/wesnoth/wesnoth/commit/5c4694c4082cc9eb000f7b7f58cf3156c1f3fa20
  Author: fendrin <fabianmueller5 at gmx.de>
  Date:   2014-07-14 (Mon, 14 Jul 2014)

  Changed paths:
    M src/hotkey/hotkey_preferences_display.cpp

  Log Message:
  -----------
  Repair the sorting of the hotkey list.

  Commit: e6256c28ee07bf9a7b76d2745e1b0d10a255188e
      https://github.com/wesnoth/wesnoth/commit/e6256c28ee07bf9a7b76d2745e1b0d10a255188e
  Author: fendrin <fabianmueller5 at gmx.de>
  Date:   2014-07-14 (Mon, 14 Jul 2014)

  Changed paths:
    M data/core/hotkeys.cfg

  Log Message:
  -----------
  Default hotkeys for editor brushes(1-5) and terrain description(ctr+t).

  Commit: 61ddf605f2d6816d81c6c27523df4be7435d6a67
      https://github.com/wesnoth/wesnoth/commit/61ddf605f2d6816d81c6c27523df4be7435d6a67
  Author: fendrin <fabianmueller5 at gmx.de>
  Date:   2014-07-14 (Mon, 14 Jul 2014)

  Changed paths:
    M src/editor/map/context_manager.cpp

  Log Message:
  -----------
  Show the selected area changed status in the area menu.

  Commit: fa341cc73d76da90686ae8b0d47762ce813166b8
      https://github.com/wesnoth/wesnoth/commit/fa341cc73d76da90686ae8b0d47762ce813166b8
  Author: fendrin <fabianmueller5 at gmx.de>
  Date:   2014-07-14 (Mon, 14 Jul 2014)

  Changed paths:
    M data/themes/editor.cfg

  Log Message:
  -----------
  Fix error message about missing ui elements.

  Commit: 426acf5a35331c289105064ca45a0571d5eba3d9
      https://github.com/wesnoth/wesnoth/commit/426acf5a35331c289105064ca45a0571d5eba3d9
  Author: fendrin <fabianmueller5 at gmx.de>
  Date:   2014-07-14 (Mon, 14 Jul 2014)

  Changed paths:
    M data/core/terrain.cfg

  Log Message:
  -----------
  Fix for bug #21298: Minimap shows invisible overlays

  Commit: a7e14e2ffd0a57754685c4eaf3329cbc3af5d988
      https://github.com/wesnoth/wesnoth/commit/a7e14e2ffd0a57754685c4eaf3329cbc3af5d988
  Author: Ignacio R. Morelle <shadowm at wesnoth.org>
  Date:   2014-07-14 (Mon, 14 Jul 2014)

  Changed paths:
    M changelog

  Log Message:
  -----------
  Update changelog

  Commit: 09379ca10c357d91787c0ab4b086f00a213ca234
      https://github.com/wesnoth/wesnoth/commit/09379ca10c357d91787c0ab4b086f00a213ca234
  Author: Ignacio R. Morelle <shadowm at wesnoth.org>
  Date:   2014-07-14 (Mon, 14 Jul 2014)

  Changed paths:
    M changelog
    M data/campaigns/Eastern_Invasion/scenarios/10_Lake_Vrug.cfg
    M data/campaigns/Liberty/scenarios/01_The_Raid.cfg
    M data/campaigns/Liberty/scenarios/02_Civil_Disobedience.cfg
    M data/campaigns/Liberty/scenarios/06_The_Grey_Woods.cfg
    M data/campaigns/Liberty/scenarios/07_The_Hunters.cfg
    M data/campaigns/Liberty/scenarios/08_Glory.cfg
    M data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg
    M data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_and_Ill.cfg
    M data/campaigns/The_South_Guard/scenarios/06b_The_Long_March.cfg
    M data/campaigns/The_South_Guard/scenarios/08a_Return_to_Kerlath.cfg
    M data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg
    M data/campaigns/The_South_Guard/scenarios/09a_Vengeance.cfg
    M data/campaigns/Two_Brothers/scenarios/02_The_Chase.cfg
    M data/core/hotkeys.cfg
    M data/core/terrain.cfg
    M data/multiplayer/maps/2p_Hornshark_Island.map
    M data/multiplayer/scenarios/2p_Dark_Forecast.cfg
    M data/multiplayer/scenarios/9p_Merkwuerdigliebe.cfg
    M data/themes/editor.cfg
    M src/display.cpp
    M src/editor/editor_controller.cpp
    M src/editor/editor_controller.hpp
    M src/editor/map/context_manager.cpp
    M src/editor/palette/unit_palette.hpp
    M src/hotkey/hotkey_command.cpp
    M src/hotkey/hotkey_command.hpp
    M src/hotkey/hotkey_preferences_display.cpp
    M src/minimap.cpp

  Log Message:
  -----------
  Merge branch 'staging/fendrin-fwd-port'

This merge brings into master a series of commits forward-ported from
the 1.12 branch, all authored by fendrin and (for those including
conflicts) reviewed by me. I felt it necessary to take action now before
more time passes and these commits end up forgotten by both their
original author (who hasn't been active for a while) and the rest of us.

The commits covered by this task were pushed to the 1.12 branch after
it diverged from master and never cherry-picked back to master. There
are some commits that I decided to not bring back from master, belonging
to two categories...

Commits that were marked as 1.12-specific in their description, in one
way or another:

 * ebf797f65f5d499e4f32fb9dc653b7c91938e1b9 Removed YAMG from the 1.12 branch codebase.
   It's possible YAMG still lives in master awaiting to be fixed at a
   later time.
 * 8d754e9ee3b39abcba8d2514e01a3cfb1bf0f2b7 Delete non working themes from the 1.12 branch.
   This commit's message and later changelog entry is misleading. The
   themes removed were not obsolete, they are simply unfinished
   (UnitBox) or broken by the 1.11.x theme UI overhaul (Widescreen). In
   the latter case, I surmise the intent is to fix them at a later time
   during 1.13.x.
 * 451b98bd9fb28ba846add926147e9e1ff8b9e0ed Fix for bug #21717: "F5->reload" doesn't work in the editor
   The commit appeared on master first before being backported to 1.12
   (see ae4cf2ac9816fa4aafc95061e327c1c415218933).
 * 3c1421ccf8a24817dbd0de41362754ebeb0cfaaf Disabled the non working custom time schedule creator in the 1.12 branch
   Presumably, this will be worked on in master at a later time so it
   might be counter productive to backport it until we near the next
   development release.
 * 023e74102e126caef764d4d47010deaafe992d45 Disable orbs for enemy units.
   Users can choose which orbs they want displayed on Preferences ->
   Display -> Colors as of this writing. An unidentified commit made
   enemy orbs to be disabled by default on master.
 * 2cb9d9422b4d3c96212c55074001ba224175abd5 Disabled the non working "toggle loyal" action from the editor.
   Presumably, this functionality is to be fixed at a later time in
   master.
 * a25ff8d6087d5c6ccb148c3c67f6ed2166c9f3a7 Disabled the editor item tool for 1.12.
   Presumably, this functionality is to be fixed at a later time in
   master.
 * 1e3f3dd0c4bf804bc5e285998bc17d39d38ec4f7 Hide non working editor tool actions from the hotkey preferences.
   It's tied to commit a25ff8d6087d5c6ccb148c3c67f6ed2166c9f3a7.
   Technically, the sound source tool's hotkey entry should be hidden
   anyway, but it's possible that feature will also be worked on in
   master later.
 * 729bea854e398a1b4aeed637842f5213dac2031d Fix bug #21971: visual glitch of terrains on 2p - Hornshark Island
   This is covered by my previous commit to master,
   753ddabc4c2db8cdc2def0fc101c63f2c04e6142 ("Make Mushroom Grove/Lit
   Mushroom Grove behave like forests, move-wise").
 * cd429818f8ead034b97fbd8b13e52312f60e450b Add section hinting about the changed fungus terrain to the notes.
   Not applicable since RELEASE_NOTES will be for changes in 1.13.0
   compared to 1.12.0, and the commit this refers to is part of 1.11.16.

And commits to the Legend of Wesmere campaign awaiting a deeper review
as they may conflict with existing changes present on master:

 * fb04bb8c05f82de309ca8cd1a40288aa1a7f17a8 LoW MP: Disabled broken chapter 4 and 5.
 * 65750635608a1982bdb60a332403c729f66fa692 Fix coordinates after a map change.

Commit 24d6015767b13501274a774174ea746e10f3a783 "Mention mostly editor
related changes." was replaced by
a7e14e2ffd0a57754685c4eaf3329cbc3af5d988 "Update changelog" in this
merge, excluding LoW-related entries and entries for 1.12-specific
changes (see above).

Compare: https://github.com/wesnoth/wesnoth/compare/c4c1983f88c4...09379ca10c35