Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8927 for code


Ignore:
Timestamp:
Nov 9, 2011, 2:42:04 PM (13 years ago)
Author:
baermatt
Message:

Changed some level tags.

Location:
code/branches/menue
Files:
2 added
21 edited

Legend:

Unmodified
Added
Removed
  • code/branches/menue/data/gui/layouts/SingleplayerMenu.layout

    r8912 r8927  
    1515            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    1616            <Property Name="VertFormatting" Value="TopAligned" />
    17             <Property Name="UnifiedAreaRect" Value="{{0.2,0},{0.2,0},{0.8,0},{0.7,0}}" />
     17            <Property Name="UnifiedAreaRect" Value="{{0.2,0},{0.15,0},{0.8,0},{0.7,0}}" />
    1818            <Window Type="MenuWidgets/TabControl" Name="orxonox/SingleplayerTabControl" >
    1919                <Property Name="TabHeight" Value="{0,26.4388}" />
     
    2525                <Property Name="AlwaysOnTop" Value="True" />
    2626                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    27                 <Property Name="UnifiedAreaRect" Value="{{0.55,0},{0.25,0},{0.9,0},{0.7,0}}" />
     27                <Property Name="UnifiedAreaRect" Value="{{0.55,0},{0.25,0},{0.9,0},{0.675,0}}" />
    2828            </Window>
    29             <Window Type="MenuWidgets/StaticText" Name="orxonox/SingleplayerLevelDescriptionWrapper" >
     29            <Window Type="MenuWidgets/StaticText" Name="orxonox/SingleplayerLevelDescription" >
    3030                <Property Name="AlwaysOnTop" Value="True" />
    3131                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    32                 <Property Name="HorzFormatting" Value="HorzCentred" />
    33                 <Property Name="VertFormatting" Value="TopAligned" />
    34                 <Property Name="UnifiedAreaRect" Value="{{0.1,0},{0.75,0},{0.9,0},{0.85,0}}" />
    35                 <Window Type="MenuWidgets/ScrollablePane" Name="orxonox/SingleplayerLevelDescriptionPane" >
    36                     <Property Name="ContentArea" Value="l:0 t:0 r:0 b:0" />
    37                     <Property Name="HorzStepSize" Value="0.005" />
    38                     <Property Name="VertStepSize" Value="0.005" />
    39                     <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    40                     <Property Name="HorzOverlapSize" Value="0.01" />
    41                     <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{0.997,0},{0.997,0}}" />
    42                     <Property Name="VertOverlapSize" Value="0.01" />
    43                     <Property Name="HorzScrollPosition" Value="0" />
    44                     <Property Name="VertScrollPosition" Value="0" />
    45                     <Window Type="MenuWidgets/StaticText" Name="orxonox/SingleplayerLevelDescription" >
    46                         <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    47                         <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
    48                     </Window>
    49                 </Window>
     32                <Property Name="VertScrollbar" Value="True" />
     33                <Property Name="HorzScrollbar" Value="True" />
     34                <Property Name="UnifiedAreaRect" Value="{{0.1,0},{0.725,0},{0.9,0},{0.875,0}}" />
    5035            </Window>
    5136        </Window>
  • code/branches/menue/data/gui/scripts/SingleplayerMenu.lua

    r8914 r8927  
    1111   
    1212    -- create tabs with desired tab as argument (nil for all)
    13     P.createFilterTab("Tests", "test")
     13    P.createFilterTab("Missions", "mission")
    1414    P.createFilterTab("Tutorials", "tutorial")
    1515    P.createFilterTab("Showcases", "showcase")
    16     P.createFilterTab("SP?", "singleplayer")
    1716    P.createFilterTab("Presentations", "presentation")
     17    P.createFilterTab("Tests", "test")
    1818    P.createFilterTab("Show All", nil)
    19 
     19   
     20    SingleplayerSelectionChanged()
     21   
    2022    --buttons are arranged in a 1x3 matrix
    2123    P:setButton(1, 1, {
     
    6264        tabName = tabName..tag
    6365    end
    64     -- add new tab window with desired name
    65     local tabControl = winMgr:getWindow("orxonox/SingleplayerTabControl")
     66    -- create new tab window with desired name
    6667    local listbox = CEGUI.toListbox(winMgr:createWindow("MenuWidgets/Listbox", tabName))
    6768    listbox:setText(name)
    6869    listbox:setProperty("UnifiedMaxSize", "{{1,0},{1,0}}")
    69     listbox:setProperty("UnifiedAreaRect", "{{0.05,0},{0.1,0},{0.5,0},{0.7,0}}")
    70     tabControl:addChildWindow(tabName)
     70    listbox:setProperty("UnifiedAreaRect", "{{0.05,0},{0.1,0},{0.5,0},{0.675,0}}")
    7171    -- fill listbox with items
    7272    listbox:resetList()
     
    8989    table.insert(P.activeTabIndexes, tabIndexes)
    9090    listbox:subscribeEvent("ItemSelectionChanged", "SingleplayerSelectionChanged")
     91    local tabControl = winMgr:getWindow("orxonox/SingleplayerTabControl")
    9192    tabControl:subscribeEvent("TabSelectionChanged", "SingleplayerSelectionChanged")
    92     SingleplayerSelectionChanged()
     93    if listbox:getItemCount() > 0 then
     94        tabControl:addChildWindow(tabName)
     95    end
    9396end
    9497
     
    108111
    109112function SingleplayerSelectionChanged(e)
     113    local levelImage = winMgr:getWindow("orxonox/SingleplayerLevelImage")
     114    local levelDescription = winMgr:getWindow("orxonox/SingleplayerLevelDescription")
    110115    local level = P.SingleplayerGetSelectedLevel()
    111116    if level ~= nil then
    112117        local levelXMLFilename = level:getXMLFilename()
    113118        local imageName = level:getScreenshot()
    114         local levelImage = winMgr:getWindow("orxonox/SingleplayerLevelImage")
    115119        levelImage:setProperty("Image", "set:"..levelXMLFilename..imageName.." image:full_image")
    116         local levelDescription = winMgr:getWindow("orxonox/SingleplayerLevelDescription")
    117         local height = getStaticTextWindowHeight(levelDescription)
    118 --        local width = getStaticTextWindowWidth(levelDescription)
    119         levelDescription:setSize(CEGUI.UVector2(CEGUI.UDim(1.0, -P.scrollbarWidth), CEGUI.UDim(0.0, height)))
    120120        levelDescription:setText(level:getDescription())
     121    else
     122        levelImage:setProperty("Image", nil)
     123        levelDescription:setText("")
    121124    end
    122125end
     
    131134
    132135function P.SingleplayerConfigButton_clicked(e)
    133     hideMenuSheet(P.name)
     136    showMenuSheet("SingleplayerConfigMenu", true)
    134137end
    135138
     
    139142
    140143return P
    141 
  • code/branches/menue/data/levels/asteroids.oxw

    r8916 r8927  
    11<LevelInfo
    22 name = "Asteroids Race"
    3  description = "testmap for gametype asteroid race"
     3 description = "Testmap for gametype asteroid race"
     4 tags = "test"
    45 screenshot = "asteroids.png"
    56/>
  • code/branches/menue/data/levels/docking.oxw

    r8916 r8927  
    22 name = "Transporter"
    33 description = "Level with a Transporter. Demonstrates the docking system."
    4  tags = ""
     4 tags = "showcase"
    55 screenshot = "transporter.png"
    66/>
  • code/branches/menue/data/levels/dynamicMatch.oxw

    r8916 r8927  
    11<LevelInfo
    22 name = "Dynamic Match"
    3  description = "In progress -level for dynamicmatch"
     3 description = "In progress - Level for dynamicmatch"
     4 tags = "test"
    45 screenshot = "dynamicMatch.png"
    56/>
  • code/branches/menue/data/levels/fightInOurBack.oxw

    r8916 r8927  
    22  name = "Fight in our Back"
    33  description = "Our fleet is far ahead of us. We need to get rid of all the enemies in its back, because we do not want our enemies to attack from everywhere. So let us clear this Sector!"
    4   tags = ""
     4  tags = "mission"
    55  screenshot = "fightinourback.png"
    66/>
  • code/branches/menue/data/levels/lastManStanding.oxw

    r8916 r8927  
    22 name = "Last Man Standing"
    33 description = "Be the sole survivor."
    4  tags = ""
     4 tags = "mission"
    55 screenshot = "lastmanstanding.png"
    66/>
  • code/branches/menue/data/levels/lastTeamStanding.oxw

    r8916 r8927  
    22 name = "Last Team Standing"
    33 description = "Survive as a team."
    4  tags = "singleplayer"
     4 tags = "mission"
    55 screenshot = "lastteamstanding.png"
    66/>
  • code/branches/menue/data/levels/lastTeamStandingII.oxw

    r8916 r8927  
    22 name = "On the fly"
    33 description = "Survive as a team."
    4  tags = ""
     4 tags = "mission"
    55 screenshot = "onthefly.png"
    66/>
  • code/branches/menue/data/levels/pong.oxw

    r8916 r8927  
    22 name = "Pong"
    33 description = "Pong in space!"
    4  tags = ""
     4 tags = "showcase"
    55 screenshot = "pong.png"
    66/>
  • code/branches/menue/data/levels/portals.oxw

    r8916 r8927  
    33 name = "Portals"
    44 description = "Level for testing portals"
    5  tags = "tutorial"
     5 tags = "test"
    66 screenshot = "portals.png"
    77/>
  • code/branches/menue/data/levels/presentationFS11.oxw

    r8916 r8927  
    22 name = "Presentation FS11"
    33 description = "Presentation level spring semester '11"
    4  tags = "test"
     4 tags = "presentation"
    55 screenshot = "presentationfs11.png"
    66/>
  • code/branches/menue/data/levels/princessAeryn.oxw

    r8916 r8927  
    22 name = "The Tale of Princess Aeryn"
    33 description = "The Tale of the elusive but beautiful Princess Aeryn"
    4  tags = ""
     4 tags = "mission"
    55 screenshot = "thetaleofprincessaeryn.png"
    66/>
  • code/branches/menue/data/levels/screenshot.oxw

    r8916 r8927  
    22 name = "Screenshot"
    33 description = "Level to make awesome screenshots in."
    4  tags = "test"
     4 tags = "test, showcase"
    55 screenshot = "screenshot.png"
    66/>
  • code/branches/menue/data/levels/sound.oxw

    r8916 r8927  
    22 name = "Sound showcase"
    33 description = "Level to test and showcase sound."
    4  tags = "test"
     4 tags = "test, showcase"
    55 screenshot = "soundshowcase.png"
    66/>
  • code/branches/menue/data/levels/teamBaseMatch.oxw

    r8916 r8927  
    22 name = "Teambase Match"
    33 description = "Fight for the bases."
    4  tags = ""
     4 tags = "mission"
    55 screenshot = "teambasematch.png"
    66/>
  • code/branches/menue/data/levels/teamDeathMatch.oxw

    r8916 r8927  
    22 name = "Team Deathmatch"
    33 description = "Fight against each other in teams."
    4  tags = ""
     4 tags = "mission"
    55 screenshot = "teamdeathmatch.png"
    66/>
  • code/branches/menue/data/levels/tetris.oxw

    r8916 r8927  
    22 name = "Tetris"
    33 description = "Tetris in space!"
    4  tags = ""
     4 tags = "showcase"
    55 screenshot = "tetris.png"
    66/>
  • code/branches/menue/data/levels/theTimeMachine.oxw

    r8916 r8927  
    22 name = "The Time Machine"
    33 description = "A simple level. The only goal is to defeat as much enemies as you can."
    4  tags = "singleplayer"
     4 tags = "mission"
    55 screenshot = "thetimemachine.png"
    66/>
  • code/branches/menue/data/levels/underAttack.oxw

    r8916 r8927  
    22 name = "UnderAttack testing"
    33 description = "A simple testlevel"
     4 tags = "test"
    45 screenshot = "underattack.png"
    56/>
  • code/branches/menue/src/orxonox/LevelInfo.cc

    r8912 r8927  
    8787        {
    8888            LevelInfoItem::possibleTags_s.insert("test");
    89             LevelInfoItem::possibleTags_s.insert("singleplayer");
    90             LevelInfoItem::possibleTags_s.insert("multiplayer");
    9189            LevelInfoItem::possibleTags_s.insert("showcase");
    9290            LevelInfoItem::possibleTags_s.insert("tutorial");
    9391            LevelInfoItem::possibleTags_s.insert("presentation");
     92            LevelInfoItem::possibleTags_s.insert("mission");
    9493        }
    9594    }
Note: See TracChangeset for help on using the changeset viewer.