Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7647 for code/branches


Ignore:
Timestamp:
Nov 13, 2010, 11:30:06 PM (14 years ago)
Author:
dafrick
Message:

Some final adjustments, before merge.

Location:
code/branches/releasetodo/data
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • code/branches/releasetodo/data/gui/layouts/MultiplayerMenu.layout

    r7163 r7647  
    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.2875,0},{0.75,0},{0.7,0}}" />
    1818            <Window Type="MenuWidgets/Listbox" Name="orxonox/MultiplayerListbox" >
    1919                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
     
    2323                <Property Name="Text" Value="Join" />
    2424                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    25                 <Property Name="UnifiedAreaRect" Value="{{0.1,0},{0.85,0},{0.3,0},{0.95,0}}" />
     25                <Property Name="UnifiedAreaRect" Value="{{0.1,0},{0.81,0},{0.3,0},{0.89,0}}" />
    2626                <Event Name="SelectStateChanged" Function="MultiplayerMenu.MultiplayerJoinButton_clicked"/>
    2727            </Window>
     
    2929                <Property Name="Text" Value="Host" />
    3030                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    31                 <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.85,0},{0.6,0},{0.95,0}}" />
     31                <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.81,0},{0.6,0},{0.89,0}}" />
    3232                <Event Name="SelectStateChanged" Function="MultiplayerMenu.MultiplayerHostButton_clicked"/>
    3333            </Window>
     
    3535                <Property Name="Text" Value="Dedicated" />
    3636                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    37                 <Property Name="UnifiedAreaRect" Value="{{0.7,0},{0.85,0},{0.9,0},{0.95,0}}" />
     37                <Property Name="UnifiedAreaRect" Value="{{0.7,0},{0.81,0},{0.9,0},{0.89,0}}" />
    3838                <Event Name="SelectStateChanged" Function="MultiplayerMenu.MultiplayerDedicatedButton_clicked"/>
     39            </Window>
     40            <Window Type="MenuWidgets/Checkbox" Name="orxonox/MultiplayerShowAllCheckbox" >
     41                <Property Name="Text" Value="show all" />
     42                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
     43                <Property Name="UnifiedAreaRect" Value="{{0.65,0},{0.89,0},{0.8,0},{0.99,0}}" />
     44                <Property Name="Disabled" Value="True" />
     45                <Event Name="CheckStateChanged" Function="MultiplayerMenu.MultiplayerShowAll_clicked"/>
    3946            </Window>
    4047        </Window>
     
    4249            <Property Name="Text" Value="Start" />
    4350            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    44             <Property Name="UnifiedAreaRect" Value="{{0.2875,0},{0.6625,0},{0.4875,0},{0.7125,0}}" />
     51            <Property Name="UnifiedAreaRect" Value="{{0.2875,0},{0.725,0},{0.4875,0},{0.775,0}}" />
    4552            <Event Name="Clicked" Function="MultiplayerMenu.MultiplayerStartButton_clicked"/>
    4653        </Window>
     
    4855            <Property Name="Text" Value="Back" />
    4956            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    50             <Property Name="UnifiedAreaRect" Value="{{0.5125,0},{0.6625,0},{0.7125,0},{0.7125,0}}" />
     57            <Property Name="UnifiedAreaRect" Value="{{0.5125,0},{0.725,0},{0.7125,0},{0.775,0}}" />
    5158            <Event Name="Clicked" Function="MultiplayerMenu.MultiplayerBackButton_clicked"/>
    5259        </Window>
  • code/branches/releasetodo/data/gui/scripts/MultiplayerMenu.lua

    r7627 r7647  
    1616        local button = tolua.cast(window,"CEGUI::RadioButton")
    1717        button:setSelected(true)
     18        local checkbox = winMgr:getWindow("orxonox/MultiplayerShowAllCheckbox")
     19        checkbox:setProperty("Disabled", "True")
    1820        P.showServerList()
    1921    end
     
    2224        local button = tolua.cast(window,"CEGUI::RadioButton")
    2325        button:setSelected(true)
     26        local checkbox = winMgr:getWindow("orxonox/MultiplayerShowAllCheckbox")
     27        checkbox:setProperty("Disabled", "False")
    2428        P.showLevelList()
    2529    end
     
    2832        local button = tolua.cast(window,"CEGUI::RadioButton")
    2933        button:setSelected(true)
     34        local checkbox = winMgr:getWindow("orxonox/MultiplayerShowAllCheckbox")
     35        checkbox:setProperty("Disabled", "True")
    3036        P.showLevelList()
    3137    end
     
    3440function P.MultiplayerJoinButton_clicked(e)
    3541    P.multiplayerMode = "startClient"
     42    local checkbox = winMgr:getWindow("orxonox/MultiplayerShowAllCheckbox")
     43    checkbox:setProperty("Disabled", "True")
    3644    P.showServerList()
    3745end
     
    3947function P.MultiplayerHostButton_clicked(e)
    4048    P.multiplayerMode = "startServer"
     49    local checkbox = winMgr:getWindow("orxonox/MultiplayerShowAllCheckbox")
     50    checkbox:setProperty("Disabled", "False")
    4151    P.showLevelList()
    4252end
     
    4454function P.MultiplayerDedicatedButton_clicked(e)
    4555    P.multiplayerMode = "startDedicated"
     56    local checkbox = winMgr:getWindow("orxonox/MultiplayerShowAllCheckbox")
     57    checkbox:setProperty("Disabled", "True")
    4658    P.showLevelList()
     59end
     60
     61function P.MultiplayerShowAll_clicked(e)
     62    local checkbox = tolua.cast(winMgr:getWindow("orxonox/MultiplayerShowAllCheckbox"), "CEGUI::Checkbox")
     63    local show = checkbox:isSelected()
     64    if show ~= P.showAll then
     65        P.showAll = show
     66        P.createLevelList()
     67    end
    4768end
    4869
     
    95116        index = index + 1
    96117    end
    97     --TODO: Reintroduce sorting, if needed.
     118    --TODO: Reintroduce sorting, if needed. At the moment it's sorted by filename.
    98119    --table.sort(levelList)
    99120    for k,v in pairs(P.levelList) do
     
    105126        end
    106127        P.itemList[k] = listbox:getListboxItemFromIndex(k-1)
    107         --TODO: The description as tooltip would be nice.
    108         --local lItem = P.itemList[k]
    109         --lItem:setTooltipText(v:getDescription())
    110128        orxonox.GUIManager:setTooltipTextHelper(P.itemList[k], v:getDescription())
    111129    end
  • code/branches/releasetodo/data/gui/scripts/SingleplayerMenu.lua

    r7639 r7647  
    3333        index = index + 1
    3434    end
    35     --TODO: Reintroduce sorting, if needed.
     35    --TODO: Reintroduce sorting, if needed. At the moment it's sorted by filename.
    3636    --table.sort(levelList)
    3737    for k,v in pairs(P.levelList) do
     
    4343        end
    4444        P.itemList[k] = listbox:getListboxItemFromIndex(k-1)
    45         --TODO: The description as tooltip would be nice.
    46         --local lItem = tolua.cast("CEGUI::ListboxItem", P.itemList[k])
    47         --lItem:setTooltipText(v:getDescription())
    4845        orxonox.GUIManager:setTooltipTextHelper(P.itemList[k], v:getDescription())
    4946    end
  • code/branches/releasetodo/data/levels/events.oxw

    r7629 r7647  
    22  name = "Events showcase"
    33  description = "Level to test and showcase events."
    4   tags = "test, showcase, events"
     4  tags = "test, showcase"
    55/>
    66
Note: See TracChangeset for help on using the changeset viewer.