Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10496 for code


Ignore:
Timestamp:
May 27, 2015, 10:21:55 AM (9 years ago)
Author:
maxima
Message:

clangenb: new spaceship heartattack merged to presentation

Location:
code/branches/presentationFS15
Files:
5 edited
3 copied

Legend:

Unmodified
Added
Removed

  • code/branches/presentationFS15/data/levels/clangenb.oxw

    r10495 r10496  
    11<LevelInfo
    2  name = "Empty level"
     2 name = "clangenb"
    33 description = "A level with absolutely nothing in it."
    44 tags = "test"

  • code/branches/presentationFS15/data/levels/emptyLevel.oxw

    r10485 r10496  
    1515  include("templates/spaceshipAssff.oxt")
    1616  include("templates/spaceshipPirate.oxt")
    17   include("templates/spaceshipEscort.oxt")
     17  include("templates/spaceshipHeartAttack.oxt")
    1818?>
    1919

  • code/branches/presentationFS15/data/levels/includes/weaponSettingsAssff.oxi

    r10485 r10496  
    2525          </attached>
    2626          <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" />
     27          <EnergyDrink mode=0 munitionpershot=0 delay=0  material="Flares/point_lensflare" muzzleoffset="2,-0.2,-1" />
    2728          <HsW01 mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" />
    2829          <LightningGun mode=1 muzzleoffset="0,0,0" damage=3.14159 shielddamage=20 />

  • code/branches/presentationFS15/src/modules/weapons/weaponmodes/EnergyDrink.cc

    r10296 r10496  
    108108        model->setScale(5);
    109109
     110        this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
    110111        projectile->setOrientation(this->getMuzzleOrientation());
    111112        projectile->setPosition(this->getMuzzlePosition());

  • code/branches/presentationFS15/src/modules/weapons/weaponmodes/FusionFire.cc

    r10296 r10496  
    6767    {
    6868        BillboardProjectile* projectile = new BillboardProjectile(this->getContext());
    69 
     69       
     70        this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
    7071        projectile->setOrientation(this->getMuzzleOrientation());
    7172        projectile->setPosition(this->getMuzzlePosition());

  • code/branches/presentationFS15/src/modules/weapons/weaponmodes/LaserFire.cc

    r10296 r10496  
    6666        ParticleProjectile* projectile = new ParticleProjectile(this->getContext());
    6767
     68        this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
    6869        projectile->setOrientation(this->getMuzzleOrientation());
    6970        projectile->setPosition(this->getMuzzlePosition());
Note: See TracChangeset for help on using the changeset viewer.