real_tabasco_sauce/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Actions Activity

Convert multiplayer connection dialog to only use 'modern' styles and make it larger for languge-friendliness and consistancy.

Browse Source 
This was SVN commit r15399.
This commit is contained in:
JoshuaJB 2014-06-19 19:22:31 +00:00
parent bee865416b
commit ec7a452d4e
3 changed files with 21 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
binaries/data/mods/public/gui/gamesetup/gamesetup_mp.xml
View File

@ -7,45 +7,45 @@
<script file="gui/gamesetup/gamesetup_mp.js"/>
<!-- Add a translucent black background to fade out the menu page -->
<object type="image" z="0" sprite="ModernFade"/>
<object type="image" sprite="ModernFade"/>
<object type="image" style="ModernDialog" size="50%-190 50%-120 50%+190 50%+120">
<object type="image" style="ModernDialog" size="50%-230 50%-120 50%+230 50%+120">
<action on="Tick">
onTick();
</action>
<object style="TitleText" type="text" size="50%-128 0%-16 50%+128 16">
<object style="ModernLabelText" type="text" size="50%-128 0%-16 50%+128 16">
<translatableAttribute id="caption">Multiplayer</translatableAttribute>
</object>
<object name="pageJoin" size="0 32 100% 100%" hidden="true">
<object type="text" style="ModernLabelText" size="0 0 400 30">
<object type="text" style="ModernLabelText" size="0 0 100% 30">
<translatableAttribute id="caption">Joining an existing game.</translatableAttribute>
</object>
<object type="text" size="0 40 200 70" style="ModernRightLabelText">
<object type="text" size="20 40 50% 70" style="ModernLabelText" text_align="right">
<translatableAttribute id="caption">Player name:</translatableAttribute>
</object>
<object name="joinPlayerName" type="input" size="210 40 100%-32 64" style="ModernInput">
<object name="joinPlayerName" type="input" size="50%+10 40 100%-20 64" style="ModernInput">
<action on="Load">
this.caption = Engine.ConfigDB_GetValue("user", "playername");
</action>
</object>
<object type="text" size="0 80 200 110" style="ModernRightLabelText">
<object type="text" size="20 80 50% 110" style="ModernLabelText" text_align="right">
<translatableAttribute id="caption">Server Hostname or IP:</translatableAttribute>
</object>
<object name="joinServer" type="input" size="210 80 100%-32 104" style="ModernInput">
<object name="joinServer" type="input" size="50%+10 80 100%-20 104" style="ModernInput">
<action on="Load">
this.caption = Engine.ConfigDB_GetValue("user", "multiplayerserver")
</action>
</object>
<object hotkey="confirm" type="button" size="50%+16 100%-60 50%+144 100%-32" style="StoneButton">
<object hotkey="confirm" type="button" size="50%+5 100%-45 100%-18 100%-17" style="ModernButtonRed">
<translatableAttribute id="caption">Continue</translatableAttribute>
<action on="Press">
var joinPlayerName = Engine.GetGUIObjectByName("joinPlayerName").caption;
@ -63,35 +63,36 @@
<object name="pageHost" size="0 32 100% 100%" hidden="true">
<object type="text" style="ModernLabelText" size="0 0 400 30">
<object type="text" style="ModernLabelText" size="0 0 100% 30">
<translatableAttribute id="caption">Set up your server to host.</translatableAttribute>
</object>
<object name="hostPlayerNameWrapper" hidden="true">
<object type="text" size="0 40 200 70" style="ModernRightLabelText">
<object type="text" size="20 40 50% 70" style="ModernLabelText" text_align="right">
<translatableAttribute id="caption">Player name:</translatableAttribute>
</object>
<object name="hostPlayerName" type="input" size="210 40 100%-32 64" style="ModernInput">
<object name="hostPlayerName" type="input" size="50%+10 40 100%-20 64" style="ModernInput">
<action on="Load">
this.caption = Engine.ConfigDB_GetValue("user", "playername");
</action>
</object>
</object>
<!-- What's this hidden hostServerName field? Can we remove it? TODO -->
<object name="hostServerNameWrapper" hidden="true">
<object type="text" size="0 80 200 110" style="ModernRightLabelText">
<object type="text" size="20 80 50% 110" style="ModernLabelText" text_align="right">
<translatableAttribute id="caption">Server name:</translatableAttribute>
</object>
<object name="hostServerName" type="input" size="210 80 100%-32 104" style="ModernInput">
<object name="hostServerName" type="input" size="50%+10 80 100%-20 10" style="ModernInput">
<action on="Load">
this.caption = getDefaultGameName();
</action>
</object>
</object>
<object type="button" size="50%+16 100%-60 50%+144 100%-32" style="StoneButton">
<object type="button" size="50%+5 100%-45 100%-18 100%-17" style="ModernButtonRed">
<translatableAttribute id="caption">Continue</translatableAttribute>
<action on="Press">
var hostPlayerName = Engine.GetGUIObjectByName("hostPlayerName").caption;
@ -103,9 +104,9 @@
</object>
</object>
<object name="hostFeedback" type="text" style="ModernLabelText" size="32 150 100%-32 180" textcolor="red" />
<object name="hostFeedback" type="text" style="ModernLabelText" size="50 100%-90 100%-50 100%-50" textcolor="red" />
<object type="button" style="StoneButton" size="50%-144 100%-60 50%-16 100%-32">
<object type="button" style="ModernButtonRed" size="18 100%-45 50%-5 100%-17">
<translatableAttribute id="caption">Cancel</translatableAttribute>
<action on="Press">cancelSetup();</action>
</object>

11
binaries/data/mods/public/gui/page_gamesetup_mp.xml
View File

@ -5,14 +5,7 @@
<include>common/modern/sprites.xml</include>
<include>common/setup.xml</include>
<include>common/sprite1.xml</include>
<include>common/styles.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
<include>gamesetup/setup.xml</include>
<include>gamesetup/sprites.xml</include>
<include>gamesetup/styles.xml</include>
<include>gamesetup/gamesetup_mp.xml</include>
<include>common/global.xml</include>
<include>gamesetup/gamesetup_mp.xml</include>
</page>

2
binaries/data/mods/public/simulation/components/Attack.js
View File

@ -576,7 +576,7 @@ Attack.prototype.MissileHit = function(data, lateness)
var targetPosition = this.InterpolatedLocation(data.target, lateness);
if (!targetPosition)
return;
if (this.template.Ranged.Splash) // splash damage, do this first in case the direct hit kills the target
{
var friendlyFire = this.template.Ranged.Splash.FriendlyFire;