Changeset 10610

Timestamp:

Oct 4, 2015, 12:11:03 PM (9 years ago)

Author:

landauf

Message:

merged branch clangenb

Location:

code/branches/presentationFS15merge

Files:

• . (modified) (1 prop)
• data/levels/clangenb.oxw (copied) (copied from code/branches/clangenb/data/levels/clangenb.oxw)
• data/levels/includes/weaponSettingsAssff.oxi (modified) (1 diff)
• data/levels/includes/weaponSettingsHeartAttack.oxi (copied) (copied from code/branches/clangenb/data/levels/includes/weaponSettingsHeartAttack.oxi)
• data/levels/templates/spaceshipHeartAttack.oxt (copied) (copied from code/branches/clangenb/data/levels/templates/spaceshipHeartAttack.oxt)
• src/modules/weapons/weaponmodes/EnergyDrink.cc (modified) (1 diff)
• src/modules/weapons/weaponmodes/FusionFire.cc (modified) (1 diff)
• src/modules/weapons/weaponmodes/LaserFire.cc (modified) (1 diff)

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

@@ -25 +25 @@
           </attached>
           <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" />
+          <EnergyDrink mode=0 munitionpershot=0 delay=0  material="Flares/point_lensflare" muzzleoffset="2,-0.2,-1" />
           <HsW01 mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" />
           <LightningGun mode=1 muzzleoffset="0,0,0" damage=3.14159 shielddamage=20 />

code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/EnergyDrink.cc

@@ -108 +108 @@
         model->setScale(5);
 
+        this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
         projectile->setOrientation(this->getMuzzleOrientation());
         projectile->setPosition(this->getMuzzlePosition());

code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/FusionFire.cc

@@ -68 +68 @@
         BillboardProjectile* projectile = new BillboardProjectile(this->getContext());
 
+        this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
         projectile->setOrientation(this->getMuzzleOrientation());
         projectile->setPosition(this->getMuzzlePosition());

code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/LaserFire.cc

@@ -66 +66 @@
         ParticleProjectile* projectile = new ParticleProjectile(this->getContext());
 
+        this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
         projectile->setOrientation(this->getMuzzleOrientation());
         projectile->setPosition(this->getMuzzlePosition());