Changeset 10613 for code/branches/presentationFS15merge/src/modules/weapons/weaponmodes

Timestamp:

Oct 4, 2015, 12:15:43 PM (9 years ago)

Author:

landauf

Message:

merged branch ParticleEffectsFS15 (but without changes in CMakeLists.txt for particle universe plugin)

Location:

code/branches/presentationFS15merge

Files:

• . (modified) (1 prop)
• src/modules/weapons/weaponmodes/CMakeLists.txt (modified) (1 diff)
• src/modules/weapons/weaponmodes/RocketFireOld.cc (copied) (copied from code/branches/ParticleEffectsFS15/src/modules/weapons/weaponmodes/RocketFireOld.cc)
• src/modules/weapons/weaponmodes/RocketFireOld.h (copied) (copied from code/branches/ParticleEffectsFS15/src/modules/weapons/weaponmodes/RocketFireOld.h)

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

@@ -6 +6 @@
   LightningGun.cc
   RocketFire.cc
+  RocketFireOld.cc
   SimpleRocketFire.cc
 )