Changeset 5528 for data/media/levels/old

Timestamp:

May 23, 2009, 3:44:34 AM (16 years ago)

Author:

landauf

Message:

Cleaned up level directory.

Levels (*.oxw): /levels/
Includes (*.oxi): /levels/includes/ (for example weaponsettings1.oxi)
Templates (*.oxt): /levels/templates/ (formerly spaceshiptemplates_*)
Huds (*.oxo): /overlay/ (moved from /levels/ to /overlay/)

Old level files and other stuff was moved to /levels/old/. This directory is not used, but serves as an archive.

For the weapons branch (and the trunk after weapons will be merged), change line 37 in /levels/templates/spaceship_assff.oxt from weaponsettings1 to weaponsettings2 to be able to shoot again.

Location:

data/media/levels/old

Files:

• . (added)
• CuboidSpaceStation.oxw (moved) (moved from data/media/levels/CuboidSpaceStation.oxw) (2 diffs)
• physicstest.oxw (moved) (moved from data/media/levels/physicstest.oxw)
• physicstest2.oxw (moved) (moved from data/media/levels/physicstest2.oxw) (10 diffs)
• planettest.oxw (moved) (moved from data/media/levels/planettest.oxw) (1 diff)
• presentation_physics.oxw (moved) (moved from data/media/levels/presentation_physics.oxw) (4 diffs)
• princessaeryn.oxw (moved) (moved from data/media/levels/princessaeryn.oxw) (6 diffs)
• questsystem.oxw (moved) (moved from data/media/levels/questsystem.oxw) (2 diffs)
• sample4.oxw (moved) (moved from data/media/levels/sample4.oxw) (1 diff)
• spaceshiptemplates_physics.oxw (moved) (moved from data/media/levels/spaceshiptemplates_physics.oxw)
• tutorial_hs08.oxw (moved) (moved from data/media/levels/tutorial_hs08.oxw)

data/media/levels/old/CuboidSpaceStation.oxw

@@ -1 +1 @@
 <?lua
-        include("levels/hudtemplates.oxw")
+        include("overlay/hudtemplates3.oxo")
 ?>
 
 <?lua
-        include("levels/spaceshiptemplates.oxw")
+        include("levels/templates/spaceship_assff.oxt")
 ?>
 
@@ -20 +20 @@
 <!-------------------------------------------------------------------------------------------------------------------------------------------------------------------------->
 <?lua
-        dofile("../../media/levels/CuboidSpaceStation.lua")
+        dofile("../../media/levels/includes/CuboidSpaceStation.lua")
 ?>
 

data/media/levels/old/physicstest2.oxw

@@ -1 +1 @@
 <?lua
-  include("levels/spaceshiptemplates_physics.oxw")
+  include("levels/old/spaceshiptemplates_physics.oxw")
 ?>
 <?lua
-  include("levels/hudtemplates.oxw")
+  include("overlay/hudtemplates3.oxo")
 ?>
 
@@ -20 +20 @@
     <SpawnPoint position="0,   0, -700" yaw  =180 spawnclass=SpaceShip pawndesign=spaceshipassff />
     <SpawnPoint position="0, 300, -300" pitch=-90 spawnclass=SpaceShip pawndesign=spaceshipassff /-->
-        
+
         <!-- axes in ogre's origin of coordinate system for phsics engine testing purposes-->
         <StaticEntity
@@ -36 +36 @@
       </collisionShapes>
         </StaticEntity>
-        
+
         <!-- red sphere for phsics engine testing purposes-->
         <!--StaticEntity position="40,0,0">
@@ -50 +50 @@
       </attached>
         </StaticEntity-->
-    
+
     <MovableEntity
      name            = "blubb"
@@ -66 +66 @@
         </StaticEntity>
       </attached>
-      
+
       <!--attached>
         <SphereCollisionShape name = "secondSphere" radius=0.4 position="1,1,1"/>
@@ -74 +74 @@
       </attached-->
     </MovableEntity>
-  
+
     <MovableEntity
      name            = "blubb2"
@@ -89 +89 @@
       </collisionShapes>
     </MovableEntity>
-    
+
     <StaticEntity
      name            = "blubbStatic"
@@ -103 +103 @@
       </collisionShapes>
     </StaticEntity>
-    
+
     <!--SpawnPoint position="0,   0,  100"           spawnclass=SpaceShip pawndesign=spaceshipassff />
     <SpawnPoint position="0,   0, -700" yaw  =180 spawnclass=SpaceShip pawndesign=spaceshipassff />
     <SpawnPoint position="0, 300, -300" pitch=-90 spawnclass=SpaceShip pawndesign=spaceshipassff /-->
-  
+
     <MovableEntity
      name            = "apple1"
@@ -122 +122 @@
       </collisionShapes>
     </MovableEntity>
-  
+
     <MovableEntity
      name            = "apple2"
@@ -138 +138 @@
       </collisionShapes>
     </MovableEntity>
-  
+
     <MovableEntity
      name            = "apple3"

data/media/levels/old/planettest.oxw

@@ -1 +1 @@
 <?lua
-  include("levels/hudtemplates.oxw")
+  include("overlay/hudtemplates3.oxo")
 ?>
 
 <?lua
-  include("levels/spaceshiptemplates.oxw")
+  include("levels/templates/spaceship_assff.oxt")
 ?>
 

data/media/levels/old/presentation_physics.oxw

@@ -1 +1 @@
 <?lua
-  include("levels/hudtemplates3.oxw")
+  include("overlay/hudtemplates3.oxo")
   include("overlay/stats.oxo")
-  include("levels/spaceshiptemplates_presentation.oxw")
+  include("levels/templates/spaceship_assff.oxt")
   math.randomseed(344)
 ?>
@@ -31 +31 @@
       </collisionShapes>
         </StaticEntity>
-    
+
         <MovableEntity
      position        = "0,250,500"
@@ -47 +47 @@
         <BlinkingBillboard position="17,-1.5,0" material="Examples/Flare" colour="1.0, 0.5, 0.3" amplitude=0.1 frequency=0.5 quadratic=1 />
         <BlinkingBillboard position="-17,-1.5,0" material="Examples/Flare" colour="0.5, 1.0, 0.3" amplitude=0.1 frequency=0.5 phase=180 quadratic=1 />
-        
+
         <!--Model position="0,0,0" yaw=90 pitch=-90 roll=0 scale=4 mesh="assff.mesh" />
         <Model position="0,0,0" scale3D="10, 3, 5" mesh="cube.mesh" />
@@ -65 +65 @@
       </collisionShapes>
         </MovableEntity>
-    
+
     <?lua
     for i = -20, 20, 8

data/media/levels/old/princessaeryn.oxw

@@ -1 +1 @@
 <?lua
-  include("levels/hudtemplates3.oxw")
+  include("overlay/hudtemplates3.oxo")
   include("overlay/stats.oxo")
-  include("levels/spaceshiptemplates_presentation.oxw")
+  include("levels/templates/spaceship_assff.oxt")
 ?>
 
 <?lua
-        dofile("../../media/levels/CuboidSpaceStation.lua")
+        dofile("../../media/levels/includes/CuboidSpaceStation.lua")
 ?>
 
@@ -97 +97 @@
             </subquests>
         </GlobalQuest>
-    
+
         <!-- Create spaceship spawner: -->
         <ParticleSpawner position="0,0,100" source="Orxonox/BigExplosion1part3" lifetime=2.0 loop=0 autostart=0>
@@ -187 +187 @@
                 </attached>
             </StaticEntity>
-      
-      
-      
+
+
+
             <!-- Spacestations -->
-      
+
             <!-- Serenity Station -->
             <StaticEntity scale=1 position="0,0,5000" yaw=30>
@@ -260 +260 @@
                 </attached>
             </StaticEntity>
-              
+
             <!-- Trail -->
             <EventDispatcher>
@@ -275 +275 @@
                 </events>
             </EventDispatcher>
-        
+
             <?lua
-                for i = 1, 25 
+                for i = 1, 25
                 do
             ?>
@@ -284 +284 @@
                 end
             ?>
-        
+
             <!-- Hideout -->
             <StaticEntity position="5000,5000,5000" >

data/media/levels/old/questsystem.oxw

@@ -1 +1 @@
 <?lua
-  include("levels/hudtemplates3.oxw")
+  include("overlay/hudtemplates3.oxo")
   include("overlay/stats.oxo")
-  include("levels/spaceshiptemplates_presentation.oxw")
+  include("levels/templates/spaceship_assff.oxt")
 ?>
 
@@ -28 +28 @@
             </hints>
         </GlobalQuest>
-        
+
                                 <ParticleSpawner position="0,0,100" source="Orxonox/BigExplosion1part3" lifetime=2.0 loop=0 autostart=0>
                                   <events>

data/media/levels/old/sample4.oxw

@@ -1 +1 @@
 <?lua
-  include("levels/hudtemplates.oxw")
+  include("overlay/hudtemplates3.oxo")
 ?>
 
 <?lua
-  include("levels/spaceshiptemplates2.oxw")
+  include("levels/templates/spaceship_assff.oxt")
 ?>