Changeset 2049 for code/branches/weapon/src/orxonox
- Timestamp:
- Oct 29, 2008, 2:40:02 PM (16 years ago)
- Location:
- code/branches/weapon/src/orxonox
- Files:
-
- 19 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/weapon/src/orxonox/CMakeLists.txt
r1844 r2049 63 63 objects/ParticleProjectile.cc 64 64 65 objects/WeaponSystem.cc 66 objects/weaponSystem/WeaponSet.cc 67 objects/weaponSystem/WeaponSlot.cc 68 objects/weaponSystem/Weapon.cc 69 objects/weaponSystem/Munition.cc 70 71 65 72 tolua/tolua_bind.cc 66 73 ) -
code/branches/weapon/src/orxonox/OrxonoxPrereqs.h
r1755 r2049 97 97 class ParticleProjectile; 98 98 99 class WeaponSystem; 100 class WeaponSet; 101 class WeaponSlot; 102 class Weapon; 103 class Munition; 104 99 105 // tools 100 106 class BillboardSet; -
code/branches/weapon/src/orxonox/objects/SpaceShip.cc
r1908 r2049 148 148 for (ObjectList<SpaceShipAI>::iterator it = ObjectList<SpaceShipAI>::begin(); it; ++it) 149 149 it->shipDied(this); 150 150 151 151 if (this->isInitialized()) 152 152 { … … 262 262 this->backlight_->setPosition(-2.35, 0, 0.2); 263 263 this->backlight_->setColour(this->getProjectileColour()); 264 264 265 265 this->smoke_ = new ParticleSpawner(); 266 266 this->smoke_->setParticle("Orxonox/smoke5", LODParticle::normal, 0, 0, 3); 267 267 this->attachObject(this->smoke_); 268 268 269 269 this->fire_ = new ParticleSpawner(); 270 270 this->fire_->setParticle("Orxonox/fire3", LODParticle::normal, 0, 0, 1); 271 271 this->attachObject(this->fire_); 272 272 } 273 273 274 274 // END CREATING ADDITIONAL EFFECTS 275 275 … … 300 300 void SpaceShip::setConfigValues() 301 301 { 302 SetConfigValue(bInvertYAxis_, false).description("Set this to true for joys tick-like mouse behaviour (mouse up = ship down).");302 SetConfigValue(bInvertYAxis_, false).description("Set this to true for joys-like mouse behaviour (mouse up = ship down)."); 303 303 SetConfigValue(reloadTime_, 0.125).description("The reload time of the weapon in seconds"); 304 304 SetConfigValue(testvector_, Vector3()).description("asdfblah");
Note: See TracChangeset
for help on using the changeset viewer.