Changeset 6926 for code/branches/presentation3/data

Timestamp:

May 20, 2010, 10:23:22 AM (15 years ago)

Author:

scheusso

Message:

merging lod branch into presentation3 merger branch

Location:

code/branches/presentation3

Files:

• . (modified) (1 prop)
• data/levels/empty_level.oxw (modified) (2 diffs)
• data/levels/gametype_asteroids.oxw (modified) (2 diffs)
• data/levels/gametype_underattack.oxw (modified) (2 diffs)
• data/levels/presentationLOD.oxw (copied) (copied from code/branches/lod/data/levels/presentationLOD.oxw)
• data/levels/presentationLODdif.oxw (copied) (copied from code/branches/lod/data/levels/presentationLODdif.oxw)
• data/levels/teambasematchlevel.oxw (modified) (2 diffs)
• data/levels/teamdeathmatch.oxw (modified) (2 diffs)
• data/levels/templates/lodinformation.oxt (copied) (copied from code/branches/lod/data/levels/templates/lodinformation.oxt)

code/branches/presentation3/data/levels/empty_level.oxw

@@ -2 +2 @@
   include("stats.oxo")
   include("hudtemplates3.oxo")
+  include("templates/lodinformation.oxt")
 ?>
 
@@ -13 +14 @@
  description  = "Just a few tests"
 >
+  <templates>
+    <Template link=lodtemplate_default />
+  </templates>
+
   <Scene
     ambientlight = "0.8, 0.8, 0.8"

code/branches/presentation3/data/levels/gametype_asteroids.oxw

@@ -3 +3 @@
   include("stats.oxo")
   include("templates/spaceship_assff.oxt")
+  include("templates/lodinformation.oxt")
 ?>
 
@@ -10 +11 @@
  gametype     =  Asteroids
 >
+  <templates>
+    <Template link=lodtemplate_default />
+  </templates>
+
 <Scene
  ambientlight = "0.5, 0.5, 0.5"

code/branches/presentation3/data/levels/gametype_underattack.oxw

@@ -4 +4 @@
   include("underattackhud.oxo")
   include("templates/spaceship_assff.oxt")
+  include("templates/lodinformation.oxt")
 ?>
 
@@ -11 +12 @@
  gametype     = UnderAttack
 >
+  <templates>
+    <Template link=lodtemplate_default />
+  </templates>
+
   <Scene
    ambientlight = "0.5, 0.5, 0.5"

code/branches/presentation3/data/levels/teambasematchlevel.oxw

@@ -5 +5 @@
   include("templates/spaceship_assff.oxt")
   include("templates/spaceship_pirate.oxt")
+  include("templates/lodinformation.oxt")
 ?>
 
@@ -12 +13 @@
  gametype     = TeamBaseMatch
 >
+  <templates>
+    <Template link=lodtemplate_default />
+  </templates>
+
   <Scene
    ambientlight = "0.5, 0.5, 0.5"

code/branches/presentation3/data/levels/teamdeathmatch.oxw

@@ -5 +5 @@
   include("templates/spaceship_H2.oxt")
   include("templates/spaceship_pirate.oxt")
+  include("templates/lodinformation.oxt")
 ?>
 
@@ -12 +13 @@
  gametype     = TeamDeathmatch
 >
+  <templates>
+    <Template link=lodtemplate_default />
+  </templates>
+
   <Scene
    ambientlight = "0.7, 0.6, 0.6"