Changeset 7655 for code/trunk/data

Timestamp:

Nov 18, 2010, 9:54:39 PM (14 years ago)

Author:

rgrieder

Message:

Merged lastmanstanding back to trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• data/levels/gametype_asteroids.oxw (modified) (5 diffs)
• data/levels/gametype_dynamicmatch.oxw (modified) (1 diff)
• data/levels/gametype_lastmanstanding.oxw (copied) (copied from code/branches/lastmanstanding/data/levels/gametype_lastmanstanding.oxw)
• data/levels/notifications.oxw (modified) (1 prop)
• data/levels/test_swallow.oxw (modified) (3 diffs)
• data/overlays/dynamicmatchhud.oxo (modified) (1 diff)
• data/overlays/lastmanstandinghud.oxo (copied) (copied from code/branches/lastmanstanding/data/overlays/lastmanstandinghud.oxo)

code/trunk/data/levels/gametype_asteroids.oxw

@@ -143 +143 @@
 
 
-    <CheckPoint name=trigger1 position="-300,300,0" scale=1 isdestination=false isfirst=true stayactive=true distance=10 addtime=26 />
-
-
-    <CheckPoint name=trigger2 position="2200,600,0" scale=3 isdestination=false stayactive=true distance=100 addtime=20>
+    <CheckPoint name=trigger1 position="-300,300,0" scale=1 isdestination=false isfirst=true stayactive=true distance=10 addtime=14 />
+
+
+    <CheckPoint name=trigger2 position="2200,600,0" scale=3 isdestination=false stayactive=true distance=100 addtime=11>
       <events>
         <activity>
@@ -197 +197 @@
 
 
-    <CheckPoint name=trigger3 position="4100,0,400" scale=3 isdestination=false stayactive=true distance=100 addtime=18>
+    <CheckPoint name=trigger3 position="4100,0,400" scale=3 isdestination=false stayactive=true distance=100 addtime=9>
       <events>
         <activity>
@@ -248 +248 @@
 
 
-    <CheckPoint name=trigger4 position="5600,400,0" scale=3 isdestination=false stayactive=true distance=100 addtime=18>
+    <CheckPoint name=trigger4 position="5600,400,0" scale=3 isdestination=false stayactive=true distance=100 addtime=9>
       <events>
         <activity>
@@ -299 +299 @@
 
 
-    <CheckPoint name=trigger5 position="7200,600,-200" scale=3 isdestination=false stayactive=true distance=100 addtime=18>
+    <CheckPoint name=trigger5 position="7200,600,-200" scale=3 isdestination=false stayactive=true distance=100 addtime=8>
       <events>
         <activity>
@@ -350 +350 @@
 
 
-    <CheckPoint name=trigger6 position="9200, 800,-800" scale=3 isdestination=false stayactive=true distance=100 addtime=20>
+    <CheckPoint name=trigger6 position="9200, 800,-800" scale=3 isdestination=false stayactive=true distance=100 addtime=10>
       <events>
         <activity>

code/trunk/data/levels/gametype_dynamicmatch.oxw

@@ -68 +68 @@
 <?lua
 max = 20
-for i = 1, max, 1
+for i = 0, max, 1
 do
     y = math.sin(i/max*6)*4000
     z = math.cos(i/max*6)*5000
-    x = i*100
+    x = 0
     ?>
 <?lua

code/trunk/data/levels/test_swallow.oxw

@@ -10 +10 @@
   include("templates/spaceship_swallow.oxt")
   include("templates/spaceship_pirate.oxt")
+  include("templates/lodinformation.oxt")
 ?>
 
@@ -17 +18 @@
 
 >
+
+  <templates>
+    <Template link=lodtemplate_default />
+  </templates>
+
   <Scene
    ambientlight = "0.5, 0.5, 0.5"
@@ -22 +28 @@
   >
     <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
-
 
 <SpawnPoint position="<?lua print(math.sin(1.5) *40000) ?>,<?lua print(math.cos(1.5) *40000) ?>,<?lua print(500) ?>" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipswallow />

code/trunk/data/overlays/dynamicmatchhud.oxo

@@ -20 +20 @@
      align    = "center"
     />
+
   </OverlayGroup>
 </Template>