- Timestamp:
- Mar 22, 2010, 2:47:10 PM (15 years ago)
- Location:
- code/branches/gamestates2
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/gamestates2
- Property svn:mergeinfo changed
/code/branches/gamestate merged: 6441-6442,6459,6537,6544-6546,6548,6564,6566-6567,6569,6571-6572
- Property svn:mergeinfo changed
-
code/branches/gamestates2/data/gui/layouts/MultiplayerOptionsMenu.layout
r6417 r6595 2 2 3 3 <GUILayout > 4 <Window Type=" TaharezLook/StaticImage" Name="orxonox/MultiplayerOptionsBackground" >4 <Window Type="MenuWidgets/StaticImage" Name="orxonox/MultiplayerOptionsBackground" > 5 5 <Property Name="FrameEnabled" Value="False" /> 6 6 <Property Name="InheritsAlpha" Value="False" /> … … 8 8 <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" /> 9 9 <Property Name="BackgroundEnabled" Value="False" /> 10 <Window Type=" TaharezLook/StaticText" Name="orxonox/MultiplayerOptionsWindow" >10 <Window Type="MenuWidgets/StaticText" Name="orxonox/MultiplayerOptionsWindow" > 11 11 <Property Name="Text" Value="Multiplayer options" /> 12 12 <Property Name="Alpha" Value="0.8" /> … … 17 17 <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.3625,0},{0.75,0},{0.6375,0}}" /> 18 18 </Window> 19 <Window Type=" TaharezLook/Button" Name="orxonox/MultiplayerOptionsBackButton" >19 <Window Type="MenuWidgets/Button" Name="orxonox/MultiplayerOptionsBackButton" > 20 20 <Property Name="Text" Value="Back" /> 21 21 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
Note: See TracChangeset
for help on using the changeset viewer.