Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


Ignore:
Timestamp:
Jan 7, 2006, 11:17:51 PM (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 . -r6224:HEAD
small conflict in space_ship.cc fixed in favor of the control

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/defs/class_id.h

    r6424 r6426  
    179179  CL_AIMING_TURRET              =    0x00000232,
    180180  CL_CANNON                     =    0x00000233,
     181  CL_TARGETING_TURRET           =    0x00000234,
    181182
    182183  CL_TEST_BULLET                =    0x00000240,
Note: See TracChangeset for help on using the changeset viewer.