Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Mar 22, 2010, 2:47:10 PM (15 years ago)
Author:
rgrieder
Message:

Merged remaining revisions from gamestate to gamestates2.

Location:
code/branches/gamestates2
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • code/branches/gamestates2

  • code/branches/gamestates2/data/gui/layouts/InGameMenu.layout

    r6417 r6595  
    66        <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    77        <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
    8         <Window Type="TaharezLook/Button" Name="orxonox/InGameMenu_ReturnButton" >
    9             <Property Name="Font" Value="BlueHighway-12" />
     8        <Window Type="MenuWidgets/Button" Name="orxonox/InGameMenu_ReturnButton" >
    109            <Property Name="Text" Value="Return to Game" />
    1110            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    … …  
    1413            <Event Name="Clicked" Function="InGameMenu.button_return_clicked"/>
    1514        </Window>
    16         <Window Type="TaharezLook/Button" Name="orxonox/InGameMenu_MainMenuButton" >
    17             <Property Name="Font" Value="BlueHighway-12" />
     15        <Window Type="MenuWidgets/Button" Name="orxonox/InGameMenu_MainMenuButton" >
    1816            <Property Name="Text" Value="Main Menu" />
    1917            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    … …  
    2220            <Event Name="Clicked" Function="InGameMenu.button_mainmenu_clicked"/>
    2321        </Window>
    24         <Window Type="TaharezLook/Button" Name="orxonox/InGameMenu_SettingsButton" >
    25             <Property Name="Font" Value="BlueHighway-12" />
     22        <Window Type="MenuWidgets/Button" Name="orxonox/InGameMenu_SettingsButton" >
    2623            <Property Name="Text" Value="Settings" />
    2724            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    … …  
    3027            <Event Name="Clicked" Function="InGameMenu.button_settings_clicked"/>
    3128        </Window>
    32         <Window Type="TaharezLook/Button" Name="orxonox/InGameMenu_QuitButton" >
    33             <Property Name="Font" Value="BlueHighway-12" />
     29        <Window Type="MenuWidgets/Button" Name="orxonox/InGameMenu_QuitButton" >
    3430            <Property Name="Text" Value="Quit" />
    3531            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
Note: See TracChangeset for help on using the changeset viewer.