Merge remote-tracking branch 'origin/master' into guifixes

wesnoth · Feb 27, 2016 · 46a0eb0 · 46a0eb0
2 parents cc760cb + f4cb656
commit 46a0eb0
Show file tree

Hide file tree

Showing 84 changed files with 441 additions and 432 deletions.
diff --git a/changelog b/changelog
@@ -43,6 +43,7 @@ Version 1.13.2+dev:
    * Implemented a new GUI2 Attack dialog
    * Added gui2 comboboxes.
    * Removed prompt when purging the WML cache from Preferences.
+   * Implemented a new GUI2 Preferences dialog
  * WML engine:
    * Added new event "unit placed", which triggers when (and regardless of how)
      a unit appears on the map.
@@ -56,6 +57,7 @@ Version 1.13.2+dev:
    * Added {CURRENT_FILE} and {CURRENT_DIRECTORY} macros.
    * add support for relative dirs in wesnoth.dofile/require
    * Added name= and write_name= attributes in [item]
+   * Added description_alignment= key to [campaign]
  * Miscellaneous and bug fixes:
    * Fix the new log code on Windows to actually use Unicode-aware functions
      in a couple of places so Wesnoth does not quit on startup when trying to

diff --git a/data/campaigns/An_Orcish_Incursion/scenarios/01_Defend_the_Forest.cfg b/data/campaigns/An_Orcish_Incursion/scenarios/01_Defend_the_Forest.cfg
@@ -68,7 +68,6 @@
             id=Lomarfel
             name= _ "Lomarfel"
             profile=portraits/lomarfel.png
-            unrenamable=yes
             x,y=15,18
             [modifications]
                 {TRAIT_LOYAL}

diff --git a/data/campaigns/An_Orcish_Incursion/scenarios/07_Showdown.cfg b/data/campaigns/An_Orcish_Incursion/scenarios/07_Showdown.cfg
@@ -119,7 +119,6 @@
             id=Lomarfel
             name= _ "Lomarfel"
             profile=portraits/lomarfel.png
-            unrenamable=yes
             x,y=16,18
             [modifications]
                 {TRAIT_LOYAL}
@@ -140,7 +139,6 @@
             id=Celodith
             name= _ "Celodith"
             gender=female
-            unrenamable=yes
             x,y=17,18
             side=1
             [modifications]
@@ -161,7 +159,6 @@
             id=Earanduil
             name= _ "Earanduil"
             gender=male
-            unrenamable=yes
             x,y=17,19
             side=1
             [modifications]
@@ -182,7 +179,6 @@
             id=Elvyniel
             name= _ "Elvyniel"
             gender=female
-            unrenamable=yes
             x,y=18,18
             side=1
             [modifications]
@@ -203,7 +199,6 @@
             id=Delorfilith
             name= _ "Delorfilith"
             gender=male
-            unrenamable=yes
             x,y=18,19
             side=1
             [modifications]

diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/12_Terror_at_the_Ford_of_Parthyn.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/12_Terror_at_the_Ford_of_Parthyn.cfg
@@ -100,7 +100,6 @@
         type=Orcish Warlord
         id=Upgar
         name= _ "Upgar"
-        unrenamable=yes
         side=2
         controller=ai
         canrecruit=yes
@@ -155,7 +154,6 @@
         type=Lieutenant
         id=Niktor
         name= _ "Niktor"
-        unrenamable=yes
         side=4
         controller=ai
         canrecruit=yes
@@ -182,7 +180,6 @@
         type=White Mage
         id=Arpus
         name= _ "Arpus"
-        unrenamable=yes
         side=5
         controller=ai
         canrecruit=yes

diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg
@@ -156,7 +156,6 @@
         id=Taylor
         name= _ "Taylor"
         canrecruit=yes
-        unrenamable=yes
 
         fog=yes
         color=green

diff --git a/data/campaigns/Eastern_Invasion/scenarios/04c_Mal-Ravanals_Capital.cfg b/data/campaigns/Eastern_Invasion/scenarios/04c_Mal-Ravanals_Capital.cfg
@@ -222,6 +222,7 @@
                         type=Paladin
                         id=Terraent
                         name= _ "Terraent"
+                        unrenamable=yes
                         x,y=$prison_locations[$i].x,$prison_locations[$i].y
                         random_traits=no
                         facing=sw

diff --git a/data/campaigns/Eastern_Invasion/scenarios/07a_The_Crossing.cfg b/data/campaigns/Eastern_Invasion/scenarios/07a_The_Crossing.cfg
@@ -73,6 +73,7 @@
         type=Ogre
         id=Grug
         name= _ "Grug"
+        unrenamable=yes
         side=4
         canrecruit=yes
         facing=sw

diff --git a/data/campaigns/Eastern_Invasion/scenarios/12_Evacuation.cfg b/data/campaigns/Eastern_Invasion/scenarios/12_Evacuation.cfg
@@ -185,6 +185,7 @@
         [unit]
             id=Engineer
             name= _ "Engineer"
+            unrenamable=yes
             type=Red Mage
             x,y=18,5
             side=1

diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg
@@ -326,7 +326,6 @@
             id=Gwaba
             type=Merman Fighter
             name= _ "Gwaba"
-            unrenamable=yes
             [modifications]
                 {TRAIT_LOYAL}
                 {TRAIT_STRONG}
@@ -340,7 +339,6 @@
             id=Nepba
             type=Merman Fighter
             name= _ "Nepba"
-            unrenamable=yes
             [modifications]
                 {TRAIT_LOYAL}
                 {TRAIT_INTELLIGENT}
@@ -354,7 +352,6 @@
             id=Triram
             type=Merman Fighter
             name= _ "Triram"
-            unrenamable=yes
             [modifications]
                 {TRAIT_LOYAL}
                 {TRAIT_RESILIENT}
@@ -370,7 +367,6 @@
             id=Mriram
             type=Merman Fighter
             name= _ "Mriram"
-            unrenamable=yes
             [modifications]
                 {TRAIT_LOYAL}
                 {TRAIT_STRONG}
@@ -403,7 +399,6 @@
             id=Mabooa
             type=Merman Fighter
             name= _ "Mabooa"
-            unrenamable=yes
             [modifications]
                 {TRAIT_LOYAL}
                 {TRAIT_RESILIENT}
@@ -419,7 +414,6 @@
             id=Earooa
             type=Merman Fighter
             name= _ "Earooa"
-            unrenamable=yes
             [modifications]
                 {TRAIT_LOYAL}
                 {TRAIT_STRONG}
@@ -433,7 +427,6 @@
             id=Nethuns
             type=Merman Fighter
             name= _ "Nethuns"
-            unrenamable=yes
             [modifications]
                 {TRAIT_LOYAL}
                 {TRAIT_INTELLIGENT}
@@ -448,7 +441,6 @@
             id=Gwoama
             type=Merman Fighter
             name= _ "Gwoama"
-            unrenamable=yes
             [modifications]
                 {TRAIT_LOYAL}
                 {TRAIT_RESILIENT}
@@ -481,7 +473,6 @@
             id=Kaba
             type=Merman Fighter
             name= _ "Kaba"
-            unrenamable=yes
             [modifications]
                 {TRAIT_LOYAL}
                 {TRAIT_QUICK}
@@ -497,7 +488,6 @@
             id=Kwaboo
             type=Merman Fighter
             name= _ "Kwaboo"
-            unrenamable=yes
             [modifications]
                 {TRAIT_LOYAL}
                 {TRAIT_INTELLIGENT}
@@ -531,7 +521,6 @@
             id=Gwimli
             type=Merman Fighter
             name= _ "Gwimli"
-            unrenamable=yes
             [modifications]
                 {TRAIT_LOYAL}
                 {TRAIT_STRONG}
@@ -545,7 +534,6 @@
             id=Jarla
             type=Merman Fighter
             name= _ "Jarla"
-            unrenamable=yes
             [modifications]
                 {TRAIT_LOYAL}
                 {TRAIT_INTELLIGENT}
@@ -561,7 +549,6 @@
             id=Gwarloa
             type=Merman Fighter
             name= _ "Gwarloa"
-            unrenamable=yes
             [modifications]
                 {TRAIT_LOYAL}
                 {TRAIT_RESILIENT}
@@ -594,7 +581,6 @@
             id=Heldaga
             type=Merman Fighter
             name= _ "Heldaga"
-            unrenamable=yes
             [modifications]
                 {TRAIT_LOYAL}
                 {TRAIT_QUICK}
@@ -608,7 +594,6 @@
             id=Apalala
             type=Merman Hunter
             name= _ "Apalala"
-            unrenamable=yes
             [modifications]
                 {TRAIT_LOYAL}
                 {TRAIT_STRONG}
@@ -622,7 +607,6 @@
             id=Oceania
             type=Mermaid Initiate
             name= _ "Oceania"
-            unrenamable=yes
             [modifications]
                 {TRAIT_LOYAL}
                 {TRAIT_INTELLIGENT}
@@ -637,7 +621,6 @@
             id=Elcmar
             type=Merman Fighter
             name= _ "Elcmar"
-            unrenamable=yes
             [modifications]
                 {TRAIT_LOYAL}
                 {TRAIT_STRONG}
@@ -651,7 +634,6 @@
             id=Aigaion
             type=Merman Fighter
             name= _ "Aigaion"
-            unrenamable=yes
             [modifications]
                 {TRAIT_LOYAL}
                 {TRAIT_QUICK}
@@ -666,7 +648,6 @@
             id=Tini
             type=Merman Fighter
             name= _ "Tini"
-            unrenamable=yes
             [modifications]
                 {TRAIT_LOYAL}
                 {TRAIT_RESILIENT}

diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/08_The_Princess_of_Wesnoth.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/08_The_Princess_of_Wesnoth.cfg
@@ -85,7 +85,6 @@
         type=Princess
         id="Li'sar"
         name= _ "Li’sar"
-        unrenamable=yes
         profile=portraits/lisar.png
         side=2
         canrecruit=yes

diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/15_The_Lost_General.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/15_The_Lost_General.cfg
@@ -190,7 +190,6 @@
             side=2
             x,y=2,21
             random_traits=no
-            unrenamable=yes
 
             [modifications]
                 {TRAIT_LOYAL}

diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg
@@ -16,6 +16,7 @@
         type=Dwarvish Fighter
         id=Rugnur
         name= _ "Rugnur"
+        unrenamable=yes
         side=1
         canrecruit=yes
         facing=sw
@@ -305,6 +306,7 @@
             side=1
             id=Alanin
             name= _ "Alanin"
+            unrenamable=yes
             {IS_HERO}
             profile=portraits/alanin.png
             [modifications]

diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/2_Closing_the_Gates.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/2_Closing_the_Gates.cfg
@@ -211,6 +211,7 @@
             side=1
             id=Baglur
             name= _ "Baglur"
+            unrenamable=yes
             {IS_HERO}
             profile=portraits/baglur.png
             facing=sw

diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/3_Searching_for_the_Runecrafter.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/3_Searching_for_the_Runecrafter.cfg
@@ -286,6 +286,7 @@
             type=Gryphon
             id=Krawg
             name= _ "Krawg"
+            unrenamable=yes
             {IS_HERO}
             x,y=5,24
             side=1
@@ -494,6 +495,7 @@
             type=Dwarvish Runemaster
             id=Thursagan
             name= _ "Thursagan"
+            unrenamable=yes
             {IS_HERO}
             profile=portraits/thursagan.png
             advances_to=Dwarvish Arcanister

diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg
@@ -183,6 +183,7 @@
             type=Dwarvish Lord
             id=Durstorn
             name= _ "Durstorn"
+            unrenamable=yes
             side=1
             {IS_HERO}
             profile=portraits/durstorn-insane.png

diff --git a/data/campaigns/Son_Of_The_Black_Eye/scenarios/01_End_of_Peace.cfg b/data/campaigns/Son_Of_The_Black_Eye/scenarios/01_End_of_Peace.cfg
@@ -54,6 +54,7 @@
         type=Orcish Leader
         id="Kapou'e"
         name= _ "Kapou’e"
+        unrenamable=yes
         profile=portraits/kapoue.png
         side=1
         canrecruit=yes

diff --git a/data/campaigns/Son_Of_The_Black_Eye/scenarios/03_Toward_Mountains_of_Haag.cfg b/data/campaigns/Son_Of_The_Black_Eye/scenarios/03_Toward_Mountains_of_Haag.cfg
@@ -246,6 +246,7 @@
         [unit]
             id=Grüü
             name= _ "Grüü"
+            unrenamable=yes
             type=Troll Hero
             side=3
             x=30

diff --git a/data/campaigns/Son_Of_The_Black_Eye/scenarios/10_Saving_Inarix.cfg b/data/campaigns/Son_Of_The_Black_Eye/scenarios/10_Saving_Inarix.cfg
@@ -238,6 +238,7 @@
         [+unit]
             random_traits=no
             profile=portraits/inarix.png
+            unrenamable=yes
         [/unit]
 
         {GENERIC_UNIT 1 "Saurian Skirmisher" 8 42}

diff --git a/data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg b/data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg
@@ -4,6 +4,7 @@
     [unit]
         id={ID_STRING}
         name={NAME_STRING}
+        unrenamable=yes
         type=Old Orcish Shaman
         profile=portraits/old_orcish_shaman.png
         side={SIDE}
@@ -21,6 +22,7 @@
     [unit]
         id={ID_STRING}
         name={NAME_STRING}
+        unrenamable=yes
         type=Novice Orcish Shaman
         profile=portraits/young_orcish_shaman.png
         side={SIDE}
@@ -38,6 +40,7 @@
     [unit]
         id={ID_STRING}
         name={NAME_STRING}
+        unrenamable=yes
         type=Orcish Shaman
         profile=portraits/orcish_shaman.png
         side={SIDE}
@@ -72,6 +75,7 @@
     type=Orcish Warlord
     id="Al'Brock"
     name= _ "Al’Brock"
+    unrenamable=yes
     side=2
     canrecruit=yes
     profile=portraits/albrock.png
@@ -85,6 +89,7 @@
     type=Orcish Warlord
     id="Flar'Tar"
     name= _ "Flar’Tar"
+    unrenamable=yes
     side=3
     canrecruit=yes
     profile=portraits/flartar.png