Merge branch '1.12' of https://github.com/wesnoth/wesnoth into 1.12

changelog

@@ -4,6 +4,7 @@ Version 1.11.18+dev:
  * Miscellaneous and bug fixes:
    * For compiling Wesnoth on OS X using Xcode, a new version of
      wesnoth_compile_mac_1.11.zip is now required.
+   * Micro AIs: only display on-screen error messages when in debug mode
 
 Version 1.11.18:
  * Add-ons server:

data/ai/lua/ai_helper.lua

@@ -127,8 +127,10 @@ end
 ----- AI execution helper functions ------
 
 function ai_helper.checked_action_error(action, error_code)
+    if wesnoth.game_config.debug then
         wesnoth.message('Lua AI error', 'If you see this message, something has gone wrong. Please report this on the Wesnoth forums, ideally with a replay and/or savegame.')
         error(action .. ' could not be executed. Error code: ' .. error_code)
+    end
 end
 
 function ai_helper.checked_attack(ai, attacker, defender, weapon)

l10n-track

@@ -6,6 +6,7 @@ ok        ¦data/campaigns/Dead_Water/images/maps/l10n/de/dw--overlay.png¦  b65
 ok        ¦data/campaigns/Descent_Into_Darkness/images/maps/l10n/de/did--overlay.png¦  6b31cd94d40c8b0d02bb5e008af0bf84  a3b14e767064ba27b97a9a316da9301d88e64b0
 ok        ¦data/campaigns/Eastern_Invasion/images/maps/l10n/de/ei--overlay.png¦  9ce99e39e9a54b28019e399879762885  3ca6988963d24be3f4f6cd8be2de2296df87919
 ok        ¦data/campaigns/Heir_To_The_Throne/images/maps/l10n/de/httt--overlay.png¦  c6a61abdc02a22a1279d6e86d2d988d0  bbace6d70c9021bea33fd06eb40ae5c793099d2
+ok        ¦data/campaigns/Legend_of_Wesmere/images/l10n/de/low-map--overlay.png¦  82d520be1d9d733cd9d6e06e2e187029  3ca6988963d24be3f4f6cd8be2de2296df87919
 ok        ¦data/campaigns/Liberty/images/maps/l10n/de/liberty--overlay.png¦  f95afb953e44122ded647dcb4d414aa5  3ca6988963d24be3f4f6cd8be2de2296df87919
 ok        ¦data/campaigns/Sceptre_of_Fire/images/maps/l10n/de/sof--overlay.png¦  8e6a191c8caec86b05feaf5a13f9c10e  bbace6d70c9021bea33fd06eb40ae5c793099d2
 ok        ¦data/campaigns/Son_Of_The_Black_Eye/images/maps/l10n/de/sotbe--overlay.png¦  99c228c3a38a107030c0f46817835adb  bbace6d70c9021bea33fd06eb40ae5c793099d2
@@ -113,7 +114,9 @@ ok        ¦images/misc/l10n/nl/logo.png¦  f109b391406d55b33ab1f6bb96b33336  48
 ok        ¦data/campaigns/An_Orcish_Incursion/images/maps/l10n/pt/aoi--overlay.png¦  566caef8841ce7ea42b49e436230f6bb  a3b14e767064ba27b97a9a316da9301d88e64b0
 ok        ¦data/campaigns/Dead_Water/images/maps/l10n/pt/dw--overlay.png¦  b652fd1277d6a947fb667537e0f934aa  3ca6988963d24be3f4f6cd8be2de2296df87919
 ok        ¦data/campaigns/Descent_Into_Darkness/images/maps/l10n/pt/did--overlay.png¦  6b31cd94d40c8b0d02bb5e008af0bf84  a3b14e767064ba27b97a9a316da9301d88e64b0
+ok        ¦data/campaigns/Eastern_Invasion/images/maps/l10n/pt/ei--overlay.png¦  9ce99e39e9a54b28019e399879762885  3ca6988963d24be3f4f6cd8be2de2296df87919
 ok        ¦data/campaigns/Heir_To_The_Throne/images/maps/l10n/pt/httt--overlay.png¦  c6a61abdc02a22a1279d6e86d2d988d0  bbace6d70c9021bea33fd06eb40ae5c793099d2
+ok        ¦data/campaigns/Legend_of_Wesmere/images/l10n/pt/low-map--overlay.png¦  82d520be1d9d733cd9d6e06e2e187029  3ca6988963d24be3f4f6cd8be2de2296df87919
 ok        ¦data/campaigns/Liberty/images/maps/l10n/pt/liberty--overlay.png¦  f95afb953e44122ded647dcb4d414aa5  3ca6988963d24be3f4f6cd8be2de2296df87919
 ok        ¦data/campaigns/Liberty/images/maps/l10n/pt/liberty-map--overlay.png¦  2db525104127ca35c8e037ad897c9b2b  48839
 ok        ¦data/campaigns/Sceptre_of_Fire/images/maps/l10n/pt/sof--overlay.png¦  8e6a191c8caec86b05feaf5a13f9c10e  bbace6d70c9021bea33fd06eb40ae5c793099d2
@@ -176,3 +179,4 @@ fuzzy     ¦data/core/images/help/l10n/zh_CN/tooltip.png¦  7acf65b98543763d7227
 ok        ¦data/core/images/maps/l10n/zh_CN/wesnoth--overlay.png¦  f03a2a4cc8cbb9fcaf48593289e3e5c4  48839
 ok        ¦data/core/images/misc/l10n/zh_CN/logo.png¦  f109b391406d55b33ab1f6bb96b33336  48839
 ok        ¦images/misc/l10n/zh_CN/logo.png¦  f109b391406d55b33ab1f6bb96b33336  48839
+

src/gui/dialogs/lobby/lobby_data.cpp

@@ -190,6 +190,7 @@ game_info::game_info(const config& game, const config& game_config)
 	, verified(true)
 	, password_required(game["password"].to_bool())
 	, have_era(true)
+	, have_all_mods(true)
 	, has_friends(false)
 	, has_ignored(false)
 	, display_status(NEW)
@@ -219,6 +220,19 @@ game_info::game_info(const config& game, const config& game_config)
 	}
 	map_info = era;
 
+	if(!game.child_or_empty("modification").empty()) {
+		BOOST_FOREACH(const config &cfg, game.child_range("modification")) {
+			if (cfg["require_modification"].to_bool(false)) {
+				const config &mod = game_config.find_child("modification", "id",
+														   cfg["id"]);
+				if (!mod) {
+					have_all_mods = false;
+					break;
+				}
+			}
+		}
+	}
+
 	if(map_data.empty()) {
 		map_data = filesystem::read_map(game["mp_scenario"]);
 	}
@@ -342,12 +356,13 @@ game_info::game_info(const config& game, const config& game_config)
 
 bool game_info::can_join() const
 {
-	return have_era && !started && vacant_slots > 0;
+	return have_era && have_all_mods && !started && vacant_slots > 0;
 }
 
 bool game_info::can_observe() const
 {
-	return (have_era && observers) || preferences::is_authenticated();
+	return (have_era && have_all_mods && observers)
+			|| preferences::is_authenticated();
 }
 
 const char* game_info::display_status_string() const

src/gui/dialogs/lobby/lobby_data.hpp

@@ -170,6 +170,7 @@ struct game_info
 	bool verified;
 	bool password_required;
 	bool have_era;
+	bool have_all_mods;
 
 	bool has_friends;
 	bool has_ignored;

src/serialization/ucs4_iterator_base.hpp

@@ -1,7 +1,6 @@
 #ifndef UCS4_ITERATOR_BASE_HPP_INCLUDED
 #define UCS4_ITERATOR_BASE_HPP_INCLUDED
 
-#include <stdint.h>  //uint32_t
 #include <iterator>  //input_iterator_tag
 #include <utility>   //pair
 #include <cstddef>   //ptrdiff_t

src/serialization/unicode_types.hpp

@@ -18,10 +18,10 @@
 #include <string>
 #include <vector>
 #include <exception>
-#include <stdint.h>
+#include <boost/cstdint.hpp>
 
 namespace ucs4 {
-	typedef uint32_t char_t;
+	typedef boost::uint32_t char_t;
 	typedef std::vector<char_t> string;
 }