Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

source: code/branches/buildsystem3/src/orxonox/objects/collisionshapes @ 2665

Name Size Rev Age Author Last Change
../
BoxCollisionShape.cc 2.4 KB ​ 2662   15 years rgrieder Merged presentation branch back to trunk.
BoxCollisionShape.h 2.3 KB ​ 2662   15 years rgrieder Merged presentation branch back to trunk.
CMakeLists.txt 214 bytes ​ 2665   15 years rgrieder Manual merge.
CollisionShape.cc 5.5 KB ​ 2662   15 years rgrieder Merged presentation branch back to trunk.
CollisionShape.h 3.3 KB ​ 2662   15 years rgrieder Merged presentation branch back to trunk.
CompoundCollisionShape.cc 6.5 KB ​ 2662   15 years rgrieder Merged presentation branch back to trunk.
CompoundCollisionShape.h 2.0 KB ​ 2662   15 years rgrieder Merged presentation branch back to trunk.
ConeCollisionShape.cc 2.4 KB ​ 2662   15 years rgrieder Merged presentation branch back to trunk.
ConeCollisionShape.h 1.9 KB ​ 2662   15 years rgrieder Merged presentation branch back to trunk.
PlaneCollisionShape.cc 2.5 KB ​ 2662   15 years rgrieder Merged presentation branch back to trunk.
PlaneCollisionShape.h 1.9 KB ​ 2662   15 years rgrieder Merged presentation branch back to trunk.
SphereCollisionShape.cc 2.2 KB ​ 2662   15 years rgrieder Merged presentation branch back to trunk.
SphereCollisionShape.h 1.7 KB ​ 2662   15 years rgrieder Merged presentation branch back to trunk.
WorldEntityCollisionShape.cc 2.2 KB ​ 2662   15 years rgrieder Merged presentation branch back to trunk.
WorldEntityCollisionShape.h 1.6 KB ​ 2662   15 years rgrieder Merged presentation branch back to trunk.
  • Property svn:mergeinfo set to (toggle deleted branches)
    /code/branches/presentation/src/orxonox/objects/collisionshapesmergedeligible
    /code/branches/ceguilua/src/orxonox/objects/collisionshapes1802-1808
    /code/branches/ceguilua/src/orxonox/objects/worldentities/collisionshapes1802-1808
    /code/branches/core3/src/orxonox/objects/collisionshapes1572-1739
    /code/branches/core3/src/orxonox/objects/worldentities/collisionshapes1572-1739
    /code/branches/gcc43/src/orxonox/objects/collisionshapes1580
    /code/branches/gcc43/src/orxonox/objects/worldentities/collisionshapes1580
    /code/branches/gui/src/orxonox/objects/collisionshapes1635-1723
    /code/branches/gui/src/orxonox/objects/worldentities/collisionshapes1635-1723
    /code/branches/input/src/orxonox/objects/collisionshapes1629-1636
    /code/branches/input/src/orxonox/objects/worldentities/collisionshapes1629-1636
    /code/branches/lodfinal/src/orxonox/objects/collisionshapes2372-2411
    /code/branches/network/src/orxonox/objects/collisionshapes2356
    /code/branches/network64/src/orxonox/objects/collisionshapes2210-2355
    /code/branches/objecthierarchy/src/orxonox/objects/collisionshapes1911-2085,​2100,​2110-2169
    /code/branches/objecthierarchy/src/orxonox/objects/worldentities/collisionshapes1911-2085,​2100
    /code/branches/objecthierarchy2/src/orxonox/objects/collisionshapes2171-2479
    /code/branches/overlay/src/orxonox/objects/collisionshapes2117-2385
    /code/branches/physics/src/orxonox/objects/collisionshapes1912-2055,​2107-2439
    /code/branches/physics/src/orxonox/objects/worldentities/collisionshapes1912-2055
    /code/branches/physics_merge/src/orxonox/objects/collisionshapes2436-2457
    /code/branches/pickups/src/orxonox/objects/collisionshapes1926-2086,​2127
    /code/branches/pickups/src/orxonox/objects/worldentities/collisionshapes1926-2086
    /code/branches/pickups2/src/orxonox/objects/collisionshapes2107-2497
    /code/branches/questsystem/src/orxonox/objects/collisionshapes1894-2088
    /code/branches/questsystem/src/orxonox/objects/worldentities/collisionshapes1894-2088
    /code/branches/questsystem2/src/orxonox/objects/collisionshapes2107-2259
    /code/branches/script_trigger/src/orxonox/objects/collisionshapes1295-1953,​1955
    /code/branches/script_trigger/src/orxonox/objects/worldentities/collisionshapes1295-1953,​1955
    /code/branches/weapon/src/orxonox/objects/collisionshapes1925-2094
    /code/branches/weapon/src/orxonox/objects/worldentities/collisionshapes1925-2094
    /code/branches/weapon2/src/orxonox/objects/collisionshapes2107-2488
Note: See TracBrowser for help on using the repository browser.