Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Dec 22, 2010, 7:24:24 PM (14 years ago)
Author:
dafrick
Message:

Merging presentation2 branch back to trunk.

Location:
code/trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • code/trunk

  • code/trunk/data/gui/layouts/AudioMenu.layout

    r6746 r7801  
    113113                <Property Name="Text" >Theme changes might take
    114114up to a minute.</Property>
    115                 <Property Name="TextColours" Value="FF4444FF" />
     115                <Property Name="TextColours" Value="FFFFFFFF" />
    116116                <Property Name="InheritsAlpha" Value="False" />
    117117                <Property Name="HorzFormatting" Value="HorzCentred" />

  • code/trunk/data/gui/layouts/CreditsMenu.layout

    r7732 r7801  
    3232                    <Property Name="VertScrollPosition" Value="0" />
    3333                    <Window Type="MenuWidgets/StaticText" Name="orxonox/CreditsText" >
    34                         <Property Name="TextColours" Value="FF4444FF" />
     34                        <Property Name="TextColours" Value="FFFFFFFF" />
    3535                        <Property Name="InheritsAlpha" Value="False" />
    3636                        <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    … …  
    3838                        <Property Name="VertFormatting" Value="TopAligned" />
    3939                        <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
    40                         <Property Name="Text">Orxonox version 0.0.3
     40                        <Property Name="Text">wird sowieso nicht gelesen
     41Orxonox version 0.0.3
    4142
    4243Programming Language:  C++ - lua - tcl
    … …  
    4546
    4647http://www.orxonox.net
    47 n
    48 n
    49 n
    50 n
    51 n
    52 n
    53 n
    54 n
    55 n                       </Property>
     48                      </Property>
    5649                    </Window>
    5750                </Window>

  • code/trunk/data/gui/layouts/GraphicsMenu.layout

    r6746 r7801  
    1515            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    1616            <Property Name="VertFormatting" Value="TopAligned" />
    17             <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.2875,0},{0.75,0},{0.6375,0}}" />
     17            <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.2,0},{0.75,0},{0.6375,0}}" />
    1818            <Window Type="MenuWidgets/StaticText" Name="orxonox/Resolution" >
    1919                <Property Name="Text" Value="Resolution" />
    … …  
    2222                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    2323                <Property Name="VertFormatting" Value="TopAligned" />
    24                 <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.15,0},{0.475,0},{0.92,0}}" />
     24                <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.10,0},{0.475,0},{0.65,0}}" />
    2525                <Window Type="MenuWidgets/Listbox" Name="orxonox/ResolutionListbox" >
    2626                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    27                     <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.15,0},{0.95,0},{0.95,0}}" />
     27                    <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.2,0},{0.95,0},{0.95,0}}" />
    2828                    <Event Name="ItemSelectionChanged" Function="GraphicsMenu.GraphicsResolutionListbox_changed"/>
     29                </Window>
     30            </Window>
     31            <Window Type="MenuWidgets/StaticText" Name="orxonox/Themes" >
     32                <Property Name="Text" Value="Themes" />
     33                <Property Name="InheritsAlpha" Value="False" />
     34                <Property Name="HorzFormatting" Value="HorzCentred" />
     35                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
     36                <Property Name="VertFormatting" Value="TopAligned" />
     37                <Property Name="UnifiedAreaRect" Value="{{0.525,0},{0.10,0},{0.95,0},{0.35,0}}" />
     38                <Window Type="MenuWidgets/Listbox" Name="orxonox/ThemeDropBox" >
     39                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
     40                    <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.3,0},{0.95,0},{0.95,0}" />
     41                    <Event Name="ItemSelectionChanged" Function="GraphicsMenu.ThemeDropBox_changed"/>
    2942                </Window>
    3043            </Window>
    … …  
    3548                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    3649                <Property Name="VertFormatting" Value="TopAligned" />
    37                 <Property Name="UnifiedAreaRect" Value="{{0.525,0},{0.15,0},{0.95,0},{0.35,0}}" />
     50                <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.70,0},{0.475,0},{0.85,0}}" />
    3851                <Window Type="MenuWidgets/HorizontalScrollbar" Name="orxonox/BrightnessScrollbar" >
    3952                    <Property Name="Disabled" Value="true" />
    … …  
    5366                <Property Name="Text" Value="Fullscreen" />
    5467                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    55                 <Property Name="UnifiedAreaRect" Value="{{0.65,0},{0.4,0},{0.85,0},{0.475,0}}" />
     68                <Property Name="UnifiedAreaRect" Value="{{0.65,0},{0.35,0},{0.85,0},{0.425,0}}" />
    5669                <Event Name="CheckStateChanged" Function="GraphicsMenu.GraphicsFullscreenCheckbox_clicked"/>
    5770            </Window>
    … …  
    6174settings require
    6275a game restart.</Property>
    63                 <Property Name="TextColours" Value="FF4444FF" />
     76                <Property Name="TextColours" Value="FFFFFFFF" />
    6477                <Property Name="InheritsAlpha" Value="False" />
    6578                <Property Name="HorzFormatting" Value="HorzCentred" />
    6679                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    6780                <Property Name="VertFormatting" Value="TopAligned" />
    68                 <Property Name="UnifiedAreaRect" Value="{{0.525,0},{0.525,0},{0.95,0},{0.92,0}}" />
     81                <Property Name="UnifiedAreaRect" Value="{{0.525,0},{0.425,0},{0.95,0},{0.85,0}}" />
    6982            </Window>
    7083        </Window>

  • code/trunk/data/gui/layouts/InGameMenu.layout

    r6746 r7801  
    1010            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    1111            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.3625,0},{0.6,0},{0.4125,0}}" />
    12             <Property Name="Alpha" Value="0.7" />
     12            <Property Name="Alpha" Value="0.9" />
    1313            <Event Name="Clicked" Function="InGameMenu.button_return_clicked"/>
    1414        </Window>
    … …  
    1717            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    1818            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.4625,0},{0.6,0},{0.5125,0}}" />
    19             <Property Name="Alpha" Value="0.7" />
     19            <Property Name="Alpha" Value="0.9" />
    2020            <Event Name="Clicked" Function="InGameMenu.button_mainmenu_clicked"/>
    2121        </Window>
    … …  
    2424            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    2525            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.5625,0},{0.6,0},{0.6125,0}}" />
    26             <Property Name="Alpha" Value="0.7" />
     26            <Property Name="Alpha" Value="0.9" />
    2727            <Event Name="Clicked" Function="InGameMenu.button_settings_clicked"/>
    2828        </Window>
    … …  
    3131            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    3232            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.6625,0},{0.6,0},{0.7125,0}}" />
    33             <Property Name="Alpha" Value="0.7" />
     33            <Property Name="Alpha" Value="0.9" />
    3434            <Event Name="Clicked" Function="InGameMenu.button_quit_clicked"/>
    3535        </Window>

  • code/trunk/data/gui/layouts/MultiplayerMenu.layout

    r7732 r7801  
    3232                <Event Name="SelectStateChanged" Function="MultiplayerMenu.InternetButton_clicked"/>
    3333            </Window>
    34 
    35 
    3634        </Window>
    3735         <Window Type="MenuWidgets/Button" Name="orxonox/MultiplayerBackButton" >
Note: See TracChangeset for help on using the changeset viewer.