Changeset 10238

Timestamp:

Feb 1, 2015, 6:42:19 PM (10 years ago)

Author:

landauf

Message:

merged weaponupdateHS14 (except some unnecessary changes)

Location:

code/branches/presentationHS14merge

Files:

• . (modified) (1 prop)
• data/levels/FPS_Level_HS14.oxw (copied) (copied from code/branches/weaponupdateHS14/data/levels/FPS_Level_HS14.oxw)
• data/levels/includes/weaponSettingsFPS_HS14.oxi (copied) (copied from code/branches/weaponupdateHS14/data/levels/includes/weaponSettingsFPS_HS14.oxi)
• data/levels/presentationHS13.oxw (modified) (1 diff)
• data/levels/templates/FPS.oxt (modified) (1 diff)
• data/levels/templates/FPS_HS14.oxt (copied) (copied from code/branches/weaponupdateHS14/data/levels/templates/FPS_HS14.oxt)
• data/levels/templates/spacestation_elements.oxt (copied) (copied from code/branches/weaponupdateHS14/data/levels/templates/spacestation_elements.oxt)
• data/levels/templates/ss_tube01.oxt (copied) (copied from code/branches/weaponupdateHS14/data/levels/templates/ss_tube01.oxt)
• src/modules/weapons/RocketController.cc (modified) (2 diffs)

code/branches/presentationHS14merge/data/levels/presentationHS13.oxw

@@ -131 +131 @@
 
             <undocking>
-                <EventListener event="undockMe" />
+                        <EventListener event="undockMe" />
             </undocking>
         

code/branches/presentationHS14merge/data/levels/templates/FPS.oxt

@@ -21 +21 @@
    weapon            = "hs-w01.mesh"
   >
-    <collisionShapes>
-      <BoxCollisionShape position="0,-20,0" halfExtents="15,25,15" />
+    <collisionShapes>                   <!-- old values: position="0,-20,0"  halfExtents="15,25,15"  -->
+      <BoxCollisionShape position="0,-25,0" halfExtents="15,20,15" />
     </collisionShapes>
 

code/branches/presentationHS14merge/src/modules/weapons/RocketController.cc

@@ -41 +41 @@
 namespace orxonox
 {
+    RegisterClass(RocketController);
+
     /**
     @brief
@@ -97 +99 @@
         if (distance > 1000 && this->rocket_->getVelocity().squaredLength()<160000)
             this->rocket_->setAcceleration(this->rocket_->getOrientation()*Vector3(-20,-20,-20));
-        if (distance <1000) this->rocket_->setAcceleration(0,0,0);
+        if (distance < 1000) this->rocket_->setAcceleration(0,0,0);
 
         this->rocket_->rotateYaw(-sgn(coord.x)*coord.x*coord.x);