Changeset 10613 for code/branches/presentationFS15merge/data/levels/includes

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)
• data/levels/includes/weaponSettingsAssff.oxi (modified) (1 diff)

code/branches/presentationFS15merge/data/levels/includes/weaponSettingsAssff.oxi

@@ -40 +40 @@
         </Weapon>
         <Weapon>
-          <SimpleRocketFire mode=2 muzzleoffset="0,0,0" damage=30 shielddamage=20 />
+          <SimpleRocketFire mode=2 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 />
           <RocketFire mode=3 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 />
         </Weapon>