Changeset 9373 for code/branches

Timestamp:

Sep 6, 2012, 4:40:00 PM (12 years ago)

Author:

jo

Message:

On the way to adjust multiplayermenue. Levels tagged with singleplayer should NOT be displayed in the multiplayermenue.

Location:

code/branches/release2012

Files:

• data/gui/scripts/HostMenu.lua (modified) (1 diff)
• data/levels/asteroids.oxw (modified) (1 diff)
• data/levels/missionOne.oxw (modified) (1 diff)
• data/levels/spaceRace.oxw (modified) (1 diff)
• data/levels/surfaceRace.oxw (modified) (1 diff)
• data/levels/tetris.oxw (modified) (1 diff)
• data/levels/theTimeMachine.oxw (modified) (1 diff)
• src/orxonox/LevelInfo.cc (modified) (1 diff)

code/branches/release2012/data/gui/scripts/HostMenu.lua

@@ -63 +63 @@
         level = orxonox.LevelManager:getInstance():getAvailableLevelListItem(index)
         if level ~= nil then
-            if P.showAll or not level:hasTag("test") then
+            if P.showAll or not level:hasTag("test") or not level:hasTag("singleplayer") then
                 table.insert(P.levelList, level)
             end

code/branches/release2012/data/levels/asteroids.oxw

@@ -2 +2 @@
  name = "Asteroids Race"
  description = "Reach the checkpoints and avoid asteroids."
- tags = "gametype"
+ tags = "gametype, singleplayer"
  screenshot = "asteroids.png"
 />

code/branches/release2012/data/levels/missionOne.oxw

@@ -3 +3 @@
  description = "First Guided Steps in the Orxonoxian Universe."
  screenshot = "missionOne.png"
- tags = "mission"
+ tags = "mission, singleplayer"
 />
 

code/branches/release2012/data/levels/spaceRace.oxw

@@ -2 +2 @@
  name = "Old Space Race"
  description = "Have a furious Race in Space: Reach the checkpoints as fast as possible."
- tags = "gametype"
+ tags = "gametype, singleplayer"
  screenshot = "spacerace.png"
 />

code/branches/release2012/data/levels/surfaceRace.oxw

@@ -8 +8 @@
  description = "Race on a planet's surface. Try to reach the goal in 70 Seconds."
  screenshot = "surfaceRace.png"
- tags = "gametype"
+ tags = "gametype, singleplayer"
 />
 

code/branches/release2012/data/levels/tetris.oxw

@@ -2 +2 @@
  name = "Tetris"
  description = "Tetris in space!"
- tags = "minigame"
+ tags = "minigame, singleplayer"
  screenshot = "tetris.png"
 />

code/branches/release2012/data/levels/theTimeMachine.oxw

@@ -2 +2 @@
  name = "The Time Machine"
  description = "A simple level. The only goal is to defeat as much enemies as you can."
- tags = "gametype"
+ tags = "gametype, singleplayer"
  screenshot = "thetimemachine.png"
 />

code/branches/release2012/src/orxonox/LevelInfo.cc

@@ -94 +94 @@
             LevelInfoItem::possibleTags_s.insert("minigame");
             LevelInfoItem::possibleTags_s.insert("shipselection");
+            LevelInfoItem::possibleTags_s.insert("singleplayer");
         }
     }