Changeset 6412 for code/branches/pickup2/data/levels/old

Timestamp:

Dec 25, 2009, 1:18:03 PM (15 years ago)

Author:

dafrick

Message:

Merged presentation2 branch into pickup2 branch.

Location:

code/branches/pickup2

Files:

• . (modified) (1 prop)
• data/levels/old/physicstest.oxw (modified) (1 diff)
• data/levels/old/physicstest2.oxw (modified) (2 diffs)
• data/levels/old/presentation_physics.oxw (modified) (2 diffs)
• data/levels/old/princessaeryn.oxw (modified) (1 diff)
• data/levels/old/questsystem.oxw (modified) (2 diffs)
• data/levels/old/sample4.oxw (modified) (1 diff)
• data/levels/old/spaceshiptemplates_physics.oxw (modified) (1 diff)
• data/levels/old/tutorial_hs08.oxw (modified) (1 diff)

code/branches/pickup2/data/levels/old/physicstest.oxw

@@ -12 +12 @@
 
 <?lua
-for i = 1, 226, 1 
+for i = 1, 226, 1
 do ?>
   <Model position="<?lua print(math.random() * 40000 - 20000)?>, <?lua print(math.random() * 40000 - 20000) ?>, <?lua print(math.random() * 40000 - 20000) ?>" scale="<?lua print(math.random() * 250 + 20) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" rotationAxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationRate="<?lua print(math.random() * 30 + 15) ?>" />
-<?lua 
+<?lua
 end
 ?>

code/branches/pickup2/data/levels/old/physicstest2.oxw

@@ -21 +21 @@
     <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
+    <!-- axes in ogre's origin of coordinate system for phsics engine testing purposes-->
+    <StaticEntity
      position        = "0,0,0"
      name            = "banana"
@@ -35 +35 @@
         <PlaneCollisionShape name="thePlane" planeNormal="0,1,0" planeOffset=0 />
       </collisionShapes>
-        </StaticEntity>
-
-        <!-- red sphere for phsics engine testing purposes-->
-        <!--StaticEntity position="40,0,0">
-                <attached>
-                        <Model position="0,0,0" scale=1 mesh="sphere.mesh" />
-                </attached>
-        </StaticEntity-->
-
-        <!-- yellow cube for phsics engine testing purposes-->
-        <!--StaticEntity position="80,0,0">
+    </StaticEntity>
+
+    <!-- red sphere for phsics engine testing purposes-->
+    <!--StaticEntity position="40,0,0">
+      <attached>
+        <Model position="0,0,0" scale=1 mesh="sphere.mesh" />
+      </attached>
+    </StaticEntity-->
+
+    <!-- yellow cube for phsics engine testing purposes-->
+    <!--StaticEntity position="80,0,0">
       <attached>
         <Model position="0,0,0" scale=1 mesh="cube.mesh" />
       </attached>
-        </StaticEntity-->
+    </StaticEntity-->
 
     <MovableEntity

code/branches/pickup2/data/levels/old/presentation_physics.oxw

@@ -30 +30 @@
         <PlaneCollisionShape planeNormal="0,1,0" planeOffset=0 />
       </collisionShapes>
-        </StaticEntity>
+    </StaticEntity>
 
-        <MovableEntity
+    <MovableEntity
      position        = "0,250,500"
      rotationaxis    = "1, 1, 1"
@@ -64 +64 @@
         <BoxCollisionShape position="0,0.1,-19"  halfExtents="1.4, 1, 2" />
       </collisionShapes>
-        </MovableEntity>
+    </MovableEntity>
 
     <?lua

code/branches/pickup2/data/levels/old/princessaeryn.oxw

@@ -6 +6 @@
 
 <?lua
-        dofile("includes/CuboidSpaceStation.lua")
+    dofile("includes/CuboidSpaceStation.lua")
 ?>
 
 <NotificationQueue
-        name  = "notification"
-        position = "1.0, 1.0"
-        targets = "questsystem"
+ name  = "notification"
+ position = "1.0, 1.0"
+ targets = "questsystem"
 />
 

code/branches/pickup2/data/levels/old/questsystem.oxw

@@ -6 +6 @@
 
 <NotificationQueue
-        name  = "notification"
-        position = "1.0, 1.0"
-        targets = "all"
+ name  = "notification"
+ position = "1.0, 1.0"
+ targets = "all"
 />
 
@@ -29 +29 @@
         </GlobalQuest>
 
-                                <ParticleSpawner position="0,0,100" source="Orxonox/BigExplosion1part3" lifetime=2.0 loop=0 autostart=0>
-                                  <events>
-                                    <spawn>
-                                      <EventTrigger delay=1>
-                                        <events>
-                                          <trigger>
-                                            <SpawnPoint position="0,0,100" spawnclass=SpaceShip pawndesign=spaceshipassff />
-                                          </trigger>
-                                        </events>
-                                      </EventTrigger>
-                                    </spawn>
-                                  </events>
-                                </ParticleSpawner>
+        <ParticleSpawner position="0,0,100" source="Orxonox/BigExplosion1part3" lifetime=2.0 loop=0 autostart=0>
+            <events>
+                <spawn>
+                    <EventTrigger delay=1>
+                        <events>
+                            <trigger>
+                                <SpawnPoint position="0,0,100" spawnclass=SpaceShip pawndesign=spaceshipassff />
+                            </trigger>
+                        </events>
+                    </EventTrigger>
+                </spawn>
+            </events>
+        </ParticleSpawner>
 
         <QuestEffectBeacon position="0,0,100" times=-1>

code/branches/pickup2/data/levels/old/sample4.oxw

@@ -23 +23 @@
         <Model position="0,0,0" scale=10 mesh="satellite.mesh" />
         <MovableEntity position="-4,0,0" velocity="0,0,0" rotationaxis="0,0,1" rotationrate=50>
-          <attached>
+          <attached>
             <Model position="4,0,0" scale=10 mesh="satellitedish.mesh"/>
           </attached>
-        </MovableEntity>
+        </MovableEntity>
         <ParticleEmitter pitch=-135 roll=30 position="-14, 3.5,-2.5" source="Orxonox/thruster3" lifetime=2.0 loop=1 startdelay=3.0 />
         <ParticleEmitter pitch=135 roll=30 position="-14, 3.5,-9" source="Orxonox/thruster3" lifetime=2.0 loop=1 startdelay=3.0 />

code/branches/pickup2/data/levels/old/spaceshiptemplates_physics.oxw

@@ -10 +10 @@
    auxilaryThrust    = 30;
    rotationThrust    = 10;
-   
+
    collisionType     = "dynamic"
    mass              = 100

code/branches/pickup2/data/levels/old/tutorial_hs08.oxw

@@ -19 +19 @@
 <!-- Embedded lua code (creates random asteroids) -->
 <?lua
-for i = 1, 226, 1 
+for i = 1, 226, 1
 do ?>
   <Model position="<?lua print(math.random() * 40000 - 20000)?>, <?lua print(math.random() * 40000 - 20000) ?>, <?lua print(math.random() * 40000 - 20000) ?>" scale="<?lua print(math.random() * 250 + 20) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" rotationAxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationRate="<?lua print(math.random() * 30 + 15) ?>" />
-<?lua 
+<?lua
 end
 ?>