Changeset 6426 in orxonox.OLD for trunk/src/world_entities/space_ships/space_ship.h

Timestamp:

Jan 7, 2006, 11:17:51 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the spaceshipcontrol branche back to the trunk

merged with command
svn merge ​https://svn.orxonox.net/orxonox/branches/spaceshipcontrol . -r6224:HEAD
small conflict in space_ship.cc fixed in favor of the control

File:

• trunk/src/world_entities/space_ships/space_ship.h (modified) (1 diff)

trunk/src/world_entities/space_ships/space_ship.h

@@ -73 +73 @@
     Vector                velocity;           //!< the velocity of the player.
     Quaternion            mouseDir;           //!< the direction where the player wants to fly
-    Quaternion rotQuat;
+    Quaternion            rotQuat;
     float                 travelSpeed;        //!< the current speed of the player (to make soft movement)
     float                 acceleration;       //!< the acceleration of the player.