Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


Ignore:
Timestamp:
Dec 19, 2005, 4:52:01 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: merged the spaceshipcontroll branche into the trunk
merged with command
svn merge -r6036:HEAD spaceshipcontrol/ ../trunk/
no conflicts

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/defs/class_id.h

    r6139 r6162  
    9292  CL_TEXTURE                    =    0x00c01000,
    9393  CL_MODEL                      =    0x00c02000,
     94  CL_STATIC_MODEL               =    0x00c04000,
     95  CL_VERTEX_ARRAY_MODEL         =    0x00c08000,
    9496
    9597
    … …  
    202204  CL_MATERIAL                   =    0x00000804,
    203205  CL_TEXTURE_SEQUENCE           =    0x00c04805,
    204   CL_VERTEX_ARRAY_MODEL         =    0x00000806,
    205   CL_OBJMODEL                   =    0x00000807,
     206  CL_OBJ_MODEL                  =    0x00000807,
    206207  CL_PROMITIVE_MODEL            =    0x00000808,
    207208  CL_MD2Model                   =    0x00000809,
Note: See TracChangeset for help on using the changeset viewer.