Changeset 11905

Timestamp:

Apr 26, 2018, 1:48:45 PM (7 years ago)

Author:

mdedial

Message:

Add "Refresh" button to Multiplayer menu.

Location:

code/branches/Masterserver_FS18

Files:

• data/gui/layouts/MultiplayerMenu.layout (modified) (2 diffs)
• src/libraries/network/packet/Gamestate.cc (modified) (1 diff)

code/branches/Masterserver_FS18/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/Masterserver_FS18/src/libraries/network/packet/Gamestate.cc

@@ -234 +234 @@
                                                  << "Are you sure you don't create a Sychnronisable objcect with 'new' \
                                                      that doesn't have objectMode = 0x0?" << endl;
-            assert(false);
           }
         }