Context Navigation

← Previous Change
Next Change →

collisionshapes

Timestamp:

Dec 15, 2008, 12:53:05 AM (16 years ago)

Author:

rgrieder

Message:

Merged physics_merge back to presentation branch.

Location:

code/branches/presentation

Files:

: 1 edited
: 10 copied

. (modified) (1 prop)
src/orxonox/objects/collisionshapes (copied) (copied from code/branches/physics_merge/src/orxonox/objects/collisionshapes) (1 prop)
src/orxonox/objects/collisionshapes/CMakeLists.txt (copied) (copied from code/branches/physics_merge/src/orxonox/objects/collisionshapes/CMakeLists.txt)
src/orxonox/objects/collisionshapes/CollisionShape.cc (copied) (copied from code/branches/physics_merge/src/orxonox/objects/collisionshapes/CollisionShape.cc)
src/orxonox/objects/collisionshapes/CollisionShape.h (copied) (copied from code/branches/physics_merge/src/orxonox/objects/collisionshapes/CollisionShape.h)
src/orxonox/objects/collisionshapes/CompoundCollisionShape.cc (copied) (copied from code/branches/physics_merge/src/orxonox/objects/collisionshapes/CompoundCollisionShape.cc)
src/orxonox/objects/collisionshapes/CompoundCollisionShape.h (copied) (copied from code/branches/physics_merge/src/orxonox/objects/collisionshapes/CompoundCollisionShape.h)
src/orxonox/objects/collisionshapes/PlaneCollisionShape.cc (copied) (copied from code/branches/physics_merge/src/orxonox/objects/collisionshapes/PlaneCollisionShape.cc)
src/orxonox/objects/collisionshapes/PlaneCollisionShape.h (copied) (copied from code/branches/physics_merge/src/orxonox/objects/collisionshapes/PlaneCollisionShape.h)
src/orxonox/objects/collisionshapes/SphereCollisionShape.cc (copied) (copied from code/branches/physics_merge/src/orxonox/objects/collisionshapes/SphereCollisionShape.cc)
src/orxonox/objects/collisionshapes/SphereCollisionShape.h (copied) (copied from code/branches/physics_merge/src/orxonox/objects/collisionshapes/SphereCollisionShape.h)

code/branches/presentation

Property svn:mergeinfo changed

/code/branches/physics (added)	merged: 1913,1919-1920,1922-1925,1933,1963-1967,1971-1974,1983-1988,1995,2047,2121-2122,2124,2141,2147-2151,2177-2179,2183-2185,2187-2190,2192,2201,2291-2292,2296-2306,2313-2315,2321,2323,2373-2374,2377,2403-2405,2407-2408,2421,2423-2427,2429-2434
/code/branches/physics_merge (added)	merged: 2439-2440,2442-2446,2448,2451-2457

code/branches/presentation/src/orxonox/objects/collisionshapes
- Property svn:mergeinfo changed
  /code/branches/physics_merge/src/orxonox/objects/collisionshapes (added) merged: 2442,2445,2452

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 2459 for code/branches/presentation/src/orxonox/objects/collisionshapes

code/branches/presentation

code/branches/presentation/src/orxonox/objects/collisionshapes

Download in other formats: