# # ChangeLog for code/branches/physics_merge/src # # Generated by Trac 1.0.9 # Nov 5, 2024, 6:34:38 AM Sun, 14 Dec 2008 23:37:09 GMT rgrieder [2458] * code/branches/physics_merge/src/orxonox/CMakeLists.txt (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/Planet.cc (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/Planet.h (modified) * code/branches/physics_merge/src/util/Integers.h (modified) Several build fixed. Something seems to be wrong with the ... Sun, 14 Dec 2008 22:41:08 GMT rgrieder [2457] * code/branches/physics_merge/src/network/packet/Gamestate.cc (modified) Fix didn't do the trick. Don't even know exactly what it would have ... Sun, 14 Dec 2008 22:25:05 GMT rgrieder [2456] * code/branches/physics_merge/src/network/packet/Gamestate.cc (modified) Applied bugfix r2441 to physics_merge branch as well. Sun, 14 Dec 2008 22:16:36 GMT rgrieder [2455] * code/branches/physics_merge/src/network/synchronisable/NetworkCallbackManager.cc (modified) Bugfix: std:dequeue::front() on an empty list is a very bad idea. Sun, 14 Dec 2008 22:02:58 GMT rgrieder [2454] * code/branches/physics_merge/src/orxonox/objects/worldentities/MobileEntity.cc (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/StaticEntity.cc (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/WorldEntity.cc (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/pawns/SpaceShip.cc (modified) Replaced bad collision type exceptions with asserts. The developer ... Sun, 14 Dec 2008 21:55:04 GMT rgrieder [2453] * code/branches/physics_merge/src/orxonox/objects/worldentities/pawns/SpaceShip.cc (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/pawns/SpaceShip.h (modified) SpaceShip is now harmonising with Bullet as well. The attributes of ... Sun, 14 Dec 2008 21:53:44 GMT rgrieder [2452] * code/branches/physics_merge/src/orxonox/objects/collisionshapes/CollisionShape.cc (modified) * code/branches/physics_merge/src/orxonox/objects/collisionshapes/CollisionShape.h (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/MobileEntity.cc (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/MobileEntity.h (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/WorldEntity.cc (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/WorldEntity.h (modified) Minor changes and added localInertia_ to worldentity for faster access. Sun, 14 Dec 2008 21:53:00 GMT rgrieder [2451] * code/branches/physics_merge/src/core/XMLPort.h (modified) Bugfix in XMLPort macro. Sun, 14 Dec 2008 19:13:56 GMT rgrieder [2448] * code/branches/physics_merge/src/orxonox/objects/Scene.cc (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/pawns/Spectator.cc (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/pawns/Spectator.h (modified) Spectator update with new physics stuff. Sun, 14 Dec 2008 18:08:36 GMT rgrieder [2446] * code/branches/physics_merge/src/orxonox/objects/Scene.cc (modified) * code/branches/physics_merge/src/orxonox/objects/Scene.h (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/WorldEntity.cc (modified) - orxonox::Scene should work properly with XMLPort and network ... Sun, 14 Dec 2008 18:06:12 GMT rgrieder [2445] * code/branches/physics_merge/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/physics_merge/src/orxonox/OrxonoxStableHeaders.h (modified) * code/branches/physics_merge/src/orxonox/objects/collisionshapes/CollisionShape.cc (modified) * code/branches/physics_merge/src/orxonox/objects/collisionshapes/CollisionShape.h (modified) * code/branches/physics_merge/src/orxonox/objects/collisionshapes/CompoundCollisionShape.cc (modified) * code/branches/physics_merge/src/orxonox/objects/collisionshapes/PlaneCollisionShape.cc (modified) * code/branches/physics_merge/src/orxonox/objects/collisionshapes/PlaneCollisionShape.h (modified) Small adjustments due to the merge. Sun, 14 Dec 2008 15:16:52 GMT rgrieder [2442] * code/branches/physics_merge (modified) * code/branches/physics_merge/cmake/FindODE.cmake (modified) * code/branches/physics_merge/src/CMakeLists.txt (modified) * code/branches/physics_merge/src/bullet (copied) * code/branches/physics_merge/src/bullet/AUTHORS (copied) * code/branches/physics_merge/src/bullet/Bullet-C-Api.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision (copied) * code/branches/physics_merge/src/bullet/BulletCollision/BroadphaseCollision (copied) * code/branches/physics_merge/src/bullet/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/BroadphaseCollision/btAxisSweep3.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/BroadphaseCollision/btBroadphaseProxy.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/BroadphaseCollision/btDbvt.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/BroadphaseCollision/btDbvt.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/BroadphaseCollision/btDispatcher.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/BroadphaseCollision/btDispatcher.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/BroadphaseCollision/btQuantizedBvh.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CMakeLists.txt (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/SphereTriangleDetector.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btBoxBoxDetector.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btCollisionConfiguration.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btCollisionDispatcher.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btCollisionObject.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btCollisionObject.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btCollisionWorld.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btCollisionWorld.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btGhostObject.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btGhostObject.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btManifoldResult.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btManifoldResult.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btSimulationIslandManager.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btUnionFind.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btUnionFind.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btBoxShape.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btBoxShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btCapsuleShape.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btCapsuleShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btCollisionMargin.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btCollisionShape.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btCollisionShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btCompoundShape.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btCompoundShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btConcaveShape.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btConcaveShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btConeShape.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btConeShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btConvexHullShape.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btConvexHullShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btConvexInternalShape.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btConvexInternalShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btConvexPointCloudShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btConvexShape.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btConvexShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btCylinderShape.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btCylinderShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btEmptyShape.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btEmptyShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btMaterial.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btMinkowskiSumShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btMultiSphereShape.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btMultiSphereShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btOptimizedBvh.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btOptimizedBvh.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btShapeHull.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btShapeHull.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btSphereShape.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btSphereShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btStaticPlaneShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btStridingMeshInterface.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btTetrahedronShape.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btTetrahedronShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btTriangleBuffer.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btTriangleBuffer.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btTriangleCallback.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btTriangleCallback.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btTriangleMesh.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btTriangleMesh.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btTriangleMeshShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btTriangleShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btUniformScalingShape.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btUniformScalingShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/btBoxCollision.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/btClipPolygon.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/btContactProcessing.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/btContactProcessing.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/btGImpactBvh.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/btGImpactBvh.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/btGImpactMassUtil.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/btGImpactQuantizedBvh.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/btGImpactShape.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/btGImpactShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/btGenericPoolAllocator.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/btGenericPoolAllocator.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/btGeometryOperations.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/btQuantization.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/btTriangleShapeEx.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/btTriangleShapeEx.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/gim_array.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/gim_basic_geometry_operations.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/gim_bitset.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/gim_box_collision.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/gim_box_set.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/gim_box_set.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/gim_clip_polygon.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/gim_contact.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/gim_contact.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/gim_geom_types.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/gim_geometry.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/gim_hash_table.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/gim_linear_math.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/gim_math.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/gim_memory.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/gim_memory.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/gim_radixsort.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/gim_tri_collision.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/gim_tri_collision.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btConvexCast.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btConvexCast.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btPointCollector.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h (copied) * code/branches/physics_merge/src/bullet/BulletDynamics (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/CMakeLists.txt (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/Character (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/Character/btCharacterControllerInterface.h (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/Character/btKinematicCharacterController.cpp (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/Character/btKinematicCharacterController.h (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/ConstraintSolver (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/ConstraintSolver/btConstraintSolver.h (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/ConstraintSolver/btContactConstraint.cpp (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/ConstraintSolver/btContactConstraint.h (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/ConstraintSolver/btContactSolverInfo.h (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/ConstraintSolver/btHingeConstraint.h (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/ConstraintSolver/btJacobianEntry.h (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/ConstraintSolver/btSliderConstraint.h (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.cpp (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.h (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/ConstraintSolver/btSolverBody.h (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/ConstraintSolver/btSolverConstraint.h (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/ConstraintSolver/btTypedConstraint.h (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/Dynamics (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/Dynamics/Bullet-C-API.cpp (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/Dynamics/btContinuousDynamicsWorld.cpp (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/Dynamics/btContinuousDynamicsWorld.h (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/Dynamics/btDynamicsWorld.h (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/Dynamics/btRigidBody.cpp (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/Dynamics/btRigidBody.h (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/Vehicle (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/Vehicle/btRaycastVehicle.cpp (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/Vehicle/btRaycastVehicle.h (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/Vehicle/btVehicleRaycaster.h (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/Vehicle/btWheelInfo.cpp (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/Vehicle/btWheelInfo.h (copied) * code/branches/physics_merge/src/bullet/BulletLicense.txt (copied) * code/branches/physics_merge/src/bullet/CMakeLists.txt (copied) * code/branches/physics_merge/src/bullet/ChangeLog (copied) * code/branches/physics_merge/src/bullet/LICENSE (copied) * code/branches/physics_merge/src/bullet/LinearMath (copied) * code/branches/physics_merge/src/bullet/LinearMath/CMakeLists.txt (copied) * code/branches/physics_merge/src/bullet/LinearMath/btAabbUtil2.h (copied) * code/branches/physics_merge/src/bullet/LinearMath/btAlignedAllocator.cpp (copied) * code/branches/physics_merge/src/bullet/LinearMath/btAlignedAllocator.h (copied) * code/branches/physics_merge/src/bullet/LinearMath/btAlignedObjectArray.h (copied) * code/branches/physics_merge/src/bullet/LinearMath/btConvexHull.cpp (copied) * code/branches/physics_merge/src/bullet/LinearMath/btConvexHull.h (copied) * code/branches/physics_merge/src/bullet/LinearMath/btDefaultMotionState.h (copied) * code/branches/physics_merge/src/bullet/LinearMath/btGeometryUtil.cpp (copied) * code/branches/physics_merge/src/bullet/LinearMath/btGeometryUtil.h (copied) * code/branches/physics_merge/src/bullet/LinearMath/btHashMap.h (copied) * code/branches/physics_merge/src/bullet/LinearMath/btIDebugDraw.h (copied) * code/branches/physics_merge/src/bullet/LinearMath/btList.h (copied) * code/branches/physics_merge/src/bullet/LinearMath/btMatrix3x3.h (copied) * code/branches/physics_merge/src/bullet/LinearMath/btMinMax.h (copied) * code/branches/physics_merge/src/bullet/LinearMath/btMotionState.h (copied) * code/branches/physics_merge/src/bullet/LinearMath/btPoolAllocator.h (copied) * code/branches/physics_merge/src/bullet/LinearMath/btQuadWord.h (copied) * code/branches/physics_merge/src/bullet/LinearMath/btQuaternion.h (copied) * code/branches/physics_merge/src/bullet/LinearMath/btQuickprof.cpp (copied) * code/branches/physics_merge/src/bullet/LinearMath/btQuickprof.h (copied) * code/branches/physics_merge/src/bullet/LinearMath/btRandom.h (copied) * code/branches/physics_merge/src/bullet/LinearMath/btScalar.h (copied) * code/branches/physics_merge/src/bullet/LinearMath/btStackAlloc.h (copied) * code/branches/physics_merge/src/bullet/LinearMath/btTransform.h (copied) * code/branches/physics_merge/src/bullet/LinearMath/btTransformUtil.h (copied) * code/branches/physics_merge/src/bullet/LinearMath/btVector3.h (copied) * code/branches/physics_merge/src/bullet/NEWS (copied) * code/branches/physics_merge/src/bullet/README (copied) * code/branches/physics_merge/src/bullet/VERSION (copied) * code/branches/physics_merge/src/bullet/btBulletCollisionCommon.h (copied) * code/branches/physics_merge/src/bullet/btBulletDynamicsCommon.h (copied) * code/branches/physics_merge/src/core/RootGameState.cc (modified) * code/branches/physics_merge/src/core/Template.cc (modified) * code/branches/physics_merge/src/core/Template.h (modified) * code/branches/physics_merge/src/core/XMLFile.h (modified) * code/branches/physics_merge/src/core/XMLIncludes.h (modified) * code/branches/physics_merge/src/core/XMLPort.h (modified) * code/branches/physics_merge/src/orxonox/CMakeLists.txt (modified) * code/branches/physics_merge/src/orxonox/CameraManager.cc (modified) * code/branches/physics_merge/src/orxonox/CameraManager.h (modified) * code/branches/physics_merge/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/physics_merge/src/orxonox/OrxonoxStableHeaders.h (modified) * code/branches/physics_merge/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/physics_merge/src/orxonox/gamestates/GSRoot.cc (modified) * code/branches/physics_merge/src/orxonox/objects/CMakeLists.txt (modified) * code/branches/physics_merge/src/orxonox/objects/Scene.cc (modified) * code/branches/physics_merge/src/orxonox/objects/Scene.h (modified) * code/branches/physics_merge/src/orxonox/objects/collisionshapes (copied) * code/branches/physics_merge/src/orxonox/objects/collisionshapes/CMakeLists.txt (added) * code/branches/physics_merge/src/orxonox/objects/collisionshapes/CollisionShape.cc (copied) * code/branches/physics_merge/src/orxonox/objects/collisionshapes/CollisionShape.h (copied) * code/branches/physics_merge/src/orxonox/objects/collisionshapes/CompoundCollisionShape.cc (copied) * code/branches/physics_merge/src/orxonox/objects/collisionshapes/CompoundCollisionShape.h (copied) * code/branches/physics_merge/src/orxonox/objects/collisionshapes/PlaneCollisionShape.cc (copied) * code/branches/physics_merge/src/orxonox/objects/collisionshapes/PlaneCollisionShape.h (copied) * code/branches/physics_merge/src/orxonox/objects/collisionshapes/SphereCollisionShape.cc (copied) * code/branches/physics_merge/src/orxonox/objects/collisionshapes/SphereCollisionShape.h (copied) * code/branches/physics_merge/src/orxonox/objects/pickup/Usable.h (modified) * code/branches/physics_merge/src/orxonox/objects/quest/AddQuest.cc (modified) * code/branches/physics_merge/src/orxonox/objects/quest/AddQuest.h (modified) * code/branches/physics_merge/src/orxonox/objects/quest/AddQuestHint.cc (modified) * code/branches/physics_merge/src/orxonox/objects/quest/AddQuestHint.h (modified) * code/branches/physics_merge/src/orxonox/objects/quest/AddReward.cc (modified) * code/branches/physics_merge/src/orxonox/objects/quest/AddReward.h (modified) * code/branches/physics_merge/src/orxonox/objects/quest/ChangeQuestStatus.cc (modified) * code/branches/physics_merge/src/orxonox/objects/quest/ChangeQuestStatus.h (modified) * code/branches/physics_merge/src/orxonox/objects/quest/CompleteQuest.cc (modified) * code/branches/physics_merge/src/orxonox/objects/quest/CompleteQuest.h (modified) * code/branches/physics_merge/src/orxonox/objects/quest/FailQuest.cc (modified) * code/branches/physics_merge/src/orxonox/objects/quest/FailQuest.h (modified) * code/branches/physics_merge/src/orxonox/objects/quest/GlobalQuest.cc (modified) * code/branches/physics_merge/src/orxonox/objects/quest/GlobalQuest.h (modified) * code/branches/physics_merge/src/orxonox/objects/quest/LocalQuest.cc (modified) * code/branches/physics_merge/src/orxonox/objects/quest/LocalQuest.h (modified) * code/branches/physics_merge/src/orxonox/objects/quest/Quest.cc (modified) * code/branches/physics_merge/src/orxonox/objects/quest/Quest.h (modified) * code/branches/physics_merge/src/orxonox/objects/quest/QuestDescription.cc (modified) * code/branches/physics_merge/src/orxonox/objects/quest/QuestDescription.h (modified) * code/branches/physics_merge/src/orxonox/objects/quest/QuestEffect.cc (modified) * code/branches/physics_merge/src/orxonox/objects/quest/QuestEffect.h (modified) * code/branches/physics_merge/src/orxonox/objects/quest/QuestEffectBeacon.cc (modified) * code/branches/physics_merge/src/orxonox/objects/quest/QuestEffectBeacon.h (modified) * code/branches/physics_merge/src/orxonox/objects/quest/QuestHint.cc (modified) * code/branches/physics_merge/src/orxonox/objects/quest/QuestHint.h (modified) * code/branches/physics_merge/src/orxonox/objects/quest/QuestItem.cc (modified) * code/branches/physics_merge/src/orxonox/objects/quest/QuestItem.h (modified) * code/branches/physics_merge/src/orxonox/objects/quest/QuestManager.cc (modified) * code/branches/physics_merge/src/orxonox/objects/quest/QuestManager.h (modified) * code/branches/physics_merge/src/orxonox/objects/quest/Rewardable.cc (modified) * code/branches/physics_merge/src/orxonox/objects/quest/Rewardable.h (modified) * code/branches/physics_merge/src/orxonox/objects/weaponSystem/WeaponSystem.cc (modified) * code/branches/physics_merge/src/orxonox/objects/weaponSystem/WeaponSystem.h (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/Backlight.cc (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/Backlight.h (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/Billboard.cc (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/Billboard.h (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/CMakeLists.txt (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/Camera.cc (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/Camera.h (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/CameraPosition.cc (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/CameraPosition.h (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/ControllableEntity.cc (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/ControllableEntity.h (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/Light.cc (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/Light.h (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/MobileEntity.cc (copied) * code/branches/physics_merge/src/orxonox/objects/worldentities/MobileEntity.h (copied) * code/branches/physics_merge/src/orxonox/objects/worldentities/Model.cc (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/Model.h (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/MovableEntity.cc (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/MovableEntity.h (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/ParticleEmitter.cc (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/ParticleEmitter.h (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/ParticleSpawner.cc (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/ParticleSpawner.h (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/Planet.cc (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/PositionableEntity.cc (deleted) * code/branches/physics_merge/src/orxonox/objects/worldentities/PositionableEntity.h (deleted) * code/branches/physics_merge/src/orxonox/objects/worldentities/SpawnPoint.cc (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/SpawnPoint.h (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/StaticEntity.cc (copied) * code/branches/physics_merge/src/orxonox/objects/worldentities/StaticEntity.h (copied) * code/branches/physics_merge/src/orxonox/objects/worldentities/WorldEntity.cc (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/WorldEntity.h (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/pawns/SpaceShip.cc (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/pawns/Spectator.cc (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/triggers/Trigger.cc (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/triggers/Trigger.h (modified) * code/branches/physics_merge/src/orxonox/tools/BillboardSet.cc (modified) * code/branches/physics_merge/src/orxonox/tools/BillboardSet.h (modified) * code/branches/physics_merge/src/orxonox/tools/BulletConversions.h (copied) * code/branches/physics_merge/src/orxonox/tools/Mesh.cc (modified) * code/branches/physics_merge/src/orxonox/tools/Mesh.h (modified) * code/branches/physics_merge/src/orxonox/tools/ParticleInterface.cc (modified) * code/branches/physics_merge/src/orxonox/tools/ParticleInterface.h (modified) * code/branches/physics_merge/src/tolua/tolua-5.1.pkg (modified) * code/branches/physics_merge/src/util (modified) * code/branches/physics_merge/src/util/Exception.cc (modified) * code/branches/physics_merge/src/util/Exception.h (modified) * code/branches/physics_merge/src/util/Math.h (modified) * code/branches/physics_merge/src/util/SignalHandler.cc (modified) * code/branches/physics_merge/src/util/SignalHandler.h (modified) * code/branches/physics_merge/visual_studio/vc8/audio.vsprops (modified) * code/branches/physics_merge/visual_studio/vc8/base.vsprops (modified) * code/branches/physics_merge/visual_studio/vc8/bullet.vsprops (copied) * code/branches/physics_merge/visual_studio/vc8/bullet_collision.vcproj (copied) * code/branches/physics_merge/visual_studio/vc8/bullet_dynamics.vcproj (copied) * code/branches/physics_merge/visual_studio/vc8/bullet_linearmath.vcproj (copied) * code/branches/physics_merge/visual_studio/vc8/bullet_softbody.vcproj (copied) * code/branches/physics_merge/visual_studio/vc8/ceguilua.vsprops (modified) * code/branches/physics_merge/visual_studio/vc8/core.vsprops (modified) * code/branches/physics_merge/visual_studio/vc8/cpptcl.vsprops (modified) * code/branches/physics_merge/visual_studio/vc8/debug.vsprops (modified) * code/branches/physics_merge/visual_studio/vc8/directories.vsprops (modified) * code/branches/physics_merge/visual_studio/vc8/lua.vsprops (modified) * code/branches/physics_merge/visual_studio/vc8/network.vsprops (modified) * code/branches/physics_merge/visual_studio/vc8/ogrebullet_collisions.vcproj (copied) * code/branches/physics_merge/visual_studio/vc8/ogrebullet_collisions.vsprops (copied) * code/branches/physics_merge/visual_studio/vc8/ogrebullet_dynamics.vcproj (copied) * code/branches/physics_merge/visual_studio/vc8/ogrebullet_dynamics.vsprops (copied) * code/branches/physics_merge/visual_studio/vc8/orxonox.vcproj (modified) * code/branches/physics_merge/visual_studio/vc8/orxonox.vsprops (modified) * code/branches/physics_merge/visual_studio/vc8/orxonox_vc8.sln (modified) * code/branches/physics_merge/visual_studio/vc8/release.vsprops (modified) * code/branches/physics_merge/visual_studio/vc8/tinyxml.vcproj (modified) * code/branches/physics_merge/visual_studio/vc8/tinyxml.vsprops (modified) * code/branches/physics_merge/visual_studio/vc8/tolua.vsprops (modified) * code/branches/physics_merge/visual_studio/vc8/toluagen.vcproj (modified) * code/branches/physics_merge/visual_studio/vc8/toluagen.vsprops (modified) * code/branches/physics_merge/visual_studio/vc8/toluagen_orxonox.vcproj (modified) * code/branches/physics_merge/visual_studio/vc8/toluagen_orxonox.vsprops (modified) * code/branches/physics_merge/visual_studio/vc8/util.vsprops (modified) Finally merged physics stuff. Target is physics_merge because I'll ... Sun, 14 Dec 2008 11:25:18 GMT rgrieder [2440] * code/branches/physics_merge (copied) new physics_merge branch Sun, 14 Dec 2008 00:43:52 GMT rgrieder [2436] * code/branches/presentation/src/network/TrafficControl.cc (modified) * code/branches/presentation/src/network/TrafficControl.h (modified) * code/branches/presentation/src/network/synchronisable/NetworkCallbackManager.cc (modified) * code/branches/presentation/src/network/synchronisable/NetworkCallbackManager.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestListener.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestListener.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Planet.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Planet.h (modified) * code/branches/presentation/src/orxonox/overlays/notifications/Notification.cc (modified) * code/branches/presentation/src/orxonox/overlays/notifications/Notification.h (modified) * code/branches/presentation/src/orxonox/overlays/notifications/NotificationManager.cc (modified) * code/branches/presentation/src/orxonox/overlays/notifications/NotificationManager.h (modified) * code/branches/presentation/src/orxonox/overlays/notifications/NotificationQueue.cc (modified) * code/branches/presentation/src/orxonox/overlays/notifications/NotificationQueue.h (modified) Added svn:eol-style "native" to all files.