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

Timestamp:

Jan 28, 2006, 5:11:51 PM (19 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:

• trunk/src/defs/class_id.h (modified) (2 diffs)

trunk/src/defs/class_id.h

@@ -118 +118 @@
   CL_VERTEX_ARRAY_MODEL         =    0x00004000,
 
+
+  CL_BILLBOARD                  =    0x10000001,
 
   // subsuper-classes derivations taken : 1, 2, 5, a, b, c.     << THIS IS A LIST OF ALL THE DCL_MASK_SUBSUPERCLASS_ID's taken
@@ -264 +266 @@
   CL_SHADER                     =    0x00000822,
   CL_FOG_EFFECT                 =    0x70000001,
+  CL_LENSE_FLARE                =    0x70000002,
 
   // GL-GUI