Changeset 10294 for code/trunk/src
- Timestamp:
- Mar 1, 2015, 9:59:28 PM (10 years ago)
- Location:
- code/trunk/src
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk/src/modules/overlays/hud/HUDNavigation.cc
r10292 r10294 86 86 87 87 this->setDetectionLimit(10000.0f); 88 this->currentMunitionSpeed_ = 2500.0f;88 this->currentMunitionSpeed_ = 750.0f; 89 89 90 90 this->closestTarget_ = true; -
code/trunk/src/modules/weapons/weaponmodes/EnergyDrink.cc
r9667 r10294 57 57 this->reloadTime_ = 0.25f; 58 58 this->damage_ = 0.0f; 59 this->speed_ = 2500.0f;59 this->speed_ = 750.0f; 60 60 this->delay_ = 0.0f; 61 61 this->setMunitionName("FusionMunition"); -
code/trunk/src/modules/weapons/weaponmodes/FusionFire.cc
r9667 r10294 55 55 this->bParallelReload_ = false; 56 56 this->damage_ = 0.0f; 57 this->speed_ = 1250.0f;57 this->speed_ = 750.0f; 58 58 59 59 this->setMunitionName("FusionMunition"); -
code/trunk/src/modules/weapons/weaponmodes/HsW01.cc
r10290 r10294 58 58 this->reloadTime_ = 0.25f; 59 59 this->damage_ = 0.0f; //default 15 60 this->speed_ = 2500.0f;60 this->speed_ = 750.0f; 61 61 this->delay_ = 0.0f; 62 62 this->setMunitionName("LaserMunition"); -
code/trunk/src/modules/weapons/weaponmodes/LaserFire.cc
r9667 r10294 53 53 this->reloadTime_ = 0.25f; 54 54 this->damage_ = 0.0f; 55 this->speed_ = 1250.0f;55 this->speed_ = 750.0f; 56 56 57 57 this->setMunitionName("LaserMunition"); -
code/trunk/src/modules/weapons/weaponmodes/LightningGun.cc
r9667 r10294 52 52 this->reloadTime_ = 1.0f; 53 53 this->damage_ = 0.0f; 54 this->speed_ = 7 00.0f;54 this->speed_ = 750.0f; 55 55 56 56 this->setMunitionName("LaserMunition"); -
code/trunk/src/orxonox/controllers/ArtificialController.cc
r10289 r10294 92 92 return; 93 93 94 static const float hardcoded_projectile_speed = 2500;94 static const float hardcoded_projectile_speed = 750; 95 95 96 96 this->targetPosition_ = getPredictedPosition(this->getControllableEntity()->getWorldPosition(), hardcoded_projectile_speed, this->target_->getWorldPosition(), this->target_->getVelocity());
Note: See TracChangeset
for help on using the changeset viewer.