- Timestamp:
- May 26, 2015, 12:53:08 PM (10 years ago)
- Location:
- code/branches/presentationFS15
- Files:
-
- 3 edited
- 4 copied
-
. (modified) (1 prop)
-
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)
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentationFS15
- Property svn:mergeinfo changed
/code/branches/weaponFS15 (added) merged: 10302,10326,10336,10341,10369,10391,10409,10435-10436,10438,10455
- Property svn:mergeinfo changed
-
code/branches/presentationFS15/src/modules/weapons/projectiles/CMakeLists.txt
r10485 r10486 8 8 RocketOld.cc 9 9 SimpleRocket.cc 10 GravityBomb.cc 11 GravityBombField.cc 10 12 ) -
code/branches/presentationFS15/src/modules/weapons/projectiles/LightningGunProjectile.cc
r9667 r10486 47 47 48 48 this->textureIndex_ = 1; 49 this->setMass(2); 50 this->setCollisionType(Dynamic); 49 51 this->maxTextureIndex_ = 8; 50 52 this->textureTimer_.setTimer(0.01f, true, createExecutor(createFunctor(&LightningGunProjectile::changeTexture, this)));
Note: See TracChangeset
for help on using the changeset viewer.
