Changeset 12029 for code/branches/mergeFS18/src/orxonox
- Timestamp:
- Oct 10, 2018, 3:36:53 PM (6 years ago)
- Location:
- code/branches/mergeFS18
- Files:
-
- 4 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(); -
code/branches/mergeFS18/src/orxonox/worldentities/pawns/SpaceShip.cc
r12028 r12029 65 65 this->boostPowerRate_ = 1.0f; 66 66 this->boostRate_ = 5.0f; 67 this->boostCooldownDuration_ = 5.0f;67 this->boostCooldownDuration_ = 10.0f; 68 68 69 69 this->shakeFrequency_ = 15.0f; -
code/branches/mergeFS18/src/orxonox/worldentities/pawns/SpaceShip.h
r12028 r12029 103 103 */ 104 104 virtual void moveFrontBack(const Vector2& value) 105 { this->steering_.z -= value.x; }105 { this->steering_.z -= (0.6)*value.x; } 106 106 /** 107 107 @brief Move right or left. … … 109 109 */ 110 110 virtual void moveRightLeft(const Vector2& value) 111 { this->steering_.x += value.x; }111 { this->steering_.x += (0.6)*value.x; } 112 112 /** 113 113 @brief Move up or down. … … 115 115 */ 116 116 virtual void moveUpDown(const Vector2& value) 117 { this->steering_.y += value.x; }117 { this->steering_.y += (0.6)*value.x; } 118 118 119 119 inline void moveFrontBack(float value)
Note: See TracChangeset
for help on using the changeset viewer.