Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Jan 28, 2006, 5:11:51 PM (18 years ago)
Author:
bensch
Message:

orxonox/trunk: merged branches/network back to the trunk.
merged with command:
svn merge https://svn.orxonox.net/orxonox/branches/network . -r6774:HEAD

no conflicts…
thats what i call orthogonal work

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/world_entities/space_ships/space_ship.h

    r6807 r6815  
    4242    virtual int       readBytes(byte* data, int maxLength, int * reciever);
    4343
    44 
    4544  private:
    4645    void init();
     
    7069
    7170    Vector                velocity;           //!< the velocity of the player.
     71    Vector                oldVelocity;        //!< the velocity the player had last synced
    7272    Quaternion            mouseDir;           //!< the direction where the player wants to fly
    7373    Quaternion            oldMouseDir;        //!< the direction where the player wanted to fly
Note: See TracChangeset for help on using the changeset viewer.