[Orxonox-commit 4260] r8931 - in code/branches/menue: data/gui/scripts data/levels src/orxonox
jo at orxonox.net
jo at orxonox.net
Thu Nov 10 22:52:50 CET 2011
Author: jo
Date: 2011-11-10 22:52:50 +0100 (Thu, 10 Nov 2011)
New Revision: 8931
Modified:
code/branches/menue/data/gui/scripts/SingleplayerMenu.lua
code/branches/menue/data/levels/asteroids.oxw
code/branches/menue/data/levels/dynamicMatch.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/spaceRace.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:
Adding new tags: 'gametype' and 'minigame'.
Modified: code/branches/menue/data/gui/scripts/SingleplayerMenu.lua
===================================================================
--- code/branches/menue/data/gui/scripts/SingleplayerMenu.lua 2011-11-09 15:16:24 UTC (rev 8930)
+++ code/branches/menue/data/gui/scripts/SingleplayerMenu.lua 2011-11-10 21:52:50 UTC (rev 8931)
@@ -10,8 +10,9 @@
P.createLevelList()
-- create tabs with desired tab as argument (nil for all)
+ P.createFilterTab("Gametypes", "gametype")
P.createFilterTab("Missions", "mission")
- P.createFilterTab("Tutorials", "tutorial")
+ P.createFilterTab("Minigames", "minigame")
P.createFilterTab("Showcases", "showcase")
P.createFilterTab("Presentations", "presentation")
P.createFilterTab("Tests", "test")
Modified: code/branches/menue/data/levels/asteroids.oxw
===================================================================
--- code/branches/menue/data/levels/asteroids.oxw 2011-11-09 15:16:24 UTC (rev 8930)
+++ code/branches/menue/data/levels/asteroids.oxw 2011-11-10 21:52:50 UTC (rev 8931)
@@ -1,7 +1,7 @@
<LevelInfo
name = "Asteroids Race"
- description = "Testmap for gametype asteroid race"
- tags = "test"
+ description = "Reach the checkpoints and avoid asteroids."
+ tags = "gametype"
screenshot = "asteroids.png"
/>
@@ -14,7 +14,7 @@
<Level
name = "Asteroids Race"
- description = "testmap for gametype asteroid race"
+ description = "Reach the checkpoints and avoid asteroids."
gametype = Asteroids
>
<templates>
Modified: code/branches/menue/data/levels/dynamicMatch.oxw
===================================================================
--- code/branches/menue/data/levels/dynamicMatch.oxw 2011-11-09 15:16:24 UTC (rev 8930)
+++ code/branches/menue/data/levels/dynamicMatch.oxw 2011-11-10 21:52:50 UTC (rev 8931)
@@ -1,7 +1,7 @@
<LevelInfo
name = "Dynamic Match"
- description = "In progress - Level for dynamicmatch"
- tags = "test"
+ description = "Dynamicmatch: Take care of what you're shooting at."
+ tags = "gametype"
screenshot = "dynamicMatch.png"
/>
Modified: code/branches/menue/data/levels/lastManStanding.oxw
===================================================================
--- code/branches/menue/data/levels/lastManStanding.oxw 2011-11-09 15:16:24 UTC (rev 8930)
+++ code/branches/menue/data/levels/lastManStanding.oxw 2011-11-10 21:52:50 UTC (rev 8931)
@@ -1,7 +1,7 @@
<LevelInfo
name = "Last Man Standing"
description = "Be the sole survivor."
- tags = "mission"
+ tags = "gametype"
screenshot = "lastmanstanding.png"
/>
Modified: code/branches/menue/data/levels/lastTeamStanding.oxw
===================================================================
--- code/branches/menue/data/levels/lastTeamStanding.oxw 2011-11-09 15:16:24 UTC (rev 8930)
+++ code/branches/menue/data/levels/lastTeamStanding.oxw 2011-11-10 21:52:50 UTC (rev 8931)
@@ -1,7 +1,7 @@
<LevelInfo
name = "Last Team Standing"
description = "Survive as a team."
- tags = "mission"
+ tags = "gametype"
screenshot = "lastteamstanding.png"
/>
<?lua
Modified: code/branches/menue/data/levels/lastTeamStandingII.oxw
===================================================================
--- code/branches/menue/data/levels/lastTeamStandingII.oxw 2011-11-09 15:16:24 UTC (rev 8930)
+++ code/branches/menue/data/levels/lastTeamStandingII.oxw 2011-11-10 21:52:50 UTC (rev 8931)
@@ -1,7 +1,7 @@
<LevelInfo
name = "On the fly"
description = "Survive as a team."
- tags = "mission"
+ tags = "gametype"
screenshot = "onthefly.png"
/>
<?lua
Modified: code/branches/menue/data/levels/pong.oxw
===================================================================
--- code/branches/menue/data/levels/pong.oxw 2011-11-09 15:16:24 UTC (rev 8930)
+++ code/branches/menue/data/levels/pong.oxw 2011-11-10 21:52:50 UTC (rev 8931)
@@ -1,7 +1,7 @@
<LevelInfo
name = "Pong"
description = "Pong in space!"
- tags = "showcase"
+ tags = "minigame"
screenshot = "pong.png"
/>
@@ -49,8 +49,8 @@
<Level
- name = "Presentation"
- description = "A simple testlevel"
+ name = "Pong"
+ description = "Pong in space!"
gametype = Pong
>
<templates>
Modified: code/branches/menue/data/levels/spaceRace.oxw
===================================================================
--- code/branches/menue/data/levels/spaceRace.oxw 2011-11-09 15:16:24 UTC (rev 8930)
+++ code/branches/menue/data/levels/spaceRace.oxw 2011-11-10 21:52:50 UTC (rev 8931)
@@ -1,7 +1,7 @@
<LevelInfo
name = "Space Race"
- description = "Test level for the gametype Space Race."
- tags = "test"
+ description = "Have a furious Race in Space: Reach the checkpoints as fast as possible."
+ tags = "gametype"
screenshot = "spacerace.png"
/>
Modified: code/branches/menue/data/levels/teamBaseMatch.oxw
===================================================================
--- code/branches/menue/data/levels/teamBaseMatch.oxw 2011-11-09 15:16:24 UTC (rev 8930)
+++ code/branches/menue/data/levels/teamBaseMatch.oxw 2011-11-10 21:52:50 UTC (rev 8931)
@@ -1,7 +1,7 @@
<LevelInfo
name = "Teambase Match"
- description = "Fight for the bases."
- tags = "mission"
+ description = "Fight for the bases. Capture bases by shooting at them and defend them against attackers."
+ tags = "gametype"
screenshot = "teambasematch.png"
/>
@@ -15,8 +15,8 @@
?>
<Level
- name = "Presentation"
- description = "A simple testlevel"
+ name = "Teambase Match"
+ description = "Fight for the bases."
gametype = TeamBaseMatch
>
Modified: code/branches/menue/data/levels/teamDeathMatch.oxw
===================================================================
--- code/branches/menue/data/levels/teamDeathMatch.oxw 2011-11-09 15:16:24 UTC (rev 8930)
+++ code/branches/menue/data/levels/teamDeathMatch.oxw 2011-11-10 21:52:50 UTC (rev 8931)
@@ -1,7 +1,7 @@
<LevelInfo
name = "Team Deathmatch"
description = "Fight against each other in teams."
- tags = "mission"
+ tags = "gametype"
screenshot = "teamdeathmatch.png"
/>
@@ -15,8 +15,8 @@
?>
<Level
- name = "Waypoints"
- description = "Testing waypoings for AI controlled spaceships."
+ name = "Team Deathmatch"
+ description = "Fight against each other in teams."
gametype = TeamDeathmatch
>
<templates>
Modified: code/branches/menue/data/levels/tetris.oxw
===================================================================
--- code/branches/menue/data/levels/tetris.oxw 2011-11-09 15:16:24 UTC (rev 8930)
+++ code/branches/menue/data/levels/tetris.oxw 2011-11-10 21:52:50 UTC (rev 8931)
@@ -1,7 +1,7 @@
<LevelInfo
name = "Tetris"
description = "Tetris in space!"
- tags = "showcase"
+ tags = "minigame"
screenshot = "tetris.png"
/>
@@ -30,8 +30,8 @@
</Template>
<Level
- name = "Presentation"
- description = "A simple testlevel"
+ name = "Tetris"
+ description = "Tetris in space!"
gametype = "Tetris"
>
<templates>
Modified: code/branches/menue/data/levels/theTimeMachine.oxw
===================================================================
--- code/branches/menue/data/levels/theTimeMachine.oxw 2011-11-09 15:16:24 UTC (rev 8930)
+++ code/branches/menue/data/levels/theTimeMachine.oxw 2011-11-10 21:52:50 UTC (rev 8931)
@@ -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 = "mission"
+ tags = "gametype"
screenshot = "thetimemachine.png"
/>
Modified: code/branches/menue/data/levels/underAttack.oxw
===================================================================
--- code/branches/menue/data/levels/underAttack.oxw 2011-11-09 15:16:24 UTC (rev 8930)
+++ code/branches/menue/data/levels/underAttack.oxw 2011-11-10 21:52:50 UTC (rev 8931)
@@ -1,7 +1,7 @@
<LevelInfo
- name = "UnderAttack testing"
- description = "A simple testlevel"
- tags = "test"
+ name = "Under Attack"
+ description = "Fight the transporter."
+ tags = "gametype"
screenshot = "underattack.png"
/>
@@ -14,8 +14,8 @@
?>
<Level
- name = "UnderAttack testing"
- description = "A simple testlevel"
+ name = "Under Attack"
+ description = "Fight against the transporter."
gametype = UnderAttack
>
<templates>
Modified: code/branches/menue/src/orxonox/LevelInfo.cc
===================================================================
--- code/branches/menue/src/orxonox/LevelInfo.cc 2011-11-09 15:16:24 UTC (rev 8930)
+++ code/branches/menue/src/orxonox/LevelInfo.cc 2011-11-10 21:52:50 UTC (rev 8931)
@@ -90,6 +90,8 @@
LevelInfoItem::possibleTags_s.insert("tutorial");
LevelInfoItem::possibleTags_s.insert("presentation");
LevelInfoItem::possibleTags_s.insert("mission");
+ LevelInfoItem::possibleTags_s.insert("gametype");
+ LevelInfoItem::possibleTags_s.insert("minigame");
}
}
More information about the Orxonox-commit
mailing list