Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10494


Ignore:
Timestamp:
May 27, 2015, 9:18:06 AM (9 years ago)
Author:
clangenb
Message:

branch added

Location:
code/branches/clangenb
Files:
2 added
6 edited

Legend:

Unmodified
Added
Removed
  • code/branches/clangenb/data/levels/emptyLevel.oxw

    r9415 r10494  
    1515  include("templates/spaceshipAssff2.oxt")
    1616  include("templates/spaceshipPirate.oxt")
    17   include("templates/spaceshipEscort.oxt")
     17  include("templates/spaceshipHeartAttack.oxt")
    1818?>
    1919
     
    3030
    3131    <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
    32     <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort />
    33    
     32    <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipHeartAttack />
     33    <SpaceShip position="0,2000,200" lookat="0,0,0" name="movingtarget" radarname="Pirate">
     34                            <events>
     35                                <visibility>
     36                                    <EventListener event="boxtrigger4" />
     37                                </visibility>
     38                            </events>
     39                    <templates>
     40                      <Template link=spaceshippirate />
     41                    </templates>
     42                    <controller>
     43                      <WaypointController team=1>
     44                         <waypoints>
     45                          <Model mesh="cube.mesh" scale=8 position="  0,1700,-200" />
     46                          <Model mesh="cube.mesh" scale=8 position="  0,1700,-700" />
     47                          <Model mesh="cube.mesh" scale=8 position="500,1700,-700" />
     48                          <Model mesh="cube.mesh" scale=8 position="500,1700,-200" />
     49                       </waypoints>
     50                    </WaypointController>
     51                  </controller>
     52                </SpaceShip>
    3453  </Scene>
    3554</Level>
  • code/branches/clangenb/data/levels/includes/weaponSettingsAssff.oxi

    r8868 r10494  
    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 />
     
    3940        </Weapon>
    4041        <Weapon>
    41           <SimpleRocketFire mode=2 muzzleoffset="0,0,0" damage=30 shielddamage=20 />
     42          <!--SimpleRocketFire mode=2 muzzleoffset="0,0,0" damage=30 shielddamage=20 /-->
     43          <LaserFire mode=2 muzzleoffset="5,5,0" damage=30 shielddamage=20 />
     44          <FusionFire mode=2 muzzleoffset="0,0,0" damage=30 shielddamage=20 />
    4245          <RocketFire mode=3 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 />
    4346        </Weapon>
  • code/branches/clangenb/src/modules/weapons/projectiles/Rocket.cc

    r10216 r10494  
    7474            // Create rocket model
    7575            Model* model = new Model(this->getContext());
    76             model->setMeshSource("rocket.mesh");
     76            model->setMeshSource("can.mesh");
    7777            model->scale(0.7f);
    7878            this->attach(model);
  • code/branches/clangenb/src/modules/weapons/weaponmodes/EnergyDrink.cc

    r10296 r10494  
    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/clangenb/src/modules/weapons/weaponmodes/FusionFire.cc

    r10296 r10494  
    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/clangenb/src/modules/weapons/weaponmodes/LaserFire.cc

    r10296 r10494  
    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.