Changeset 7018 for code/branches/presentation3/data

Timestamp:

May 30, 2010, 3:19:49 PM (14 years ago)

Author:

scheusso

Message:

merged rocket2 branch back into presentation3 branch

Location:

code/branches/presentation3/data

Files:

• levels/tutorial.oxw (modified) (1 diff)
• particle/simplerocketfire.particle (copied) (copied from code/branches/rocket2/data/particle/simplerocketfire.particle)

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

@@ -14 +14 @@
   >
 
-    <Drone name="meineDrohne" primarythrust="80" auxilarythrust="10" rotationthrust="10" mass= "50" linearDamping = "0.9" angularDamping = "0.7">
-      <attached>
-        <Model scale="1" mesh="drone.mesh"/>
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="0,0,0"      halfExtents="10, 10, 10" />
-      </collisionShapes>
-    </Drone>
+  
+  
+  
+<Drone name="meineDrohne" primarythrust="80" auxilarythrust="10" rotationthrust="10" mass= "50" linearDamping = "0.9" angularDamping = "0.7">
+  <attached>
+    <Model scale="1" mesh="drone.mesh"/>
+  </attached>
+  <collisionShapes>
+    <BoxCollisionShape position="0,0,0"      halfExtents="10, 10, 10" />
+  </collisionShapes>
+</Drone>
 
     <Drone name="meineDrohne" primarythrust="80" auxilarythrust="10" rotationthrust="10" mass= "50" linearDamping = "0.9" angularDamping = "0.7">