# # ChangeLog for code # # Generated by Trac 1.0.9 # Jun 2, 2024, 7:33:40 AM Mon, 15 Dec 2008 18:57:48 GMT rgrieder [2469] * code/branches/presentation/src/orxonox/objects/collisionshapes/CollisionShape.cc (modified) * code/branches/presentation/src/orxonox/objects/collisionshapes/CompoundCollisionShape.cc (modified) * code/branches/presentation/src/orxonox/objects/collisionshapes/CompoundCollisionShape.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/MobileEntity.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/WorldEntity.cc (modified) Resolved the issue with the collision shape synchronisation. Mon, 15 Dec 2008 18:40:25 GMT rgrieder [2468] * code/branches/presentation/src/orxonox/objects/Scene.cc (modified) * code/branches/presentation/src/orxonox/objects/Scene.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Model.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/ParticleEmitter.cc (modified) Bugfix for dedicated mode. Should work now except for an exception ... Mon, 15 Dec 2008 15:41:47 GMT landauf [2467] * code/branches/objecthierarchy2/bin/Plugins.cfg (modified) cgprogrammanager for shaders Mon, 15 Dec 2008 15:33:50 GMT rgrieder [2466] * code/branches/presentation/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/presentation/src/orxonox/objects/Scene.cc (modified) * code/branches/presentation/src/orxonox/objects/Scene.h (modified) * code/branches/presentation/src/orxonox/objects/weaponSystem/projectiles/Projectile.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/WorldEntity.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/WorldEntity.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/pawns/SpaceShip.cc (modified) Added callback for collisions. Every WorldEntity that collides ... Mon, 15 Dec 2008 14:16:07 GMT rgrieder [2465] * code/branches/presentation/src/orxonox/objects/collisionshapes/CompoundCollisionShape.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/WorldEntity.cc (modified) Bugfix in WorldEntity: It creates a CompoundCollisionShape in its ... Mon, 15 Dec 2008 14:14:07 GMT rgrieder [2464] * code/branches/presentation/src/network/packet/Gamestate.cc (modified) * code/branches/presentation/src/network/synchronisable/Synchronisable.cc (modified) Bugfix in network: When checking for other objectIDs, it was possible ... Mon, 15 Dec 2008 00:52:00 GMT rgrieder [2463] * code/branches/presentation/src/orxonox/objects/Scene.cc (modified) * code/branches/presentation/src/orxonox/objects/collisionshapes/CompoundCollisionShape.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/pawns/SpaceShip.cc (modified) Two bugfixes and an optimisation. Mon, 15 Dec 2008 00:38:02 GMT landauf [2462] * code/branches/objecthierarchy2/bin/def_keybindings.ini (modified) * code/branches/objecthierarchy2/src/orxonox/gamestates/GSRoot.cc (modified) * code/branches/objecthierarchy2/src/orxonox/gamestates/GSRoot.h (modified) * code/branches/objecthierarchy2/src/orxonox/objects/controllers/HumanController.cc (modified) * code/branches/objecthierarchy2/src/orxonox/objects/controllers/HumanController.h (modified) * code/branches/objecthierarchy2/src/orxonox/objects/gametypes/Gametype.cc (modified) * code/branches/objecthierarchy2/src/orxonox/objects/gametypes/Gametype.h (modified) * code/branches/objecthierarchy2/src/orxonox/objects/infos/PlayerInfo.cc (modified) * code/branches/objecthierarchy2/src/orxonox/overlays/hud/HUDBar.cc (modified) - fixed a small speedbar-initialization problem - added new ... Mon, 15 Dec 2008 00:02:48 GMT rgrieder [2461] * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/ControllableEntity.cc (modified) * code/branches/objecthierarchy2/visual_studio/vc8/orxonox.vcproj (modified) - Updated msvc files - temporary solution for a super function ... Sun, 14 Dec 2008 23:54:27 GMT rgrieder [2460] * code/branches/presentation/src/orxonox/gamestates/GSLevel.cc (modified) Switched level file to "presentation.oxw". Sun, 14 Dec 2008 23:53:05 GMT rgrieder [2459] * code/branches/presentation (modified) * code/branches/presentation/cmake/FindODE.cmake (deleted) * code/branches/presentation/src/CMakeLists.txt (modified) * code/branches/presentation/src/bullet (copied) * code/branches/presentation/src/bullet/AUTHORS (copied) * code/branches/presentation/src/bullet/Bullet-C-Api.h (copied) * code/branches/presentation/src/bullet/BulletCollision (copied) * code/branches/presentation/src/bullet/BulletCollision/BroadphaseCollision (copied) * code/branches/presentation/src/bullet/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/BroadphaseCollision/btAxisSweep3.h (copied) * code/branches/presentation/src/bullet/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h (copied) * code/branches/presentation/src/bullet/BulletCollision/BroadphaseCollision/btBroadphaseProxy.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h (copied) * code/branches/presentation/src/bullet/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h (copied) * code/branches/presentation/src/bullet/BulletCollision/BroadphaseCollision/btDbvt.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/BroadphaseCollision/btDbvt.h (copied) * code/branches/presentation/src/bullet/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h (copied) * code/branches/presentation/src/bullet/BulletCollision/BroadphaseCollision/btDispatcher.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/BroadphaseCollision/btDispatcher.h (copied) * code/branches/presentation/src/bullet/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h (copied) * code/branches/presentation/src/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h (copied) * code/branches/presentation/src/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h (copied) * code/branches/presentation/src/bullet/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/BroadphaseCollision/btQuantizedBvh.h (copied) * code/branches/presentation/src/bullet/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CMakeLists.txt (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/SphereTriangleDetector.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btBoxBoxDetector.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btCollisionConfiguration.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btCollisionDispatcher.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btCollisionObject.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btCollisionObject.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btCollisionWorld.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btCollisionWorld.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btGhostObject.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btGhostObject.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btManifoldResult.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btManifoldResult.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btSimulationIslandManager.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btUnionFind.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btUnionFind.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btBoxShape.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btBoxShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btCapsuleShape.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btCapsuleShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btCollisionMargin.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btCollisionShape.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btCollisionShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btCompoundShape.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btCompoundShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btConcaveShape.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btConcaveShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btConeShape.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btConeShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btConvexHullShape.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btConvexHullShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btConvexInternalShape.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btConvexInternalShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btConvexPointCloudShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btConvexShape.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btConvexShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btCylinderShape.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btCylinderShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btEmptyShape.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btEmptyShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btMaterial.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btMinkowskiSumShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btMultiSphereShape.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btMultiSphereShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btOptimizedBvh.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btOptimizedBvh.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btShapeHull.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btShapeHull.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btSphereShape.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btSphereShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btStaticPlaneShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btStridingMeshInterface.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btTetrahedronShape.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btTetrahedronShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btTriangleBuffer.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btTriangleBuffer.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btTriangleCallback.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btTriangleCallback.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btTriangleMesh.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btTriangleMesh.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btTriangleMeshShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btTriangleShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btUniformScalingShape.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btUniformScalingShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/btBoxCollision.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/btClipPolygon.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/btContactProcessing.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/btContactProcessing.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/btGImpactBvh.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/btGImpactBvh.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/btGImpactMassUtil.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/btGImpactQuantizedBvh.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/btGImpactShape.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/btGImpactShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/btGenericPoolAllocator.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/btGenericPoolAllocator.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/btGeometryOperations.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/btQuantization.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/btTriangleShapeEx.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/btTriangleShapeEx.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/gim_array.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/gim_basic_geometry_operations.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/gim_bitset.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/gim_box_collision.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/gim_box_set.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/gim_box_set.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/gim_clip_polygon.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/gim_contact.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/gim_contact.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/gim_geom_types.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/gim_geometry.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/gim_hash_table.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/gim_linear_math.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/gim_math.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/gim_memory.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/gim_memory.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/gim_radixsort.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/gim_tri_collision.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/gim_tri_collision.h (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btConvexCast.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btConvexCast.h (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btPointCollector.h (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h (copied) * code/branches/presentation/src/bullet/BulletDynamics (copied) * code/branches/presentation/src/bullet/BulletDynamics/CMakeLists.txt (copied) * code/branches/presentation/src/bullet/BulletDynamics/Character (copied) * code/branches/presentation/src/bullet/BulletDynamics/Character/btCharacterControllerInterface.h (copied) * code/branches/presentation/src/bullet/BulletDynamics/Character/btKinematicCharacterController.cpp (copied) * code/branches/presentation/src/bullet/BulletDynamics/Character/btKinematicCharacterController.h (copied) * code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver (copied) * code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp (copied) * code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h (copied) * code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btConstraintSolver.h (copied) * code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btContactConstraint.cpp (copied) * code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btContactConstraint.h (copied) * code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btContactSolverInfo.h (copied) * code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp (copied) * code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h (copied) * code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp (copied) * code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btHingeConstraint.h (copied) * code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btJacobianEntry.h (copied) * code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp (copied) * code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h (copied) * code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp (copied) * code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h (copied) * code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp (copied) * code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btSliderConstraint.h (copied) * code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.cpp (copied) * code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.h (copied) * code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btSolverBody.h (copied) * code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btSolverConstraint.h (copied) * code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp (copied) * code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btTypedConstraint.h (copied) * code/branches/presentation/src/bullet/BulletDynamics/Dynamics (copied) * code/branches/presentation/src/bullet/BulletDynamics/Dynamics/Bullet-C-API.cpp (copied) * code/branches/presentation/src/bullet/BulletDynamics/Dynamics/btContinuousDynamicsWorld.cpp (copied) * code/branches/presentation/src/bullet/BulletDynamics/Dynamics/btContinuousDynamicsWorld.h (copied) * code/branches/presentation/src/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp (copied) * code/branches/presentation/src/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h (copied) * code/branches/presentation/src/bullet/BulletDynamics/Dynamics/btDynamicsWorld.h (copied) * code/branches/presentation/src/bullet/BulletDynamics/Dynamics/btRigidBody.cpp (copied) * code/branches/presentation/src/bullet/BulletDynamics/Dynamics/btRigidBody.h (copied) * code/branches/presentation/src/bullet/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp (copied) * code/branches/presentation/src/bullet/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h (copied) * code/branches/presentation/src/bullet/BulletDynamics/Vehicle (copied) * code/branches/presentation/src/bullet/BulletDynamics/Vehicle/btRaycastVehicle.cpp (copied) * code/branches/presentation/src/bullet/BulletDynamics/Vehicle/btRaycastVehicle.h (copied) * code/branches/presentation/src/bullet/BulletDynamics/Vehicle/btVehicleRaycaster.h (copied) * code/branches/presentation/src/bullet/BulletDynamics/Vehicle/btWheelInfo.cpp (copied) * code/branches/presentation/src/bullet/BulletDynamics/Vehicle/btWheelInfo.h (copied) * code/branches/presentation/src/bullet/BulletLicense.txt (copied) * code/branches/presentation/src/bullet/CMakeLists.txt (copied) * code/branches/presentation/src/bullet/ChangeLog (copied) * code/branches/presentation/src/bullet/LICENSE (copied) * code/branches/presentation/src/bullet/LinearMath (copied) * code/branches/presentation/src/bullet/LinearMath/CMakeLists.txt (copied) * code/branches/presentation/src/bullet/LinearMath/btAabbUtil2.h (copied) * code/branches/presentation/src/bullet/LinearMath/btAlignedAllocator.cpp (copied) * code/branches/presentation/src/bullet/LinearMath/btAlignedAllocator.h (copied) * code/branches/presentation/src/bullet/LinearMath/btAlignedObjectArray.h (copied) * code/branches/presentation/src/bullet/LinearMath/btConvexHull.cpp (copied) * code/branches/presentation/src/bullet/LinearMath/btConvexHull.h (copied) * code/branches/presentation/src/bullet/LinearMath/btDefaultMotionState.h (copied) * code/branches/presentation/src/bullet/LinearMath/btGeometryUtil.cpp (copied) * code/branches/presentation/src/bullet/LinearMath/btGeometryUtil.h (copied) * code/branches/presentation/src/bullet/LinearMath/btHashMap.h (copied) * code/branches/presentation/src/bullet/LinearMath/btIDebugDraw.h (copied) * code/branches/presentation/src/bullet/LinearMath/btList.h (copied) * code/branches/presentation/src/bullet/LinearMath/btMatrix3x3.h (copied) * code/branches/presentation/src/bullet/LinearMath/btMinMax.h (copied) * code/branches/presentation/src/bullet/LinearMath/btMotionState.h (copied) * code/branches/presentation/src/bullet/LinearMath/btPoolAllocator.h (copied) * code/branches/presentation/src/bullet/LinearMath/btQuadWord.h (copied) * code/branches/presentation/src/bullet/LinearMath/btQuaternion.h (copied) * code/branches/presentation/src/bullet/LinearMath/btQuickprof.cpp (copied) * code/branches/presentation/src/bullet/LinearMath/btQuickprof.h (copied) * code/branches/presentation/src/bullet/LinearMath/btRandom.h (copied) * code/branches/presentation/src/bullet/LinearMath/btScalar.h (copied) * code/branches/presentation/src/bullet/LinearMath/btStackAlloc.h (copied) * code/branches/presentation/src/bullet/LinearMath/btTransform.h (copied) * code/branches/presentation/src/bullet/LinearMath/btTransformUtil.h (copied) * code/branches/presentation/src/bullet/LinearMath/btVector3.h (copied) * code/branches/presentation/src/bullet/NEWS (copied) * code/branches/presentation/src/bullet/README (copied) * code/branches/presentation/src/bullet/VERSION (copied) * code/branches/presentation/src/bullet/btBulletCollisionCommon.h (copied) * code/branches/presentation/src/bullet/btBulletDynamicsCommon.h (copied) * code/branches/presentation/src/core/RootGameState.cc (modified) * code/branches/presentation/src/core/Template.cc (modified) * code/branches/presentation/src/core/Template.h (modified) * code/branches/presentation/src/core/XMLFile.h (modified) * code/branches/presentation/src/core/XMLIncludes.h (modified) * code/branches/presentation/src/core/XMLPort.h (modified) * code/branches/presentation/src/network/packet/Gamestate.cc (modified) * code/branches/presentation/src/network/synchronisable/NetworkCallback.h (modified) * code/branches/presentation/src/network/synchronisable/NetworkCallbackManager.cc (modified) * code/branches/presentation/src/network/synchronisable/Synchronisable.cc (modified) * code/branches/presentation/src/network/synchronisable/Synchronisable.h (modified) * code/branches/presentation/src/orxonox/CMakeLists.txt (modified) * code/branches/presentation/src/orxonox/CameraManager.cc (modified) * code/branches/presentation/src/orxonox/CameraManager.h (modified) * code/branches/presentation/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/presentation/src/orxonox/OrxonoxStableHeaders.h (modified) * code/branches/presentation/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/presentation/src/orxonox/gamestates/GSRoot.cc (modified) * code/branches/presentation/src/orxonox/objects/CMakeLists.txt (modified) * code/branches/presentation/src/orxonox/objects/Level.cc (modified) * code/branches/presentation/src/orxonox/objects/Level.h (modified) * code/branches/presentation/src/orxonox/objects/Scene.cc (modified) * code/branches/presentation/src/orxonox/objects/Scene.h (modified) * code/branches/presentation/src/orxonox/objects/collisionshapes (copied) * code/branches/presentation/src/orxonox/objects/collisionshapes/CMakeLists.txt (copied) * code/branches/presentation/src/orxonox/objects/collisionshapes/CollisionShape.cc (copied) * code/branches/presentation/src/orxonox/objects/collisionshapes/CollisionShape.h (copied) * code/branches/presentation/src/orxonox/objects/collisionshapes/CompoundCollisionShape.cc (copied) * code/branches/presentation/src/orxonox/objects/collisionshapes/CompoundCollisionShape.h (copied) * code/branches/presentation/src/orxonox/objects/collisionshapes/PlaneCollisionShape.cc (copied) * code/branches/presentation/src/orxonox/objects/collisionshapes/PlaneCollisionShape.h (copied) * code/branches/presentation/src/orxonox/objects/collisionshapes/SphereCollisionShape.cc (copied) * code/branches/presentation/src/orxonox/objects/collisionshapes/SphereCollisionShape.h (copied) * code/branches/presentation/src/orxonox/objects/pickup/Usable.h (modified) * code/branches/presentation/src/orxonox/objects/quest/AddQuest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/AddQuest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/AddQuestHint.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/AddQuestHint.h (modified) * code/branches/presentation/src/orxonox/objects/quest/AddReward.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/AddReward.h (modified) * code/branches/presentation/src/orxonox/objects/quest/ChangeQuestStatus.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/ChangeQuestStatus.h (modified) * code/branches/presentation/src/orxonox/objects/quest/CompleteQuest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/CompleteQuest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/FailQuest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/FailQuest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/GlobalQuest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/GlobalQuest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/LocalQuest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/LocalQuest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/Quest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/Quest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestDescription.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestDescription.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestEffect.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestEffect.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestEffectBeacon.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestEffectBeacon.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestHint.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestHint.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestItem.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestItem.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestManager.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestManager.h (modified) * code/branches/presentation/src/orxonox/objects/quest/Rewardable.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/Rewardable.h (modified) * code/branches/presentation/src/orxonox/objects/weaponSystem/WeaponSystem.cc (modified) * code/branches/presentation/src/orxonox/objects/weaponSystem/WeaponSystem.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Backlight.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Backlight.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Billboard.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Billboard.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/CMakeLists.txt (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Camera.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Camera.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/CameraPosition.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/CameraPosition.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/ControllableEntity.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/ControllableEntity.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Light.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Light.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/MobileEntity.cc (copied) * code/branches/presentation/src/orxonox/objects/worldentities/MobileEntity.h (copied) * code/branches/presentation/src/orxonox/objects/worldentities/Model.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Model.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/MovableEntity.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/MovableEntity.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/ParticleEmitter.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/ParticleEmitter.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/ParticleSpawner.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/ParticleSpawner.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/objects/worldentities/PositionableEntity.cc (deleted) * code/branches/presentation/src/orxonox/objects/worldentities/PositionableEntity.h (deleted) * code/branches/presentation/src/orxonox/objects/worldentities/SpawnPoint.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/SpawnPoint.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/StaticEntity.cc (copied) * code/branches/presentation/src/orxonox/objects/worldentities/StaticEntity.h (copied) * code/branches/presentation/src/orxonox/objects/worldentities/WorldEntity.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/WorldEntity.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/pawns/SpaceShip.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/pawns/SpaceShip.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/pawns/Spectator.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/pawns/Spectator.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/triggers/Trigger.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/triggers/Trigger.h (modified) * code/branches/presentation/src/orxonox/tools/BillboardSet.cc (modified) * code/branches/presentation/src/orxonox/tools/BillboardSet.h (modified) * code/branches/presentation/src/orxonox/tools/BulletConversions.h (copied) * code/branches/presentation/src/orxonox/tools/Mesh.cc (modified) * code/branches/presentation/src/orxonox/tools/Mesh.h (modified) * code/branches/presentation/src/orxonox/tools/ParticleInterface.cc (modified) * code/branches/presentation/src/orxonox/tools/ParticleInterface.h (modified) * code/branches/presentation/src/tolua/tolua-5.1.pkg (modified) * code/branches/presentation/src/util (modified) * code/branches/presentation/src/util/Exception.cc (modified) * code/branches/presentation/src/util/Exception.h (modified) * code/branches/presentation/src/util/Integers.h (modified) * code/branches/presentation/src/util/Math.h (modified) * code/branches/presentation/src/util/SignalHandler.cc (modified) * code/branches/presentation/src/util/SignalHandler.h (modified) * code/branches/presentation/visual_studio/vc8/audio.vsprops (modified) * code/branches/presentation/visual_studio/vc8/base.vsprops (modified) * code/branches/presentation/visual_studio/vc8/bullet.vsprops (copied) * code/branches/presentation/visual_studio/vc8/bullet_collision.vcproj (copied) * code/branches/presentation/visual_studio/vc8/bullet_dynamics.vcproj (copied) * code/branches/presentation/visual_studio/vc8/bullet_linearmath.vcproj (copied) * code/branches/presentation/visual_studio/vc8/bullet_softbody.vcproj (copied) * code/branches/presentation/visual_studio/vc8/ceguilua.vsprops (modified) * code/branches/presentation/visual_studio/vc8/core.vsprops (modified) * code/branches/presentation/visual_studio/vc8/cpptcl.vsprops (modified) * code/branches/presentation/visual_studio/vc8/debug.vsprops (modified) * code/branches/presentation/visual_studio/vc8/directories.vsprops (modified) * code/branches/presentation/visual_studio/vc8/lua.vsprops (modified) * code/branches/presentation/visual_studio/vc8/network.vsprops (modified) * code/branches/presentation/visual_studio/vc8/ogrebullet_collisions.vcproj (copied) * code/branches/presentation/visual_studio/vc8/ogrebullet_collisions.vsprops (copied) * code/branches/presentation/visual_studio/vc8/ogrebullet_dynamics.vcproj (copied) * code/branches/presentation/visual_studio/vc8/ogrebullet_dynamics.vsprops (copied) * code/branches/presentation/visual_studio/vc8/orxonox.vcproj (modified) * code/branches/presentation/visual_studio/vc8/orxonox.vsprops (modified) * code/branches/presentation/visual_studio/vc8/orxonox_vc8.sln (modified) * code/branches/presentation/visual_studio/vc8/release.vsprops (modified) * code/branches/presentation/visual_studio/vc8/tinyxml.vcproj (modified) * code/branches/presentation/visual_studio/vc8/tinyxml.vsprops (modified) * code/branches/presentation/visual_studio/vc8/tolua.vsprops (modified) * code/branches/presentation/visual_studio/vc8/toluagen.vcproj (modified) * code/branches/presentation/visual_studio/vc8/toluagen.vsprops (modified) * code/branches/presentation/visual_studio/vc8/toluagen_orxonox.vcproj (modified) * code/branches/presentation/visual_studio/vc8/toluagen_orxonox.vsprops (modified) * code/branches/presentation/visual_studio/vc8/util.vsprops (modified) Merged physics_merge back to presentation branch. 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 21:15:55 GMT landauf [2450] * code/branches/objecthierarchy2/src/network/packet/Gamestate.cc (modified) I'm not 100% sure if this works, but I had no more crashes since this ... Sun, 14 Dec 2008 20:36:26 GMT landauf [2449] * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/Camera.cc (modified) * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/CameraPosition.cc (modified) * code/branches/objecthierarchy2/src/orxonox/overlays/hud/GametypeStatus.cc (modified) removed temporary workaround in Camera and CameraPosition thanks to ... 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 19:13:43 GMT landauf [2447] * code/branches/objecthierarchy2/src/orxonox/objects/Scene.cc (modified) * code/branches/objecthierarchy2/src/orxonox/objects/Scene.h (modified) * code/branches/objecthierarchy2/src/orxonox/objects/gametypes/Gametype.cc (modified) * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/ControllableEntity.cc (modified) * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/Light.cc (modified) * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/Light.h (modified) * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/Model.cc (modified) * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) - Removed directional-light-hack from Scene - Many changes in ... 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:32:14 GMT rgrieder [2444] * code/branches/physics_merge/cmake/FindODE.cmake (deleted) ODE isn't required anymore. Sun, 14 Dec 2008 15:29:42 GMT rgrieder [2443] * code/branches/physics_merge/visual_studio/vc8/directories.vsprops (modified) reverted accidentally merged stuff. 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 14:08:25 GMT scheusso [2441] * code/branches/objecthierarchy2/TODO (modified) * code/branches/objecthierarchy2/src/network/packet/Gamestate.cc (modified) i think i fixed that problem with objectMode 0x0 Sun, 14 Dec 2008 11:25:18 GMT rgrieder [2440] * code/branches/physics_merge (copied) new physics_merge branch Sun, 14 Dec 2008 11:24:34 GMT rgrieder [2439] * code/branches/physics_merge (deleted) Removed outdated physics_merge branch Sun, 14 Dec 2008 02:53:05 GMT landauf [2438] * code/branches/objecthierarchy2/src/orxonox/objects/Radar.cc (modified) * code/branches/objecthierarchy2/src/orxonox/objects/RadarViewable.cc (modified) * code/branches/objecthierarchy2/src/orxonox/objects/RadarViewable.h (modified) * code/branches/objecthierarchy2/src/orxonox/objects/gametypes/Gametype.cc (modified) * code/branches/objecthierarchy2/src/orxonox/objects/infos/PlayerInfo.cc (modified) * code/branches/objecthierarchy2/src/orxonox/objects/infos/PlayerInfo.h (modified) * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/ControllableEntity.cc (modified) * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) * code/branches/objecthierarchy2/src/orxonox/overlays/hud/HUDNavigation.cc (modified) - If the player dies, the Spectator spawns at the same position the ... Sun, 14 Dec 2008 02:00:37 GMT landauf [2437] * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/Camera.cc (modified) * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/CameraPosition.cc (modified) There's a problem in the network engine causing a crash. It's somehow ... 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. Sun, 14 Dec 2008 00:42:17 GMT rgrieder [2435] * code/branches/presentation/src/network/NetworkPrereqs.h (modified) * code/branches/presentation/src/network/packet/Gamestate.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/AddQuest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/AddQuest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/AddQuestHint.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/AddQuestHint.h (modified) * code/branches/presentation/src/orxonox/objects/quest/AddReward.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/AddReward.h (modified) * code/branches/presentation/src/orxonox/objects/quest/ChangeQuestStatus.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/ChangeQuestStatus.h (modified) * code/branches/presentation/src/orxonox/objects/quest/CompleteQuest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/CompleteQuest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/FailQuest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/FailQuest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/GlobalQuest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/GlobalQuest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/LocalQuest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/LocalQuest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/Quest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/Quest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestDescription.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestDescription.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestEffect.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestEffect.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestEffectBeacon.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestEffectBeacon.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestHint.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestHint.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestItem.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestItem.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/quest/QuestManager.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestManager.h (modified) * code/branches/presentation/src/orxonox/objects/quest/Rewardable.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/Rewardable.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/objects/worldentities/triggers/PlayerTrigger.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/triggers/PlayerTrigger.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) * code/branches/presentation/visual_studio/vc8/network.vcproj (modified) * code/branches/presentation/visual_studio/vc8/orxonox.vcproj (modified) - updated msvc files - Fixed build by including util/Integer.h in ... Sat, 13 Dec 2008 23:51:08 GMT rgrieder [2434] * code/branches/physics/src/CMakeLists.txt (modified) * code/branches/physics/src/ogrebullet (deleted) * code/branches/physics/visual_studio/vc8/orxonox_vc8.sln (modified) Removed OgreBullet from the repository. Sat, 13 Dec 2008 23:25:13 GMT rgrieder [2433] * code/branches/physics/src/orxonox/objects/collisionshapes/CollisionShape.cc (modified) * code/branches/physics/src/orxonox/objects/collisionshapes/CompoundCollisionShape.cc (modified) * code/branches/physics/src/orxonox/objects/worldentities/StaticEntity.cc (modified) * code/branches/physics/src/orxonox/objects/worldentities/WorldEntity.cc (modified) Replaced most Exception throwing considering physics with warnings. ... Sat, 13 Dec 2008 23:09:32 GMT rgrieder [2432] * code/branches/physics/visual_studio/vc8/bullet_collision.vcproj (modified) * code/branches/physics/visual_studio/vc8/bullet_dynamics.vcproj (modified) * code/branches/physics/visual_studio/vc8/bullet_linearmath.vcproj (modified) * code/branches/physics/visual_studio/vc8/orxonox_vc8.sln (modified) Updated msvc files for the Bullet update to v2.73. Sat, 13 Dec 2008 22:47:05 GMT rgrieder [2431] * code/branches/physics/src/bullet/BulletCollision/Gimpact (added) * code/branches/physics/src/bullet/BulletCollision/Gimpact/btBoxCollision.h (added) * code/branches/physics/src/bullet/BulletCollision/Gimpact/btClipPolygon.h (added) * code/branches/physics/src/bullet/BulletCollision/Gimpact/btContactProcessing.cpp (added) * code/branches/physics/src/bullet/BulletCollision/Gimpact/btContactProcessing.h (added) * code/branches/physics/src/bullet/BulletCollision/Gimpact/btGImpactBvh.cpp (added) * code/branches/physics/src/bullet/BulletCollision/Gimpact/btGImpactBvh.h (added) * code/branches/physics/src/bullet/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.cpp (added) * code/branches/physics/src/bullet/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h (added) * code/branches/physics/src/bullet/BulletCollision/Gimpact/btGImpactMassUtil.h (added) * code/branches/physics/src/bullet/BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp (added) * code/branches/physics/src/bullet/BulletCollision/Gimpact/btGImpactQuantizedBvh.h (added) * code/branches/physics/src/bullet/BulletCollision/Gimpact/btGImpactShape.cpp (added) * code/branches/physics/src/bullet/BulletCollision/Gimpact/btGImpactShape.h (added) * code/branches/physics/src/bullet/BulletCollision/Gimpact/btGenericPoolAllocator.cpp (added) * code/branches/physics/src/bullet/BulletCollision/Gimpact/btGenericPoolAllocator.h (added) * code/branches/physics/src/bullet/BulletCollision/Gimpact/btGeometryOperations.h (added) * code/branches/physics/src/bullet/BulletCollision/Gimpact/btQuantization.h (added) * code/branches/physics/src/bullet/BulletCollision/Gimpact/btTriangleShapeEx.cpp (added) * code/branches/physics/src/bullet/BulletCollision/Gimpact/btTriangleShapeEx.h (added) * code/branches/physics/src/bullet/BulletCollision/Gimpact/gim_array.h (added) * code/branches/physics/src/bullet/BulletCollision/Gimpact/gim_basic_geometry_operations.h (added) * code/branches/physics/src/bullet/BulletCollision/Gimpact/gim_bitset.h (added) * code/branches/physics/src/bullet/BulletCollision/Gimpact/gim_box_collision.h (added) * code/branches/physics/src/bullet/BulletCollision/Gimpact/gim_box_set.cpp (added) * code/branches/physics/src/bullet/BulletCollision/Gimpact/gim_box_set.h (added) * code/branches/physics/src/bullet/BulletCollision/Gimpact/gim_clip_polygon.h (added) * code/branches/physics/src/bullet/BulletCollision/Gimpact/gim_contact.cpp (added) * code/branches/physics/src/bullet/BulletCollision/Gimpact/gim_contact.h (added) * code/branches/physics/src/bullet/BulletCollision/Gimpact/gim_geom_types.h (added) * code/branches/physics/src/bullet/BulletCollision/Gimpact/gim_geometry.h (added) * code/branches/physics/src/bullet/BulletCollision/Gimpact/gim_hash_table.h (added) * code/branches/physics/src/bullet/BulletCollision/Gimpact/gim_linear_math.h (added) * code/branches/physics/src/bullet/BulletCollision/Gimpact/gim_math.h (added) * code/branches/physics/src/bullet/BulletCollision/Gimpact/gim_memory.cpp (added) * code/branches/physics/src/bullet/BulletCollision/Gimpact/gim_memory.h (added) * code/branches/physics/src/bullet/BulletCollision/Gimpact/gim_radixsort.h (added) * code/branches/physics/src/bullet/BulletCollision/Gimpact/gim_tri_collision.cpp (added) * code/branches/physics/src/bullet/BulletCollision/Gimpact/gim_tri_collision.h (added) Bullet update, second part. (Renaming GIMPACT to Gimpact is not very ... Sat, 13 Dec 2008 22:45:51 GMT rgrieder [2430] * code/branches/physics/src/bullet/Bullet-C-Api.h (modified) * code/branches/physics/src/bullet/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp (modified) * code/branches/physics/src/bullet/BulletCollision/BroadphaseCollision/btAxisSweep3.h (modified) * code/branches/physics/src/bullet/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h (modified) * code/branches/physics/src/bullet/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h (modified) * code/branches/physics/src/bullet/BulletCollision/BroadphaseCollision/btDbvt.cpp (modified) * code/branches/physics/src/bullet/BulletCollision/BroadphaseCollision/btDbvt.h (modified) * code/branches/physics/src/bullet/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp (modified) * code/branches/physics/src/bullet/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h (modified) * code/branches/physics/src/bullet/BulletCollision/BroadphaseCollision/btDispatcher.h (modified) * code/branches/physics/src/bullet/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp (modified) * code/branches/physics/src/bullet/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h (modified) * code/branches/physics/src/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp (modified) * code/branches/physics/src/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h (modified) * code/branches/physics/src/bullet/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp (modified) * code/branches/physics/src/bullet/BulletCollision/BroadphaseCollision/btQuantizedBvh.h (modified) * code/branches/physics/src/bullet/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp (modified) * code/branches/physics/src/bullet/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h (modified) * code/branches/physics/src/bullet/BulletCollision/CMakeLists.txt (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionDispatch/SphereTriangleDetector.h (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.cpp (added) * code/branches/physics/src/bullet/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h (added) * code/branches/physics/src/bullet/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionDispatch/btCollisionConfiguration.h (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionDispatch/btCollisionObject.h (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionDispatch/btCollisionWorld.cpp (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionDispatch/btCollisionWorld.h (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionDispatch/btGhostObject.cpp (added) * code/branches/physics/src/bullet/BulletCollision/CollisionDispatch/btGhostObject.h (added) * code/branches/physics/src/bullet/BulletCollision/CollisionDispatch/btManifoldResult.cpp (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionDispatch/btSimulationIslandManager.h (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionShapes/btBoxShape.h (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionShapes/btCapsuleShape.h (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionShapes/btCollisionShape.cpp (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionShapes/btCollisionShape.h (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionShapes/btCompoundShape.cpp (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionShapes/btCompoundShape.h (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionShapes/btConcaveShape.h (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionShapes/btConeShape.cpp (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionShapes/btConvexHullShape.cpp (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionShapes/btConvexHullShape.h (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionShapes/btConvexInternalShape.cpp (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionShapes/btConvexInternalShape.h (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionShapes/btConvexPointCloudShape.h (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionShapes/btConvexShape.cpp (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionShapes/btConvexShape.h (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionShapes/btCylinderShape.cpp (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionShapes/btEmptyShape.h (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionShapes/btOptimizedBvh.cpp (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionShapes/btSphereShape.cpp (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionShapes/btSphereShape.h (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionShapes/btStridingMeshInterface.h (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionShapes/btTetrahedronShape.cpp (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionShapes/btTetrahedronShape.h (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionShapes/btTriangleBuffer.h (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionShapes/btTriangleMesh.cpp (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionShapes/btTriangleMesh.h (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp (modified) * code/branches/physics/src/bullet/BulletCollision/CollisionShapes/btTriangleShape.h (modified) * code/branches/physics/src/bullet/BulletCollision/GIMPACT (deleted) * code/branches/physics/src/bullet/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h (modified) * code/branches/physics/src/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpa.cpp (deleted) * code/branches/physics/src/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpa.h (deleted) * code/branches/physics/src/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp (modified) * code/branches/physics/src/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp (modified) * code/branches/physics/src/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h (modified) * code/branches/physics/src/bullet/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp (modified) * code/branches/physics/src/bullet/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h (modified) * code/branches/physics/src/bullet/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h (modified) * code/branches/physics/src/bullet/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp (modified) * code/branches/physics/src/bullet/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h (modified) * code/branches/physics/src/bullet/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp (modified) * code/branches/physics/src/bullet/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h (modified) * code/branches/physics/src/bullet/BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h (modified) * code/branches/physics/src/bullet/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp (modified) * code/branches/physics/src/bullet/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h (modified) * code/branches/physics/src/bullet/BulletDynamics/CMakeLists.txt (modified) * code/branches/physics/src/bullet/BulletDynamics/Character (added) * code/branches/physics/src/bullet/BulletDynamics/Character/btCharacterControllerInterface.h (added) * code/branches/physics/src/bullet/BulletDynamics/Character/btKinematicCharacterController.cpp (added) * code/branches/physics/src/bullet/BulletDynamics/Character/btKinematicCharacterController.h (added) * code/branches/physics/src/bullet/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h (modified) * code/branches/physics/src/bullet/BulletDynamics/ConstraintSolver/btContactConstraint.cpp (modified) * code/branches/physics/src/bullet/BulletDynamics/ConstraintSolver/btContactConstraint.h (modified) * code/branches/physics/src/bullet/BulletDynamics/ConstraintSolver/btContactSolverInfo.h (modified) * code/branches/physics/src/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp (modified) * code/branches/physics/src/bullet/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp (modified) * code/branches/physics/src/bullet/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp (modified) * code/branches/physics/src/bullet/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h (modified) * code/branches/physics/src/bullet/BulletDynamics/ConstraintSolver/btSolverBody.h (modified) * code/branches/physics/src/bullet/BulletDynamics/Dynamics/Bullet-C-API.cpp (modified) * code/branches/physics/src/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp (modified) * code/branches/physics/src/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h (modified) * code/branches/physics/src/bullet/BulletDynamics/Dynamics/btDynamicsWorld.h (modified) * code/branches/physics/src/bullet/BulletDynamics/Dynamics/btRigidBody.h (modified) * code/branches/physics/src/bullet/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp (modified) * code/branches/physics/src/bullet/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h (modified) * code/branches/physics/src/bullet/BulletDynamics/Vehicle/btRaycastVehicle.cpp (modified) * code/branches/physics/src/bullet/BulletSoftBody (deleted) * code/branches/physics/src/bullet/CMakeLists.txt (modified) * code/branches/physics/src/bullet/ChangeLog (modified) * code/branches/physics/src/bullet/LinearMath/CMakeLists.txt (modified) * code/branches/physics/src/bullet/LinearMath/btAabbUtil2.h (modified) * code/branches/physics/src/bullet/LinearMath/btConvexHull.cpp (modified) * code/branches/physics/src/bullet/LinearMath/btConvexHull.h (modified) * code/branches/physics/src/bullet/LinearMath/btMatrix3x3.h (modified) * code/branches/physics/src/bullet/LinearMath/btPoint3.h (deleted) * code/branches/physics/src/bullet/LinearMath/btQuadWord.h (modified) * code/branches/physics/src/bullet/LinearMath/btQuaternion.h (modified) * code/branches/physics/src/bullet/LinearMath/btQuickprof.cpp (modified) * code/branches/physics/src/bullet/LinearMath/btQuickprof.h (modified) * code/branches/physics/src/bullet/LinearMath/btScalar.h (modified) * code/branches/physics/src/bullet/LinearMath/btStackAlloc.h (modified) * code/branches/physics/src/bullet/LinearMath/btTransform.h (modified) * code/branches/physics/src/bullet/LinearMath/btTransformUtil.h (modified) * code/branches/physics/src/bullet/LinearMath/btVector3.h (modified) * code/branches/physics/src/bullet/VERSION (modified) Updated to Bullet 2.73 (first part). Sat, 13 Dec 2008 22:18:44 GMT rgrieder [2429] * code/branches/physics/src/orxonox/objects/collisionshapes/CollisionShape.cc (modified) * code/branches/physics/src/orxonox/objects/worldentities/WorldEntity.cc (modified) * code/branches/physics/src/orxonox/objects/worldentities/WorldEntity.h (modified) Added XML Parameters for restitution, angular factor, linear damping, ... Sat, 13 Dec 2008 21:54:26 GMT landauf [2428] * code/branches/objecthierarchy2/src/core/BaseObject.h (modified) * code/branches/objecthierarchy2/src/core/Super.h (modified) * code/branches/objecthierarchy2/src/network/Synchronisable.h (modified) * code/branches/objecthierarchy2/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/objecthierarchy2/src/orxonox/objects/controllers/Controller.cc (modified) * code/branches/objecthierarchy2/src/orxonox/objects/controllers/Controller.h (modified) * code/branches/objecthierarchy2/src/orxonox/objects/gametypes/Gametype.cc (modified) * code/branches/objecthierarchy2/src/orxonox/objects/gametypes/Gametype.h (modified) * code/branches/objecthierarchy2/src/orxonox/objects/infos/CMakeLists.txt (modified) * code/branches/objecthierarchy2/src/orxonox/objects/infos/GametypeInfo.cc (added) * code/branches/objecthierarchy2/src/orxonox/objects/infos/GametypeInfo.h (added) * code/branches/objecthierarchy2/src/orxonox/objects/infos/HumanPlayer.cc (modified) * code/branches/objecthierarchy2/src/orxonox/objects/infos/HumanPlayer.h (modified) * code/branches/objecthierarchy2/src/orxonox/objects/infos/PlayerInfo.cc (modified) * code/branches/objecthierarchy2/src/orxonox/objects/infos/PlayerInfo.h (modified) * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/ControllableEntity.cc (modified) * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/ControllableEntity.h (modified) * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/pawns/Spectator.cc (modified) * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/pawns/Spectator.h (modified) * code/branches/objecthierarchy2/src/orxonox/overlays/hud/CMakeLists.txt (modified) * code/branches/objecthierarchy2/src/orxonox/overlays/hud/GametypeStatus.cc (added) * code/branches/objecthierarchy2/src/orxonox/overlays/hud/GametypeStatus.h (added) - Moved some variables from Gametype to GametypeInfo (Gametype exists ... Sat, 13 Dec 2008 20:38:30 GMT rgrieder [2427] * code/branches/physics/src/orxonox/objects/worldentities/ControllableEntity.cc (modified) * code/branches/physics/src/orxonox/objects/worldentities/ControllableEntity.h (modified) * code/branches/physics/src/orxonox/objects/worldentities/MobileEntity.cc (modified) * code/branches/physics/src/orxonox/objects/worldentities/MobileEntity.h (modified) * code/branches/physics/src/orxonox/objects/worldentities/MovableEntity.cc (modified) * code/branches/physics/src/orxonox/objects/worldentities/MovableEntity.h (modified) Changed the way setPosition, setVelocity, setOrientation and ... Sat, 13 Dec 2008 19:55:40 GMT rgrieder [2426] * code/branches/physics/src/orxonox/objects/worldentities/MobileEntity.cc (modified) * code/branches/physics/src/orxonox/objects/worldentities/MobileEntity.h (modified) * code/branches/physics/src/orxonox/objects/worldentities/StaticEntity.cc (modified) * code/branches/physics/src/orxonox/objects/worldentities/StaticEntity.h (modified) * code/branches/physics/src/orxonox/objects/worldentities/WorldEntity.cc (modified) * code/branches/physics/src/orxonox/objects/worldentities/WorldEntity.h (modified) - Handled translate, rotate, yaw, pitch, roll, lookAt and ... Sat, 13 Dec 2008 19:50:32 GMT rgrieder [2425] * code/branches/physics/src/orxonox/objects/worldentities/Billboard.cc (modified) * code/branches/physics/src/orxonox/objects/worldentities/Model.cc (modified) * code/branches/physics/src/orxonox/objects/worldentities/pawns/Spectator.cc (modified) * code/branches/physics/src/orxonox/objects/worldentities/triggers/Trigger.cc (modified) * code/branches/physics/src/orxonox/tools/BillboardSet.cc (modified) * code/branches/physics/src/orxonox/tools/BillboardSet.h (modified) * code/branches/physics/src/orxonox/tools/Mesh.cc (modified) * code/branches/physics/src/orxonox/tools/Mesh.h (modified) * code/branches/physics/src/orxonox/tools/ParticleInterface.h (modified) - Removed unnecessary ogre header files from BillboardSet.h, Mesh.h ... Sat, 13 Dec 2008 19:50:03 GMT rgrieder [2424] * code/branches/physics/src/util/Math.h (modified) - Added orxonox TransformSpace enum (needed by WorldEntity.h) - ... Sat, 13 Dec 2008 15:14:36 GMT rgrieder [2423] * code/branches/physics/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/physics/src/orxonox/OrxonoxStableHeaders.h (modified) * code/branches/physics/src/orxonox/objects/collisionshapes/CollisionShape.cc (modified) * code/branches/physics/src/orxonox/objects/collisionshapes/CollisionShape.h (modified) * code/branches/physics/src/orxonox/objects/collisionshapes/CompoundCollisionShape.cc (modified) * code/branches/physics/src/orxonox/objects/collisionshapes/CompoundCollisionShape.h (modified) * code/branches/physics/src/orxonox/objects/collisionshapes/PlaneCollisionShape.cc (modified) * code/branches/physics/src/orxonox/objects/collisionshapes/SphereCollisionShape.cc (modified) * code/branches/physics/src/orxonox/objects/worldentities/StaticEntity.cc (modified) * code/branches/physics/src/orxonox/objects/worldentities/WorldEntity.cc (modified) * code/branches/physics/src/orxonox/objects/worldentities/WorldEntity.h (modified) - Added detach functions to CollisionShapes - Added update functions ... Sat, 13 Dec 2008 13:55:13 GMT landauf [2422] * code/branches/objecthierarchy2/src/network/Synchronisable.cc (modified) * code/branches/objecthierarchy2/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/ExplosionChunk.cc (modified) * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/ExplosionChunk.h (modified) * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/MovableEntity.cc (modified) * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/MovableEntity.h (modified) * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/pawns/Spectator.cc (modified) * code/branches/objecthierarchy2/src/orxonox/tools/Shader.cc (modified) - deatheffect (explosion) of Pawns works on client and server ... Sat, 13 Dec 2008 13:37:53 GMT rgrieder [2421] * code/branches/physics/src/orxonox/objects/worldentities/MovableEntity.cc (modified) * code/branches/physics/src/orxonox/objects/worldentities/MovableEntity.h (modified) Added resynchronisation timer in MovableEntity to ensure the right ... Fri, 12 Dec 2008 11:05:03 GMT scheusso [2420] * code/branches/presentation (modified) * code/branches/presentation/src/core/Template.cc (modified) * code/branches/presentation/src/core/Template.h (modified) * code/branches/presentation/src/core/XMLFile.h (modified) * code/branches/presentation/src/core/XMLIncludes.h (modified) * code/branches/presentation/src/orxonox/CameraManager.cc (modified) * code/branches/presentation/src/orxonox/CameraManager.h (modified) * code/branches/presentation/src/orxonox/objects/Level.cc (modified) * code/branches/presentation/src/orxonox/objects/Level.h (modified) * code/branches/presentation/src/orxonox/objects/pickup/Usable.h (modified) * code/branches/presentation/src/orxonox/objects/quest/AddQuest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/AddQuest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/AddQuestHint.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/AddQuestHint.h (modified) * code/branches/presentation/src/orxonox/objects/quest/AddReward.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/AddReward.h (modified) * code/branches/presentation/src/orxonox/objects/quest/ChangeQuestStatus.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/ChangeQuestStatus.h (modified) * code/branches/presentation/src/orxonox/objects/quest/CompleteQuest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/CompleteQuest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/FailQuest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/FailQuest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/GlobalQuest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/GlobalQuest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/LocalQuest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/LocalQuest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/Quest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/Quest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestDescription.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestDescription.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestEffect.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestEffect.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestHint.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestHint.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestItem.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestItem.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestManager.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestManager.h (modified) * code/branches/presentation/src/orxonox/objects/quest/Rewardable.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/Rewardable.h (modified) * code/branches/presentation/src/orxonox/objects/weaponSystem/WeaponSystem.cc (modified) * code/branches/presentation/src/orxonox/objects/weaponSystem/WeaponSystem.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Backlight.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Backlight.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/CMakeLists.txt (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Camera.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Camera.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/ParticleSpawner.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/ParticleSpawner.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Planet.cc (copied) * code/branches/presentation/src/orxonox/objects/worldentities/Planet.h (copied) * code/branches/presentation/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/triggers/Trigger.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/triggers/Trigger.h (modified) * code/branches/presentation/src/tolua/tolua-5.1.pkg (modified) * code/branches/presentation/src/util (modified) * code/branches/presentation/src/util/Exception.cc (modified) * code/branches/presentation/src/util/Exception.h (modified) * code/branches/presentation/src/util/SignalHandler.cc (modified) * code/branches/presentation/src/util/SignalHandler.h (modified) * code/branches/presentation/visual_studio/vc8/audio.vsprops (modified) * code/branches/presentation/visual_studio/vc8/base.vsprops (modified) * code/branches/presentation/visual_studio/vc8/ceguilua.vsprops (modified) * code/branches/presentation/visual_studio/vc8/core.vsprops (modified) * code/branches/presentation/visual_studio/vc8/cpptcl.vsprops (modified) * code/branches/presentation/visual_studio/vc8/debug.vsprops (modified) * code/branches/presentation/visual_studio/vc8/directories.vsprops (modified) * code/branches/presentation/visual_studio/vc8/lua.vsprops (modified) * code/branches/presentation/visual_studio/vc8/network.vsprops (modified) * code/branches/presentation/visual_studio/vc8/orxonox.vsprops (modified) * code/branches/presentation/visual_studio/vc8/orxonox_vc8.sln (modified) * code/branches/presentation/visual_studio/vc8/release.vsprops (modified) * code/branches/presentation/visual_studio/vc8/tinyxml.vcproj (modified) * code/branches/presentation/visual_studio/vc8/tinyxml.vsprops (modified) * code/branches/presentation/visual_studio/vc8/tolua.vsprops (modified) * code/branches/presentation/visual_studio/vc8/toluagen.vcproj (modified) * code/branches/presentation/visual_studio/vc8/toluagen.vsprops (modified) * code/branches/presentation/visual_studio/vc8/toluagen_orxonox.vcproj (modified) * code/branches/presentation/visual_studio/vc8/toluagen_orxonox.vsprops (modified) * code/branches/presentation/visual_studio/vc8/util.vsprops (modified) merged lodfinal (planet) branch to presentation branch Fri, 12 Dec 2008 10:47:11 GMT scheusso [2419] * code/branches/presentation/src/network/TrafficControl.cc (modified) * code/branches/presentation/src/network/packet/Gamestate.cc (modified) * code/branches/presentation/src/network/synchronisable/Synchronisable.cc (modified) * code/branches/presentation/src/network/synchronisable/Synchronisable.h (modified) some cleaning up in TrafficControl small bugfix in Gamestate ... Fri, 12 Dec 2008 10:04:12 GMT scheusso [2418] * code/branches/presentation/src/network/TrafficControl.cc (modified) TrafficControl usage can now be steered by the config value bActive_ Fri, 12 Dec 2008 09:56:22 GMT scheusso [2417] * code/branches/presentation/src/network/packet/Gamestate.cc (modified) * code/branches/presentation/src/network/synchronisable/Synchronisable.cc (modified) further improvements in diffing (around 50% reduction of traffic) Fri, 12 Dec 2008 09:43:48 GMT scheusso [2416] * code/branches/presentation/src/network/TrafficControl.cc (modified) * code/branches/presentation/src/network/TrafficControl.h (modified) some improvement in diffing (after trimming the objectlist we sort ... Fri, 12 Dec 2008 09:10:31 GMT scheusso [2415] * code/branches/presentation/src/network/NetworkPrereqs.h (modified) * code/branches/presentation/src/network/Server.cc (modified) * code/branches/presentation/src/network/Server.h (modified) * code/branches/presentation/src/network/TrafficControl.cc (modified) * code/branches/presentation/src/network/synchronisable/Synchronisable.cc (modified) * code/branches/presentation/src/network/synchronisable/Synchronisable.h (modified) * code/branches/presentation/src/orxonox/gamestates/GSDedicated.cc (modified) * code/branches/presentation/src/orxonox/gamestates/GSDedicated.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/ControllableEntity.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Model.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/MovableEntity.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/PositionableEntity.cc (modified) - adjusted some priorities of objects (movableentity, ... Fri, 12 Dec 2008 03:39:13 GMT landauf [2414] * code/branches/objecthierarchy2/src/orxonox/objects/GlobalShader.cc (modified) * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/Backlight.cc (modified) * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/CMakeLists.txt (modified) * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/ExplosionChunk.cc (added) * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/ExplosionChunk.h (added) * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/ParticleEmitter.cc (modified) * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/pawns/Pawn.h (modified) * code/branches/objecthierarchy2/src/orxonox/tools/ParticleInterface.cc (modified) added spawn- and destroy-effects to Pawn Thu, 11 Dec 2008 22:09:01 GMT scheusso [2413] * code/branches/presentation/src/network/TrafficControl.cc (modified) * code/branches/presentation/src/network/TrafficControl.h (modified) trafficControl working now, but further tweaking in diff and ... Thu, 11 Dec 2008 20:33:11 GMT scheusso [2412] * code/branches/lodfinal/src/orxonox/objects/worldentities/Planet.cc (modified) everything should work now on clients Thu, 11 Dec 2008 20:21:20 GMT scheusso [2411] * code/branches/lodfinal/src/orxonox/objects/worldentities/Planet.cc (modified) Client doesn't segfault now anymore, but the atmospheres are all ... Thu, 11 Dec 2008 16:52:13 GMT polakma [2410] * code/branches/weapon2/src/orxonox/objects/weaponSystem/Munition.cc (modified) "Munition" had no Factory, so it didn't work on Windows (why did it ... Thu, 11 Dec 2008 13:48:33 GMT rgrieder [2409] * code/branches/physics_merge (copied) merger branch for physics --> presentation Thu, 11 Dec 2008 13:18:34 GMT rgrieder [2408] * code/branches/physics/src/orxonox/CMakeLists.txt (modified) * code/branches/physics/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/physics/src/orxonox/objects/weaponSystem/projectiles/Projectile.cc (modified) * code/branches/physics/src/orxonox/objects/weaponSystem/projectiles/Projectile.h (modified) * code/branches/physics/src/orxonox/objects/worldentities/ControllableEntity.cc (modified) * code/branches/physics/src/orxonox/objects/worldentities/ControllableEntity.h (modified) * code/branches/physics/src/orxonox/objects/worldentities/LinearEntity.cc (deleted) * code/branches/physics/src/orxonox/objects/worldentities/LinearEntity.h (deleted) * code/branches/physics/src/orxonox/objects/worldentities/MobileEntity.cc (copied) * code/branches/physics/src/orxonox/objects/worldentities/MobileEntity.h (copied) * code/branches/physics/src/orxonox/objects/worldentities/MovableEntity.cc (modified) * code/branches/physics/src/orxonox/objects/worldentities/MovableEntity.h (modified) * code/branches/physics/src/orxonox/objects/worldentities/WorldEntity.cc (modified) * code/branches/physics/visual_studio/vc8/orxonox.vcproj (modified) Renamed MovableEntity to MobileEntity and LinearEntity to MovableEntity. Thu, 11 Dec 2008 12:54:35 GMT rgrieder [2407] * code/branches/physics/src/orxonox/objects/collisionshapes/CompoundCollisionShape.cc (modified) * code/branches/physics/src/orxonox/objects/collisionshapes/CompoundCollisionShape.h (modified) * code/branches/physics/src/orxonox/objects/worldentities/ControllableEntity.cc (modified) * code/branches/physics/src/orxonox/objects/worldentities/ControllableEntity.h (modified) * code/branches/physics/src/orxonox/objects/worldentities/LinearEntity.cc (modified) * code/branches/physics/src/orxonox/objects/worldentities/MovableEntity.cc (modified) * code/branches/physics/src/orxonox/objects/worldentities/MovableEntity.h (modified) * code/branches/physics/src/orxonox/objects/worldentities/WorldEntity.cc (modified) * code/branches/physics/src/orxonox/objects/worldentities/WorldEntity.h (modified) - Removed debug output - Fixed a bug with parentID_ in ... Thu, 11 Dec 2008 02:06:33 GMT landauf [2406] * code/branches/objecthierarchy2/src/orxonox/gamestates/GSRoot.cc (modified) * code/branches/objecthierarchy2/src/orxonox/gamestates/GSRoot.h (modified) * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/Backlight.cc (modified) * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/Backlight.h (modified) * code/branches/objecthierarchy2/src/orxonox/tools/ParticleInterface.cc (modified) * code/branches/objecthierarchy2/src/orxonox/tools/ParticleInterface.h (modified) * code/branches/objecthierarchy2/src/orxonox/tools/Timer.cc (modified) * code/branches/objecthierarchy2/src/orxonox/tools/Timer.h (modified) Added TimeFactorListener to properly handle changes of the global ... Wed, 10 Dec 2008 22:41:54 GMT rgrieder [2405] * code/branches/physics/src/orxonox/CMakeLists.txt (modified) * code/branches/physics/visual_studio/vc8/orxonox.vcproj (modified) Updated build files. Wed, 10 Dec 2008 22:40:18 GMT rgrieder [2404] * code/branches/physics/src/orxonox/objects/collisionshapes (moved) Moved collision shapes to new folder. Wed, 10 Dec 2008 22:33:58 GMT rgrieder [2403] * code/branches/physics/src/orxonox/objects/worldentities/collisionshapes/CollisionShape.cc (modified) * code/branches/physics/src/orxonox/objects/worldentities/collisionshapes/CompoundCollisionShape.cc (modified) * code/branches/physics/src/orxonox/objects/worldentities/collisionshapes/CompoundCollisionShape.h (modified) * code/branches/physics/src/orxonox/objects/worldentities/collisionshapes/PlaneCollisionShape.cc (modified) * code/branches/physics/src/orxonox/objects/worldentities/collisionshapes/PlaneCollisionShape.h (modified) * code/branches/physics/src/orxonox/objects/worldentities/collisionshapes/SphereCollisionShape.cc (modified) * code/branches/physics/src/orxonox/objects/worldentities/collisionshapes/SphereCollisionShape.h (modified) - Fixed issues with CollisionShape loading, handling and ... Wed, 10 Dec 2008 22:24:15 GMT FelixSchulthess [2402] * code/branches/lodfinal/src/orxonox/objects/worldentities/Planet.cc (modified) * code/branches/lodfinal/src/orxonox/objects/worldentities/Planet.h (modified) i cannot convince svn Wed, 10 Dec 2008 22:14:31 GMT adrfried [2401] * code/branches/buildsystem/bin/CMakeLists.txt (modified) * code/branches/buildsystem/bin/tardis/ogre.cfg (added) default ogre.cfg added for tardis Wed, 10 Dec 2008 21:08:37 GMT landauf [2400] * code/branches/objecthierarchy2/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/objecthierarchy2/src/orxonox/gamestates/GSLevel.h (modified) * code/branches/objecthierarchy2/src/orxonox/gamestates/GSRoot.cc (modified) * code/branches/objecthierarchy2/src/orxonox/gamestates/GSRoot.h (modified) moved setTimeFactor to GSRoot because tickables are currently ticked ... Wed, 10 Dec 2008 20:45:35 GMT adrfried [2399] * code/branches/buildsystem/CMakeLists.txt (modified) * code/branches/buildsystem/cmake/UseTolua.cmake (modified) * code/branches/buildsystem/src/tolua/CMakeLists.txt (modified) tolua fixed for mingw, libtolua linked statically Wed, 10 Dec 2008 20:20:39 GMT polakma [2398] * code/branches/weapon2/bin/def_keybindings.ini (modified) * code/branches/weapon2/src/orxonox/CMakeLists.txt (modified) * code/branches/weapon2/src/orxonox/objects/weaponSystem/Weapon.cc (modified) * code/branches/weapon2/src/orxonox/objects/weaponSystem/Weapon.h (modified) * code/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponPack.cc (modified) * code/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponSet.cc (modified) * code/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponSlot.cc (modified) * code/branches/weapon2/src/orxonox/objects/weaponSystem/munitions/LaserGunMunition.cc (modified) * code/branches/weapon2/src/orxonox/objects/weaponSystem/projectiles/ParticleProjectile.cc (modified) * code/branches/weapon2/src/orxonox/objects/weaponSystem/weapons/Fusion.cc (added) * code/branches/weapon2/src/orxonox/objects/weaponSystem/weapons/Fusion.h (added) * code/branches/weapon2/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc (modified) * code/branches/weapon2/src/orxonox/objects/weaponSystem/weapons/LaserGun.h (modified) * code/branches/weapon2/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) altfire now available Wed, 10 Dec 2008 19:24:53 GMT dsommer [2397] * code/branches/pickups2/src/orxonox/objects/pickup/ShipEquipment.cc (modified) * code/branches/pickups2/src/orxonox/objects/pickup/ShipEquipment.h (modified) * code/branches/pickups2/src/orxonox/objects/pickup/Turbo.cc (modified) teilweise doxy geaddet und weitere test instanzen Wed, 10 Dec 2008 17:37:31 GMT landauf [2396] * code/branches/objecthierarchy2/src/orxonox/CameraManager.cc (modified) * code/branches/objecthierarchy2/src/orxonox/CameraManager.h (modified) * code/branches/objecthierarchy2/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/Camera.cc (modified) * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/Camera.h (modified) * code/branches/objecthierarchy2/src/orxonox/tools/Shader.cc (modified) fixed shader/camera crash Wed, 10 Dec 2008 17:07:13 GMT FelixSchulthess [2395] * code/branches/lodfinal/src/orxonox/objects/worldentities/Planet.cc (modified) messing up planet so it will work in client mode Wed, 10 Dec 2008 17:02:42 GMT FelixSchulthess [2394] * code/branches/lodfinal/src/orxonox/objects/worldentities/Planet.cc (modified) * code/branches/lodfinal/src/orxonox/objects/worldentities/Planet.h (modified) messing up planet so it will work in client mode Wed, 10 Dec 2008 16:39:22 GMT polakma [2393] * code/branches/weapon2/src/orxonox/objects/weaponSystem/Weapon.cc (modified) now working Wed, 10 Dec 2008 16:37:29 GMT adrfried [2392] * code/branches/buildsystem/cmake/CheckTardis.cmake (modified) tardis check improved Wed, 10 Dec 2008 16:30:39 GMT polakma [2391] * code/branches/weapon2/src/orxonox/objects/weaponSystem/Munition.cc (modified) * code/branches/weapon2/src/orxonox/objects/weaponSystem/Munition.h (modified) * code/branches/weapon2/src/orxonox/objects/weaponSystem/Weapon.cc (modified) * code/branches/weapon2/src/orxonox/objects/weaponSystem/Weapon.h (modified) * code/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponPack.cc (modified) * code/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponSet.cc (modified) * code/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponSlot.cc (modified) * code/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponSlot.h (modified) * code/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponSystem.cc (modified) * code/branches/weapon2/src/orxonox/objects/weaponSystem/projectiles/BillboardProjectile.cc (modified) * code/branches/weapon2/src/orxonox/objects/weaponSystem/projectiles/ParticleProjectile.cc (modified) * code/branches/weapon2/src/orxonox/objects/weaponSystem/projectiles/ParticleProjectile.h (modified) * code/branches/weapon2/src/orxonox/objects/weaponSystem/projectiles/Projectile.cc (modified) * code/branches/weapon2/src/orxonox/objects/weaponSystem/projectiles/Projectile.h (modified) * code/branches/weapon2/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc (modified) * code/branches/weapon2/src/orxonox/objects/worldentities/MovableEntity.cc (modified) * code/branches/weapon2/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) fixed projectile, particle effect, reloadingTimer and magazineTimer Wed, 10 Dec 2008 16:30:10 GMT dafrick [2390] * code/branches/questsystem4 (copied) Create new questsystem branch Wed, 10 Dec 2008 16:25:38 GMT dsommer [2389] * code/branches/pickups2/src/orxonox/objects/pickup/PickupSpawner.cc (modified) * code/branches/pickups2/src/orxonox/objects/pickup/PickupSpawner.h (modified) * code/branches/pickups2/src/orxonox/objects/pickup/ShipEquipment.cc (modified) * code/branches/pickups2/src/orxonox/objects/pickup/ShipEquipment.h (modified) * code/branches/pickups2/src/orxonox/objects/pickup/Turbo.cc (modified) funktioniert :) Wed, 10 Dec 2008 15:49:48 GMT runom [2388] * code/branches/lodfinal/src/orxonox/objects/worldentities/Planet.cc (modified) Added additional files for planet Wed, 10 Dec 2008 15:28:26 GMT chpeter [2387] * code/branches/presentation/src/network/TrafficControl.cc (modified) * code/branches/presentation/src/network/TrafficControl.h (modified) added fct pri- and pubRemoveClient to help remove Info in lists when ... Wed, 10 Dec 2008 15:23:21 GMT bhildebr [2386] * code/branches/overlay/src/orxonox/overlays/stats/CreateLines.cc (modified) * code/branches/overlay/src/orxonox/overlays/stats/Scoreboard.cc (modified) * code/branches/overlay/src/orxonox/overlays/stats/Scoreboard.h (modified) * code/branches/overlay/src/orxonox/overlays/stats/Stats.cc (modified) CreateLines and Scoreboard are now running without segfaults Wed, 10 Dec 2008 15:19:44 GMT dafrick [2385] * code/branches/presentation/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/presentation/src/orxonox/objects/quest/AddQuest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/AddQuest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/AddQuestHint.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/AddQuestHint.h (modified) * code/branches/presentation/src/orxonox/objects/quest/AddReward.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/AddReward.h (modified) * code/branches/presentation/src/orxonox/objects/quest/CMakeLists.txt (modified) * code/branches/presentation/src/orxonox/objects/quest/ChangeQuestStatus.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/ChangeQuestStatus.h (modified) * code/branches/presentation/src/orxonox/objects/quest/CompleteQuest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/CompleteQuest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/FailQuest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/FailQuest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/GlobalQuest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/GlobalQuest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/LocalQuest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/LocalQuest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/Quest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/Quest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestDescription.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestDescription.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestEffect.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestEffect.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestEffectBeacon.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestEffectBeacon.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestHint.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestHint.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestItem.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestItem.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestListener.cc (copied) * code/branches/presentation/src/orxonox/objects/quest/QuestListener.h (copied) * code/branches/presentation/src/orxonox/objects/quest/QuestManager.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestManager.h (modified) * code/branches/presentation/src/orxonox/objects/quest/Rewardable.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/Rewardable.h (modified) * code/branches/presentation/src/orxonox/overlays/CMakeLists.txt (modified) * code/branches/presentation/src/orxonox/overlays/notifications (copied) * code/branches/presentation/src/orxonox/overlays/notifications/CMakeLists.txt (copied) * code/branches/presentation/src/orxonox/overlays/notifications/Notification.cc (copied) * code/branches/presentation/src/orxonox/overlays/notifications/Notification.h (copied) * code/branches/presentation/src/orxonox/overlays/notifications/NotificationManager.cc (copied) * code/branches/presentation/src/orxonox/overlays/notifications/NotificationManager.h (copied) * code/branches/presentation/src/orxonox/overlays/notifications/NotificationQueue.cc (copied) * code/branches/presentation/src/orxonox/overlays/notifications/NotificationQueue.h (copied) Merged questsystem3. Wed, 10 Dec 2008 15:19:26 GMT adrfried [2384] * code/branches/buildsystem/src/audio/CMakeLists.txt (modified) * code/branches/buildsystem/src/ceguilua-0.5.0/ceguilua/CMakeLists.txt (modified) * code/branches/buildsystem/src/ceguilua-0.6.1/ceguilua/CMakeLists.txt (modified) * code/branches/buildsystem/src/core/CMakeLists.txt (modified) * code/branches/buildsystem/src/cpptcl/CMakeLists.txt (modified) * code/branches/buildsystem/src/network/CMakeLists.txt (modified) * code/branches/buildsystem/src/ois/CMakeLists.txt (modified) * code/branches/buildsystem/src/orxonox/CMakeLists.txt (modified) * code/branches/buildsystem/src/tinyxml/CMakeLists.txt (modified) * code/branches/buildsystem/src/tolua/CMakeLists.txt (modified) * code/branches/buildsystem/src/util/CMakeLists.txt (modified) install targets added Wed, 10 Dec 2008 14:36:47 GMT dafrick [2383] * code/branches/questsystem3/src/orxonox/objects/quest/LocalQuest.h (modified) * code/branches/questsystem3/src/orxonox/objects/quest/QuestHint.h (modified) * code/branches/questsystem3/src/orxonox/objects/quest/QuestItem.cc (modified) * code/branches/questsystem3/src/orxonox/objects/quest/QuestListener.cc (modified) * code/branches/questsystem3/src/orxonox/overlays/notifications/Notification.h (modified) Some verry small changes... Wed, 10 Dec 2008 14:36:36 GMT scheusso [2382] * code/branches/presentation/src/network/GamestateManager.cc (modified) * code/branches/presentation/src/network/GamestateManager.h (modified) * code/branches/presentation/src/network/TrafficControl.cc (modified) * code/branches/presentation/src/network/TrafficControl.h (modified) * code/branches/presentation/src/network/packet/Gamestate.cc (modified) * code/branches/presentation/src/network/packet/Gamestate.h (modified) changes in trafficcontrol: - configvalue for targetsize (size of ... Wed, 10 Dec 2008 14:02:14 GMT scheusso [2381] * code/branches/presentation/src/network/GamestateManager.cc (modified) * code/branches/presentation/src/network/TrafficControl.cc (modified) * code/branches/presentation/src/network/TrafficControl.h (modified) corrected some problem with scheduling and cutting (in trafficcontrol) Wed, 10 Dec 2008 13:40:15 GMT runom [2380] * code/branches/lodfinal/src/orxonox/objects/worldentities/CMakeLists.txt (modified) * code/branches/lodfinal/src/orxonox/objects/worldentities/Planet.cc (added) * code/branches/lodfinal/src/orxonox/objects/worldentities/Planet.h (added) modified planet to moveable entity, added atmosphere select per xml Wed, 10 Dec 2008 13:38:33 GMT polakma [2379] * code/branches/weapon2/src/orxonox/objects/weaponSystem/Munition.cc (modified) * code/branches/weapon2/src/orxonox/objects/weaponSystem/Munition.h (modified) * code/branches/weapon2/src/orxonox/objects/weaponSystem/Weapon.cc (modified) * code/branches/weapon2/src/orxonox/objects/weaponSystem/Weapon.h (modified) * code/branches/weapon2/src/orxonox/objects/weaponSystem/projectiles/Projectile.cc (modified) * code/branches/weapon2/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc (modified) * code/branches/weapon2/src/orxonox/objects/weaponSystem/weapons/LaserGun.h (modified) * code/branches/weapon2/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) changed Weapon::fire and munition reloading Wed, 10 Dec 2008 13:13:54 GMT chpeter [2378] * code/branches/presentation/src/network/TrafficControl.cc (modified) process ack- solved set back of schedValue, watching targetsize from cut Wed, 10 Dec 2008 12:46:31 GMT rgrieder [2377] * code/branches/physics/src/orxonox/objects/worldentities/collisionshapes/CollisionShape.h (modified) Fixed build Wed, 10 Dec 2008 12:42:05 GMT dafrick [2376] * code/branches/questsystem3/src/orxonox/objects/quest/AddQuest.cc (modified) * code/branches/questsystem3/src/orxonox/objects/quest/AddQuestHint.cc (modified) Once again, I failed to test whether it would compile. ;) Wed, 10 Dec 2008 12:39:50 GMT dafrick [2375] * code/branches/questsystem3/src/orxonox/objects/quest/AddQuest.cc (modified) * code/branches/questsystem3/src/orxonox/objects/quest/AddQuestHint.cc (modified) * code/branches/questsystem3/src/orxonox/objects/quest/AddReward.cc (modified) * code/branches/questsystem3/src/orxonox/objects/quest/Quest.cc (modified) * code/branches/questsystem3/src/orxonox/objects/quest/QuestEffect.cc (modified) * code/branches/questsystem3/src/orxonox/overlays/notifications/NotificationManager.cc (modified) Added some more output. Wed, 10 Dec 2008 12:38:17 GMT rgrieder [2374] * code/branches/physics/src/orxonox/CMakeLists.txt (modified) * code/branches/physics/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/physics/src/orxonox/objects/HelloBullet.cc (deleted) * code/branches/physics/src/orxonox/objects/HelloBullet.h (deleted) * code/branches/physics/src/orxonox/objects/Scene.cc (modified) * code/branches/physics/src/orxonox/objects/Scene.h (modified) * code/branches/physics/src/orxonox/objects/worldentities/ControllableEntity.cc (modified) * code/branches/physics/src/orxonox/objects/worldentities/ControllableEntity.h (modified) * code/branches/physics/src/orxonox/objects/worldentities/LinearEntity.cc (modified) * code/branches/physics/src/orxonox/objects/worldentities/LinearEntity.h (modified) * code/branches/physics/src/orxonox/objects/worldentities/MovableEntity.cc (modified) * code/branches/physics/src/orxonox/objects/worldentities/MovableEntity.h (modified) * code/branches/physics/src/orxonox/objects/worldentities/StaticEntity.cc (modified) * code/branches/physics/src/orxonox/objects/worldentities/StaticEntity.h (modified) * code/branches/physics/src/orxonox/objects/worldentities/WorldEntity.cc (modified) * code/branches/physics/src/orxonox/objects/worldentities/WorldEntity.h (modified) * code/branches/physics/src/orxonox/objects/worldentities/collisionshapes/CollisionShape.cc (modified) * code/branches/physics/src/orxonox/objects/worldentities/collisionshapes/CollisionShape.h (modified) * code/branches/physics/src/orxonox/objects/worldentities/collisionshapes/CompoundCollisionShape.cc (modified) * code/branches/physics/src/orxonox/objects/worldentities/collisionshapes/CompoundCollisionShape.h (modified) * code/branches/physics/src/orxonox/objects/worldentities/collisionshapes/PlaneCollisionShape.cc (modified) * code/branches/physics/src/orxonox/objects/worldentities/collisionshapes/PlaneCollisionShape.h (modified) * code/branches/physics/src/orxonox/objects/worldentities/collisionshapes/SphereCollisionShape.cc (modified) * code/branches/physics/src/orxonox/objects/worldentities/collisionshapes/SphereCollisionShape.h (modified) * code/branches/physics/src/orxonox/objects/worldentities/pawns/SpaceShip.cc (modified) * code/branches/physics/src/orxonox/objects/worldentities/pawns/Spectator.cc (modified) * code/branches/physics/visual_studio/vc8/orxonox.vcproj (modified) Trying to synchronise phyiscs over the network. - Removed derivation ... Wed, 10 Dec 2008 12:33:54 GMT rgrieder [2373] * code/branches/physics/src/core/XMLPort.h (modified) Finished work on new XMLport macro (XMLPortParamVariable). Wed, 10 Dec 2008 12:23:18 GMT runom [2372] * code/branches/lodfinal (copied) creating final lod branch Wed, 10 Dec 2008 11:50:05 GMT scheusso [2371] * code/branches/presentation (modified) * code/branches/presentation/src/core/Factory.cc (modified) * code/branches/presentation/src/core/Factory.h (modified) * code/branches/presentation/src/core/Identifier.cc (modified) * code/branches/presentation/src/core/Identifier.h (modified) * code/branches/presentation/src/core/Template.cc (modified) * code/branches/presentation/src/core/Template.h (modified) * code/branches/presentation/src/core/XMLFile.h (modified) * code/branches/presentation/src/core/XMLIncludes.h (modified) * code/branches/presentation/src/network/CMakeLists.txt (modified) * code/branches/presentation/src/network/Client.cc (modified) * code/branches/presentation/src/network/ClientInformation.cc (modified) * code/branches/presentation/src/network/ClientInformation.h (modified) * code/branches/presentation/src/network/ConnectionManager.cc (modified) * code/branches/presentation/src/network/GamestateClient.cc (modified) * code/branches/presentation/src/network/GamestateManager.cc (modified) * code/branches/presentation/src/network/NetworkCallback.h (deleted) * code/branches/presentation/src/network/NetworkPrereqs.h (modified) * code/branches/presentation/src/network/Synchronisable.cc (deleted) * code/branches/presentation/src/network/Synchronisable.h (deleted) * code/branches/presentation/src/network/TrafficControl.cc (copied) * code/branches/presentation/src/network/TrafficControl.h (copied) * code/branches/presentation/src/network/packet/DeleteObjects.cc (modified) * code/branches/presentation/src/network/packet/Gamestate.cc (modified) * code/branches/presentation/src/network/packet/Gamestate.h (modified) * code/branches/presentation/src/network/packet/Welcome.cc (modified) * code/branches/presentation/src/network/synchronisable (copied) * code/branches/presentation/src/network/synchronisable/CMakeLists.txt (copied) * code/branches/presentation/src/network/synchronisable/NetworkCallback.h (copied) * code/branches/presentation/src/network/synchronisable/NetworkCallbackManager.cc (copied) * code/branches/presentation/src/network/synchronisable/NetworkCallbackManager.h (copied) * code/branches/presentation/src/network/synchronisable/Synchronisable.cc (copied) * code/branches/presentation/src/network/synchronisable/Synchronisable.h (copied) * code/branches/presentation/src/network/synchronisable/SynchronisableSpecialisations.cc (copied) * code/branches/presentation/src/network/synchronisable/SynchronisableVariable.cc (copied) * code/branches/presentation/src/network/synchronisable/SynchronisableVariable.h (copied) * code/branches/presentation/src/orxonox/CameraManager.cc (modified) * code/branches/presentation/src/orxonox/CameraManager.h (modified) * code/branches/presentation/src/orxonox/OrxonoxStableHeaders.h (modified) * code/branches/presentation/src/orxonox/objects/Level.cc (modified) * code/branches/presentation/src/orxonox/objects/Level.h (modified) * code/branches/presentation/src/orxonox/objects/Scene.cc (modified) * code/branches/presentation/src/orxonox/objects/Scene.h (modified) * code/branches/presentation/src/orxonox/objects/Test.cc (modified) * code/branches/presentation/src/orxonox/objects/Test.h (modified) * code/branches/presentation/src/orxonox/objects/infos/HumanPlayer.cc (modified) * code/branches/presentation/src/orxonox/objects/infos/Info.h (modified) * code/branches/presentation/src/orxonox/objects/infos/PlayerInfo.cc (modified) * code/branches/presentation/src/orxonox/objects/pickup/Usable.h (modified) * code/branches/presentation/src/orxonox/objects/quest/AddQuest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/AddQuest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/AddQuestHint.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/AddQuestHint.h (modified) * code/branches/presentation/src/orxonox/objects/quest/AddReward.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/AddReward.h (modified) * code/branches/presentation/src/orxonox/objects/quest/ChangeQuestStatus.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/ChangeQuestStatus.h (modified) * code/branches/presentation/src/orxonox/objects/quest/CompleteQuest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/CompleteQuest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/FailQuest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/FailQuest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/GlobalQuest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/GlobalQuest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/LocalQuest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/LocalQuest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/Quest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/Quest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestDescription.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestDescription.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestEffect.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestEffect.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestHint.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestHint.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestItem.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestItem.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestManager.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestManager.h (modified) * code/branches/presentation/src/orxonox/objects/quest/Rewardable.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/Rewardable.h (modified) * code/branches/presentation/src/orxonox/objects/weaponSystem/WeaponSystem.cc (modified) * code/branches/presentation/src/orxonox/objects/weaponSystem/WeaponSystem.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Backlight.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Backlight.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Billboard.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Camera.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Camera.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/ControllableEntity.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Light.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Model.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/MovableEntity.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/ParticleEmitter.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/ParticleSpawner.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/ParticleSpawner.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/PositionableEntity.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/WorldEntity.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/WorldEntity.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/pawns/SpaceShip.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/pawns/Spectator.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/triggers/Trigger.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/triggers/Trigger.h (modified) * code/branches/presentation/src/tolua/tolua-5.1.pkg (modified) * code/branches/presentation/src/util (modified) * code/branches/presentation/src/util/Exception.cc (modified) * code/branches/presentation/src/util/Exception.h (modified) * code/branches/presentation/src/util/SignalHandler.cc (modified) * code/branches/presentation/src/util/SignalHandler.h (modified) * code/branches/presentation/src/util/mbool.h (modified) * code/branches/presentation/visual_studio/vc8/audio.vsprops (modified) * code/branches/presentation/visual_studio/vc8/base.vsprops (modified) * code/branches/presentation/visual_studio/vc8/ceguilua.vsprops (modified) * code/branches/presentation/visual_studio/vc8/core.vsprops (modified) * code/branches/presentation/visual_studio/vc8/cpptcl.vsprops (modified) * code/branches/presentation/visual_studio/vc8/debug.vsprops (modified) * code/branches/presentation/visual_studio/vc8/directories.vsprops (modified) * code/branches/presentation/visual_studio/vc8/lua.vsprops (modified) * code/branches/presentation/visual_studio/vc8/network.vcproj (modified) * code/branches/presentation/visual_studio/vc8/network.vsprops (modified) * code/branches/presentation/visual_studio/vc8/orxonox.vsprops (modified) * code/branches/presentation/visual_studio/vc8/orxonox_vc8.sln (modified) * code/branches/presentation/visual_studio/vc8/release.vsprops (modified) * code/branches/presentation/visual_studio/vc8/tinyxml.vcproj (modified) * code/branches/presentation/visual_studio/vc8/tinyxml.vsprops (modified) * code/branches/presentation/visual_studio/vc8/tolua.vsprops (modified) * code/branches/presentation/visual_studio/vc8/toluagen.vcproj (modified) * code/branches/presentation/visual_studio/vc8/toluagen.vsprops (modified) * code/branches/presentation/visual_studio/vc8/toluagen_orxonox.vcproj (modified) * code/branches/presentation/visual_studio/vc8/toluagen_orxonox.vsprops (modified) * code/branches/presentation/visual_studio/vc8/util.vsprops (modified) merged network branch to presentation branch Wed, 10 Dec 2008 11:37:48 GMT scheusso [2370] * code/branches/presentation (copied) create our presentation branch