[Orxonox-commit 2063] r6779 - in code/branches/rocket/data/levels: . includes

[gnadler at orxonox.net]

Author: gnadler
Date: 2010-04-26 15:40:33 +0200 (Mon, 26 Apr 2010)
New Revision: 6779

Modified:
   code/branches/rocket/data/levels/includes/weaponsettings3.oxi
   code/branches/rocket/data/levels/tutorial.oxw
Log:


Modified: code/branches/rocket/data/levels/includes/weaponsettings3.oxi
===================================================================
--- code/branches/rocket/data/levels/includes/weaponsettings3.oxi	2010-04-26 13:40:16 UTC (rev 6778)
+++ code/branches/rocket/data/levels/includes/weaponsettings3.oxi	2010-04-26 13:40:33 UTC (rev 6779)
@@ -38,7 +38,7 @@
           <LightningGun mode=1 muzzleoffset="0,0,0" />
         </Weapon>
         <Weapon>
-          <RocketFire mode=2 muzzleoffset="0,0,0" />
+          <DroneFire mode=2 muzzleoffset="5,5,5" />
         </Weapon>
       </WeaponPack>
       <WeaponPack>

Modified: code/branches/rocket/data/levels/tutorial.oxw
===================================================================
--- code/branches/rocket/data/levels/tutorial.oxw	2010-04-26 13:40:16 UTC (rev 6778)
+++ code/branches/rocket/data/levels/tutorial.oxw	2010-04-26 13:40:33 UTC (rev 6779)
@@ -22,6 +22,14 @@
   </collisionShapes>
 </Drone>
 
+<Drone name="meineDrohne" primarythrust="80" auxilarythrust="10" rotationthrust="10" mass= "50" linearDamping = "0.9" angularDamping = "0.7">
+  <attached>
+    <Model scale="10" 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" />