Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

source: code/branches/presentation/src/orxonox/objects/collisionshapes @ 2493

Name Size Rev Age Author Last Change
../
BoxCollisionShape.cc 2.5 KB 2486   16 years rgrieder Added 2 new collision shapes: cone and box.
BoxCollisionShape.h 2.3 KB 2486   16 years rgrieder Added 2 new collision shapes: cone and box.
CMakeLists.txt 192 bytes 2486   16 years rgrieder Added 2 new collision shapes: cone and box.
CollisionShape.cc 4.2 KB 2469   16 years rgrieder Resolved the issue with the collision shape synchronisation.
CollisionShape.h 3.3 KB 2459   16 years rgrieder Merged physics_merge back to presentation branch.
CompoundCollisionShape.cc 7.1 KB 2484   16 years rgrieder Bugfix within CompoundCollisionShape.
CompoundCollisionShape.h 2.0 KB 2469   16 years rgrieder Resolved the issue with the collision shape synchronisation.
ConeCollisionShape.cc 2.5 KB 2486   16 years rgrieder Added 2 new collision shapes: cone and box.
ConeCollisionShape.h 1.9 KB 2486   16 years rgrieder Added 2 new collision shapes: cone and box.
PlaneCollisionShape.cc 2.6 KB 2459   16 years rgrieder Merged physics_merge back to presentation branch.
PlaneCollisionShape.h 1.9 KB 2459   16 years rgrieder Merged physics_merge back to presentation branch.
SphereCollisionShape.cc 2.4 KB 2459   16 years rgrieder Merged physics_merge back to presentation branch.
SphereCollisionShape.h 1.7 KB 2486   16 years rgrieder Added 2 new collision shapes: cone and box.
  • Property svn:mergeinfo set to (toggle deleted branches)
    /code/branches/physics/src/orxonox/objects/collisionshapesmergedeligible
    /code/branches/physics_merge/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/physics/src/orxonox/objects/worldentities/collisionshapes1912-2055
    /code/branches/pickups/src/orxonox/objects/collisionshapes1926-2086
    /code/branches/pickups/src/orxonox/objects/worldentities/collisionshapes1926-2086
    /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
Note: See TracBrowser for help on using the repository browser.