Changeset 6951 for code/branches/presentation3/data

Timestamp:

May 21, 2010, 10:25:27 AM (15 years ago)

Author:

scheusso

Message:

merged rocket branch into presentation3 and cleaned up some things (mostly debug output and intendation)

Location:

code/branches/presentation3

Files:

• . (modified) (1 prop)
• data/levels/includes/weaponsettings3.oxi (modified) (1 diff)
• data/levels/tutorial.oxw (modified) (2 diffs)
• data/particle/rocketfire2.particle (copied) (copied from code/branches/rocket/data/particle/rocketfire2.particle)

code/branches/presentation3/data/levels/includes/weaponsettings3.oxi

@@ -39 +39 @@
         </Weapon>
         <Weapon>
-          <RocketFire mode=2 muzzleoffset="0,0,0" />
+          <SimpleRocketFire mode=2 muzzleoffset="0,0,0" />
         </Weapon>
       </WeaponPack>

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

@@ -16 +16 @@
 <Drone name="meineDrohne" primarythrust="80" auxilarythrust="10" rotationthrust="10" mass= "50" linearDamping = "0.9" angularDamping = "0.7">
   <attached>
-    <Model scale="10" mesh="drone.mesh"/>
+    <Model scale="1" mesh="drone.mesh"/>
   </attached>
   <collisionShapes>
@@ -23 +23 @@
 </Drone>
 
+<Drone name="meineDrohne" primarythrust="80" auxilarythrust="10" rotationthrust="10" mass= "50" linearDamping = "0.9" angularDamping = "0.7">
+  <attached>
+    <Model scale="1" mesh="rocket.mesh"/>
+  </attached>
+  <collisionShapes>
+    <BoxCollisionShape position="0,0,0"      halfExtents="10, 10, 10" />
+  </collisionShapes>
+</Drone>
 
     <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" />