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: * ebf797f Removed YAMG from the 1.12 branch codebase. It's possible YAMG still lives in master awaiting to be fixed at a later time. * 8d754e9 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. * 451b98b 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 ae4cf2a). * 3c1421c 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. * 023e741 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. * 2cb9d94 Disabled the non working "toggle loyal" action from the editor. Presumably, this functionality is to be fixed at a later time in master. * a25ff8d Disabled the editor item tool for 1.12. Presumably, this functionality is to be fixed at a later time in master. * 1e3f3dd Hide non working editor tool actions from the hotkey preferences. It's tied to commit a25ff8d. 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. * 729bea8 Fix bug #21971: visual glitch of terrains on 2p - Hornshark Island This is covered by my previous commit to master, 753ddab ("Make Mushroom Grove/Lit Mushroom Grove behave like forests, move-wise"). * cd42981 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: * fb04bb8 LoW MP: Disabled broken chapter 4 and 5. * 6575063 Fix coordinates after a map change. Commit 24d6015 "Mention mostly editor related changes." was replaced by a7e14e2 "Update changelog" in this merge, excluding LoW-related entries and entries for 1.12-specific changes (see above).
wesnoth · Jul 14, 2014 · 09379ca · 09379ca
2 parents c4c1983 + a7e14e2
commit 09379ca
Show file tree

Hide file tree

Showing 29 changed files with 147 additions and 149 deletions.
diff --git a/changelog b/changelog
@@ -52,6 +52,13 @@ Version 1.13.0-dev:
      * Rebalanced scenarios 'Invaders', Mages and Drakes' and 'Fear'.
  * C++ Engine:
    * Purge "human_ai" controller type. This is a fixup of bugfix #18829 below.
+ * Editor:
+   * Added an entry for the terrain description help to the context menu.
+   * Default hotkey bindings for brushes (1-5)
+   * Disabled the swap palette button when the unit palette is active.
+   * Disabled the tod schedule and playlist menues in pure map mode.
+   * Support for displaying the saved status of the selected area.
+   * Fixed error messages about missing UI elements.
  * Language and i18n:
    * Updated translations: Czech, French, German, Greek, Hungarian, Italian,
      Lithuanian, Scottish Gaelic, Slovak, Vietnamese
@@ -264,6 +271,12 @@ Version 1.13.0-dev:
    * Fix bug wherein "lobby sounds" advanced preference didn't do anything for the normal (GUI 1) lobby.
    * Fix bug wherein dbus notifications did not have a wesnoth icon
    * Fix bug wherein chat history synopses weren't working right in the dbus notifications
+   * Default to classic minimap unit/village color coding (colored by side).
+   * Default to classic minimap terrain representation (satellite view).
+   * Display the tooltip for actions browsed in the hotkey preferences dialog.
+   * Enabled action icons in the hotkey preferences dialog.
+   * Fix bug #21717: "F5->reload wml tree" doesn't work in editor.
+   * Fix bug #21298: Minimap shows invisible overlays
 
 Version 1.11.11:
  * Add-ons server:

diff --git a/data/campaigns/Eastern_Invasion/scenarios/10_Lake_Vrug.cfg b/data/campaigns/Eastern_Invasion/scenarios/10_Lake_Vrug.cfg
@@ -5,12 +5,7 @@
     map_data="{campaigns/Eastern_Invasion/maps/10_Lake_Vrug.map}"
     turns=30
 
-    {MORNING}
-    {AFTERNOON}
-    {DUSK}
-    {FIRST_WATCH}
-    {SECOND_WATCH}
-    {DAWN}
+    {DEFAULT_SCHEDULE_MORNING}
 
     next_scenario=11_Captured
 

diff --git a/data/campaigns/Liberty/scenarios/01_The_Raid.cfg b/data/campaigns/Liberty/scenarios/01_The_Raid.cfg
@@ -43,12 +43,7 @@
 
     {BIGMAP_01}
 
-    {DUSK}
-    {FIRST_WATCH}
-    {SECOND_WATCH}
-    {DAWN}
-    {MORNING}
-    {AFTERNOON}
+    {DEFAULT_SCHEDULE_DUSK}
 
     [side]
         type=Bandit_Peasant

diff --git a/data/campaigns/Liberty/scenarios/02_Civil_Disobedience.cfg b/data/campaigns/Liberty/scenarios/02_Civil_Disobedience.cfg
@@ -5,12 +5,7 @@
     next_scenario=03_A_Strategy_of_Hope
     map_data="{campaigns/Liberty/maps/02_Civil_Disobedience.map}"
     {TURNS 14 13 12}
-    {AFTERNOON}
-    {DUSK}
-    {FIRST_WATCH}
-    {SECOND_WATCH}
-    {DAWN}
-    {MORNING}
+    {DEFAULT_SCHEDULE_AFTERNOON}
 
     {INTRO_AND_SCENARIO_MUSIC "traveling_minstrels.ogg" "loyalists.ogg"}
     {EXTRA_SCENARIO_MUSIC "battle.ogg"}

diff --git a/data/campaigns/Liberty/scenarios/06_The_Grey_Woods.cfg b/data/campaigns/Liberty/scenarios/06_The_Grey_Woods.cfg
@@ -6,12 +6,7 @@
     victory_when_enemies_defeated=yes
     map_data="{campaigns/Liberty/maps/06_The_Grey_Woods.map}"
     {TURNS 50 44 42}
-    {SECOND_WATCH}
-    {DAWN}
-    {MORNING}
-    {AFTERNOON}
-    {DUSK}
-    {FIRST_WATCH}
+    {DEFAULT_SCHEDULE_SECOND_WATCH}
 
     {INTRO_AND_SCENARIO_MUSIC "underground.ogg" "the_deep_path.ogg"}
     {EXTRA_SCENARIO_MUSIC "elvish-theme.ogg"}

diff --git a/data/campaigns/Liberty/scenarios/07_The_Hunters.cfg b/data/campaigns/Liberty/scenarios/07_The_Hunters.cfg
@@ -6,12 +6,7 @@
     map_data="{campaigns/Liberty/maps/07_The_Hunters.map}"
     victory_when_enemies_defeated=no
     {TURNS 36 31 26}
-    {DUSK}
-    {FIRST_WATCH}
-    {SECOND_WATCH}
-    {DAWN}
-    {MORNING}
-    {AFTERNOON}
+    {DEFAULT_SCHEDULE_DUSK}
 
     {INTRO_AND_SCENARIO_MUSIC breaking_the_chains.ogg vengeful.ogg}
     {EXTRA_SCENARIO_MUSIC battle.ogg}

diff --git a/data/campaigns/Liberty/scenarios/08_Glory.cfg b/data/campaigns/Liberty/scenarios/08_Glory.cfg
@@ -6,12 +6,7 @@
     victory_when_enemies_defeated=no
     map_data="{campaigns/Liberty/maps/08_Glory.map}"
     {TURNS 48 45 40}
-    {AFTERNOON}
-    {DUSK}
-    {FIRST_WATCH}
-    {SECOND_WATCH}
-    {DAWN}
-    {MORNING}
+    {DEFAULT_SCHEDULE_AFTERNOON}
 
     {INTRO_AND_SCENARIO_MUSIC heroes_rite.ogg loyalists.ogg}
     {EXTRA_SCENARIO_MUSIC vengeful.ogg}

diff --git a/data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg b/data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg
@@ -18,12 +18,7 @@
         text=_"Westin"
     [/label]
 
-    {SECOND_WATCH}
-    {DAWN}
-    {MORNING}
-    {AFTERNOON}
-    {DUSK}
-    {FIRST_WATCH}
+    {DEFAULT_SCHEDULE_SECOND_WATCH}
 
     {TURNS 40 32 28}
 

diff --git a/data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_and_Ill.cfg b/data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_and_Ill.cfg
@@ -13,12 +13,7 @@
     {campaigns/The_South_Guard/utils/sg_deaths.cfg}
     {campaigns/The_South_Guard/utils/sg_help.cfg}
 
-    {DUSK}
-    {FIRST_WATCH}
-    {SECOND_WATCH}
-    {DAWN}
-    {MORNING}
-    {AFTERNOON}
+    {DEFAULT_SCHEDULE_DUSK}
 
     turns=18
     victory_when_enemies_defeated=no

diff --git a/data/campaigns/The_South_Guard/scenarios/06b_The_Long_March.cfg b/data/campaigns/The_South_Guard/scenarios/06b_The_Long_March.cfg
@@ -16,12 +16,7 @@
 
     {campaigns/The_South_Guard/utils/sg_deaths.cfg}
 
-    {DUSK}
-    {FIRST_WATCH}
-    {SECOND_WATCH}
-    {DAWN}
-    {MORNING}
-    {AFTERNOON}
+    {DEFAULT_SCHEDULE_DUSK}
 
     victory_when_enemies_defeated=no
     {TURNS 30 25 20}

diff --git a/data/campaigns/The_South_Guard/scenarios/08a_Return_to_Kerlath.cfg b/data/campaigns/The_South_Guard/scenarios/08a_Return_to_Kerlath.cfg
@@ -20,12 +20,7 @@
 
     {campaigns/The_South_Guard/utils/sg_deaths.cfg}
 
-    {DUSK}
-    {FIRST_WATCH}
-    {SECOND_WATCH}
-    {DAWN}
-    {MORNING}
-    {AFTERNOON}
+    {DEFAULT_SCHEDULE_DUSK}
 
     {SG_RETURN_TO_KERLATH}
     {BIGMAP_08A}

diff --git a/data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg b/data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg
@@ -11,12 +11,7 @@
 
     map_data="{campaigns/The_South_Guard/maps/08b_The_Tides_of_War.map}"
 
-    {DAWN}
-    {MORNING}
-    {AFTERNOON}
-    {DUSK}
-    {FIRST_WATCH}
-    {SECOND_WATCH}
+    {DEFAULT_SCHEDULE_DAWN}
 
     victory_when_enemies_defeated=yes
     turns=60

diff --git a/data/campaigns/The_South_Guard/scenarios/09a_Vengeance.cfg b/data/campaigns/The_South_Guard/scenarios/09a_Vengeance.cfg
@@ -10,12 +10,7 @@
 
     map_data="{campaigns/The_South_Guard/maps/09a_Vengeance.map}"
 
-    {MORNING}
-    {AFTERNOON}
-    {DUSK}
-    {FIRST_WATCH}
-    {SECOND_WATCH}
-    {DAWN}
+    {DEFAULT_SCHEDULE_MORNING}
 
     turns=-1
     victory_when_enemies_defeated=no

diff --git a/data/campaigns/Two_Brothers/scenarios/02_The_Chase.cfg b/data/campaigns/Two_Brothers/scenarios/02_The_Chase.cfg
@@ -12,12 +12,7 @@
 #endif
     victory_when_enemies_defeated=no
 
-    {DUSK}
-    {FIRST_WATCH}
-    {SECOND_WATCH}
-    {DAWN}
-    {MORNING}
-    {AFTERNOON}
+    {DEFAULT_SCHEDULE_DUSK}
 
     {INTRO_AND_SCENARIO_MUSIC frantic.ogg elf-land.ogg}
     {EXTRA_SCENARIO_MUSIC knolls.ogg}

diff --git a/data/core/hotkeys.cfg b/data/core/hotkeys.cfg
@@ -85,6 +85,11 @@
     command=describeunit
     key=d
 [/hotkey]
+[hotkey]
+    command=describeterrain
+    key=t
+    {IF_APPLE_CMD_ELSE_CTRL}
+[/hotkey]
 [hotkey]
     command=endunitturn
     key=" "
@@ -321,6 +326,27 @@
 [/hotkey]
 
 # Editor key definitions
+[hotkey]
+	command="editor-brush-1"
+	key=1
+[/hotkey]
+[hotkey]
+	command="editor-brush-2"
+	key=2
+[/hotkey]
+[hotkey]
+	command="editor-brush-3"
+	key=3
+[/hotkey]
+[hotkey]
+	command="editor-brush-nw-se"
+	key=4
+[/hotkey]
+[hotkey]
+	command="editor-brush-sw-ne"
+	key=5
+[/hotkey]
+
 [hotkey]
     command="editor-quit-to-desktop"
     key="q"
@@ -355,7 +381,7 @@
 
 [hotkey]
     command="editor-map-new"
-    key="n"
+    key="m"
     {IF_APPLE_CMD_ELSE_CTRL}
 [/hotkey]
 
@@ -445,7 +471,7 @@
 
 [hotkey]
     command="editor-refresh"
-    key="e"
+    key="d"
     {IF_APPLE_CMD_ELSE_CTRL}
 [/hotkey]
 

diff --git a/data/core/terrain.cfg b/data/core/terrain.cfg
@@ -1094,7 +1094,6 @@ Most units have about 50% defense in rocky caves, whereas cavalry are limited to
 [/terrain_type]
 
 [terrain_type]
-    symbol_image=void/void
     editor_image=impassable-editor
     id=impassable_overlay
     editor_name= _ "Impassable Overlay"
@@ -1108,7 +1107,6 @@ Most units have about 50% defense in rocky caves, whereas cavalry are limited to
 # wmllint: general spelling unwalkable
 
 [terrain_type]
-    symbol_image=void/void
     editor_image=unwalkable-editor
     id=unwalkable_overlay
     editor_name= _ "Unwalkable Overlay"