[Orxonox-commit 4256] r8927 - in code/branches/menue: data/gui/layouts data/gui/scripts data/levels src/orxonox

baermatt at orxonox.net baermatt at orxonox.net
Wed Nov 9 14:42:05 CET 2011


Author: baermatt
Date: 2011-11-09 14:42:04 +0100 (Wed, 09 Nov 2011)
New Revision: 8927

Added:
   code/branches/menue/data/gui/layouts/SingleplayerConfigMenu.layout
   code/branches/menue/data/gui/scripts/SingleplayerConfigMenu.lua
Modified:
   code/branches/menue/data/gui/layouts/SingleplayerMenu.layout
   code/branches/menue/data/gui/scripts/SingleplayerMenu.lua
   code/branches/menue/data/levels/asteroids.oxw
   code/branches/menue/data/levels/docking.oxw
   code/branches/menue/data/levels/dynamicMatch.oxw
   code/branches/menue/data/levels/fightInOurBack.oxw
   code/branches/menue/data/levels/lastManStanding.oxw
   code/branches/menue/data/levels/lastTeamStanding.oxw
   code/branches/menue/data/levels/lastTeamStandingII.oxw
   code/branches/menue/data/levels/pong.oxw
   code/branches/menue/data/levels/portals.oxw
   code/branches/menue/data/levels/presentationFS11.oxw
   code/branches/menue/data/levels/princessAeryn.oxw
   code/branches/menue/data/levels/screenshot.oxw
   code/branches/menue/data/levels/sound.oxw
   code/branches/menue/data/levels/teamBaseMatch.oxw
   code/branches/menue/data/levels/teamDeathMatch.oxw
   code/branches/menue/data/levels/tetris.oxw
   code/branches/menue/data/levels/theTimeMachine.oxw
   code/branches/menue/data/levels/underAttack.oxw
   code/branches/menue/src/orxonox/LevelInfo.cc
Log:
Changed some level tags.

Added: code/branches/menue/data/gui/layouts/SingleplayerConfigMenu.layout
===================================================================
--- code/branches/menue/data/gui/layouts/SingleplayerConfigMenu.layout	                        (rev 0)
+++ code/branches/menue/data/gui/layouts/SingleplayerConfigMenu.layout	2011-11-09 13:42:04 UTC (rev 8927)
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<GUILayout >
+    <Window Type="MenuWidgets/StaticImage" Name="orxonox/SingleplayerConfigMenu/Background" >
+        <Property Name="FrameEnabled" Value="False" />
+        <Property Name="InheritsAlpha" Value="False" />
+        <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+        <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
+        <Property Name="BackgroundEnabled" Value="False" />
+        <Window Type="MenuWidgets/StaticText" Name="orxonox/SingleplayerConfigMenu/ConfigWindow" >
+            <Property Name="Text" Value="Miscellaneous" />
+            <Property Name="Alpha" Value="0.8" />
+            <Property Name="InheritsAlpha" Value="False" />
+            <Property Name="HorzFormatting" Value="HorzCentred" />
+            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+            <Property Name="VertFormatting" Value="TopAligned" />
+            <Property Name="UnifiedAreaRect" Value="{{0.15,0},{0.2125,0},{0.85,0},{0.6375,0}}" />
+            <Window Type="MenuWidgets/StaticText" Name="orxonox/SingleplayerConfigMenu/Wrapper" >
+                <Property Name="TextColours" Value="FF4444FF" />
+                <Property Name="InheritsAlpha" Value="False" />
+                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+                <Property Name="HorzFormatting" Value="HorzCentred" />
+                <Property Name="VertFormatting" Value="TopAligned" />
+                <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.15,0},{0.95,0},{0.92,0}}" />
+                <Window Type="MenuWidgets/ScrollablePane" Name="orxonox/SingleplayerConfigMenu/MiscConfigPane" >
+                    <Property Name="ContentArea" Value="l:0 t:0 r:0 b:0" />
+                    <Property Name="HorzStepSize" Value="0.005" />
+                    <Property Name="VertStepSize" Value="0.005" />
+                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+                    <Property Name="HorzOverlapSize" Value="0.01" />
+                    <Property Name="UnifiedAreaRect" Value="{{0.005,0},{0.01,0},{0.995,0},{0.99,0}}" />
+                    <Property Name="VertOverlapSize" Value="0.01" />
+                    <Property Name="HorzScrollPosition" Value="0" />
+                    <Property Name="VertScrollPosition" Value="0" />
+                </Window>
+            </Window>
+        </Window>
+        <Window Type="MenuWidgets/Button" Name="orxonox/SingleplayerConfigMenu/CancelButton" >
+            <Property Name="Text" Value="Cancel" />
+            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+            <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.725,0},{0.4,0},{0.775,0}}" />
+            <Event Name="Clicked" Function="SingleplayerConfigMenu.SingleplayerConfigCancelButton_clicked"/>
+        </Window>
+        <Window Type="MenuWidgets/Button" Name="orxonox/SingleplayerConfigMenu/OKButton" >
+            <Property Name="Text" Value="OK" />
+            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+            <Property Name="UnifiedAreaRect" Value="{{0.6,0},{0.725,0},{0.75,0},{0.775,0}}" />
+            <Event Name="Clicked" Function="SingleplayerConfigMenu.SingleplayerConfigOKButton_clicked"/>
+        </Window>
+    </Window>
+</GUILayout>


Property changes on: code/branches/menue/data/gui/layouts/SingleplayerConfigMenu.layout
___________________________________________________________________
Added: svn:executable
   + *

Modified: code/branches/menue/data/gui/layouts/SingleplayerMenu.layout
===================================================================
--- code/branches/menue/data/gui/layouts/SingleplayerMenu.layout	2011-11-08 21:56:43 UTC (rev 8926)
+++ code/branches/menue/data/gui/layouts/SingleplayerMenu.layout	2011-11-09 13:42:04 UTC (rev 8927)
@@ -14,7 +14,7 @@
             <Property Name="HorzFormatting" Value="HorzCentred" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
             <Property Name="VertFormatting" Value="TopAligned" />
-            <Property Name="UnifiedAreaRect" Value="{{0.2,0},{0.2,0},{0.8,0},{0.7,0}}" />
+            <Property Name="UnifiedAreaRect" Value="{{0.2,0},{0.15,0},{0.8,0},{0.7,0}}" />
             <Window Type="MenuWidgets/TabControl" Name="orxonox/SingleplayerTabControl" >
                 <Property Name="TabHeight" Value="{0,26.4388}" />
                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -24,29 +24,14 @@
             <Window Type="MenuWidgets/StaticImage" Name="orxonox/SingleplayerLevelImage" >
                 <Property Name="AlwaysOnTop" Value="True" />
                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.55,0},{0.25,0},{0.9,0},{0.7,0}}" />
+                <Property Name="UnifiedAreaRect" Value="{{0.55,0},{0.25,0},{0.9,0},{0.675,0}}" />
             </Window>
-            <Window Type="MenuWidgets/StaticText" Name="orxonox/SingleplayerLevelDescriptionWrapper" >
+            <Window Type="MenuWidgets/StaticText" Name="orxonox/SingleplayerLevelDescription" >
                 <Property Name="AlwaysOnTop" Value="True" />
                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="HorzFormatting" Value="HorzCentred" />
-                <Property Name="VertFormatting" Value="TopAligned" />
-                <Property Name="UnifiedAreaRect" Value="{{0.1,0},{0.75,0},{0.9,0},{0.85,0}}" />
-                <Window Type="MenuWidgets/ScrollablePane" Name="orxonox/SingleplayerLevelDescriptionPane" >
-                    <Property Name="ContentArea" Value="l:0 t:0 r:0 b:0" />
-                    <Property Name="HorzStepSize" Value="0.005" />
-                    <Property Name="VertStepSize" Value="0.005" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="HorzOverlapSize" Value="0.01" />
-                    <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{0.997,0},{0.997,0}}" />
-                    <Property Name="VertOverlapSize" Value="0.01" />
-                    <Property Name="HorzScrollPosition" Value="0" />
-                    <Property Name="VertScrollPosition" Value="0" />
-                    <Window Type="MenuWidgets/StaticText" Name="orxonox/SingleplayerLevelDescription" >
-                        <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                        <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
-                    </Window>
-                </Window>
+                <Property Name="VertScrollbar" Value="True" />
+                <Property Name="HorzScrollbar" Value="True" />
+                <Property Name="UnifiedAreaRect" Value="{{0.1,0},{0.725,0},{0.9,0},{0.875,0}}" />
             </Window>
         </Window>
         <Window Type="MenuWidgets/Button" Name="orxonox/SingleplayerStartButton" >

Added: code/branches/menue/data/gui/scripts/SingleplayerConfigMenu.lua
===================================================================
--- code/branches/menue/data/gui/scripts/SingleplayerConfigMenu.lua	                        (rev 0)
+++ code/branches/menue/data/gui/scripts/SingleplayerConfigMenu.lua	2011-11-09 13:42:04 UTC (rev 8927)
@@ -0,0 +1,5 @@
+-- SingleplayerMenu.lua
+
+local P = createMenuSheet("SingleplayerConfigMenu")
+
+return P


Property changes on: code/branches/menue/data/gui/scripts/SingleplayerConfigMenu.lua
___________________________________________________________________
Added: svn:executable
   + *

Modified: code/branches/menue/data/gui/scripts/SingleplayerMenu.lua
===================================================================
--- code/branches/menue/data/gui/scripts/SingleplayerMenu.lua	2011-11-08 21:56:43 UTC (rev 8926)
+++ code/branches/menue/data/gui/scripts/SingleplayerMenu.lua	2011-11-09 13:42:04 UTC (rev 8927)
@@ -10,13 +10,15 @@
     P.createLevelList()
     
     -- create tabs with desired tab as argument (nil for all)
-    P.createFilterTab("Tests", "test")
+    P.createFilterTab("Missions", "mission")
     P.createFilterTab("Tutorials", "tutorial")
     P.createFilterTab("Showcases", "showcase")
-    P.createFilterTab("SP?", "singleplayer")
     P.createFilterTab("Presentations", "presentation")
+    P.createFilterTab("Tests", "test")
     P.createFilterTab("Show All", nil)
-
+    
+    SingleplayerSelectionChanged()
+    
     --buttons are arranged in a 1x3 matrix
     P:setButton(1, 1, {
             ["button"] = winMgr:getWindow("orxonox/SingleplayerStartButton"),
@@ -61,13 +63,11 @@
     if tag ~= nil then
         tabName = tabName..tag
     end
-    -- add new tab window with desired name
-    local tabControl = winMgr:getWindow("orxonox/SingleplayerTabControl")
+    -- create new tab window with desired name
     local listbox = CEGUI.toListbox(winMgr:createWindow("MenuWidgets/Listbox", tabName))
     listbox:setText(name)
     listbox:setProperty("UnifiedMaxSize", "{{1,0},{1,0}}")
-    listbox:setProperty("UnifiedAreaRect", "{{0.05,0},{0.1,0},{0.5,0},{0.7,0}}")
-    tabControl:addChildWindow(tabName)
+    listbox:setProperty("UnifiedAreaRect", "{{0.05,0},{0.1,0},{0.5,0},{0.675,0}}")
     -- fill listbox with items
     listbox:resetList()
     orxonox.GUIManager:setItemTooltipsEnabledHelper(listbox, true)
@@ -88,8 +88,11 @@
     end
     table.insert(P.activeTabIndexes, tabIndexes)
     listbox:subscribeEvent("ItemSelectionChanged", "SingleplayerSelectionChanged")
+    local tabControl = winMgr:getWindow("orxonox/SingleplayerTabControl")
     tabControl:subscribeEvent("TabSelectionChanged", "SingleplayerSelectionChanged")
-    SingleplayerSelectionChanged()
+    if listbox:getItemCount() > 0 then
+        tabControl:addChildWindow(tabName)
+    end
 end
 
 function P.SingleplayerGetSelectedLevel()
@@ -107,17 +110,17 @@
 end
 
 function SingleplayerSelectionChanged(e)
+    local levelImage = winMgr:getWindow("orxonox/SingleplayerLevelImage")
+    local levelDescription = winMgr:getWindow("orxonox/SingleplayerLevelDescription")
     local level = P.SingleplayerGetSelectedLevel()
     if level ~= nil then
         local levelXMLFilename = level:getXMLFilename()
         local imageName = level:getScreenshot()
-        local levelImage = winMgr:getWindow("orxonox/SingleplayerLevelImage")
         levelImage:setProperty("Image", "set:"..levelXMLFilename..imageName.." image:full_image")
-        local levelDescription = winMgr:getWindow("orxonox/SingleplayerLevelDescription")
-        local height = getStaticTextWindowHeight(levelDescription)
---        local width = getStaticTextWindowWidth(levelDescription)
-        levelDescription:setSize(CEGUI.UVector2(CEGUI.UDim(1.0, -P.scrollbarWidth), CEGUI.UDim(0.0, height)))
         levelDescription:setText(level:getDescription())
+    else
+        levelImage:setProperty("Image", nil)
+        levelDescription:setText("")
     end
 end
 
@@ -130,7 +133,7 @@
 end
 
 function P.SingleplayerConfigButton_clicked(e)
-    hideMenuSheet(P.name)
+    showMenuSheet("SingleplayerConfigMenu", true)
 end
 
 function P.SingleplayerBackButton_clicked(e)
@@ -138,4 +141,3 @@
 end
 
 return P
-

Modified: code/branches/menue/data/levels/asteroids.oxw
===================================================================
--- code/branches/menue/data/levels/asteroids.oxw	2011-11-08 21:56:43 UTC (rev 8926)
+++ code/branches/menue/data/levels/asteroids.oxw	2011-11-09 13:42:04 UTC (rev 8927)
@@ -1,6 +1,7 @@
 <LevelInfo
  name = "Asteroids Race"
- description = "testmap for gametype asteroid race"
+ description = "Testmap for gametype asteroid race"
+ tags = "test"
  screenshot = "asteroids.png"
 />
 

Modified: code/branches/menue/data/levels/docking.oxw
===================================================================
--- code/branches/menue/data/levels/docking.oxw	2011-11-08 21:56:43 UTC (rev 8926)
+++ code/branches/menue/data/levels/docking.oxw	2011-11-09 13:42:04 UTC (rev 8927)
@@ -1,7 +1,7 @@
 <LevelInfo
  name = "Transporter"
  description = "Level with a Transporter. Demonstrates the docking system."
- tags = ""
+ tags = "showcase"
  screenshot = "transporter.png"
 />
 

Modified: code/branches/menue/data/levels/dynamicMatch.oxw
===================================================================
--- code/branches/menue/data/levels/dynamicMatch.oxw	2011-11-08 21:56:43 UTC (rev 8926)
+++ code/branches/menue/data/levels/dynamicMatch.oxw	2011-11-09 13:42:04 UTC (rev 8927)
@@ -1,6 +1,7 @@
 <LevelInfo
  name = "Dynamic Match"
- description = "In progress -level for dynamicmatch"
+ description = "In progress - Level for dynamicmatch"
+ tags = "test"
  screenshot = "dynamicMatch.png"
 />
 

Modified: code/branches/menue/data/levels/fightInOurBack.oxw
===================================================================
--- code/branches/menue/data/levels/fightInOurBack.oxw	2011-11-08 21:56:43 UTC (rev 8926)
+++ code/branches/menue/data/levels/fightInOurBack.oxw	2011-11-09 13:42:04 UTC (rev 8927)
@@ -1,7 +1,7 @@
 <LevelInfo
   name = "Fight in our Back"
   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!"
-  tags = ""
+  tags = "mission"
   screenshot = "fightinourback.png"
 />
 

Modified: code/branches/menue/data/levels/lastManStanding.oxw
===================================================================
--- code/branches/menue/data/levels/lastManStanding.oxw	2011-11-08 21:56:43 UTC (rev 8926)
+++ code/branches/menue/data/levels/lastManStanding.oxw	2011-11-09 13:42:04 UTC (rev 8927)
@@ -1,7 +1,7 @@
 <LevelInfo
  name = "Last Man Standing"
  description = "Be the sole survivor."
- tags = ""
+ tags = "mission"
  screenshot = "lastmanstanding.png"
 />
 

Modified: code/branches/menue/data/levels/lastTeamStanding.oxw
===================================================================
--- code/branches/menue/data/levels/lastTeamStanding.oxw	2011-11-08 21:56:43 UTC (rev 8926)
+++ code/branches/menue/data/levels/lastTeamStanding.oxw	2011-11-09 13:42:04 UTC (rev 8927)
@@ -1,7 +1,7 @@
 <LevelInfo
  name = "Last Team Standing"
  description = "Survive as a team."
- tags = "singleplayer"
+ tags = "mission"
  screenshot = "lastteamstanding.png"
 />
 <?lua

Modified: code/branches/menue/data/levels/lastTeamStandingII.oxw
===================================================================
--- code/branches/menue/data/levels/lastTeamStandingII.oxw	2011-11-08 21:56:43 UTC (rev 8926)
+++ code/branches/menue/data/levels/lastTeamStandingII.oxw	2011-11-09 13:42:04 UTC (rev 8927)
@@ -1,7 +1,7 @@
 <LevelInfo
  name = "On the fly"
  description = "Survive as a team."
- tags = ""
+ tags = "mission"
  screenshot = "onthefly.png"
 />
 <?lua

Modified: code/branches/menue/data/levels/pong.oxw
===================================================================
--- code/branches/menue/data/levels/pong.oxw	2011-11-08 21:56:43 UTC (rev 8926)
+++ code/branches/menue/data/levels/pong.oxw	2011-11-09 13:42:04 UTC (rev 8927)
@@ -1,7 +1,7 @@
 <LevelInfo
  name = "Pong"
  description = "Pong in space!"
- tags = ""
+ tags = "showcase"
  screenshot = "pong.png"
 />
 

Modified: code/branches/menue/data/levels/portals.oxw
===================================================================
--- code/branches/menue/data/levels/portals.oxw	2011-11-08 21:56:43 UTC (rev 8926)
+++ code/branches/menue/data/levels/portals.oxw	2011-11-09 13:42:04 UTC (rev 8927)
@@ -2,7 +2,7 @@
 <LevelInfo
  name = "Portals"
  description = "Level for testing portals"
- tags = "tutorial"
+ tags = "test"
  screenshot = "portals.png"
 />
 

Modified: code/branches/menue/data/levels/presentationFS11.oxw
===================================================================
--- code/branches/menue/data/levels/presentationFS11.oxw	2011-11-08 21:56:43 UTC (rev 8926)
+++ code/branches/menue/data/levels/presentationFS11.oxw	2011-11-09 13:42:04 UTC (rev 8927)
@@ -1,7 +1,7 @@
 <LevelInfo
  name = "Presentation FS11"
  description = "Presentation level spring semester '11"
- tags = "test"
+ tags = "presentation"
  screenshot = "presentationfs11.png"
 />
 

Modified: code/branches/menue/data/levels/princessAeryn.oxw
===================================================================
--- code/branches/menue/data/levels/princessAeryn.oxw	2011-11-08 21:56:43 UTC (rev 8926)
+++ code/branches/menue/data/levels/princessAeryn.oxw	2011-11-09 13:42:04 UTC (rev 8927)
@@ -1,7 +1,7 @@
 <LevelInfo
  name = "The Tale of Princess Aeryn"
  description = "The Tale of the elusive but beautiful Princess Aeryn"
- tags = ""
+ tags = "mission"
  screenshot = "thetaleofprincessaeryn.png"
 />
 

Modified: code/branches/menue/data/levels/screenshot.oxw
===================================================================
--- code/branches/menue/data/levels/screenshot.oxw	2011-11-08 21:56:43 UTC (rev 8926)
+++ code/branches/menue/data/levels/screenshot.oxw	2011-11-09 13:42:04 UTC (rev 8927)
@@ -1,7 +1,7 @@
 <LevelInfo
  name = "Screenshot"
  description = "Level to make awesome screenshots in."
- tags = "test"
+ tags = "test, showcase"
  screenshot = "screenshot.png"
 />
 

Modified: code/branches/menue/data/levels/sound.oxw
===================================================================
--- code/branches/menue/data/levels/sound.oxw	2011-11-08 21:56:43 UTC (rev 8926)
+++ code/branches/menue/data/levels/sound.oxw	2011-11-09 13:42:04 UTC (rev 8927)
@@ -1,7 +1,7 @@
 <LevelInfo
  name = "Sound showcase"
  description = "Level to test and showcase sound."
- tags = "test"
+ tags = "test, showcase"
  screenshot = "soundshowcase.png"
 />
 

Modified: code/branches/menue/data/levels/teamBaseMatch.oxw
===================================================================
--- code/branches/menue/data/levels/teamBaseMatch.oxw	2011-11-08 21:56:43 UTC (rev 8926)
+++ code/branches/menue/data/levels/teamBaseMatch.oxw	2011-11-09 13:42:04 UTC (rev 8927)
@@ -1,7 +1,7 @@
 <LevelInfo
  name = "Teambase Match"
  description = "Fight for the bases."
- tags = ""
+ tags = "mission"
  screenshot = "teambasematch.png"
 />
 

Modified: code/branches/menue/data/levels/teamDeathMatch.oxw
===================================================================
--- code/branches/menue/data/levels/teamDeathMatch.oxw	2011-11-08 21:56:43 UTC (rev 8926)
+++ code/branches/menue/data/levels/teamDeathMatch.oxw	2011-11-09 13:42:04 UTC (rev 8927)
@@ -1,7 +1,7 @@
 <LevelInfo
  name = "Team Deathmatch"
  description = "Fight against each other in teams."
- tags = ""
+ tags = "mission"
  screenshot = "teamdeathmatch.png"
 />
 

Modified: code/branches/menue/data/levels/tetris.oxw
===================================================================
--- code/branches/menue/data/levels/tetris.oxw	2011-11-08 21:56:43 UTC (rev 8926)
+++ code/branches/menue/data/levels/tetris.oxw	2011-11-09 13:42:04 UTC (rev 8927)
@@ -1,7 +1,7 @@
 <LevelInfo
  name = "Tetris"
  description = "Tetris in space!"
- tags = ""
+ tags = "showcase"
  screenshot = "tetris.png"
 />
 

Modified: code/branches/menue/data/levels/theTimeMachine.oxw
===================================================================
--- code/branches/menue/data/levels/theTimeMachine.oxw	2011-11-08 21:56:43 UTC (rev 8926)
+++ code/branches/menue/data/levels/theTimeMachine.oxw	2011-11-09 13:42:04 UTC (rev 8927)
@@ -1,7 +1,7 @@
 <LevelInfo
  name = "The Time Machine"
  description = "A simple level. The only goal is to defeat as much enemies as you can."
- tags = "singleplayer"
+ tags = "mission"
  screenshot = "thetimemachine.png"
 />
 

Modified: code/branches/menue/data/levels/underAttack.oxw
===================================================================
--- code/branches/menue/data/levels/underAttack.oxw	2011-11-08 21:56:43 UTC (rev 8926)
+++ code/branches/menue/data/levels/underAttack.oxw	2011-11-09 13:42:04 UTC (rev 8927)
@@ -1,6 +1,7 @@
 <LevelInfo
  name = "UnderAttack testing"
  description = "A simple testlevel"
+ tags = "test"
  screenshot = "underattack.png"
 />
 

Modified: code/branches/menue/src/orxonox/LevelInfo.cc
===================================================================
--- code/branches/menue/src/orxonox/LevelInfo.cc	2011-11-08 21:56:43 UTC (rev 8926)
+++ code/branches/menue/src/orxonox/LevelInfo.cc	2011-11-09 13:42:04 UTC (rev 8927)
@@ -86,11 +86,10 @@
         if(!LevelInfoItem::initialized_s)
         {
             LevelInfoItem::possibleTags_s.insert("test");
-            LevelInfoItem::possibleTags_s.insert("singleplayer");
-            LevelInfoItem::possibleTags_s.insert("multiplayer");
             LevelInfoItem::possibleTags_s.insert("showcase");
             LevelInfoItem::possibleTags_s.insert("tutorial");
             LevelInfoItem::possibleTags_s.insert("presentation");
+            LevelInfoItem::possibleTags_s.insert("mission");
         }
     }
 




More information about the Orxonox-commit mailing list