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

Timestamp:

Jan 21, 2006, 1:18:19 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the network-branche back to the trunk

merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/network . -r6500:HEAD
minor conflicts in texture and one Makefile resolved to the trunk

also made a small patch to texture, so it Modulates with GL_REPEAT

File:

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

trunk/src/world_entities/space_ships/space_ship.h

@@ -75 +75 @@
     float                 airViscosity;
 
+    int oldMask;
+
 };