Context Navigation

← Previous Change
Next Change →

BulletDynamics

Timestamp:

Feb 14, 2009, 10:17:35 PM (17 years ago)

Author:

rgrieder

Message:

Merged presentation branch back to trunk.

Location:

code/trunk

Files:

: 1 edited
: 48 copied

. (modified) (1 prop)
src/bullet (copied) (copied from code/branches/presentation/src/bullet)
src/bullet/BulletDynamics (copied) (copied from code/branches/presentation/src/bullet/BulletDynamics)
src/bullet/BulletDynamics/CMakeLists.txt (copied) (copied from code/branches/presentation/src/bullet/BulletDynamics/CMakeLists.txt)
src/bullet/BulletDynamics/Character (copied) (copied from code/branches/presentation/src/bullet/BulletDynamics/Character)
src/bullet/BulletDynamics/Character/btCharacterControllerInterface.h (copied) (copied from code/branches/presentation/src/bullet/BulletDynamics/Character/btCharacterControllerInterface.h)
src/bullet/BulletDynamics/Character/btKinematicCharacterController.cpp (copied) (copied from code/branches/presentation/src/bullet/BulletDynamics/Character/btKinematicCharacterController.cpp)
src/bullet/BulletDynamics/Character/btKinematicCharacterController.h (copied) (copied from code/branches/presentation/src/bullet/BulletDynamics/Character/btKinematicCharacterController.h)
src/bullet/BulletDynamics/ConstraintSolver (copied) (copied from code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver)
src/bullet/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp (copied) (copied from code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp)
src/bullet/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h (copied) (copied from code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h)
src/bullet/BulletDynamics/ConstraintSolver/btConstraintSolver.h (copied) (copied from code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btConstraintSolver.h)
src/bullet/BulletDynamics/ConstraintSolver/btContactConstraint.cpp (copied) (copied from code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btContactConstraint.cpp)
src/bullet/BulletDynamics/ConstraintSolver/btContactConstraint.h (copied) (copied from code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btContactConstraint.h)
src/bullet/BulletDynamics/ConstraintSolver/btContactSolverInfo.h (copied) (copied from code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btContactSolverInfo.h)
src/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp (copied) (copied from code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp)
src/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h (copied) (copied from code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h)
src/bullet/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp (copied) (copied from code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp)
src/bullet/BulletDynamics/ConstraintSolver/btHingeConstraint.h (copied) (copied from code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btHingeConstraint.h)
src/bullet/BulletDynamics/ConstraintSolver/btJacobianEntry.h (copied) (copied from code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btJacobianEntry.h)
src/bullet/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp (copied) (copied from code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp)
src/bullet/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h (copied) (copied from code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h)
src/bullet/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp (copied) (copied from code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp)
src/bullet/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h (copied) (copied from code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h)
src/bullet/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp (copied) (copied from code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp)
src/bullet/BulletDynamics/ConstraintSolver/btSliderConstraint.h (copied) (copied from code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btSliderConstraint.h)
src/bullet/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.cpp (copied) (copied from code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.cpp)
src/bullet/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.h (copied) (copied from code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.h)
src/bullet/BulletDynamics/ConstraintSolver/btSolverBody.h (copied) (copied from code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btSolverBody.h)
src/bullet/BulletDynamics/ConstraintSolver/btSolverConstraint.h (copied) (copied from code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btSolverConstraint.h)
src/bullet/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp (copied) (copied from code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp)
src/bullet/BulletDynamics/ConstraintSolver/btTypedConstraint.h (copied) (copied from code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btTypedConstraint.h)
src/bullet/BulletDynamics/Dynamics (copied) (copied from code/branches/presentation/src/bullet/BulletDynamics/Dynamics)
src/bullet/BulletDynamics/Dynamics/Bullet-C-API.cpp (copied) (copied from code/branches/presentation/src/bullet/BulletDynamics/Dynamics/Bullet-C-API.cpp)
src/bullet/BulletDynamics/Dynamics/btContinuousDynamicsWorld.cpp (copied) (copied from code/branches/presentation/src/bullet/BulletDynamics/Dynamics/btContinuousDynamicsWorld.cpp)
src/bullet/BulletDynamics/Dynamics/btContinuousDynamicsWorld.h (copied) (copied from code/branches/presentation/src/bullet/BulletDynamics/Dynamics/btContinuousDynamicsWorld.h)
src/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp (copied) (copied from code/branches/presentation/src/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp)
src/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h (copied) (copied from code/branches/presentation/src/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h)
src/bullet/BulletDynamics/Dynamics/btDynamicsWorld.h (copied) (copied from code/branches/presentation/src/bullet/BulletDynamics/Dynamics/btDynamicsWorld.h)
src/bullet/BulletDynamics/Dynamics/btRigidBody.cpp (copied) (copied from code/branches/presentation/src/bullet/BulletDynamics/Dynamics/btRigidBody.cpp)
src/bullet/BulletDynamics/Dynamics/btRigidBody.h (copied) (copied from code/branches/presentation/src/bullet/BulletDynamics/Dynamics/btRigidBody.h)
src/bullet/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp (copied) (copied from code/branches/presentation/src/bullet/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp)
src/bullet/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h (copied) (copied from code/branches/presentation/src/bullet/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h)
src/bullet/BulletDynamics/Vehicle (copied) (copied from code/branches/presentation/src/bullet/BulletDynamics/Vehicle)
src/bullet/BulletDynamics/Vehicle/btRaycastVehicle.cpp (copied) (copied from code/branches/presentation/src/bullet/BulletDynamics/Vehicle/btRaycastVehicle.cpp)
src/bullet/BulletDynamics/Vehicle/btRaycastVehicle.h (copied) (copied from code/branches/presentation/src/bullet/BulletDynamics/Vehicle/btRaycastVehicle.h)
src/bullet/BulletDynamics/Vehicle/btVehicleRaycaster.h (copied) (copied from code/branches/presentation/src/bullet/BulletDynamics/Vehicle/btVehicleRaycaster.h)
src/bullet/BulletDynamics/Vehicle/btWheelInfo.cpp (copied) (copied from code/branches/presentation/src/bullet/BulletDynamics/Vehicle/btWheelInfo.cpp)
src/bullet/BulletDynamics/Vehicle/btWheelInfo.h (copied) (copied from code/branches/presentation/src/bullet/BulletDynamics/Vehicle/btWheelInfo.h)

code/trunk

Property svn:mergeinfo changed

/code/branches/lodfinal (added)	merged: 2372,2380,2388,2394-2395,2402,2411
/code/branches/network (added)	merged: 2356
/code/branches/network64 (added)	merged: 2210-2211,2245-2247,2255,2307,2309-2312,2316,2355
/code/branches/objecthierarchy2 (added)	merged: 2172-2176,2182,2207,2212-2213,2254,2256-2257,2259,2343-2345,2350,2358,2361-2365,2369,2396,2400,2406,2414,2422,2428,2437-2438,2441,2447,2449-2450,2461-2462,2467,2478-2479
/code/branches/overlay (added)	merged: 2117-2118,2120,2140,2152,2180-2181,2200,2222,2225,2320
/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/pickups2 (added)	merged: 2110,2136,2202,2227,2289-2290,2293-2294,2324,2342,2389,2397
/code/branches/presentation (added)	merged: 2370-2371,2378,2381-2382,2385,2387,2413,2415-2420,2435-2436,2459-2460,2463-2466,2468-2477,2480-2506,2513-2515,2527,2535-2545,2548-2565,2571,2575,2578,2655,2660
/code/branches/weapon2 (added)	merged: 2108,2145,2186,2203,2232,2272-2273,2288,2308,2319,2327,2331,2337,2347,2354,2366-2368,2379,2391,2393,2398,2410

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

Context Navigation

Changeset 2662 for code/trunk/src/bullet/BulletDynamics

code/trunk

Download in other formats: