Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Jul 2, 2006, 2:22:19 PM (18 years ago)
Author:
bensch
Message:

orxonox/trunk: merged the network bak to the trunk
merged with command:
svn merge -r8804:HEAD https://svn.orxonox.net/orxonox/branches/multi_player_map .

conflicts all resolved in favour of the branche

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/lib/collision_detection/bounding_volume.h

    r7711 r9008  
    3838    const int*          triangleIndexes;            //!< Array with the triangle indexes in modelInfo
    3939    int                 triangleIndexesLength;      //!< length of the indexes array
     40
     41    float               radius;                     //!< the radius of the box (longest axis)
    4042};
    4143
Note: See TracChangeset for help on using the changeset viewer.