Changeset 12029 for code/branches/mergeFS18/src/orxonox/items
- Timestamp:
- Oct 10, 2018, 3:36:53 PM (6 years ago)
- Location:
- code/branches/mergeFS18
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/mergeFS18
- Property svn:mergeinfo changed
/code/branches/RacingBots_FS18 (added) merged: 11817,11840-11841,11857,11860,11893,11912-11913,11938,11964-11969,11977,11982,11986,11989,11997
- Property svn:mergeinfo changed
-
code/branches/mergeFS18/src/orxonox/items/Engine.cc
r11071 r12029 54 54 this->relativePosition_ = Vector3::ZERO; 55 55 56 this->boostFactor_ = 1. 5f;56 this->boostFactor_ = 1.2f; 57 57 58 58 this->maxSpeedFront_ = 0.0f; … … 61 61 this->maxSpeedUpDown_ = 0.0f; 62 62 63 this->accelerationFront_ = 0.0f;63 this->accelerationFront_ = 1.0f; 64 64 this->accelerationBrake_ = 0.0f; 65 65 this->accelerationBack_ = 0.0f; … … 68 68 69 69 this->speedAdd_ = 0.0f; 70 this->speedMultiply_ = 1.0f; 70 this->speedMultiply_ = 1.0f; ////////////////////////////////////////// 71 71 72 72 this->setConfigValues();
Note: See TracChangeset
for help on using the changeset viewer.