Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9979 in orxonox.OLD for branches/playability


Ignore:
Timestamp:
Nov 29, 2006, 10:30:03 PM (18 years ago)
Author:
nicolasc
Message:

created hbolt.[cc,h], copied from laser, used in heavy blaster
included models

Location:
branches/playability
Files:
2 added
7 edited

Legend:

Unmodified
Added
Removed

  • branches/playability/ChangeLog

    r9965 r9979  
     12006-11-29  Nicolas Schlumbgerger <nicolasc@ee.ethz.ch>
     2  Added bolt projectile for light blaster, copied of laser
     3  Added hbolt projectile for heavy blaster, copied of laser
     4  Added bolt model, currently untextured
     5  Added hbolt model, currently untextured
     6
    172006-11-28      Marc Schärer <marcscha@ee.ethz.ch>
    28        Mapped primary weapon manager back to playable default weapon manager.

  • branches/playability/src/world_entities/WorldEntities.am

    r9978 r9979  
    4242                \
    4343                world_entities/projectiles/bolt.cc \
     44                world_entities/projectiles/hbolt.cc \
    4445                world_entities/projectiles/bomb.cc \
    4546                world_entities/projectiles/laser.cc \

  • branches/playability/src/world_entities/projectiles/bolt.cc

    r9978 r9979  
    1414
    1515*/
     16
     17
    1618#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WEAPON
    1719

  • branches/playability/src/world_entities/projectiles/bolt.h

    r9978 r9979  
    11/*!
    2  * @file laser.h
    3  * @brief a projectile, that is been shooted by a weapon
     2 * @file bolt.h
     3 * @brief light blaster bolt
    44*/
    55

  • branches/playability/src/world_entities/space_ships/space_ship.cc

    r9975 r9979  
    133133
    134134  //weapons:
    135   Weapon* wpRight = new LightBlaster ();
     135  Weapon* wpRight = new HeavyBlaster ();
    136136  wpRight->setName("Blaster Right");
    137   Weapon* wpLeft = new LightBlaster ();
     137  Weapon* wpLeft = new HeavyBlaster ();
    138138  wpLeft->setName("Blaster Left");
    139139

  • branches/playability/src/world_entities/test_entity2.cc

    r9978 r9979  
    100100{
    101101
     102    glPushAttrib(GL_ENABLE_BIT);
     103    glDisable(GL_LIGHTING);
    102104
    103105    glPushMatrix();
    … …  
    113115
    114116//PRINTF(0)("axis: %f\n", axis);
     117
     118
    115119    glDisable(GL_TEXTURE_2D);
    116120    this->material->select();
    … …  
    228232
    229233  glPopMatrix();
    230 //    glPopAttrib();
     234  glPopAttrib();
    231235}
    232236

  • branches/playability/src/world_entities/weapons/heavy_blaster.cc

    r9975 r9979  
    5151 
    5252
    53   this->setStateDuration(WS_SHOOTING, 0.05);
     53  this->setStateDuration(WS_SHOOTING, 0.5);
    5454  this->setStateDuration(WS_RELOADING, 0);
    5555  this->setStateDuration(WS_ACTIVATING, .5);
    … …  
    6565
    6666  this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL | WTYPE_LIGHT);
    67   this->setProjectileTypeC("RailProjectile");   // FIXME temp project type until the blaste class exist
     67  this->setProjectileTypeC("HBolt");   // FIXME temp project type until the blaste class exist
    6868  this->prepareProjectiles(100);
    6969
Note: See TracChangeset for help on using the changeset viewer.