Changeset 10616 for code/branches/presentationFS15merge

Timestamp:

Oct 4, 2015, 12:20:35 PM (9 years ago)

Author:

landauf

Message:

merged branch weaponFS15 (but without changes in weaponSettingsAssff.oxi)

Location:

code/branches/presentationFS15merge

Files:

• . (modified) (1 prop)
• data/particle/FieldExplosion.particle (copied) (copied from code/branches/weaponFS15/data/particle/FieldExplosion.particle)
• data/particle/GravityBombField.particle (copied) (copied from code/branches/weaponFS15/data/particle/GravityBombField.particle)
• src/modules/objects/ForceField.h (modified) (2 diffs)
• src/modules/weapons/WeaponsPrereqs.h (modified) (3 diffs)
• src/modules/weapons/munitions/CMakeLists.txt (modified) (1 diff)
• src/modules/weapons/munitions/GravityBombMunition.cc (copied) (copied from code/branches/weaponFS15/src/modules/weapons/munitions/GravityBombMunition.cc)
• src/modules/weapons/munitions/GravityBombMunition.h (copied) (copied from code/branches/weaponFS15/src/modules/weapons/munitions/GravityBombMunition.h)
• src/modules/weapons/projectiles/CMakeLists.txt (modified) (1 diff)
• src/modules/weapons/projectiles/GravityBomb.cc (copied) (copied from code/branches/weaponFS15/src/modules/weapons/projectiles/GravityBomb.cc)
• src/modules/weapons/projectiles/GravityBomb.h (copied) (copied from code/branches/weaponFS15/src/modules/weapons/projectiles/GravityBomb.h)
• src/modules/weapons/projectiles/GravityBombField.cc (copied) (copied from code/branches/weaponFS15/src/modules/weapons/projectiles/GravityBombField.cc)
• src/modules/weapons/projectiles/GravityBombField.h (copied) (copied from code/branches/weaponFS15/src/modules/weapons/projectiles/GravityBombField.h)
• src/modules/weapons/projectiles/LightningGunProjectile.cc (modified) (1 diff)
• src/modules/weapons/weaponmodes/CMakeLists.txt (modified) (1 diff)
• src/modules/weapons/weaponmodes/GravityBombFire.cc (copied) (copied from code/branches/weaponFS15/src/modules/weapons/weaponmodes/GravityBombFire.cc)
• src/modules/weapons/weaponmodes/GravityBombFire.h (copied) (copied from code/branches/weaponFS15/src/modules/weapons/weaponmodes/GravityBombFire.h)

code/branches/presentationFS15merge/src/modules/objects/ForceField.h

@@ -160 +160 @@
             const std::string& getMode(void); //!< Get the mode of the ForceField.
 
-        private:
             //! Strings to represent the modes.
             static const std::string modeTube_s;
@@ -166 +165 @@
             static const std::string modeInvertedSphere_s;
             static const std::string modeNewtonianGravity_s;
-
             static const std::string modeHomogen_s;
 
+        private:
             float velocity_; //!< The velocity of the ForceField.
             float radius_; //!< The radius of the ForceField.

code/branches/presentationFS15merge/src/modules/weapons/WeaponsPrereqs.h

@@ -75 +75 @@
     class ReplenishingMunition;
     class RocketMunition;
+    class GravityBombMuntion;
 
     // projectiles
@@ -84 +85 @@
     class RocketOld;
     class SimpleRocket;
+    class GravityBomb;
 
     // weaponmodes
@@ -94 +96 @@
     class RocketFireOld;
     class SimpleRocketFire;
+    class GravityBombFire;
 }
 

code/branches/presentationFS15merge/src/modules/weapons/munitions/CMakeLists.txt

@@ -4 +4 @@
   FusionMunition.cc
   RocketMunition.cc
+  GravityBombMunition.cc
 )

code/branches/presentationFS15merge/src/modules/weapons/projectiles/CMakeLists.txt

@@ -8 +8 @@
   RocketOld.cc
   SimpleRocket.cc
+  GravityBomb.cc
+  GravityBombField.cc
 )

code/branches/presentationFS15merge/src/modules/weapons/projectiles/LightningGunProjectile.cc

@@ -47 +47 @@
 
         this->textureIndex_ = 1;
+        this->setMass(2);
+        this->setCollisionType(Dynamic);
         this->maxTextureIndex_ = 8;
         this->textureTimer_.setTimer(0.01f, true, createExecutor(createFunctor(&LightningGunProjectile::changeTexture, this)));

code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/CMakeLists.txt

@@ -8 +8 @@
   RocketFireOld.cc
   SimpleRocketFire.cc
+  GravityBombFire.cc
 )