Merge 'remotes/trunk'

0ad · Feb 8, 2017 · b5e3f0d · b5e3f0d
2 parents a1188c3 + 7253296
commit b5e3f0d
Show file tree

Hide file tree

Showing 11 changed files with 247 additions and 246 deletions.
diff --git a/binaries/data/mods/public/art/animation/mechanical/kart_gate_closed.dae b/binaries/data/mods/public/art/animation/mechanical/kart_gate_closed.dae
diff --git a/binaries/data/mods/public/art/animation/mechanical/kart_gate_closing.dae b/binaries/data/mods/public/art/animation/mechanical/kart_gate_closing.dae
diff --git a/binaries/data/mods/public/art/animation/mechanical/kart_gate_open.dae b/binaries/data/mods/public/art/animation/mechanical/kart_gate_open.dae
diff --git a/binaries/data/mods/public/art/animation/mechanical/kart_gate_opening.dae b/binaries/data/mods/public/art/animation/mechanical/kart_gate_opening.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/kart_gate_b.dae b/binaries/data/mods/public/art/meshes/structural/kart_gate_b.dae
diff --git a/.../data/mods/public/art/textures/ui/session/portraits/technologies/spy_trader.png b/.../data/mods/public/art/textures/ui/session/portraits/technologies/spy_trader.png
diff --git a/binaries/data/mods/public/gui/lobby/prelobby.js b/binaries/data/mods/public/gui/lobby/prelobby.js
@@ -162,7 +162,8 @@ function onTick()
 		case "error":
 		case "disconnected":
 		{
-			Engine.GetGUIObjectByName("feedback").caption = message.text;
+			Engine.GetGUIObjectByName("feedback").caption = message.text ||
+				translate("Unknown error. This usually occurs because the same IP address is not allowed to register more than one account within one hour.");
 			g_DisplayingSystemMessage = true;
 			Engine.StopXmppClient();
 			break;

diff --git a/binaries/data/mods/public/gui/lobby/prelobby.xml b/binaries/data/mods/public/gui/lobby/prelobby.xml
@@ -8,7 +8,7 @@
 	<!-- Add a translucent black background to fade out the menu page -->
 	<object type="image" z="0" sprite="ModernFade"/>
 
-	<object name="dialog" type="image" style="ModernDialog" size="50%-230 50%-120 50%+230 50%+120">
+	<object name="dialog" type="image" style="ModernDialog" size="50%-230 50%-130 50%+230 50%+130">
 
 		<action on="Tick">
 			onTick();
@@ -92,7 +92,7 @@
 			</object>
 
 		</object>
-		<object name="feedback" type="text" size="50 100%-90 100%-50 100%-50" style="ModernLabelText" textcolor="red" text_align="center"/>
+		<object name="feedback" type="text" size="50 100%-110 100%-50 100%-50" style="ModernLabelText" textcolor="red" text_align="center"/>
 		<object name="cancel" type="button" size="18 100%-45 50%-5 100%-17" style="ModernButtonRed" hotkey="cancel">
 			<translatableAttribute id="caption">Cancel</translatableAttribute>
 			<action on="Press">

diff --git a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ballista.xml b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ballista.xml
@@ -38,7 +38,7 @@
     <Height>2.0</Height>
   </Footprint>
   <Health>
-    <Max>100</Max>
+    <Max>200</Max>
   </Health>
   <Identity>
     <GenericName>Bolt Shooter</GenericName>

diff --git a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_onager.xml b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_onager.xml
@@ -28,16 +28,16 @@
   <Cost>
     <BuildTime>25</BuildTime>
     <Resources>
-      <wood>350</wood>
-      <stone>350</stone>
+      <wood>400</wood>
+      <stone>250</stone>
     </Resources>
   </Cost>
   <Footprint replace="">
     <Square width="6.0" depth="15.0"/>
     <Height>4.5</Height>
   </Footprint>
   <Health>
-    <Max>100</Max>
+    <Max>250</Max>
   </Health>
   <Identity>
     <GenericName>Siege Catapult</GenericName>

diff --git a/source/lobby/XmppClient.cpp b/source/lobby/XmppClient.cpp
@@ -1094,7 +1094,7 @@ std::string XmppClient::RegistrationResultToString(gloox::RegistrationResult res
 	DEBUG_CASE(RegistrationUnexpectedRequest, "This client is unregistered with the server");
 	DEBUG_CASE(RegistrationNotAllowed, "Server does not permit password changes");
 	default:
-		return g_L10n.Translate("Unknown error");
+		return "";
 	}
 #undef DEBUG_CASE
 #undef CASE