Changeset 8597 for code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.h

Timestamp:

May 26, 2011, 2:29:03 PM (14 years ago)

Author:

dafrick

Message:

Merging steering branch into presentation branch.

Location:

code/branches/presentation

Files:

• . (modified) (1 prop)
• src/orxonox/worldentities/pawns/SpaceShip.h (modified) (1 diff)

code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.h

@@ -98 +98 @@
             float boostPowerRate_;
             float boostCooldownDuration_;
+            float lift_;
+            float stallSpeed_;
             Vector3 steering_;
             float primaryThrust_;