Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6637 in orxonox.OLD for trunk/src/defs


Ignore:
Timestamp:
Jan 21, 2006, 1:27:29 AM (19 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 . -r6482:HEAD

minor conflicts, and added file hover.cc/h to the Makefile.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/defs/class_id.h

    r6634 r6637  
    178178  CL_SPAWNING_POINT             =    0x0000020c,
    179179  CL_MD2_CREATURE               =    0x0000020d,
     180  CL_HOVER                      =    0x0000020e,
    180181
    181182  CL_TURRET_POWER_UP            =    0x00000211,
Note: See TracChangeset for help on using the changeset viewer.