Merge branch 'master' of https://github.com/wesnoth/wesnoth-old.git

CMakeLists.txt

@@ -405,6 +405,11 @@ check_compiler_has_flag(
 	HAS_COMPILER_FLAG_WEXTRA_SEMI
 )
 
+check_compiler_has_flag(
+	CXX_FLAGS_STRICT_COMPILATION
+	"-Wconditional-uninitialized"
+	HAS_COMPILER_FLAG_WCONDITIONAL_INITIALIZED
+)
 
 ### Set the final compiler flags.
 

Doxyfile

@@ -31,7 +31,7 @@ PROJECT_NAME           = "The Battle for Wesnoth"
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 1.11.8+dev
+PROJECT_NUMBER         = 1.11.9+dev
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 

RELEASE_NOTES

@@ -18,6 +18,14 @@ CHANGES
 Based on the feedback we have gotten, we turned gold saving off by default for the RCA AI. There is no clear overall benefit to having it turned on and it would require many scenarios to be rebalanced. There are, however, individual scenarios which definitely benefit from enabling gold saving. Help with identifying such scenarios will be much appreciated.
 [/section]
 
+[section="Son of the Black Eye campaign rebalancing"]
+Rebalancing of the campaign continues and is done for scenarios 1 (“End of Peace”) through 12 (“Giving Some Back”). [b]Play-testing and feedback by others would be extremely helpful at this time.[/b] The first newly rebalanced scenario of this release is “Shan Taum the Smug”, but some earlier scenarios have seen minor changes as well. 
+[/section]
+
+[section="Input control scheme"]
+The old default has been restored again. Players who want to change how inputs work for them can assign the action supposed to be activated by left-/right-clicking in the hotkey preferences.
+[/section]
+
 [section="Example section header"]
 Example contents.
 [/section]

SConstruct

@@ -353,8 +353,13 @@ if env["prereqs"]:
             client_env['fribidi'] = conf.CheckPKG('fribidi >= 0.10.9') or Warning("Can't find libfribidi, disabling freebidi support.")
 
     if env["forum_user_handler"]:
-        env.ParseConfig("mysql_config --libs --cflags")
+        flags = env.ParseFlags("!mysql_config --libs --cflags")
+        try: # Some versions of mysql_config add -DNDEBUG but we don't want it
+            flags["CPPDEFINES"].remove("NDEBUG")
+        except ValueError:
+            pass
         env.Append(CPPDEFINES = ["HAVE_MYSQLPP"])
+        env.MergeFlags(flags)
 
     client_env = conf.Finish()
 

changelog

@@ -1,21 +1,63 @@
-Version 1.11.8+dev:
+Version 1.11.9+dev:
+ * Campaigns:
+   * Heir to the Throne:
+     * Fixed Delfador clobbering whichever unit happens to be standing on
+       31,11 at the end of The Bay of Pearls, causing it to disappear
+       forever.
+ * GUI2
+   * Added: FAI-function handling in GUI2 widgets.
+   * Added: A new tooltip window.
+ * Language and i18n:
+   * Updated translations:
+ * Miscellaneous and bug fixes:
+   * Fixed: A compilation warning with DEBUG_WINDOW_LAYOUT_GRAPHS.
+   * Add translatable default filename to map editor save dialog box
+
+Version 1.11.9:
+ * Add-ons client:
+   * Display the first and last upload dates in the Description dialog.
+ * Add-ons server:
+   * Record the first upload date and time for new add-ons.
+   * Removed ancient compatibility code used only for add-ons stored by some
+     1.5.x versions.
  * AI:
-   * RCA (default) AI: Gold saving is turned off by default again
+   * Default AI: Gold saving is turned off by default again
    * New macros AI_SAVE_GOLD and AI_SAVE_GOLD_DEFAULT for easy enabling of
      recruitment gold saving in specific scenarios
    * Wolves Micro AI: new optional parameter attack_only_prey=
  * Campaigns:
    * Heir to the Throne:
      * Gave Li'sar a new ability "initiative" (grants adjacent allies first
        strike in melee).
+   * Son of the Black Eye:
+     * Rebalancing of the campaign continues and is done for Scenarios 1 (End
+       of Peace) through 12 (Giving Some Back).  In addition, the following
+       not directly balance related changes have also been made:
+     * S3: remove AI controller right-click menu option
+     * S4 & S9: make AI attack enemies 1 XP from leveling so that it is not
+       possible to block key locations with such units
+     * S10 & S12: don't give huge unannounced gold bonus to AIs
+ * Editor:
+   * Added Impassable Overlay and Unwalkable Overlay terrains to the obstacle
+     group.
+   * Added Snowy Human City village terrain to the frozen group.
+   * Added Cave Path terrain to the flat group.
+   * Added Dry Hills terrain to the fall group.
  * Language and i18n:
-   * Updated translations: Portuguese, Scottish Gaelic
+   * Updated translations: Dutch, Portuguese, Scottish Gaelic
  * Lua API:
    * Added wesnoth.set_dialog_markup function (patch #2759).
+ * Multiplayer
+   * Updated map: Ruins of Terra-Dwelve.
+ * Terrains:
+   * Made Snowy Encampment, Snowy Orcish Castle, Snowy Encampment Keep and Snowy
+     Orcish Keep aliases of both castle and frozen terrains
  * Units:
+   * Decreased the strikes of the Dwarvish Lord's hatchet attack from 2 to 1.
    * Fixed subtle magenta TC for the Giant Mudcrawler sprites not being
      enabled in-game.
  * User interface:
+   * Restored the old control scheme as the default
    * Fixed hidden variations of unit types (hide_help=yes) being listed in the
      help browser when they shouldn't.
    * Gray-out GUI1 scrollbar upwards scrolling button by default when starting
@@ -43,6 +85,10 @@ Version 1.11.8+dev:
    * Selecting off-map hexes, then hovering over a unit no longer causes
      the game to crash (bug #21351).
    * Changed: Added -Wextra-semi to pedantic compilation.
+   * Changed: Added -Wconditional-uninitialized to pedantic compilation.
+   * Fixed NULL pointer dereference when viewing units in the Recall Unit
+     dialog including nonexistent/unreadable images in their overlays, while
+     not in debug mode.
 
 Version 1.11.8:
  * Add-ons client: