Changeset 12020 for code/branches/PresentationFS18/data

Timestamp:

May 30, 2018, 2:56:24 PM (7 years ago)

Author:

patricwi

Message:

Merged Masterserver

Location:

code/branches/PresentationFS18

Files:

• . (modified) (1 prop)
• data/gui/layouts/MultiplayerMenu.layout (modified) (2 diffs)
• data/levels/testMultiplayerLevel.oxw (copied) (copied from code/branches/Masterserver_FS18/data/levels/testMultiplayerLevel.oxw)
• data/levels/testMultiplayerLevelLTS.oxw (copied) (copied from code/branches/Masterserver_FS18/data/levels/testMultiplayerLevelLTS.oxw)
• data/overlays/lastTeamStandingHUD.oxo (modified) (4 diffs)

code/branches/PresentationFS18/data/gui/layouts/MultiplayerMenu.layout

@@ -23 +23 @@
                 <Property Name="Text" Value="LAN"/>
                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.2,0},{0.87,0},{0.4,0},{0.97,0}}" />
+                <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.87,0},{0.25,0},{0.97,0}}" />
                 <Event Name="SelectStateChanged" Function="MultiplayerMenu.LanButton_clicked"/>
             </Window>
@@ -29 +29 @@
                 <Property Name="Text" Value="Internet" />
                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.6,0},{0.87,0},{0.8,0},{0.97,0}}" />
+                <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.87,0},{0.6,0},{0.97,0}}" />
                 <Event Name="SelectStateChanged" Function="MultiplayerMenu.InternetButton_clicked"/>
+            </Window>
+            <Window Type="MenuWidgets/Button" Name="orxonox/MultiplayerRefreshButton" >
+                <Property Name="Text" Value="Refresh" />
+                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+                <Property Name="UnifiedAreaRect" Value="{{0.75,0},{0.87,0},{0.95,0},{0.97,0}}" />
+                <Event Name="Clicked" Function="MultiplayerMenu.showServerList" />
             </Window>
         </Window>

code/branches/PresentationFS18/data/overlays/lastTeamStandingHUD.oxo

@@ -2 +2 @@
   <OverlayGroup name="lastTeamStandingHUD" scale = "1, 1">
     <LastTeamStandingInfos
-     position  = "0.14, 0.02"
+     position  = "0.5, 0.02"
      pickpoint = "0.0, 0.0"
      font      = "ShareTechMono"
@@ -14 +14 @@
 
     <OverlayText
-     position  = "0.02, 0.02"
+     position  = "0.38, 0.02"
      pickpoint = "0.0, 0.0"
      font      = "ShareTechMono"
@@ -24 +24 @@
 
     <OverlayText
-     position  = "0.02, 0.055"
+     position  = "0.38, 0.055"
      pickpoint = "0.0, 0.0"
      font      = "ShareTechMono"
@@ -34 +34 @@
 
     <LastTeamStandingInfos
-     position  = "0.14, 0.055"
+     position  = "0.5, 0.055"
      pickpoint = "0.0, 0.0"
      font      = "ShareTechMono"