# # ChangeLog for code # # Generated by Trac 1.0.9 # Jun 12, 2024, 4:38:17 PM Tue, 07 Apr 2009 23:07:27 GMT dafrick [2909] * code/trunk/src/core/RootGameState.cc (added) * code/trunk/src/core/RootGameState.h (added) * code/trunk/src/orxonox/GraphicsEngine.cc (added) * code/trunk/src/orxonox/GraphicsEngine.h (added) * code/trunk/src/orxonox/OrxonoxPrereqs.h (modified) * code/trunk/src/orxonox/gamestates/GSGUI.cc (added) * code/trunk/src/orxonox/gamestates/GSGUI.h (added) * code/trunk/src/orxonox/gamestates/GSLevel.cc (modified) * code/trunk/src/orxonox/gamestates/GSLevel.h (modified) * code/trunk/src/orxonox/objects/quest/AddQuest.cc (modified) * code/trunk/src/orxonox/objects/quest/AddQuest.h (modified) * code/trunk/src/orxonox/objects/quest/AddQuestHint.cc (modified) * code/trunk/src/orxonox/objects/quest/AddQuestHint.h (modified) * code/trunk/src/orxonox/objects/quest/AddReward.cc (modified) * code/trunk/src/orxonox/objects/quest/AddReward.h (modified) * code/trunk/src/orxonox/objects/quest/CMakeLists.txt (modified) * code/trunk/src/orxonox/objects/quest/ChangeQuestStatus.cc (modified) * code/trunk/src/orxonox/objects/quest/ChangeQuestStatus.h (modified) * code/trunk/src/orxonox/objects/quest/CompleteQuest.cc (modified) * code/trunk/src/orxonox/objects/quest/CompleteQuest.h (modified) * code/trunk/src/orxonox/objects/quest/FailQuest.cc (modified) * code/trunk/src/orxonox/objects/quest/FailQuest.h (modified) * code/trunk/src/orxonox/objects/quest/GlobalQuest.cc (modified) * code/trunk/src/orxonox/objects/quest/GlobalQuest.h (modified) * code/trunk/src/orxonox/objects/quest/LocalQuest.cc (modified) * code/trunk/src/orxonox/objects/quest/LocalQuest.h (modified) * code/trunk/src/orxonox/objects/quest/Quest.cc (modified) * code/trunk/src/orxonox/objects/quest/Quest.h (modified) * code/trunk/src/orxonox/objects/quest/QuestDescription.cc (modified) * code/trunk/src/orxonox/objects/quest/QuestDescription.h (modified) * code/trunk/src/orxonox/objects/quest/QuestEffect.cc (modified) * code/trunk/src/orxonox/objects/quest/QuestEffect.h (modified) * code/trunk/src/orxonox/objects/quest/QuestEffectBeacon.cc (modified) * code/trunk/src/orxonox/objects/quest/QuestEffectBeacon.h (modified) * code/trunk/src/orxonox/objects/quest/QuestHint.cc (modified) * code/trunk/src/orxonox/objects/quest/QuestHint.h (modified) * code/trunk/src/orxonox/objects/quest/QuestItem.cc (modified) * code/trunk/src/orxonox/objects/quest/QuestItem.h (modified) * code/trunk/src/orxonox/objects/quest/QuestListener.cc (modified) * code/trunk/src/orxonox/objects/quest/QuestListener.h (modified) * code/trunk/src/orxonox/objects/quest/QuestManager.cc (modified) * code/trunk/src/orxonox/objects/quest/QuestManager.h (modified) * code/trunk/src/orxonox/objects/quest/QuestNotification.cc (added) * code/trunk/src/orxonox/objects/quest/QuestNotification.h (added) * code/trunk/src/orxonox/objects/quest/Rewardable.cc (modified) * code/trunk/src/orxonox/objects/quest/Rewardable.h (modified) * code/trunk/src/orxonox/overlays/OverlayGroup.cc (modified) * code/trunk/src/orxonox/overlays/OverlayGroup.h (modified) * code/trunk/src/orxonox/overlays/notifications/CMakeLists.txt (modified) * code/trunk/src/orxonox/overlays/notifications/Notification.cc (modified) * code/trunk/src/orxonox/overlays/notifications/Notification.h (modified) * code/trunk/src/orxonox/overlays/notifications/NotificationManager.cc (modified) * code/trunk/src/orxonox/overlays/notifications/NotificationManager.h (modified) * code/trunk/src/orxonox/overlays/notifications/NotificationOverlay.cc (added) * code/trunk/src/orxonox/overlays/notifications/NotificationOverlay.h (added) * code/trunk/src/orxonox/overlays/notifications/NotificationQueue.cc (modified) * code/trunk/src/orxonox/overlays/notifications/NotificationQueue.h (modified) Merging the QuestSystem branch to the trunk. Let's hope, this isn't a ... Tue, 07 Apr 2009 22:58:47 GMT dafrick [2908] * code/branches/questsystem5 (modified) * code/branches/questsystem5/CMakeLists.txt (modified) * code/branches/questsystem5/Doxyfile (modified) * code/branches/questsystem5/bin/client1.bat.in (modified) * code/branches/questsystem5/bin/client1.in (modified) * code/branches/questsystem5/bin/client2.bat.in (modified) * code/branches/questsystem5/bin/client2.in (modified) * code/branches/questsystem5/bin/dedicated.bat.in (modified) * code/branches/questsystem5/bin/dedicated.in (modified) * code/branches/questsystem5/bin/run.bat.in (modified) * code/branches/questsystem5/bin/server.bat.in (modified) * code/branches/questsystem5/bin/server.in (modified) * code/branches/questsystem5/bin/standalone.bat.in (modified) * code/branches/questsystem5/bin/standalone.in (modified) * code/branches/questsystem5/cmake/BuildConfig.cmake (modified) * code/branches/questsystem5/cmake/BuildConfigGCC.cmake (modified) * code/branches/questsystem5/cmake/FindDirectX.cmake (modified) * code/branches/questsystem5/cmake/FlagUtilities.cmake (modified) * code/branches/questsystem5/cmake/LibraryConfigTardis.cmake (modified) * code/branches/questsystem5/doc/api/doxy.config.in (modified) * code/branches/questsystem5/doc/examples (deleted) * code/branches/questsystem5/doc/images (deleted) * code/branches/questsystem5/src/OrxonoxConfig.h.in (modified) * code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btAxisSweep3.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btDbvt.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btDbvt.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btCollisionObject.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btCollisionObject.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btCollisionWorld.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btCollisionWorld.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btGhostObject.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btManifoldResult.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btManifoldResult.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btSimulationIslandManager.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btUnionFind.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btUnionFind.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btBoxShape.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btCollisionShape.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btCompoundShape.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btCompoundShape.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btConeShape.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btConvexHullShape.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btConvexShape.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btSphereShape.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btTriangleMesh.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btTriangleMeshShape.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/Gimpact/btGImpactBvh.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/Gimpact/btGImpactShape.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/Gimpact/gim_box_set.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/Gimpact/gim_math.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/Gimpact/gim_tri_collision.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/CMakeLists.txt (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/Character/btCharacterControllerInterface.h (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/Character/btKinematicCharacterController.cpp (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/Character/btKinematicCharacterController.h (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btContactConstraint.cpp (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btContactSolverInfo.h (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btHingeConstraint.h (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btSliderConstraint.h (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btSolverBody.h (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btSolverConstraint.h (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btTypedConstraint.h (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/Dynamics/Bullet-C-API.cpp (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/Dynamics/btActionInterface.h (deleted) * code/branches/questsystem5/src/bullet/BulletDynamics/Dynamics/btContinuousDynamicsWorld.cpp (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/Dynamics/btDynamicsWorld.h (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/Dynamics/btRigidBody.cpp (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/Dynamics/btRigidBody.h (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/Vehicle/btRaycastVehicle.cpp (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/Vehicle/btRaycastVehicle.h (modified) * code/branches/questsystem5/src/bullet/LinearMath/btAlignedAllocator.cpp (modified) * code/branches/questsystem5/src/bullet/LinearMath/btAlignedAllocator.h (modified) * code/branches/questsystem5/src/bullet/LinearMath/btAlignedObjectArray.h (modified) * code/branches/questsystem5/src/bullet/LinearMath/btConvexHull.cpp (modified) * code/branches/questsystem5/src/bullet/LinearMath/btIDebugDraw.h (modified) * code/branches/questsystem5/src/bullet/LinearMath/btMatrix3x3.h (modified) * code/branches/questsystem5/src/bullet/LinearMath/btQuadWord.h (modified) * code/branches/questsystem5/src/bullet/LinearMath/btQuaternion.h (modified) * code/branches/questsystem5/src/bullet/LinearMath/btScalar.h (modified) * code/branches/questsystem5/src/bullet/LinearMath/btTransform.h (modified) * code/branches/questsystem5/src/bullet/LinearMath/btVector3.h (modified) * code/branches/questsystem5/src/bullet/changes_orxonox.diff (modified) * code/branches/questsystem5/src/core/CMakeLists.txt (modified) * code/branches/questsystem5/src/core/Clock.h (modified) * code/branches/questsystem5/src/core/ConfigFileManager.cc (modified) * code/branches/questsystem5/src/core/Core.cc (modified) * code/branches/questsystem5/src/core/Core.h (modified) * code/branches/questsystem5/src/core/CorePrereqs.h (modified) * code/branches/questsystem5/src/core/Game.cc (deleted) * code/branches/questsystem5/src/core/Game.h (deleted) * code/branches/questsystem5/src/core/GameMode.cc (deleted) * code/branches/questsystem5/src/core/GameMode.h (deleted) * code/branches/questsystem5/src/core/GameState.cc (modified) * code/branches/questsystem5/src/core/GameState.h (modified) * code/branches/questsystem5/src/core/Identifier.h (modified) * code/branches/questsystem5/src/core/Iterator.h (modified) * code/branches/questsystem5/src/core/LuaBind.cc (modified) * code/branches/questsystem5/src/core/LuaBind.h (modified) * code/branches/questsystem5/src/core/ObjectListBase.cc (modified) * code/branches/questsystem5/src/core/ObjectListBase.h (modified) * code/branches/questsystem5/src/core/ObjectListIterator.h (modified) * code/branches/questsystem5/src/core/RootGameState.cc (added) * code/branches/questsystem5/src/core/RootGameState.h (added) * code/branches/questsystem5/src/core/TclThreadManager.cc (modified) * code/branches/questsystem5/src/core/TclThreadManager.h (modified) * code/branches/questsystem5/src/core/Template.cc (modified) * code/branches/questsystem5/src/core/Template.h (modified) * code/branches/questsystem5/src/core/XMLFile.h (modified) * code/branches/questsystem5/src/core/XMLIncludes.h (modified) * code/branches/questsystem5/src/core/XMLPort.h (modified) * code/branches/questsystem5/src/core/input/CalibratorCallback.h (modified) * code/branches/questsystem5/src/core/input/ExtendedInputState.cc (modified) * code/branches/questsystem5/src/core/input/ExtendedInputState.h (modified) * code/branches/questsystem5/src/core/input/InputBuffer.cc (modified) * code/branches/questsystem5/src/core/input/InputBuffer.h (modified) * code/branches/questsystem5/src/core/input/InputInterfaces.h (modified) * code/branches/questsystem5/src/core/input/InputManager.cc (modified) * code/branches/questsystem5/src/core/input/InputManager.h (modified) * code/branches/questsystem5/src/core/input/InputState.h (modified) * code/branches/questsystem5/src/core/input/KeyBinder.cc (modified) * code/branches/questsystem5/src/core/input/KeyBinder.h (modified) * code/branches/questsystem5/src/core/input/SimpleInputState.h (modified) * code/branches/questsystem5/src/cpptcl/cpptcl.cc (modified) * code/branches/questsystem5/src/cpptcl/cpptcl.h (modified) * code/branches/questsystem5/src/network/ChatListener.cc (modified) * code/branches/questsystem5/src/network/Client.cc (modified) * code/branches/questsystem5/src/network/Client.h (modified) * code/branches/questsystem5/src/network/ClientConnectionListener.cc (modified) * code/branches/questsystem5/src/network/ConnectionManager.cc (modified) * code/branches/questsystem5/src/network/Server.cc (modified) * code/branches/questsystem5/src/network/Server.h (modified) * code/branches/questsystem5/src/network/TrafficControl.cc (modified) * code/branches/questsystem5/src/network/packet/Gamestate.cc (modified) * code/branches/questsystem5/src/network/packet/Gamestate.h (modified) * code/branches/questsystem5/src/network/synchronisable/NetworkCallback.h (modified) * code/branches/questsystem5/src/network/synchronisable/Synchronisable.cc (modified) * code/branches/questsystem5/src/network/synchronisable/Synchronisable.h (modified) * code/branches/questsystem5/src/network/synchronisable/SynchronisableVariable.cc (modified) * code/branches/questsystem5/src/network/synchronisable/SynchronisableVariable.h (modified) * code/branches/questsystem5/src/orxonox/CMakeLists.txt (modified) * code/branches/questsystem5/src/orxonox/CameraManager.cc (modified) * code/branches/questsystem5/src/orxonox/CameraManager.h (modified) * code/branches/questsystem5/src/orxonox/GraphicsEngine.cc (added) * code/branches/questsystem5/src/orxonox/GraphicsEngine.h (added) * code/branches/questsystem5/src/orxonox/GraphicsManager.cc (deleted) * code/branches/questsystem5/src/orxonox/GraphicsManager.h (deleted) * code/branches/questsystem5/src/orxonox/Main.cc (modified) * code/branches/questsystem5/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/questsystem5/src/orxonox/PlayerManager.cc (modified) * code/branches/questsystem5/src/orxonox/gamestates/CMakeLists.txt (modified) * code/branches/questsystem5/src/orxonox/gamestates/GSClient.cc (modified) * code/branches/questsystem5/src/orxonox/gamestates/GSClient.h (modified) * code/branches/questsystem5/src/orxonox/gamestates/GSDedicated.cc (modified) * code/branches/questsystem5/src/orxonox/gamestates/GSDedicated.h (modified) * code/branches/questsystem5/src/orxonox/gamestates/GSGUI.cc (added) * code/branches/questsystem5/src/orxonox/gamestates/GSGUI.h (added) * code/branches/questsystem5/src/orxonox/gamestates/GSGraphics.cc (modified) * code/branches/questsystem5/src/orxonox/gamestates/GSGraphics.h (modified) * code/branches/questsystem5/src/orxonox/gamestates/GSIOConsole.cc (modified) * code/branches/questsystem5/src/orxonox/gamestates/GSIOConsole.h (modified) * code/branches/questsystem5/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/questsystem5/src/orxonox/gamestates/GSLevel.h (modified) * code/branches/questsystem5/src/orxonox/gamestates/GSMainMenu.cc (deleted) * code/branches/questsystem5/src/orxonox/gamestates/GSMainMenu.h (deleted) * code/branches/questsystem5/src/orxonox/gamestates/GSRoot.cc (modified) * code/branches/questsystem5/src/orxonox/gamestates/GSRoot.h (modified) * code/branches/questsystem5/src/orxonox/gamestates/GSServer.cc (modified) * code/branches/questsystem5/src/orxonox/gamestates/GSServer.h (modified) * code/branches/questsystem5/src/orxonox/gamestates/GSStandalone.cc (modified) * code/branches/questsystem5/src/orxonox/gamestates/GSStandalone.h (modified) * code/branches/questsystem5/src/orxonox/gui/GUIManager.cc (modified) * code/branches/questsystem5/src/orxonox/gui/GUIManager.h (modified) * code/branches/questsystem5/src/orxonox/objects/CMakeLists.txt (modified) * code/branches/questsystem5/src/orxonox/objects/EventTarget.cc (modified) * code/branches/questsystem5/src/orxonox/objects/Level.cc (modified) * code/branches/questsystem5/src/orxonox/objects/Level.h (modified) * code/branches/questsystem5/src/orxonox/objects/Radar.cc (modified) * code/branches/questsystem5/src/orxonox/objects/Scene.cc (modified) * code/branches/questsystem5/src/orxonox/objects/Teamcolourable.cc (deleted) * code/branches/questsystem5/src/orxonox/objects/Teamcolourable.h (deleted) * code/branches/questsystem5/src/orxonox/objects/collisionshapes (modified) * code/branches/questsystem5/src/orxonox/objects/controllers/AIController.cc (modified) * code/branches/questsystem5/src/orxonox/objects/controllers/CMakeLists.txt (modified) * code/branches/questsystem5/src/orxonox/objects/controllers/Controller.cc (modified) * code/branches/questsystem5/src/orxonox/objects/controllers/Controller.h (modified) * code/branches/questsystem5/src/orxonox/objects/controllers/HumanController.cc (modified) * code/branches/questsystem5/src/orxonox/objects/controllers/PongAI.cc (deleted) * code/branches/questsystem5/src/orxonox/objects/controllers/PongAI.h (deleted) * code/branches/questsystem5/src/orxonox/objects/gametypes/CMakeLists.txt (modified) * code/branches/questsystem5/src/orxonox/objects/gametypes/Deathmatch.cc (deleted) * code/branches/questsystem5/src/orxonox/objects/gametypes/Deathmatch.h (deleted) * code/branches/questsystem5/src/orxonox/objects/gametypes/Gametype.cc (modified) * code/branches/questsystem5/src/orxonox/objects/gametypes/Gametype.h (modified) * code/branches/questsystem5/src/orxonox/objects/gametypes/Pong.cc (deleted) * code/branches/questsystem5/src/orxonox/objects/gametypes/Pong.h (deleted) * code/branches/questsystem5/src/orxonox/objects/gametypes/TeamDeathmatch.cc (deleted) * code/branches/questsystem5/src/orxonox/objects/gametypes/TeamDeathmatch.h (deleted) * code/branches/questsystem5/src/orxonox/objects/infos/Bot.cc (modified) * code/branches/questsystem5/src/orxonox/objects/infos/CMakeLists.txt (modified) * code/branches/questsystem5/src/orxonox/objects/infos/GametypeInfo.cc (modified) * code/branches/questsystem5/src/orxonox/objects/infos/GametypeInfo.h (modified) * code/branches/questsystem5/src/orxonox/objects/infos/HumanPlayer.cc (modified) * code/branches/questsystem5/src/orxonox/objects/infos/HumanPlayer.h (modified) * code/branches/questsystem5/src/orxonox/objects/infos/PlayerInfo.cc (modified) * code/branches/questsystem5/src/orxonox/objects/infos/PlayerInfo.h (modified) * code/branches/questsystem5/src/orxonox/objects/infos/PongBot.cc (deleted) * code/branches/questsystem5/src/orxonox/objects/infos/PongBot.h (deleted) * code/branches/questsystem5/src/orxonox/objects/items/MultiStateEngine.cc (modified) * code/branches/questsystem5/src/orxonox/objects/pickup/PickupSpawner.cc (modified) * code/branches/questsystem5/src/orxonox/objects/pickup/Usable.h (modified) * code/branches/questsystem5/src/orxonox/objects/quest/AddQuest.cc (modified) * code/branches/questsystem5/src/orxonox/objects/quest/AddQuest.h (modified) * code/branches/questsystem5/src/orxonox/objects/quest/AddQuestHint.cc (modified) * code/branches/questsystem5/src/orxonox/objects/quest/AddQuestHint.h (modified) * code/branches/questsystem5/src/orxonox/objects/quest/AddReward.cc (modified) * code/branches/questsystem5/src/orxonox/objects/quest/AddReward.h (modified) * code/branches/questsystem5/src/orxonox/objects/quest/ChangeQuestStatus.cc (modified) * code/branches/questsystem5/src/orxonox/objects/quest/ChangeQuestStatus.h (modified) * code/branches/questsystem5/src/orxonox/objects/quest/CompleteQuest.cc (modified) * code/branches/questsystem5/src/orxonox/objects/quest/CompleteQuest.h (modified) * code/branches/questsystem5/src/orxonox/objects/quest/FailQuest.cc (modified) * code/branches/questsystem5/src/orxonox/objects/quest/FailQuest.h (modified) * code/branches/questsystem5/src/orxonox/objects/quest/GlobalQuest.cc (modified) * code/branches/questsystem5/src/orxonox/objects/quest/GlobalQuest.h (modified) * code/branches/questsystem5/src/orxonox/objects/quest/LocalQuest.cc (modified) * code/branches/questsystem5/src/orxonox/objects/quest/LocalQuest.h (modified) * code/branches/questsystem5/src/orxonox/objects/quest/Quest.cc (modified) * code/branches/questsystem5/src/orxonox/objects/quest/Quest.h (modified) * code/branches/questsystem5/src/orxonox/objects/quest/QuestDescription.cc (modified) * code/branches/questsystem5/src/orxonox/objects/quest/QuestDescription.h (modified) * code/branches/questsystem5/src/orxonox/objects/quest/QuestEffect.cc (modified) * code/branches/questsystem5/src/orxonox/objects/quest/QuestEffect.h (modified) * code/branches/questsystem5/src/orxonox/objects/quest/QuestHint.cc (modified) * code/branches/questsystem5/src/orxonox/objects/quest/QuestHint.h (modified) * code/branches/questsystem5/src/orxonox/objects/quest/QuestItem.cc (modified) * code/branches/questsystem5/src/orxonox/objects/quest/QuestItem.h (modified) * code/branches/questsystem5/src/orxonox/objects/quest/QuestManager.cc (modified) * code/branches/questsystem5/src/orxonox/objects/quest/QuestManager.h (modified) * code/branches/questsystem5/src/orxonox/objects/quest/Rewardable.cc (modified) * code/branches/questsystem5/src/orxonox/objects/quest/Rewardable.h (modified) * code/branches/questsystem5/src/orxonox/objects/weaponSystem/Munition.cc (modified) * code/branches/questsystem5/src/orxonox/objects/weaponSystem/Weapon.cc (modified) * code/branches/questsystem5/src/orxonox/objects/weaponSystem/Weapon.h (modified) * code/branches/questsystem5/src/orxonox/objects/weaponSystem/WeaponPack.cc (modified) * code/branches/questsystem5/src/orxonox/objects/weaponSystem/WeaponPack.h (modified) * code/branches/questsystem5/src/orxonox/objects/weaponSystem/WeaponSet.cc (modified) * code/branches/questsystem5/src/orxonox/objects/weaponSystem/WeaponSystem.cc (modified) * code/branches/questsystem5/src/orxonox/objects/weaponSystem/WeaponSystem.h (modified) * code/branches/questsystem5/src/orxonox/objects/weaponSystem/munitions/CMakeLists.txt (modified) * code/branches/questsystem5/src/orxonox/objects/weaponSystem/munitions/FusionMunition.cc (deleted) * code/branches/questsystem5/src/orxonox/objects/weaponSystem/munitions/FusionMunition.h (deleted) * code/branches/questsystem5/src/orxonox/objects/weaponSystem/munitions/LaserGunMunition.cc (modified) * code/branches/questsystem5/src/orxonox/objects/weaponSystem/projectiles/BillboardProjectile.cc (modified) * code/branches/questsystem5/src/orxonox/objects/weaponSystem/projectiles/ParticleProjectile.cc (modified) * code/branches/questsystem5/src/orxonox/objects/weaponSystem/projectiles/Projectile.cc (modified) * code/branches/questsystem5/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc (modified) * code/branches/questsystem5/src/orxonox/objects/weaponSystem/weapons/LaserGun.h (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/Backlight.cc (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/Backlight.h (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/Billboard.cc (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/Billboard.h (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/BlinkingBillboard.cc (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/CMakeLists.txt (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/Camera.cc (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/Camera.h (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/CameraPosition.cc (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/CameraPosition.h (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/ControllableEntity.cc (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/ControllableEntity.h (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/ExplosionChunk.cc (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/Light.cc (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/Light.h (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/MobileEntity.cc (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/MobileEntity.h (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/Model.cc (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/MovableEntity.cc (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/ParticleEmitter.cc (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/ParticleSpawner.cc (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/ParticleSpawner.h (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/Planet.cc (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/PongBall.cc (deleted) * code/branches/questsystem5/src/orxonox/objects/worldentities/PongBall.h (deleted) * code/branches/questsystem5/src/orxonox/objects/worldentities/PongBat.cc (deleted) * code/branches/questsystem5/src/orxonox/objects/worldentities/PongBat.h (deleted) * code/branches/questsystem5/src/orxonox/objects/worldentities/PongCenterpoint.cc (deleted) * code/branches/questsystem5/src/orxonox/objects/worldentities/PongCenterpoint.h (deleted) * code/branches/questsystem5/src/orxonox/objects/worldentities/StaticEntity.cc (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/StaticEntity.h (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/TeamSpawnPoint.cc (deleted) * code/branches/questsystem5/src/orxonox/objects/worldentities/TeamSpawnPoint.h (deleted) * code/branches/questsystem5/src/orxonox/objects/worldentities/WorldEntity.cc (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/WorldEntity.h (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/pawns/Pawn.h (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/pawns/Spectator.cc (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/triggers/Trigger.cc (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/triggers/Trigger.h (modified) * code/branches/questsystem5/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/branches/questsystem5/src/orxonox/overlays/OrxonoxOverlay.h (modified) * code/branches/questsystem5/src/orxonox/overlays/OverlayGroup.cc (modified) * code/branches/questsystem5/src/orxonox/overlays/OverlayGroup.h (modified) * code/branches/questsystem5/src/orxonox/overlays/console/InGameConsole.cc (modified) * code/branches/questsystem5/src/orxonox/overlays/console/InGameConsole.h (modified) * code/branches/questsystem5/src/orxonox/overlays/debug/DebugFPSText.cc (modified) * code/branches/questsystem5/src/orxonox/overlays/debug/DebugRTRText.cc (modified) * code/branches/questsystem5/src/orxonox/overlays/hud/CMakeLists.txt (modified) * code/branches/questsystem5/src/orxonox/overlays/hud/HUDRadar.cc (modified) * code/branches/questsystem5/src/orxonox/overlays/hud/PongScore.cc (deleted) * code/branches/questsystem5/src/orxonox/overlays/hud/PongScore.h (deleted) * code/branches/questsystem5/src/orxonox/overlays/notifications/NotificationQueue.cc (modified) * code/branches/questsystem5/src/orxonox/pch/havepch/OrxonoxStableHeaders.h (modified) * code/branches/questsystem5/src/orxonox/tools/BillboardSet.cc (modified) * code/branches/questsystem5/src/orxonox/tools/CMakeLists.txt (modified) * code/branches/questsystem5/src/orxonox/tools/Mesh.cc (modified) * code/branches/questsystem5/src/orxonox/tools/ParticleInterface.cc (modified) * code/branches/questsystem5/src/orxonox/tools/ParticleInterface.h (modified) * code/branches/questsystem5/src/orxonox/tools/Shader.cc (modified) * code/branches/questsystem5/src/orxonox/tools/TimeFactorListener.cc (deleted) * code/branches/questsystem5/src/orxonox/tools/TimeFactorListener.h (deleted) * code/branches/questsystem5/src/orxonox/tools/Timer.h (modified) * code/branches/questsystem5/src/orxonox/tools/WindowEventListener.h (modified) * code/branches/questsystem5/src/tolua/all-5.0.lua (modified) * code/branches/questsystem5/src/tolua/all-5.1.lua (modified) * code/branches/questsystem5/src/util (modified) * code/branches/questsystem5/src/util/CMakeLists.txt (modified) * code/branches/questsystem5/src/util/Exception.cc (modified) * code/branches/questsystem5/src/util/Exception.h (modified) * code/branches/questsystem5/src/util/Math.h (modified) * code/branches/questsystem5/src/util/SignalHandler.cc (modified) * code/branches/questsystem5/src/util/SignalHandler.h (modified) Reverted to revision 2906 (because I'm too stupid to merge correctly, ... Tue, 07 Apr 2009 22:36:08 GMT dafrick [2907] * code/branches/questsystem5 (modified) * code/branches/questsystem5/CMakeLists.txt (modified) * code/branches/questsystem5/Doxyfile (modified) * code/branches/questsystem5/bin/client1.bat.in (modified) * code/branches/questsystem5/bin/client1.in (modified) * code/branches/questsystem5/bin/client2.bat.in (modified) * code/branches/questsystem5/bin/client2.in (modified) * code/branches/questsystem5/bin/dedicated.bat.in (modified) * code/branches/questsystem5/bin/dedicated.in (modified) * code/branches/questsystem5/bin/run.bat.in (modified) * code/branches/questsystem5/bin/server.bat.in (modified) * code/branches/questsystem5/bin/server.in (modified) * code/branches/questsystem5/bin/standalone.bat.in (modified) * code/branches/questsystem5/bin/standalone.in (modified) * code/branches/questsystem5/cmake/BuildConfig.cmake (modified) * code/branches/questsystem5/cmake/BuildConfigGCC.cmake (modified) * code/branches/questsystem5/cmake/FindDirectX.cmake (modified) * code/branches/questsystem5/cmake/FlagUtilities.cmake (modified) * code/branches/questsystem5/cmake/LibraryConfigTardis.cmake (modified) * code/branches/questsystem5/doc/api/doxy.config.in (modified) * code/branches/questsystem5/doc/examples (added) * code/branches/questsystem5/doc/images (added) * code/branches/questsystem5/src/OrxonoxConfig.h.in (modified) * code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btAxisSweep3.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btDbvt.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btDbvt.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btCollisionObject.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btCollisionObject.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btCollisionWorld.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btCollisionWorld.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btGhostObject.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btManifoldResult.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btManifoldResult.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btSimulationIslandManager.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btUnionFind.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btUnionFind.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btBoxShape.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btCollisionShape.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btCompoundShape.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btCompoundShape.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btConeShape.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btConvexHullShape.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btConvexShape.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btSphereShape.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btTriangleMesh.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btTriangleMeshShape.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/Gimpact/btGImpactBvh.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/Gimpact/btGImpactShape.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/Gimpact/gim_box_set.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/Gimpact/gim_math.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/Gimpact/gim_tri_collision.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp (modified) * code/branches/questsystem5/src/bullet/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h (modified) * code/branches/questsystem5/src/bullet/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/CMakeLists.txt (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/Character/btCharacterControllerInterface.h (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/Character/btKinematicCharacterController.cpp (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/Character/btKinematicCharacterController.h (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btContactConstraint.cpp (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btContactSolverInfo.h (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btHingeConstraint.h (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btSliderConstraint.h (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btSolverBody.h (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btSolverConstraint.h (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btTypedConstraint.h (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/Dynamics/Bullet-C-API.cpp (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/Dynamics/btActionInterface.h (added) * code/branches/questsystem5/src/bullet/BulletDynamics/Dynamics/btContinuousDynamicsWorld.cpp (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/Dynamics/btDynamicsWorld.h (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/Dynamics/btRigidBody.cpp (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/Dynamics/btRigidBody.h (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/Vehicle/btRaycastVehicle.cpp (modified) * code/branches/questsystem5/src/bullet/BulletDynamics/Vehicle/btRaycastVehicle.h (modified) * code/branches/questsystem5/src/bullet/LinearMath/btAlignedAllocator.cpp (modified) * code/branches/questsystem5/src/bullet/LinearMath/btAlignedAllocator.h (modified) * code/branches/questsystem5/src/bullet/LinearMath/btAlignedObjectArray.h (modified) * code/branches/questsystem5/src/bullet/LinearMath/btConvexHull.cpp (modified) * code/branches/questsystem5/src/bullet/LinearMath/btIDebugDraw.h (modified) * code/branches/questsystem5/src/bullet/LinearMath/btMatrix3x3.h (modified) * code/branches/questsystem5/src/bullet/LinearMath/btQuadWord.h (modified) * code/branches/questsystem5/src/bullet/LinearMath/btQuaternion.h (modified) * code/branches/questsystem5/src/bullet/LinearMath/btScalar.h (modified) * code/branches/questsystem5/src/bullet/LinearMath/btTransform.h (modified) * code/branches/questsystem5/src/bullet/LinearMath/btVector3.h (modified) * code/branches/questsystem5/src/bullet/changes_orxonox.diff (modified) * code/branches/questsystem5/src/core/CMakeLists.txt (modified) * code/branches/questsystem5/src/core/Clock.h (modified) * code/branches/questsystem5/src/core/ConfigFileManager.cc (modified) * code/branches/questsystem5/src/core/Core.cc (modified) * code/branches/questsystem5/src/core/Core.h (modified) * code/branches/questsystem5/src/core/CorePrereqs.h (modified) * code/branches/questsystem5/src/core/Game.cc (added) * code/branches/questsystem5/src/core/Game.h (added) * code/branches/questsystem5/src/core/GameMode.cc (added) * code/branches/questsystem5/src/core/GameMode.h (added) * code/branches/questsystem5/src/core/GameState.cc (modified) * code/branches/questsystem5/src/core/GameState.h (modified) * code/branches/questsystem5/src/core/Identifier.h (modified) * code/branches/questsystem5/src/core/Iterator.h (modified) * code/branches/questsystem5/src/core/LuaBind.cc (modified) * code/branches/questsystem5/src/core/LuaBind.h (modified) * code/branches/questsystem5/src/core/ObjectListBase.cc (modified) * code/branches/questsystem5/src/core/ObjectListBase.h (modified) * code/branches/questsystem5/src/core/ObjectListIterator.h (modified) * code/branches/questsystem5/src/core/RootGameState.cc (deleted) * code/branches/questsystem5/src/core/RootGameState.h (deleted) * code/branches/questsystem5/src/core/TclThreadManager.cc (modified) * code/branches/questsystem5/src/core/TclThreadManager.h (modified) * code/branches/questsystem5/src/core/Template.cc (modified) * code/branches/questsystem5/src/core/Template.h (modified) * code/branches/questsystem5/src/core/XMLFile.h (modified) * code/branches/questsystem5/src/core/XMLIncludes.h (modified) * code/branches/questsystem5/src/core/XMLPort.h (modified) * code/branches/questsystem5/src/core/input/CalibratorCallback.h (modified) * code/branches/questsystem5/src/core/input/ExtendedInputState.cc (modified) * code/branches/questsystem5/src/core/input/ExtendedInputState.h (modified) * code/branches/questsystem5/src/core/input/InputBuffer.cc (modified) * code/branches/questsystem5/src/core/input/InputBuffer.h (modified) * code/branches/questsystem5/src/core/input/InputInterfaces.h (modified) * code/branches/questsystem5/src/core/input/InputManager.cc (modified) * code/branches/questsystem5/src/core/input/InputManager.h (modified) * code/branches/questsystem5/src/core/input/InputState.h (modified) * code/branches/questsystem5/src/core/input/KeyBinder.cc (modified) * code/branches/questsystem5/src/core/input/KeyBinder.h (modified) * code/branches/questsystem5/src/core/input/SimpleInputState.h (modified) * code/branches/questsystem5/src/cpptcl/cpptcl.cc (modified) * code/branches/questsystem5/src/cpptcl/cpptcl.h (modified) * code/branches/questsystem5/src/network/ChatListener.cc (modified) * code/branches/questsystem5/src/network/Client.cc (modified) * code/branches/questsystem5/src/network/Client.h (modified) * code/branches/questsystem5/src/network/ClientConnectionListener.cc (modified) * code/branches/questsystem5/src/network/ConnectionManager.cc (modified) * code/branches/questsystem5/src/network/Server.cc (modified) * code/branches/questsystem5/src/network/Server.h (modified) * code/branches/questsystem5/src/network/TrafficControl.cc (modified) * code/branches/questsystem5/src/network/packet/Gamestate.cc (modified) * code/branches/questsystem5/src/network/packet/Gamestate.h (modified) * code/branches/questsystem5/src/network/synchronisable/NetworkCallback.h (modified) * code/branches/questsystem5/src/network/synchronisable/Synchronisable.cc (modified) * code/branches/questsystem5/src/network/synchronisable/Synchronisable.h (modified) * code/branches/questsystem5/src/network/synchronisable/SynchronisableVariable.cc (modified) * code/branches/questsystem5/src/network/synchronisable/SynchronisableVariable.h (modified) * code/branches/questsystem5/src/orxonox/CMakeLists.txt (modified) * code/branches/questsystem5/src/orxonox/CameraManager.cc (modified) * code/branches/questsystem5/src/orxonox/CameraManager.h (modified) * code/branches/questsystem5/src/orxonox/GraphicsEngine.cc (deleted) * code/branches/questsystem5/src/orxonox/GraphicsEngine.h (deleted) * code/branches/questsystem5/src/orxonox/GraphicsManager.cc (added) * code/branches/questsystem5/src/orxonox/GraphicsManager.h (added) * code/branches/questsystem5/src/orxonox/Main.cc (modified) * code/branches/questsystem5/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/questsystem5/src/orxonox/PlayerManager.cc (modified) * code/branches/questsystem5/src/orxonox/gamestates/CMakeLists.txt (modified) * code/branches/questsystem5/src/orxonox/gamestates/GSClient.cc (modified) * code/branches/questsystem5/src/orxonox/gamestates/GSClient.h (modified) * code/branches/questsystem5/src/orxonox/gamestates/GSDedicated.cc (modified) * code/branches/questsystem5/src/orxonox/gamestates/GSDedicated.h (modified) * code/branches/questsystem5/src/orxonox/gamestates/GSGUI.cc (deleted) * code/branches/questsystem5/src/orxonox/gamestates/GSGUI.h (deleted) * code/branches/questsystem5/src/orxonox/gamestates/GSGraphics.cc (modified) * code/branches/questsystem5/src/orxonox/gamestates/GSGraphics.h (modified) * code/branches/questsystem5/src/orxonox/gamestates/GSIOConsole.cc (modified) * code/branches/questsystem5/src/orxonox/gamestates/GSIOConsole.h (modified) * code/branches/questsystem5/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/questsystem5/src/orxonox/gamestates/GSLevel.h (modified) * code/branches/questsystem5/src/orxonox/gamestates/GSMainMenu.cc (added) * code/branches/questsystem5/src/orxonox/gamestates/GSMainMenu.h (added) * code/branches/questsystem5/src/orxonox/gamestates/GSRoot.cc (modified) * code/branches/questsystem5/src/orxonox/gamestates/GSRoot.h (modified) * code/branches/questsystem5/src/orxonox/gamestates/GSServer.cc (modified) * code/branches/questsystem5/src/orxonox/gamestates/GSServer.h (modified) * code/branches/questsystem5/src/orxonox/gamestates/GSStandalone.cc (modified) * code/branches/questsystem5/src/orxonox/gamestates/GSStandalone.h (modified) * code/branches/questsystem5/src/orxonox/gui/GUIManager.cc (modified) * code/branches/questsystem5/src/orxonox/gui/GUIManager.h (modified) * code/branches/questsystem5/src/orxonox/objects/CMakeLists.txt (modified) * code/branches/questsystem5/src/orxonox/objects/EventTarget.cc (modified) * code/branches/questsystem5/src/orxonox/objects/Level.cc (modified) * code/branches/questsystem5/src/orxonox/objects/Level.h (modified) * code/branches/questsystem5/src/orxonox/objects/Radar.cc (modified) * code/branches/questsystem5/src/orxonox/objects/Scene.cc (modified) * code/branches/questsystem5/src/orxonox/objects/Teamcolourable.cc (added) * code/branches/questsystem5/src/orxonox/objects/Teamcolourable.h (added) * code/branches/questsystem5/src/orxonox/objects/collisionshapes (modified) * code/branches/questsystem5/src/orxonox/objects/controllers/AIController.cc (modified) * code/branches/questsystem5/src/orxonox/objects/controllers/CMakeLists.txt (modified) * code/branches/questsystem5/src/orxonox/objects/controllers/Controller.cc (modified) * code/branches/questsystem5/src/orxonox/objects/controllers/Controller.h (modified) * code/branches/questsystem5/src/orxonox/objects/controllers/HumanController.cc (modified) * code/branches/questsystem5/src/orxonox/objects/controllers/PongAI.cc (added) * code/branches/questsystem5/src/orxonox/objects/controllers/PongAI.h (added) * code/branches/questsystem5/src/orxonox/objects/gametypes/CMakeLists.txt (modified) * code/branches/questsystem5/src/orxonox/objects/gametypes/Deathmatch.cc (added) * code/branches/questsystem5/src/orxonox/objects/gametypes/Deathmatch.h (added) * code/branches/questsystem5/src/orxonox/objects/gametypes/Gametype.cc (modified) * code/branches/questsystem5/src/orxonox/objects/gametypes/Gametype.h (modified) * code/branches/questsystem5/src/orxonox/objects/gametypes/Pong.cc (added) * code/branches/questsystem5/src/orxonox/objects/gametypes/Pong.h (added) * code/branches/questsystem5/src/orxonox/objects/gametypes/TeamDeathmatch.cc (added) * code/branches/questsystem5/src/orxonox/objects/gametypes/TeamDeathmatch.h (added) * code/branches/questsystem5/src/orxonox/objects/infos/Bot.cc (modified) * code/branches/questsystem5/src/orxonox/objects/infos/CMakeLists.txt (modified) * code/branches/questsystem5/src/orxonox/objects/infos/GametypeInfo.cc (modified) * code/branches/questsystem5/src/orxonox/objects/infos/GametypeInfo.h (modified) * code/branches/questsystem5/src/orxonox/objects/infos/HumanPlayer.cc (modified) * code/branches/questsystem5/src/orxonox/objects/infos/HumanPlayer.h (modified) * code/branches/questsystem5/src/orxonox/objects/infos/PlayerInfo.cc (modified) * code/branches/questsystem5/src/orxonox/objects/infos/PlayerInfo.h (modified) * code/branches/questsystem5/src/orxonox/objects/infos/PongBot.cc (added) * code/branches/questsystem5/src/orxonox/objects/infos/PongBot.h (added) * code/branches/questsystem5/src/orxonox/objects/items/MultiStateEngine.cc (modified) * code/branches/questsystem5/src/orxonox/objects/pickup/PickupSpawner.cc (modified) * code/branches/questsystem5/src/orxonox/objects/pickup/Usable.h (modified) * code/branches/questsystem5/src/orxonox/objects/quest/AddQuest.cc (modified) * code/branches/questsystem5/src/orxonox/objects/quest/AddQuest.h (modified) * code/branches/questsystem5/src/orxonox/objects/quest/AddQuestHint.cc (modified) * code/branches/questsystem5/src/orxonox/objects/quest/AddQuestHint.h (modified) * code/branches/questsystem5/src/orxonox/objects/quest/AddReward.cc (modified) * code/branches/questsystem5/src/orxonox/objects/quest/AddReward.h (modified) * code/branches/questsystem5/src/orxonox/objects/quest/ChangeQuestStatus.cc (modified) * code/branches/questsystem5/src/orxonox/objects/quest/ChangeQuestStatus.h (modified) * code/branches/questsystem5/src/orxonox/objects/quest/CompleteQuest.cc (modified) * code/branches/questsystem5/src/orxonox/objects/quest/CompleteQuest.h (modified) * code/branches/questsystem5/src/orxonox/objects/quest/FailQuest.cc (modified) * code/branches/questsystem5/src/orxonox/objects/quest/FailQuest.h (modified) * code/branches/questsystem5/src/orxonox/objects/quest/GlobalQuest.cc (modified) * code/branches/questsystem5/src/orxonox/objects/quest/GlobalQuest.h (modified) * code/branches/questsystem5/src/orxonox/objects/quest/LocalQuest.cc (modified) * code/branches/questsystem5/src/orxonox/objects/quest/LocalQuest.h (modified) * code/branches/questsystem5/src/orxonox/objects/quest/Quest.cc (modified) * code/branches/questsystem5/src/orxonox/objects/quest/Quest.h (modified) * code/branches/questsystem5/src/orxonox/objects/quest/QuestDescription.cc (modified) * code/branches/questsystem5/src/orxonox/objects/quest/QuestDescription.h (modified) * code/branches/questsystem5/src/orxonox/objects/quest/QuestEffect.cc (modified) * code/branches/questsystem5/src/orxonox/objects/quest/QuestEffect.h (modified) * code/branches/questsystem5/src/orxonox/objects/quest/QuestHint.cc (modified) * code/branches/questsystem5/src/orxonox/objects/quest/QuestHint.h (modified) * code/branches/questsystem5/src/orxonox/objects/quest/QuestItem.cc (modified) * code/branches/questsystem5/src/orxonox/objects/quest/QuestItem.h (modified) * code/branches/questsystem5/src/orxonox/objects/quest/QuestManager.cc (modified) * code/branches/questsystem5/src/orxonox/objects/quest/QuestManager.h (modified) * code/branches/questsystem5/src/orxonox/objects/quest/Rewardable.cc (modified) * code/branches/questsystem5/src/orxonox/objects/quest/Rewardable.h (modified) * code/branches/questsystem5/src/orxonox/objects/weaponSystem/Munition.cc (modified) * code/branches/questsystem5/src/orxonox/objects/weaponSystem/Weapon.cc (modified) * code/branches/questsystem5/src/orxonox/objects/weaponSystem/Weapon.h (modified) * code/branches/questsystem5/src/orxonox/objects/weaponSystem/WeaponPack.cc (modified) * code/branches/questsystem5/src/orxonox/objects/weaponSystem/WeaponPack.h (modified) * code/branches/questsystem5/src/orxonox/objects/weaponSystem/WeaponSet.cc (modified) * code/branches/questsystem5/src/orxonox/objects/weaponSystem/WeaponSystem.cc (modified) * code/branches/questsystem5/src/orxonox/objects/weaponSystem/WeaponSystem.h (modified) * code/branches/questsystem5/src/orxonox/objects/weaponSystem/munitions/CMakeLists.txt (modified) * code/branches/questsystem5/src/orxonox/objects/weaponSystem/munitions/FusionMunition.cc (added) * code/branches/questsystem5/src/orxonox/objects/weaponSystem/munitions/FusionMunition.h (added) * code/branches/questsystem5/src/orxonox/objects/weaponSystem/munitions/LaserGunMunition.cc (modified) * code/branches/questsystem5/src/orxonox/objects/weaponSystem/projectiles/BillboardProjectile.cc (modified) * code/branches/questsystem5/src/orxonox/objects/weaponSystem/projectiles/ParticleProjectile.cc (modified) * code/branches/questsystem5/src/orxonox/objects/weaponSystem/projectiles/Projectile.cc (modified) * code/branches/questsystem5/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc (modified) * code/branches/questsystem5/src/orxonox/objects/weaponSystem/weapons/LaserGun.h (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/Backlight.cc (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/Backlight.h (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/Billboard.cc (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/Billboard.h (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/BlinkingBillboard.cc (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/CMakeLists.txt (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/Camera.cc (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/Camera.h (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/CameraPosition.cc (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/CameraPosition.h (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/ControllableEntity.cc (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/ControllableEntity.h (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/ExplosionChunk.cc (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/Light.cc (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/Light.h (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/MobileEntity.cc (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/MobileEntity.h (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/Model.cc (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/MovableEntity.cc (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/ParticleEmitter.cc (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/ParticleSpawner.cc (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/ParticleSpawner.h (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/Planet.cc (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/PongBall.cc (added) * code/branches/questsystem5/src/orxonox/objects/worldentities/PongBall.h (added) * code/branches/questsystem5/src/orxonox/objects/worldentities/PongBat.cc (added) * code/branches/questsystem5/src/orxonox/objects/worldentities/PongBat.h (added) * code/branches/questsystem5/src/orxonox/objects/worldentities/PongCenterpoint.cc (added) * code/branches/questsystem5/src/orxonox/objects/worldentities/PongCenterpoint.h (added) * code/branches/questsystem5/src/orxonox/objects/worldentities/StaticEntity.cc (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/StaticEntity.h (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/TeamSpawnPoint.cc (added) * code/branches/questsystem5/src/orxonox/objects/worldentities/TeamSpawnPoint.h (added) * code/branches/questsystem5/src/orxonox/objects/worldentities/WorldEntity.cc (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/WorldEntity.h (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/pawns/Pawn.h (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/pawns/Spectator.cc (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/triggers/Trigger.cc (modified) * code/branches/questsystem5/src/orxonox/objects/worldentities/triggers/Trigger.h (modified) * code/branches/questsystem5/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/branches/questsystem5/src/orxonox/overlays/OrxonoxOverlay.h (modified) * code/branches/questsystem5/src/orxonox/overlays/OverlayGroup.cc (modified) * code/branches/questsystem5/src/orxonox/overlays/OverlayGroup.h (modified) * code/branches/questsystem5/src/orxonox/overlays/console/InGameConsole.cc (modified) * code/branches/questsystem5/src/orxonox/overlays/console/InGameConsole.h (modified) * code/branches/questsystem5/src/orxonox/overlays/debug/DebugFPSText.cc (modified) * code/branches/questsystem5/src/orxonox/overlays/debug/DebugRTRText.cc (modified) * code/branches/questsystem5/src/orxonox/overlays/hud/CMakeLists.txt (modified) * code/branches/questsystem5/src/orxonox/overlays/hud/HUDRadar.cc (modified) * code/branches/questsystem5/src/orxonox/overlays/hud/PongScore.cc (added) * code/branches/questsystem5/src/orxonox/overlays/hud/PongScore.h (added) * code/branches/questsystem5/src/orxonox/overlays/notifications/NotificationQueue.cc (modified) * code/branches/questsystem5/src/orxonox/pch/havepch/OrxonoxStableHeaders.h (modified) * code/branches/questsystem5/src/orxonox/tools/BillboardSet.cc (modified) * code/branches/questsystem5/src/orxonox/tools/CMakeLists.txt (modified) * code/branches/questsystem5/src/orxonox/tools/Mesh.cc (modified) * code/branches/questsystem5/src/orxonox/tools/ParticleInterface.cc (modified) * code/branches/questsystem5/src/orxonox/tools/ParticleInterface.h (modified) * code/branches/questsystem5/src/orxonox/tools/Shader.cc (modified) * code/branches/questsystem5/src/orxonox/tools/TimeFactorListener.cc (added) * code/branches/questsystem5/src/orxonox/tools/TimeFactorListener.h (added) * code/branches/questsystem5/src/orxonox/tools/Timer.h (modified) * code/branches/questsystem5/src/orxonox/tools/WindowEventListener.h (modified) * code/branches/questsystem5/src/tolua/all-5.0.lua (modified) * code/branches/questsystem5/src/tolua/all-5.1.lua (modified) * code/branches/questsystem5/src/util (modified) * code/branches/questsystem5/src/util/CMakeLists.txt (modified) * code/branches/questsystem5/src/util/Exception.cc (modified) * code/branches/questsystem5/src/util/Exception.h (modified) * code/branches/questsystem5/src/util/Math.h (modified) * code/branches/questsystem5/src/util/SignalHandler.cc (modified) * code/branches/questsystem5/src/util/SignalHandler.h (modified) Merging of the current QuestSystem branch. Tue, 07 Apr 2009 15:43:08 GMT landauf [2906] * code/branches/gametypes/src/orxonox/objects/gametypes/TeamDeathmatch.cc (modified) removed 3 warnings Mon, 06 Apr 2009 15:25:22 GMT Aurelian [2905] * code/branches/gametypes/src/orxonox/objects/gametypes/Asteroids.cc (added) * code/branches/gametypes/src/orxonox/objects/gametypes/Asteroids.h (added) * code/branches/gametypes/src/orxonox/objects/worldentities/triggers/CheckPoint.cc (added) * code/branches/gametypes/src/orxonox/objects/worldentities/triggers/CheckPoint.h (added) * code/branches/gametypes/src/orxonox/objects/worldentities/triggers/Trigger.cc (modified) * code/branches/gametypes/src/orxonox/objects/worldentities/triggers/Trigger.h (modified) My first version with working triggers in a row... Mon, 06 Apr 2009 14:50:31 GMT scheusso [2904] * code/trunk/src/orxonox/objects/gametypes/TeamBaseMatch.cc (deleted) * code/trunk/src/orxonox/objects/gametypes/TeamBaseMatch.h (deleted) * code/trunk/src/orxonox/objects/gametypes/TeamDeathmatch.cc (modified) * code/trunk/src/orxonox/objects/gametypes/TeamDeathmatch.h (modified) * code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) * code/trunk/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.h (deleted) reverted changes from 2902 Mon, 06 Apr 2009 14:48:32 GMT scheusso [2903] * code/branches/gametypes/src/orxonox/objects/gametypes/TeamBaseMatch.cc (added) * code/branches/gametypes/src/orxonox/objects/gametypes/TeamBaseMatch.h (added) * code/branches/gametypes/src/orxonox/objects/gametypes/TeamDeathmatch.cc (modified) * code/branches/gametypes/src/orxonox/objects/gametypes/TeamDeathmatch.h (modified) * code/branches/gametypes/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) * code/branches/gametypes/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.h (added) merged changes made to trunk (r2902) into branch Mon, 06 Apr 2009 14:25:45 GMT vmikos [2902] * code/trunk/src/orxonox/objects/gametypes/TeamBaseMatch.cc (added) * code/trunk/src/orxonox/objects/gametypes/TeamBaseMatch.h (added) * code/trunk/src/orxonox/objects/gametypes/TeamDeathmatch.cc (modified) * code/trunk/src/orxonox/objects/gametypes/TeamDeathmatch.h (modified) * code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) * code/trunk/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.h (added) this is my first upload of the basematchfile Mon, 06 Apr 2009 14:23:16 GMT Hagen [2901] * code/branches/weapons/src/orxonox/objects/weaponSystem/weapons/HsW01.cc (added) * code/branches/weapons/src/orxonox/objects/weaponSystem/weapons/HsW01.h (added) The class HsW01 was added, but is only a copy of LaserGun Mon, 06 Apr 2009 13:53:50 GMT danielh [2900] * code/branches/pickups (modified) * code/branches/pickups/src/orxonox/objects/controllers/HumanController.cc (modified) * code/branches/pickups/src/orxonox/objects/controllers/HumanController.h (modified) * code/branches/pickups/src/orxonox/objects/items/Engine.cc (modified) * code/branches/pickups/src/orxonox/objects/pickup/BaseItem.cc (modified) * code/branches/pickups/src/orxonox/objects/pickup/CMakeLists.txt (modified) * code/branches/pickups/src/orxonox/objects/pickup/DroppedItem.cc (added) * code/branches/pickups/src/orxonox/objects/pickup/DroppedItem.h (added) * code/branches/pickups/src/orxonox/objects/pickup/Jump.cc (added) * code/branches/pickups/src/orxonox/objects/pickup/Jump.h (added) * code/branches/pickups/src/orxonox/objects/pickup/ModifierPickup.cc (modified) * code/branches/pickups/src/orxonox/objects/pickup/ModifierPickup.h (modified) * code/branches/pickups/src/orxonox/objects/pickup/ModifierType.h (modified) * code/branches/pickups/src/orxonox/objects/pickup/PickupCollection.cc (modified) * code/branches/pickups/src/orxonox/objects/pickup/PickupCollection.h (modified) * code/branches/pickups/src/orxonox/objects/pickup/UsableItem.h (modified) * code/branches/pickups/src/orxonox/objects/worldentities/ControllableEntity.h (modified) * code/branches/pickups/src/orxonox/objects/worldentities/pawns/Pawn.h (modified) - some changes to the base framework - added DroppedItem - ... Mon, 06 Apr 2009 13:08:09 GMT erwin [2899] * code/branches/sound/src/sound/SoundBase.cc (added) * code/branches/sound/src/sound/SoundBase.h (modified) * code/branches/sound/src/sound/SoundManager.cc (added) * code/branches/sound/src/sound/SoundManager.h (modified) implemented SoundManager class Mon, 06 Apr 2009 12:34:01 GMT landauf [2898] * code/branches/weapons (copied) created new weapon branch Mon, 06 Apr 2009 12:33:23 GMT landauf [2897] * code/branches/weapon1 (deleted) removed weapon1 branch Sun, 05 Apr 2009 23:59:00 GMT landauf [2896] * code/trunk (modified) * code/trunk/bin/client1.bat.in (modified) * code/trunk/bin/client1.in (modified) * code/trunk/bin/client2.bat.in (modified) * code/trunk/bin/client2.in (modified) * code/trunk/bin/dedicated.bat.in (modified) * code/trunk/bin/dedicated.in (modified) * code/trunk/bin/run.bat.in (modified) * code/trunk/bin/server.bat.in (modified) * code/trunk/bin/server.in (modified) * code/trunk/bin/standalone.bat.in (modified) * code/trunk/bin/standalone.in (modified) * code/trunk/cmake/BuildConfig.cmake (modified) * code/trunk/cmake/BuildConfigGCC.cmake (modified) * code/trunk/cmake/FindDirectX.cmake (modified) * code/trunk/cmake/LibraryConfigTardis.cmake (modified) * code/trunk/src/core/CMakeLists.txt (modified) * code/trunk/src/core/Clock.h (modified) * code/trunk/src/core/ConfigFileManager.cc (modified) * code/trunk/src/core/Core.cc (modified) * code/trunk/src/core/Core.h (modified) * code/trunk/src/core/CorePrereqs.h (modified) * code/trunk/src/core/Game.cc (copied) * code/trunk/src/core/Game.h (copied) * code/trunk/src/core/GameMode.cc (copied) * code/trunk/src/core/GameMode.h (copied) * code/trunk/src/core/GameState.cc (modified) * code/trunk/src/core/GameState.h (modified) * code/trunk/src/core/Iterator.h (modified) * code/trunk/src/core/LuaBind.cc (modified) * code/trunk/src/core/LuaBind.h (modified) * code/trunk/src/core/ObjectListBase.h (modified) * code/trunk/src/core/RootGameState.cc (deleted) * code/trunk/src/core/RootGameState.h (deleted) * code/trunk/src/core/TclThreadManager.cc (modified) * code/trunk/src/core/TclThreadManager.h (modified) * code/trunk/src/core/Template.cc (modified) * code/trunk/src/core/Template.h (modified) * code/trunk/src/core/XMLFile.h (modified) * code/trunk/src/core/XMLIncludes.h (modified) * code/trunk/src/core/XMLPort.h (modified) * code/trunk/src/core/input/CalibratorCallback.h (modified) * code/trunk/src/core/input/ExtendedInputState.cc (modified) * code/trunk/src/core/input/ExtendedInputState.h (modified) * code/trunk/src/core/input/InputBuffer.cc (modified) * code/trunk/src/core/input/InputBuffer.h (modified) * code/trunk/src/core/input/InputInterfaces.h (modified) * code/trunk/src/core/input/InputManager.cc (modified) * code/trunk/src/core/input/InputManager.h (modified) * code/trunk/src/core/input/InputState.h (modified) * code/trunk/src/core/input/KeyBinder.cc (modified) * code/trunk/src/core/input/KeyBinder.h (modified) * code/trunk/src/core/input/SimpleInputState.h (modified) * code/trunk/src/cpptcl/cpptcl.cc (modified) * code/trunk/src/cpptcl/cpptcl.h (modified) * code/trunk/src/network/ChatListener.cc (modified) * code/trunk/src/network/Client.cc (modified) * code/trunk/src/network/Client.h (modified) * code/trunk/src/network/ClientConnectionListener.cc (modified) * code/trunk/src/network/ConnectionManager.cc (modified) * code/trunk/src/network/Server.cc (modified) * code/trunk/src/network/Server.h (modified) * code/trunk/src/network/TrafficControl.cc (modified) * code/trunk/src/network/packet/Gamestate.cc (modified) * code/trunk/src/network/packet/Gamestate.h (modified) * code/trunk/src/network/synchronisable/NetworkCallback.h (modified) * code/trunk/src/network/synchronisable/Synchronisable.cc (modified) * code/trunk/src/network/synchronisable/Synchronisable.h (modified) * code/trunk/src/network/synchronisable/SynchronisableVariable.cc (modified) * code/trunk/src/network/synchronisable/SynchronisableVariable.h (modified) * code/trunk/src/orxonox/CMakeLists.txt (modified) * code/trunk/src/orxonox/CameraManager.cc (modified) * code/trunk/src/orxonox/CameraManager.h (modified) * code/trunk/src/orxonox/GraphicsEngine.cc (deleted) * code/trunk/src/orxonox/GraphicsEngine.h (deleted) * code/trunk/src/orxonox/GraphicsManager.cc (copied) * code/trunk/src/orxonox/GraphicsManager.h (copied) * code/trunk/src/orxonox/Main.cc (modified) * code/trunk/src/orxonox/OrxonoxPrereqs.h (modified) * code/trunk/src/orxonox/PlayerManager.cc (modified) * code/trunk/src/orxonox/gamestates/CMakeLists.txt (modified) * code/trunk/src/orxonox/gamestates/GSClient.cc (modified) * code/trunk/src/orxonox/gamestates/GSClient.h (modified) * code/trunk/src/orxonox/gamestates/GSDedicated.cc (modified) * code/trunk/src/orxonox/gamestates/GSDedicated.h (modified) * code/trunk/src/orxonox/gamestates/GSGUI.cc (deleted) * code/trunk/src/orxonox/gamestates/GSGUI.h (deleted) * code/trunk/src/orxonox/gamestates/GSGraphics.cc (modified) * code/trunk/src/orxonox/gamestates/GSGraphics.h (modified) * code/trunk/src/orxonox/gamestates/GSIOConsole.cc (modified) * code/trunk/src/orxonox/gamestates/GSIOConsole.h (modified) * code/trunk/src/orxonox/gamestates/GSLevel.cc (modified) * code/trunk/src/orxonox/gamestates/GSLevel.h (modified) * code/trunk/src/orxonox/gamestates/GSMainMenu.cc (copied) * code/trunk/src/orxonox/gamestates/GSMainMenu.h (copied) * code/trunk/src/orxonox/gamestates/GSRoot.cc (modified) * code/trunk/src/orxonox/gamestates/GSRoot.h (modified) * code/trunk/src/orxonox/gamestates/GSServer.cc (modified) * code/trunk/src/orxonox/gamestates/GSServer.h (modified) * code/trunk/src/orxonox/gamestates/GSStandalone.cc (modified) * code/trunk/src/orxonox/gamestates/GSStandalone.h (modified) * code/trunk/src/orxonox/gui/GUIManager.cc (modified) * code/trunk/src/orxonox/gui/GUIManager.h (modified) * code/trunk/src/orxonox/objects/EventTarget.cc (modified) * code/trunk/src/orxonox/objects/Level.cc (modified) * code/trunk/src/orxonox/objects/Level.h (modified) * code/trunk/src/orxonox/objects/Radar.cc (modified) * code/trunk/src/orxonox/objects/Scene.cc (modified) * code/trunk/src/orxonox/objects/collisionshapes (modified) * code/trunk/src/orxonox/objects/controllers/AIController.cc (modified) * code/trunk/src/orxonox/objects/gametypes/Gametype.cc (modified) * code/trunk/src/orxonox/objects/infos/Bot.cc (modified) * code/trunk/src/orxonox/objects/infos/HumanPlayer.cc (modified) * code/trunk/src/orxonox/objects/items/MultiStateEngine.cc (modified) * code/trunk/src/orxonox/objects/pickup/PickupSpawner.cc (modified) * code/trunk/src/orxonox/objects/pickup/Usable.h (modified) * code/trunk/src/orxonox/objects/quest/AddQuest.cc (modified) * code/trunk/src/orxonox/objects/quest/AddQuest.h (modified) * code/trunk/src/orxonox/objects/quest/AddQuestHint.cc (modified) * code/trunk/src/orxonox/objects/quest/AddQuestHint.h (modified) * code/trunk/src/orxonox/objects/quest/AddReward.cc (modified) * code/trunk/src/orxonox/objects/quest/AddReward.h (modified) * code/trunk/src/orxonox/objects/quest/ChangeQuestStatus.cc (modified) * code/trunk/src/orxonox/objects/quest/ChangeQuestStatus.h (modified) * code/trunk/src/orxonox/objects/quest/CompleteQuest.cc (modified) * code/trunk/src/orxonox/objects/quest/CompleteQuest.h (modified) * code/trunk/src/orxonox/objects/quest/FailQuest.cc (modified) * code/trunk/src/orxonox/objects/quest/FailQuest.h (modified) * code/trunk/src/orxonox/objects/quest/GlobalQuest.cc (modified) * code/trunk/src/orxonox/objects/quest/GlobalQuest.h (modified) * code/trunk/src/orxonox/objects/quest/LocalQuest.cc (modified) * code/trunk/src/orxonox/objects/quest/LocalQuest.h (modified) * code/trunk/src/orxonox/objects/quest/Quest.cc (modified) * code/trunk/src/orxonox/objects/quest/Quest.h (modified) * code/trunk/src/orxonox/objects/quest/QuestDescription.cc (modified) * code/trunk/src/orxonox/objects/quest/QuestDescription.h (modified) * code/trunk/src/orxonox/objects/quest/QuestEffect.cc (modified) * code/trunk/src/orxonox/objects/quest/QuestEffect.h (modified) * code/trunk/src/orxonox/objects/quest/QuestHint.cc (modified) * code/trunk/src/orxonox/objects/quest/QuestHint.h (modified) * code/trunk/src/orxonox/objects/quest/QuestItem.cc (modified) * code/trunk/src/orxonox/objects/quest/QuestItem.h (modified) * code/trunk/src/orxonox/objects/quest/QuestManager.cc (modified) * code/trunk/src/orxonox/objects/quest/QuestManager.h (modified) * code/trunk/src/orxonox/objects/quest/Rewardable.cc (modified) * code/trunk/src/orxonox/objects/quest/Rewardable.h (modified) * code/trunk/src/orxonox/objects/weaponSystem/WeaponSystem.cc (modified) * code/trunk/src/orxonox/objects/weaponSystem/WeaponSystem.h (modified) * code/trunk/src/orxonox/objects/weaponSystem/projectiles/BillboardProjectile.cc (modified) * code/trunk/src/orxonox/objects/weaponSystem/projectiles/ParticleProjectile.cc (modified) * code/trunk/src/orxonox/objects/weaponSystem/projectiles/Projectile.cc (modified) * code/trunk/src/orxonox/objects/worldentities/Backlight.cc (modified) * code/trunk/src/orxonox/objects/worldentities/Backlight.h (modified) * code/trunk/src/orxonox/objects/worldentities/Billboard.cc (modified) * code/trunk/src/orxonox/objects/worldentities/BlinkingBillboard.cc (modified) * code/trunk/src/orxonox/objects/worldentities/Camera.cc (modified) * code/trunk/src/orxonox/objects/worldentities/Camera.h (modified) * code/trunk/src/orxonox/objects/worldentities/ControllableEntity.cc (modified) * code/trunk/src/orxonox/objects/worldentities/ExplosionChunk.cc (modified) * code/trunk/src/orxonox/objects/worldentities/Light.cc (modified) * code/trunk/src/orxonox/objects/worldentities/MobileEntity.cc (modified) * code/trunk/src/orxonox/objects/worldentities/MobileEntity.h (modified) * code/trunk/src/orxonox/objects/worldentities/Model.cc (modified) * code/trunk/src/orxonox/objects/worldentities/MovableEntity.cc (modified) * code/trunk/src/orxonox/objects/worldentities/ParticleEmitter.cc (modified) * code/trunk/src/orxonox/objects/worldentities/ParticleSpawner.cc (modified) * code/trunk/src/orxonox/objects/worldentities/ParticleSpawner.h (modified) * code/trunk/src/orxonox/objects/worldentities/Planet.cc (modified) * code/trunk/src/orxonox/objects/worldentities/PongBall.cc (modified) * code/trunk/src/orxonox/objects/worldentities/StaticEntity.cc (modified) * code/trunk/src/orxonox/objects/worldentities/StaticEntity.h (modified) * code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) * code/trunk/src/orxonox/objects/worldentities/pawns/Spectator.cc (modified) * code/trunk/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified) * code/trunk/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h (modified) * code/trunk/src/orxonox/objects/worldentities/triggers/Trigger.cc (modified) * code/trunk/src/orxonox/objects/worldentities/triggers/Trigger.h (modified) * code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/trunk/src/orxonox/overlays/OrxonoxOverlay.h (modified) * code/trunk/src/orxonox/overlays/console/InGameConsole.cc (modified) * code/trunk/src/orxonox/overlays/console/InGameConsole.h (modified) * code/trunk/src/orxonox/overlays/debug/DebugFPSText.cc (modified) * code/trunk/src/orxonox/overlays/debug/DebugRTRText.cc (modified) * code/trunk/src/orxonox/overlays/hud/HUDRadar.cc (modified) * code/trunk/src/orxonox/tools/BillboardSet.cc (modified) * code/trunk/src/orxonox/tools/CMakeLists.txt (modified) * code/trunk/src/orxonox/tools/Mesh.cc (modified) * code/trunk/src/orxonox/tools/ParticleInterface.cc (modified) * code/trunk/src/orxonox/tools/ParticleInterface.h (modified) * code/trunk/src/orxonox/tools/Shader.cc (modified) * code/trunk/src/orxonox/tools/TimeFactorListener.cc (copied) * code/trunk/src/orxonox/tools/TimeFactorListener.h (copied) * code/trunk/src/orxonox/tools/Timer.h (modified) * code/trunk/src/orxonox/tools/WindowEventListener.h (modified) * code/trunk/src/tolua/all-5.0.lua (modified) * code/trunk/src/tolua/all-5.1.lua (modified) * code/trunk/src/util (modified) * code/trunk/src/util/Exception.cc (modified) * code/trunk/src/util/Exception.h (modified) * code/trunk/src/util/SignalHandler.cc (modified) * code/trunk/src/util/SignalHandler.h (modified) Merged gui branch back to trunk. I did 2 small changes in ... Sun, 05 Apr 2009 22:00:51 GMT landauf [2895] * code/branches/miniprojects (deleted) removed miniprojects branch Sun, 05 Apr 2009 21:33:09 GMT landauf [2894] * code/trunk/src/orxonox/objects/weaponSystem/munitions/FusionMunition.cc (modified) * code/trunk/src/orxonox/objects/weaponSystem/munitions/FusionMunition.h (modified) eolstyle Sun, 05 Apr 2009 21:27:54 GMT landauf [2893] * code/trunk (modified) * code/trunk/bin/client1.bat.in (modified) * code/trunk/bin/client2.bat.in (modified) * code/trunk/bin/dedicated.bat.in (modified) * code/trunk/bin/run.bat.in (modified) * code/trunk/bin/server.bat.in (modified) * code/trunk/cmake/FindDirectX.cmake (modified) * code/trunk/cmake/LibraryConfigTardis.cmake (modified) * code/trunk/src/core/LuaBind.cc (modified) * code/trunk/src/core/LuaBind.h (modified) * code/trunk/src/core/Template.cc (modified) * code/trunk/src/core/Template.h (modified) * code/trunk/src/core/XMLFile.h (modified) * code/trunk/src/core/XMLIncludes.h (modified) * code/trunk/src/cpptcl/cpptcl.cc (modified) * code/trunk/src/cpptcl/cpptcl.h (modified) * code/trunk/src/network/synchronisable/NetworkCallback.h (modified) * code/trunk/src/network/synchronisable/Synchronisable.cc (modified) * code/trunk/src/network/synchronisable/Synchronisable.h (modified) * code/trunk/src/orxonox/CameraManager.cc (modified) * code/trunk/src/orxonox/CameraManager.h (modified) * code/trunk/src/orxonox/OrxonoxPrereqs.h (modified) * code/trunk/src/orxonox/objects/Level.cc (modified) * code/trunk/src/orxonox/objects/Level.h (modified) * code/trunk/src/orxonox/objects/collisionshapes (modified) * code/trunk/src/orxonox/objects/pickup/Usable.h (modified) * code/trunk/src/orxonox/objects/quest/AddQuest.cc (modified) * code/trunk/src/orxonox/objects/quest/AddQuest.h (modified) * code/trunk/src/orxonox/objects/quest/AddQuestHint.cc (modified) * code/trunk/src/orxonox/objects/quest/AddQuestHint.h (modified) * code/trunk/src/orxonox/objects/quest/AddReward.cc (modified) * code/trunk/src/orxonox/objects/quest/AddReward.h (modified) * code/trunk/src/orxonox/objects/quest/ChangeQuestStatus.cc (modified) * code/trunk/src/orxonox/objects/quest/ChangeQuestStatus.h (modified) * code/trunk/src/orxonox/objects/quest/CompleteQuest.cc (modified) * code/trunk/src/orxonox/objects/quest/CompleteQuest.h (modified) * code/trunk/src/orxonox/objects/quest/FailQuest.cc (modified) * code/trunk/src/orxonox/objects/quest/FailQuest.h (modified) * code/trunk/src/orxonox/objects/quest/GlobalQuest.cc (modified) * code/trunk/src/orxonox/objects/quest/GlobalQuest.h (modified) * code/trunk/src/orxonox/objects/quest/LocalQuest.cc (modified) * code/trunk/src/orxonox/objects/quest/LocalQuest.h (modified) * code/trunk/src/orxonox/objects/quest/Quest.cc (modified) * code/trunk/src/orxonox/objects/quest/Quest.h (modified) * code/trunk/src/orxonox/objects/quest/QuestDescription.cc (modified) * code/trunk/src/orxonox/objects/quest/QuestDescription.h (modified) * code/trunk/src/orxonox/objects/quest/QuestEffect.cc (modified) * code/trunk/src/orxonox/objects/quest/QuestEffect.h (modified) * code/trunk/src/orxonox/objects/quest/QuestHint.cc (modified) * code/trunk/src/orxonox/objects/quest/QuestHint.h (modified) * code/trunk/src/orxonox/objects/quest/QuestItem.cc (modified) * code/trunk/src/orxonox/objects/quest/QuestItem.h (modified) * code/trunk/src/orxonox/objects/quest/QuestManager.cc (modified) * code/trunk/src/orxonox/objects/quest/QuestManager.h (modified) * code/trunk/src/orxonox/objects/quest/Rewardable.cc (modified) * code/trunk/src/orxonox/objects/quest/Rewardable.h (modified) * code/trunk/src/orxonox/objects/weaponSystem/Munition.cc (modified) * code/trunk/src/orxonox/objects/weaponSystem/Weapon.cc (modified) * code/trunk/src/orxonox/objects/weaponSystem/Weapon.h (modified) * code/trunk/src/orxonox/objects/weaponSystem/WeaponPack.cc (modified) * code/trunk/src/orxonox/objects/weaponSystem/WeaponPack.h (modified) * code/trunk/src/orxonox/objects/weaponSystem/WeaponSet.cc (modified) * code/trunk/src/orxonox/objects/weaponSystem/WeaponSystem.cc (modified) * code/trunk/src/orxonox/objects/weaponSystem/WeaponSystem.h (modified) * code/trunk/src/orxonox/objects/weaponSystem/munitions/CMakeLists.txt (modified) * code/trunk/src/orxonox/objects/weaponSystem/munitions/FusionMunition.cc (copied) * code/trunk/src/orxonox/objects/weaponSystem/munitions/FusionMunition.h (copied) * code/trunk/src/orxonox/objects/weaponSystem/munitions/LaserGunMunition.cc (modified) * code/trunk/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc (modified) * code/trunk/src/orxonox/objects/weaponSystem/weapons/LaserGun.h (modified) * code/trunk/src/orxonox/objects/worldentities/Backlight.cc (modified) * code/trunk/src/orxonox/objects/worldentities/Backlight.h (modified) * code/trunk/src/orxonox/objects/worldentities/Camera.cc (modified) * code/trunk/src/orxonox/objects/worldentities/Camera.h (modified) * code/trunk/src/orxonox/objects/worldentities/MobileEntity.cc (modified) * code/trunk/src/orxonox/objects/worldentities/MobileEntity.h (modified) * code/trunk/src/orxonox/objects/worldentities/ParticleSpawner.cc (modified) * code/trunk/src/orxonox/objects/worldentities/ParticleSpawner.h (modified) * code/trunk/src/orxonox/objects/worldentities/StaticEntity.cc (modified) * code/trunk/src/orxonox/objects/worldentities/StaticEntity.h (modified) * code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) * code/trunk/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified) * code/trunk/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h (modified) * code/trunk/src/orxonox/objects/worldentities/triggers/Trigger.cc (modified) * code/trunk/src/orxonox/objects/worldentities/triggers/Trigger.h (modified) * code/trunk/src/tolua/all-5.0.lua (modified) * code/trunk/src/tolua/all-5.1.lua (modified) * code/trunk/src/util (modified) * code/trunk/src/util/Exception.cc (modified) * code/trunk/src/util/Exception.h (modified) * code/trunk/src/util/SignalHandler.cc (modified) * code/trunk/src/util/SignalHandler.h (modified) merged weaponsystem branch back to trunk Sun, 05 Apr 2009 21:26:23 GMT bknecht [2892] * code/branches/gui/src/orxonox/gui/GUIManager.cc (modified) catching CEGUI error to avoid sigabrt. ready for merge Fri, 03 Apr 2009 09:17:44 GMT bknecht [2891] * code/trunk/doc/api/doxy.config.in (modified) * changed option for inherited members: the list of members is long ... Thu, 02 Apr 2009 18:42:11 GMT landauf [2890] * code/trunk/src/orxonox/objects/gametypes/Gametype.cc (modified) * code/trunk/src/orxonox/objects/gametypes/Gametype.h (modified) * code/trunk/src/orxonox/objects/gametypes/Pong.cc (modified) * code/trunk/src/orxonox/objects/gametypes/Pong.h (modified) * code/trunk/src/orxonox/objects/infos/HumanPlayer.cc (modified) * code/trunk/src/orxonox/overlays/OrxonoxOverlay.h (modified) * code/trunk/src/orxonox/overlays/OverlayGroup.cc (modified) * code/trunk/src/orxonox/overlays/OverlayGroup.h (modified) * code/trunk/src/orxonox/overlays/hud/CMakeLists.txt (modified) * code/trunk/src/orxonox/overlays/hud/PongScore.cc (added) * code/trunk/src/orxonox/overlays/hud/PongScore.h (added) - Added overlay element for the Pong Gametype - Changed the type of ... Thu, 02 Apr 2009 16:36:23 GMT adrfried [2889] * code/branches/ggz/cmake/FindGGZ.cmake (added) * code/branches/ggz/cmake/LibraryConfig.cmake (modified) * code/branches/ggz/src/orxonox/CMakeLists.txt (modified) * code/branches/ggz/src/orxonox/GGZClient.cc (added) * code/branches/ggz/src/orxonox/GGZClient.h (added) * code/branches/ggz/src/orxonox/objects/CMakeLists.txt (modified) * code/branches/ggz/src/orxonox/objects/FDWatcher.cc (added) * code/branches/ggz/src/orxonox/objects/FDWatcher.h (added) FDWatcher and GGZClient Objects introduced Thu, 02 Apr 2009 16:36:19 GMT adrfried [2888] * code/branches/ggz/CMakeLists.txt (modified) * code/branches/ggz/cmake/BuildConfigGCC.cmake (modified) cmake install prefix reset, compiler flags fixed Thu, 02 Apr 2009 15:03:16 GMT bknecht [2887] * code/branches/gui/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/gui/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/branches/gui/src/orxonox/gui/GUIManager.cc (modified) * code/branches/gui/src/orxonox/gui/GUIManager.h (modified) first part of finishing up to merge back. solving some issues I ran ... Thu, 02 Apr 2009 14:07:24 GMT polakma [2886] * code/branches/weaponsystem/src/orxonox/objects/weaponSystem/munitions/FusionMunition.cc (added) * code/branches/weaponsystem/src/orxonox/objects/weaponSystem/munitions/FusionMunition.h (added) forgot to add a file Tue, 31 Mar 2009 22:37:16 GMT landauf [2885] * code/trunk/src/orxonox/objects/controllers/PongAI.cc (modified) * code/trunk/src/orxonox/objects/controllers/PongAI.h (modified) * code/trunk/src/orxonox/objects/gametypes/Pong.cc (modified) * code/trunk/src/orxonox/objects/worldentities/PongBall.cc (modified) * code/trunk/src/orxonox/objects/worldentities/PongBall.h (modified) Extended PongAI: - Random prediction errors depend on the vertical ... Tue, 31 Mar 2009 22:25:12 GMT bknecht [2884] * code/trunk/doc/api/doxy.config.in (modified) Reducing width of class diagrams for nicer images Tue, 31 Mar 2009 20:28:36 GMT landauf [2883] * code/trunk/src/bullet/LinearMath/btScalar.h (modified) * code/trunk/src/bullet/changes_orxonox.diff (modified) reapplied mingw-patch Tue, 31 Mar 2009 18:05:51 GMT rgrieder [2882] * code/trunk/src/bullet/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp (modified) * code/trunk/src/bullet/BulletCollision/BroadphaseCollision/btAxisSweep3.h (modified) * code/trunk/src/bullet/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h (modified) * code/trunk/src/bullet/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h (modified) * code/trunk/src/bullet/BulletCollision/BroadphaseCollision/btDbvt.cpp (modified) * code/trunk/src/bullet/BulletCollision/BroadphaseCollision/btDbvt.h (modified) * code/trunk/src/bullet/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp (modified) * code/trunk/src/bullet/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h (modified) * code/trunk/src/bullet/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp (modified) * code/trunk/src/bullet/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h (modified) * code/trunk/src/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp (modified) * code/trunk/src/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h (modified) * code/trunk/src/bullet/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp (modified) * code/trunk/src/bullet/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp (modified) * code/trunk/src/bullet/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h (modified) * code/trunk/src/bullet/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp (modified) * code/trunk/src/bullet/BulletCollision/CollisionDispatch/btCollisionObject.cpp (modified) * code/trunk/src/bullet/BulletCollision/CollisionDispatch/btCollisionObject.h (modified) * code/trunk/src/bullet/BulletCollision/CollisionDispatch/btCollisionWorld.cpp (modified) * code/trunk/src/bullet/BulletCollision/CollisionDispatch/btCollisionWorld.h (modified) * code/trunk/src/bullet/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp (modified) * code/trunk/src/bullet/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h (modified) * code/trunk/src/bullet/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp (modified) * code/trunk/src/bullet/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h (modified) * code/trunk/src/bullet/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp (modified) * code/trunk/src/bullet/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h (modified) * code/trunk/src/bullet/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp (modified) * code/trunk/src/bullet/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h (modified) * code/trunk/src/bullet/BulletCollision/CollisionDispatch/btGhostObject.cpp (modified) * code/trunk/src/bullet/BulletCollision/CollisionDispatch/btManifoldResult.cpp (modified) * code/trunk/src/bullet/BulletCollision/CollisionDispatch/btManifoldResult.h (modified) * code/trunk/src/bullet/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp (modified) * code/trunk/src/bullet/BulletCollision/CollisionDispatch/btSimulationIslandManager.h (modified) * code/trunk/src/bullet/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp (modified) * code/trunk/src/bullet/BulletCollision/CollisionDispatch/btUnionFind.cpp (modified) * code/trunk/src/bullet/BulletCollision/CollisionDispatch/btUnionFind.h (modified) * code/trunk/src/bullet/BulletCollision/CollisionShapes/btBoxShape.h (modified) * code/trunk/src/bullet/BulletCollision/CollisionShapes/btCollisionShape.cpp (modified) * code/trunk/src/bullet/BulletCollision/CollisionShapes/btCompoundShape.cpp (modified) * code/trunk/src/bullet/BulletCollision/CollisionShapes/btCompoundShape.h (modified) * code/trunk/src/bullet/BulletCollision/CollisionShapes/btConeShape.cpp (modified) * code/trunk/src/bullet/BulletCollision/CollisionShapes/btConvexHullShape.cpp (modified) * code/trunk/src/bullet/BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp (modified) * code/trunk/src/bullet/BulletCollision/CollisionShapes/btConvexShape.cpp (modified) * code/trunk/src/bullet/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp (modified) * code/trunk/src/bullet/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h (modified) * code/trunk/src/bullet/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp (modified) * code/trunk/src/bullet/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h (modified) * code/trunk/src/bullet/BulletCollision/CollisionShapes/btSphereShape.h (modified) * code/trunk/src/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp (modified) * code/trunk/src/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h (modified) * code/trunk/src/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp (modified) * code/trunk/src/bullet/BulletCollision/CollisionShapes/btTriangleMesh.cpp (modified) * code/trunk/src/bullet/BulletCollision/CollisionShapes/btTriangleMeshShape.h (modified) * code/trunk/src/bullet/BulletCollision/Gimpact/btGImpactBvh.cpp (modified) * code/trunk/src/bullet/BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp (modified) * code/trunk/src/bullet/BulletCollision/Gimpact/btGImpactShape.h (modified) * code/trunk/src/bullet/BulletCollision/Gimpact/gim_box_set.cpp (modified) * code/trunk/src/bullet/BulletCollision/Gimpact/gim_math.h (modified) * code/trunk/src/bullet/BulletCollision/Gimpact/gim_tri_collision.h (modified) * code/trunk/src/bullet/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp (modified) * code/trunk/src/bullet/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp (modified) * code/trunk/src/bullet/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h (modified) * code/trunk/src/bullet/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp (modified) * code/trunk/src/bullet/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h (modified) * code/trunk/src/bullet/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp (modified) * code/trunk/src/bullet/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h (modified) * code/trunk/src/bullet/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp (modified) * code/trunk/src/bullet/BulletDynamics/CMakeLists.txt (modified) * code/trunk/src/bullet/BulletDynamics/Character/btCharacterControllerInterface.h (modified) * code/trunk/src/bullet/BulletDynamics/Character/btKinematicCharacterController.cpp (modified) * code/trunk/src/bullet/BulletDynamics/Character/btKinematicCharacterController.h (modified) * code/trunk/src/bullet/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp (modified) * code/trunk/src/bullet/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h (modified) * code/trunk/src/bullet/BulletDynamics/ConstraintSolver/btContactConstraint.cpp (modified) * code/trunk/src/bullet/BulletDynamics/ConstraintSolver/btContactSolverInfo.h (modified) * code/trunk/src/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp (modified) * code/trunk/src/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h (modified) * code/trunk/src/bullet/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp (modified) * code/trunk/src/bullet/BulletDynamics/ConstraintSolver/btHingeConstraint.h (modified) * code/trunk/src/bullet/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp (modified) * code/trunk/src/bullet/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h (modified) * code/trunk/src/bullet/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp (modified) * code/trunk/src/bullet/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h (modified) * code/trunk/src/bullet/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp (modified) * code/trunk/src/bullet/BulletDynamics/ConstraintSolver/btSliderConstraint.h (modified) * code/trunk/src/bullet/BulletDynamics/ConstraintSolver/btSolverBody.h (modified) * code/trunk/src/bullet/BulletDynamics/ConstraintSolver/btSolverConstraint.h (modified) * code/trunk/src/bullet/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp (modified) * code/trunk/src/bullet/BulletDynamics/ConstraintSolver/btTypedConstraint.h (modified) * code/trunk/src/bullet/BulletDynamics/Dynamics/Bullet-C-API.cpp (modified) * code/trunk/src/bullet/BulletDynamics/Dynamics/btActionInterface.h (added) * code/trunk/src/bullet/BulletDynamics/Dynamics/btContinuousDynamicsWorld.cpp (modified) * code/trunk/src/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp (modified) * code/trunk/src/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h (modified) * code/trunk/src/bullet/BulletDynamics/Dynamics/btDynamicsWorld.h (modified) * code/trunk/src/bullet/BulletDynamics/Dynamics/btRigidBody.cpp (modified) * code/trunk/src/bullet/BulletDynamics/Dynamics/btRigidBody.h (modified) * code/trunk/src/bullet/BulletDynamics/Vehicle/btRaycastVehicle.cpp (modified) * code/trunk/src/bullet/BulletDynamics/Vehicle/btRaycastVehicle.h (modified) * code/trunk/src/bullet/LinearMath/btAlignedAllocator.cpp (modified) * code/trunk/src/bullet/LinearMath/btAlignedAllocator.h (modified) * code/trunk/src/bullet/LinearMath/btAlignedObjectArray.h (modified) * code/trunk/src/bullet/LinearMath/btConvexHull.cpp (modified) * code/trunk/src/bullet/LinearMath/btIDebugDraw.h (modified) * code/trunk/src/bullet/LinearMath/btMatrix3x3.h (modified) * code/trunk/src/bullet/LinearMath/btQuadWord.h (modified) * code/trunk/src/bullet/LinearMath/btQuaternion.h (modified) * code/trunk/src/bullet/LinearMath/btScalar.h (modified) * code/trunk/src/bullet/LinearMath/btTransform.h (modified) * code/trunk/src/bullet/LinearMath/btVector3.h (modified) Update from Bullet 2.73 to 2.74. Tue, 31 Mar 2009 16:54:47 GMT bknecht [2881] * code/trunk/doc/api/doxy.config.in (modified) * code/trunk/doc/examples (added) * code/trunk/doc/images (added) Added directories and paths so we can also display images (using the ... Tue, 31 Mar 2009 16:49:01 GMT bknecht [2880] * code/trunk/doc/api/doxy.config.in (modified) Now we also have the version number and name displayed on the main page Tue, 31 Mar 2009 15:47:24 GMT bknecht [2879] * code/trunk/doc/api/TracFooter.html (deleted) * code/trunk/doc/api/TracHeader.html (deleted) * code/trunk/doc/api/doxy.config.in (modified) * code/trunk/doc/api/doxygen.css (deleted) Found another way to produce a great doxygen output Tue, 31 Mar 2009 14:07:09 GMT bknecht [2878] * code/trunk/doc/api/TracFooter.html (added) * code/trunk/doc/api/TracHeader.html (added) * code/trunk/doc/api/doxy.config.in (modified) * code/trunk/doc/api/doxygen.css (added) Modified doxy.config.in to produce nicer HTML output for trac. This ... Tue, 31 Mar 2009 12:41:24 GMT bknecht [2877] * code/trunk/src/bullet/BulletCollision/CollisionDispatch/btCollisionWorld.h (modified) reverted back everything, sorry KDevelop screws things up sometimes Tue, 31 Mar 2009 12:30:26 GMT bknecht [2876] * code/trunk/doc/api/doxy.config.in (modified) * code/trunk/src/bullet/BulletCollision/CollisionDispatch/btCollisionWorld.h (modified) corrected exclude path and added an exclude pattern which should ... Tue, 31 Mar 2009 12:14:09 GMT bknecht [2875] * code/branches/gui/src/orxonox/gamestates/GSGraphics.cc (modified) * code/branches/gui/src/orxonox/gamestates/GSGraphics.h (modified) * code/branches/gui/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/gui/src/orxonox/gamestates/GSLevel.h (modified) * code/branches/gui/src/orxonox/gui/GUIManager.cc (modified) * code/branches/gui/src/orxonox/gui/GUIManager.h (modified) (Doxygen) Documentation added for GUIManager and some GameState classes. Tue, 31 Mar 2009 10:10:42 GMT bknecht [2874] * code/trunk/doc/api/doxy.config.in (modified) Changes in Doxygen to check if it works on nautilus to compile it ... Tue, 31 Mar 2009 08:06:01 GMT bknecht [2873] * code/trunk/Doxyfile (modified) * code/trunk/src/bullet/BulletCollision/CollisionDispatch/btCollisionWorld.h (modified) * code/trunk/src/orxonox/Main.cc (modified) Doxygen fixes. Please advise me on better places or methods to fix ... Mon, 30 Mar 2009 23:15:52 GMT landauf [2872] * code/trunk/src/orxonox/objects/controllers/HumanController.cc (modified) * code/trunk/src/orxonox/objects/controllers/PongAI.cc (modified) * code/trunk/src/orxonox/objects/controllers/PongAI.h (modified) * code/trunk/src/orxonox/objects/gametypes/Pong.cc (modified) * code/trunk/src/util/Math.h (modified) some small adjustments in PongAI and related classes Mon, 30 Mar 2009 21:42:30 GMT rgrieder [2871] * code/trunk/CMakeLists.txt (modified) Removed other piece of setting the install prefix as well. Mon, 30 Mar 2009 21:35:53 GMT bknecht [2870] * code/trunk/src/orxonox/tools/Mesh.cc (modified) additional commentary to my last commit. maybe useful in the future, ... Mon, 30 Mar 2009 21:34:51 GMT bknecht [2869] * code/branches/gui/src/orxonox/gamestates/GSGraphics.cc (modified) * code/branches/gui/src/orxonox/gamestates/GSGraphics.h (modified) * code/branches/gui/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/gui/src/orxonox/gamestates/GSLevel.h (modified) * code/branches/gui/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/branches/gui/src/orxonox/gamestates/GSStandalone.cc (modified) * code/branches/gui/src/orxonox/gamestates/GSStandalone.h (modified) * code/branches/gui/src/orxonox/gui/GUIManager.cc (modified) Including some features to use only mouse or keys in a GUI, also ... Mon, 30 Mar 2009 21:26:14 GMT adrfried [2868] * code/trunk/CMakeLists.txt (modified) * code/trunk/cmake/BuildConfigGCC.cmake (modified) cmake install prefix reset, compiler flags fixed Mon, 30 Mar 2009 19:31:00 GMT bknecht [2867] * code/trunk/src/orxonox/tools/Mesh.cc (modified) Magician Beni on what he does best: Fixed the problem with the large ... Mon, 30 Mar 2009 13:34:39 GMT erwin [2866] * code/branches/sound/src/audio (deleted) * code/branches/sound/src/sound (added) * code/branches/sound/src/sound/SoundBase.h (added) * code/branches/sound/src/sound/SoundManager.h (added) * code/branches/sound/src/sound/copyheader (added) Added src/sound and some files Mon, 30 Mar 2009 13:21:25 GMT FelixSchulthess [2865] * code/branches/weapon1 (copied) created branch for weapon development Mon, 30 Mar 2009 12:27:26 GMT danielh [2864] * code/branches/pickups/src/orxonox/objects/pickup/BaseItem.cc (added) * code/branches/pickups/src/orxonox/objects/pickup/BaseItem.h (added) * code/branches/pickups/src/orxonox/objects/pickup/CMakeLists.txt (modified) * code/branches/pickups/src/orxonox/objects/pickup/EquipmentItem.cc (added) * code/branches/pickups/src/orxonox/objects/pickup/EquipmentItem.h (added) * code/branches/pickups/src/orxonox/objects/pickup/ModifierPickup.cc (added) * code/branches/pickups/src/orxonox/objects/pickup/ModifierPickup.h (added) * code/branches/pickups/src/orxonox/objects/pickup/ModifierType.h (added) * code/branches/pickups/src/orxonox/objects/pickup/PassiveItem.cc (added) * code/branches/pickups/src/orxonox/objects/pickup/PassiveItem.h (added) * code/branches/pickups/src/orxonox/objects/pickup/PickupCollection.cc (added) * code/branches/pickups/src/orxonox/objects/pickup/PickupCollection.h (added) * code/branches/pickups/src/orxonox/objects/pickup/PickupSpawner.cc (added) * code/branches/pickups/src/orxonox/objects/pickup/PickupSpawner.h (added) * code/branches/pickups/src/orxonox/objects/pickup/UsableItem.cc (added) * code/branches/pickups/src/orxonox/objects/pickup/UsableItem.h (added) * code/branches/pickups/src/orxonox/objects/weaponSystem/projectiles/Projectile.cc (modified) * code/branches/pickups/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) * code/branches/pickups/src/orxonox/objects/worldentities/pawns/Pawn.h (modified) first commit of pickup system - working PickupCollection - working ... Sun, 29 Mar 2009 22:26:52 GMT rgrieder [2863] * code/branches/gui/cmake/BuildConfigGCC.cmake (modified) -Wno-deprecated is only available for C++, but fortunately the ... Sun, 29 Mar 2009 22:14:36 GMT rgrieder [2862] * code/branches/gui/cmake/BuildConfig.cmake (modified) * code/branches/gui/cmake/BuildConfigGCC.cmake (modified) quote: "Fixed some bugs. Please do not break the code, when working ... Sat, 28 Mar 2009 22:19:06 GMT scheusso [2861] * code/branches/netp2/src/network/synchronisable/SynchronisableSpecialisations.cc (modified) * code/branches/netp2/src/network/synchronisable/SynchronisableVariable.h (modified) * code/branches/netp2/src/util/MultiType.h (modified) * code/branches/netp2/src/util/MultiTypeValue.h (modified) * code/branches/netp2/src/util/Serialise.h (added) - moved serialise functions from ... Fri, 27 Mar 2009 18:11:30 GMT landauf [2860] * code/trunk/src/orxonox/objects/controllers/PongAI.cc (modified) * code/trunk/src/orxonox/objects/controllers/PongAI.h (modified) Improved PongAI - it tries to predict the position of the ball (but ... Fri, 27 Mar 2009 15:04:24 GMT rgrieder [2859] * code/branches/gui/src/core/Core.cc (modified) Infinite loop bugfix if orxonox_dev_build.keep_me is missing. Thu, 26 Mar 2009 20:45:23 GMT dafrick [2858] * code/branches/questsystem5/src/orxonox/overlays/notifications/NotificationManager.cc (modified) * code/branches/questsystem5/src/orxonox/overlays/notifications/NotificationManager.h (modified) * code/branches/questsystem5/src/orxonox/overlays/notifications/NotificationOverlay.cc (modified) * code/branches/questsystem5/src/orxonox/overlays/notifications/NotificationOverlay.h (modified) * code/branches/questsystem5/src/orxonox/overlays/notifications/NotificationQueue.cc (modified) * code/branches/questsystem5/src/orxonox/overlays/notifications/NotificationQueue.h (modified) Done some documenting, and resolved some (possible) issues. So the ... Thu, 26 Mar 2009 18:28:09 GMT landauf [2857] * code/trunk/src/orxonox/objects/controllers/PongAI.cc (modified) * code/trunk/src/orxonox/objects/controllers/PongAI.h (modified) added configurable PongAI-strength Thu, 26 Mar 2009 16:06:25 GMT Naaduun [2856] * code/branches/map/src/orxonox/overlays/map/Map.cc (modified) * code/branches/map/src/orxonox/overlays/map/Map.h (modified) implemented Map::openMap() Thu, 26 Mar 2009 15:39:31 GMT rgrieder [2855] * code/trunk/src/orxonox/objects/worldentities/WorldEntity.cc (modified) * code/trunk/src/util/CMakeLists.txt (modified) Two small fixes. Thu, 26 Mar 2009 15:33:32 GMT rgrieder [2854] * code/branches/gui/src/orxonox/gamestates/GSGraphics.cc (modified) * code/branches/gui/src/orxonox/gamestates/GSRoot.cc (modified) small fixes with game states. Thu, 26 Mar 2009 14:18:08 GMT bknecht [2853] * code/branches/gui/cmake/BuildConfig.cmake (modified) * code/branches/gui/src/core/Game.h (modified) * code/branches/gui/src/network/packet/Gamestate.h (modified) * code/branches/gui/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/branches/gui/src/orxonox/gui/GUIManager.cc (modified) * code/branches/gui/src/orxonox/gui/GUIManager.h (modified) Fixed some bugs. Please do not break the code, when working with ... Thu, 26 Mar 2009 13:56:39 GMT polakma [2852] * code/branches/weaponsystem/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/weaponsystem/src/orxonox/objects/weaponSystem/Weapon.cc (modified) * code/branches/weaponsystem/src/orxonox/objects/weaponSystem/Weapon.h (modified) * code/branches/weaponsystem/src/orxonox/objects/weaponSystem/WeaponSystem.cc (modified) * code/branches/weaponsystem/src/orxonox/objects/weaponSystem/WeaponSystem.h (modified) * code/branches/weaponsystem/src/orxonox/objects/weaponSystem/munitions/CMakeLists.txt (modified) * code/branches/weaponsystem/src/orxonox/objects/weaponSystem/munitions/LaserGunMunition.cc (modified) added unlimited munition, reverted shared munition and fixed some bugs Thu, 26 Mar 2009 10:59:39 GMT landauf [2851] * code/trunk/src/orxonox/objects/worldentities/ControllableEntity.cc (modified) * code/trunk/src/orxonox/objects/worldentities/ControllableEntity.h (modified) * code/trunk/src/orxonox/objects/worldentities/WorldEntity.cc (modified) * code/trunk/src/orxonox/objects/worldentities/WorldEntity.h (modified) Fixed attachment of "absolute" CameraPosition-Nodes in the Network ... Wed, 25 Mar 2009 22:53:04 GMT rgrieder [2850] * code/branches/gui/bin/client1.bat.in (modified) * code/branches/gui/bin/client1.in (modified) * code/branches/gui/bin/client2.bat.in (modified) * code/branches/gui/bin/client2.in (modified) * code/branches/gui/bin/dedicated.bat.in (modified) * code/branches/gui/bin/dedicated.in (modified) * code/branches/gui/bin/server.bat.in (modified) * code/branches/gui/bin/server.in (modified) * code/branches/gui/bin/standalone.bat.in (modified) * code/branches/gui/bin/standalone.in (modified) * code/branches/gui/src/core/Game.cc (modified) * code/branches/gui/src/core/Game.h (modified) * code/branches/gui/src/core/GameState.cc (modified) * code/branches/gui/src/core/GameState.h (modified) * code/branches/gui/src/orxonox/CameraManager.cc (modified) * code/branches/gui/src/orxonox/GraphicsManager.cc (modified) * code/branches/gui/src/orxonox/GraphicsManager.h (modified) * code/branches/gui/src/orxonox/gamestates/CMakeLists.txt (modified) * code/branches/gui/src/orxonox/gamestates/GSGraphics.cc (modified) * code/branches/gui/src/orxonox/gamestates/GSIOConsole.cc (modified) * code/branches/gui/src/orxonox/gamestates/GSIOConsole.h (modified) * code/branches/gui/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/gui/src/orxonox/gamestates/GSLevel.h (modified) * code/branches/gui/src/orxonox/gamestates/GSMainMenu.cc (moved) * code/branches/gui/src/orxonox/gamestates/GSMainMenu.h (moved) * code/branches/gui/src/orxonox/gamestates/GSRoot.cc (modified) * code/branches/gui/src/orxonox/gui/GUIManager.cc (modified) * code/branches/gui/src/orxonox/gui/GUIManager.h (modified) - Started working on cleaning up the GameState mess ;) - Cleaned out ... Wed, 25 Mar 2009 22:50:23 GMT rgrieder [2849] * code/branches/gui/src/core/input/InputManager.cc (modified) Bug fix in the InputManager. Wed, 25 Mar 2009 18:37:00 GMT rgrieder [2848] * code/branches/gui/src/core/CMakeLists.txt (modified) * code/branches/gui/src/core/Core.cc (modified) * code/branches/gui/src/core/Core.h (modified) * code/branches/gui/src/core/GameMode.cc (copied) * code/branches/gui/src/core/GameMode.h (copied) * code/branches/gui/src/network/ClientConnectionListener.cc (modified) * code/branches/gui/src/network/packet/Gamestate.cc (modified) * code/branches/gui/src/network/synchronisable/SynchronisableVariable.cc (modified) * code/branches/gui/src/orxonox/CameraManager.cc (modified) * code/branches/gui/src/orxonox/GraphicsManager.cc (modified) * code/branches/gui/src/orxonox/PlayerManager.cc (modified) * code/branches/gui/src/orxonox/gamestates/GSClient.cc (modified) * code/branches/gui/src/orxonox/gamestates/GSDedicated.cc (modified) * code/branches/gui/src/orxonox/gamestates/GSGUI.cc (modified) * code/branches/gui/src/orxonox/gamestates/GSGraphics.cc (modified) * code/branches/gui/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/gui/src/orxonox/gamestates/GSRoot.cc (modified) * code/branches/gui/src/orxonox/gamestates/GSServer.cc (modified) * code/branches/gui/src/orxonox/gamestates/GSStandalone.cc (modified) * code/branches/gui/src/orxonox/objects/Scene.cc (modified) * code/branches/gui/src/orxonox/objects/controllers/AIController.cc (modified) * code/branches/gui/src/orxonox/objects/gametypes/Gametype.cc (modified) * code/branches/gui/src/orxonox/objects/infos/Bot.cc (modified) * code/branches/gui/src/orxonox/objects/infos/HumanPlayer.cc (modified) * code/branches/gui/src/orxonox/objects/items/MultiStateEngine.cc (modified) * code/branches/gui/src/orxonox/objects/weaponSystem/projectiles/BillboardProjectile.cc (modified) * code/branches/gui/src/orxonox/objects/weaponSystem/projectiles/ParticleProjectile.cc (modified) * code/branches/gui/src/orxonox/objects/weaponSystem/projectiles/Projectile.cc (modified) * code/branches/gui/src/orxonox/objects/worldentities/Backlight.cc (modified) * code/branches/gui/src/orxonox/objects/worldentities/Billboard.cc (modified) * code/branches/gui/src/orxonox/objects/worldentities/BlinkingBillboard.cc (modified) * code/branches/gui/src/orxonox/objects/worldentities/ControllableEntity.cc (modified) * code/branches/gui/src/orxonox/objects/worldentities/ExplosionChunk.cc (modified) * code/branches/gui/src/orxonox/objects/worldentities/Light.cc (modified) * code/branches/gui/src/orxonox/objects/worldentities/Model.cc (modified) * code/branches/gui/src/orxonox/objects/worldentities/MovableEntity.cc (modified) * code/branches/gui/src/orxonox/objects/worldentities/ParticleEmitter.cc (modified) * code/branches/gui/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) * code/branches/gui/src/orxonox/objects/worldentities/pawns/Spectator.cc (modified) * code/branches/gui/src/orxonox/objects/worldentities/triggers/Trigger.cc (modified) * code/branches/gui/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/branches/gui/src/orxonox/tools/BillboardSet.cc (modified) * code/branches/gui/src/orxonox/tools/Mesh.cc (modified) * code/branches/gui/src/orxonox/tools/ParticleInterface.cc (modified) * code/branches/gui/src/orxonox/tools/Shader.cc (modified) Exported showsGraphics, etc. to a new class named GameMode in the core. Wed, 25 Mar 2009 18:36:23 GMT rgrieder [2847] * code/branches/gui/src/orxonox/gamestates/GSGraphics.cc (modified) De initialisation bugfix in GSGraphics. Wed, 25 Mar 2009 17:24:15 GMT rgrieder [2846] * code/branches/gui/src/core/Core.cc (modified) * code/branches/gui/src/core/Core.h (modified) * code/branches/gui/src/core/Game.cc (modified) * code/branches/gui/src/core/Game.h (modified) * code/branches/gui/src/core/input/KeyBinder.cc (modified) * code/branches/gui/src/network/ChatListener.cc (modified) * code/branches/gui/src/network/ClientConnectionListener.cc (modified) * code/branches/gui/src/orxonox/gamestates/GSClient.cc (modified) * code/branches/gui/src/orxonox/gamestates/GSGraphics.cc (modified) * code/branches/gui/src/orxonox/gamestates/GSRoot.cc (modified) Moving game clock from Core to Game. Other small fixes. Wed, 25 Mar 2009 16:33:58 GMT rgrieder [2845] * code/branches/gui/src/core/Game.cc (modified) * code/branches/gui/src/orxonox/Main.cc (modified) * code/branches/gui/src/orxonox/gamestates/GSGUI.cc (modified) * code/branches/gui/src/orxonox/gamestates/GSRoot.cc (modified) - Moved some code from Game to Main and GSRoot - Renamed "gui" ... Wed, 25 Mar 2009 16:23:00 GMT rgrieder [2844] * code/branches/gui/src/core/CMakeLists.txt (modified) * code/branches/gui/src/core/CorePrereqs.h (modified) * code/branches/gui/src/core/Game.cc (moved) * code/branches/gui/src/core/Game.h (moved) * code/branches/gui/src/core/GameState.cc (modified) * code/branches/gui/src/core/GameState.h (modified) * code/branches/gui/src/core/RootGameState.cc (deleted) * code/branches/gui/src/core/RootGameState.h (deleted) * code/branches/gui/src/network/Server.h (modified) * code/branches/gui/src/orxonox/CMakeLists.txt (modified) * code/branches/gui/src/orxonox/Main.cc (copied) * code/branches/gui/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/gui/src/orxonox/gamestates/GSClient.cc (modified) * code/branches/gui/src/orxonox/gamestates/GSClient.h (modified) * code/branches/gui/src/orxonox/gamestates/GSDedicated.cc (modified) * code/branches/gui/src/orxonox/gamestates/GSDedicated.h (modified) * code/branches/gui/src/orxonox/gamestates/GSGUI.cc (modified) * code/branches/gui/src/orxonox/gamestates/GSGUI.h (modified) * code/branches/gui/src/orxonox/gamestates/GSGraphics.cc (modified) * code/branches/gui/src/orxonox/gamestates/GSGraphics.h (modified) * code/branches/gui/src/orxonox/gamestates/GSIOConsole.cc (modified) * code/branches/gui/src/orxonox/gamestates/GSIOConsole.h (modified) * code/branches/gui/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/gui/src/orxonox/gamestates/GSLevel.h (modified) * code/branches/gui/src/orxonox/gamestates/GSRoot.cc (modified) * code/branches/gui/src/orxonox/gamestates/GSRoot.h (modified) * code/branches/gui/src/orxonox/gamestates/GSServer.cc (modified) * code/branches/gui/src/orxonox/gamestates/GSServer.h (modified) * code/branches/gui/src/orxonox/gamestates/GSStandalone.cc (modified) * code/branches/gui/src/orxonox/gamestates/GSStandalone.h (modified) * code/branches/gui/src/orxonox/overlays/debug/DebugFPSText.cc (modified) * code/branches/gui/src/orxonox/overlays/debug/DebugRTRText.cc (modified) Implemented new GameState concept. It doesn't differ that much from ... Wed, 25 Mar 2009 15:34:40 GMT rgrieder [2843] * code/branches/gui/src/orxonox/gamestates/GSRoot.cc (modified) * code/branches/gui/src/orxonox/gamestates/GSRoot.h (modified) * code/branches/gui/src/orxonox/objects/worldentities/Backlight.h (modified) * code/branches/gui/src/orxonox/tools/CMakeLists.txt (modified) * code/branches/gui/src/orxonox/tools/ParticleInterface.h (modified) * code/branches/gui/src/orxonox/tools/TimeFactorListener.cc (added) * code/branches/gui/src/orxonox/tools/TimeFactorListener.h (added) * code/branches/gui/src/orxonox/tools/Timer.h (modified) Exported TimeFactorListener to separate file in the tools folder. Wed, 25 Mar 2009 15:21:45 GMT rgrieder [2842] * code/branches/gui/src/network/ConnectionManager.cc (modified) * code/branches/gui/src/network/TrafficControl.cc (modified) * code/branches/gui/src/network/packet/Gamestate.h (modified) * code/branches/gui/src/network/synchronisable/SynchronisableVariable.h (modified) * code/branches/gui/src/orxonox/GraphicsManager.cc (modified) Header file fixes (reduced some dependencies). Wed, 25 Mar 2009 14:17:38 GMT rgrieder [2841] * code/branches/gui/src/orxonox/gui/GUIManager.cc (modified) Using loadGUI_2.lua in this branch now. Wed, 25 Mar 2009 10:15:28 GMT bknecht [2840] * code/branches/gui/src/orxonox/gui/GUIManager.cc (modified) * code/branches/gui/src/orxonox/gui/GUIManager.h (modified) GUIManager now behaves how it should. Most things seem to work fine. ... Wed, 25 Mar 2009 02:26:06 GMT landauf [2839] * code/trunk/src/orxonox/OrxonoxPrereqs.h (modified) * code/trunk/src/orxonox/objects/controllers/CMakeLists.txt (modified) * code/trunk/src/orxonox/objects/controllers/PongAI.cc (added) * code/trunk/src/orxonox/objects/controllers/PongAI.h (added) * code/trunk/src/orxonox/objects/gametypes/Gametype.cc (modified) * code/trunk/src/orxonox/objects/gametypes/Gametype.h (modified) * code/trunk/src/orxonox/objects/gametypes/Pong.cc (modified) * code/trunk/src/orxonox/objects/infos/CMakeLists.txt (modified) * code/trunk/src/orxonox/objects/infos/PlayerInfo.cc (modified) * code/trunk/src/orxonox/objects/infos/PongBot.cc (added) * code/trunk/src/orxonox/objects/infos/PongBot.h (added) * code/trunk/src/orxonox/objects/worldentities/ControllableEntity.cc (modified) * code/trunk/src/orxonox/objects/worldentities/ControllableEntity.h (modified) * code/trunk/src/orxonox/objects/worldentities/PongBall.cc (modified) * code/trunk/src/orxonox/objects/worldentities/PongBall.h (modified) * code/trunk/src/orxonox/objects/worldentities/PongBat.cc (modified) * code/trunk/src/orxonox/objects/worldentities/PongBat.h (modified) added AI for the Pong gametype improved Pong gameplay Tue, 24 Mar 2009 13:50:13 GMT Naaduun [2838] * code/branches/map/archlinux (added) * code/branches/map/archlinux/PKGBUILD (added) Added PKGBUILD for building package in Archlinux. See ... Tue, 24 Mar 2009 12:06:10 GMT Naaduun [2837] * code/branches/map/src/orxonox/overlays/CMakeLists.txt (modified) * code/branches/map/src/orxonox/overlays/map (added) * code/branches/map/src/orxonox/overlays/map/CMakeLists.txt (added) * code/branches/map/src/orxonox/overlays/map/Map.cc (added) * code/branches/map/src/orxonox/overlays/map/Map.h (added) added Map class Mon, 23 Mar 2009 16:00:54 GMT scheusso [2836] * code/branches/netp2/src/network/ClientConnection.cc (modified) * code/branches/netp2/src/network/ClientConnection.h (modified) * code/branches/netp2/src/network/ConnectionManager.cc (modified) * code/branches/netp2/src/network/ConnectionManager.h (modified) * code/branches/netp2/src/network/TrafficControl.cc (modified) * code/branches/netp2/src/network/packet/Gamestate.cc (modified) * code/branches/netp2/src/network/packet/Packet.h (modified) * code/branches/netp2/src/network/synchronisable/NetworkCallbackManager.cc (modified) * code/branches/netp2/src/network/synchronisable/Synchronisable.cc (modified) * code/branches/netp2/src/network/synchronisable/Synchronisable.h (modified) * code/branches/netp2/src/network/synchronisable/SynchronisableSpecialisations.cc (modified) * code/branches/netp2/src/network/synchronisable/SynchronisableVariable.cc (added) * code/branches/netp2/src/network/synchronisable/SynchronisableVariable.h (modified) * code/branches/netp2/src/network/synchronisable/SynchronisableVariableSpecialisations.h (added) * code/branches/netp2/src/orxonox/objects/controllers/AIController.cc (modified) * code/branches/netp2/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) merge old netp branch to netp2 (still because of multiplayer pong...) Mon, 23 Mar 2009 15:57:42 GMT scheusso [2835] * code/branches/netp2 (copied) create new netp branch (in order to play multiplayer pong ^^) Mon, 23 Mar 2009 15:48:23 GMT bknecht [2834] * code/branches/gui/src/orxonox/CameraManager.cc (modified) * code/branches/gui/src/orxonox/gamestates/GSStandalone.cc (modified) * code/branches/gui/src/orxonox/gui/GUIManager.cc (modified) * code/branches/gui/src/orxonox/gui/GUIManager.h (modified) When you change the camera, the GUI is now newly set. Also: the GUI ... Mon, 23 Mar 2009 15:15:33 GMT scheusso [2833] * code/branches/netp/src/network/synchronisable/NetworkCallbackManager.cc (modified) * code/branches/netp/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) some bugfixes (client crashed when server was killed 2 times) Mon, 23 Mar 2009 13:53:10 GMT scheusso [2832] * code/branches/netp/src/network/packet/Gamestate.cc (modified) * code/branches/netp/src/network/synchronisable/Synchronisable.cc (modified) * code/branches/netp/src/network/synchronisable/Synchronisable.h (modified) further improvements in network (eliminated double calls of ... Mon, 23 Mar 2009 13:39:47 GMT danielh [2831] * code/branches/pickups/src/orxonox/objects/pickup/BaseItem.cc (deleted) * code/branches/pickups/src/orxonox/objects/pickup/BaseItem.h (deleted) * code/branches/pickups/src/orxonox/objects/pickup/CMakeLists.txt (modified) * code/branches/pickups/src/orxonox/objects/pickup/PickupSpawner.cc (deleted) * code/branches/pickups/src/orxonox/objects/pickup/PickupSpawner.h (deleted) * code/branches/pickups/src/orxonox/objects/pickup/ShipEquipment.cc (deleted) * code/branches/pickups/src/orxonox/objects/pickup/ShipEquipment.h (deleted) * code/branches/pickups/src/orxonox/objects/pickup/ShipEquipmentClasses.cc (deleted) * code/branches/pickups/src/orxonox/objects/pickup/ShipEquipmentClasses.h (deleted) * code/branches/pickups/src/orxonox/objects/pickup/ShipItem.cc (deleted) * code/branches/pickups/src/orxonox/objects/pickup/ShipItem.h (deleted) * code/branches/pickups/src/orxonox/objects/pickup/Turbo.cc (deleted) * code/branches/pickups/src/orxonox/objects/pickup/Turbo.h (deleted) * code/branches/pickups/src/orxonox/objects/pickup/Usable.h (deleted) * code/branches/pickups/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) * code/branches/pickups/src/orxonox/objects/worldentities/pawns/Pawn.h (modified) removed old pickup system Mon, 23 Mar 2009 13:26:35 GMT landauf [2830] * code/branches/particles (copied) created new branch for the particles-project Mon, 23 Mar 2009 13:12:23 GMT landauf [2829] * code/branches/sound (copied) created new branch for the sound-project Mon, 23 Mar 2009 13:11:02 GMT landauf [2828] * code/branches/pickups (copied) created new branch for the pickup-project Mon, 23 Mar 2009 12:50:21 GMT landauf [2827] * code/branches/gametypes (copied) created new branch for all 3 gametype-projects Mon, 23 Mar 2009 11:02:49 GMT landauf [2826] * code/trunk (modified) * code/trunk/bin/client1.bat.in (modified) * code/trunk/bin/client2.bat.in (modified) * code/trunk/bin/dedicated.bat.in (modified) * code/trunk/bin/run.bat.in (modified) * code/trunk/bin/server.bat.in (modified) * code/trunk/cmake/FindDirectX.cmake (modified) * code/trunk/cmake/LibraryConfigTardis.cmake (modified) * code/trunk/src/core/LuaBind.cc (modified) * code/trunk/src/core/LuaBind.h (modified) * code/trunk/src/core/Template.cc (modified) * code/trunk/src/core/Template.h (modified) * code/trunk/src/core/XMLFile.h (modified) * code/trunk/src/core/XMLIncludes.h (modified) * code/trunk/src/cpptcl/cpptcl.cc (modified) * code/trunk/src/cpptcl/cpptcl.h (modified) * code/trunk/src/network/synchronisable/NetworkCallback.h (modified) * code/trunk/src/network/synchronisable/Synchronisable.cc (modified) * code/trunk/src/network/synchronisable/Synchronisable.h (modified) * code/trunk/src/orxonox/CameraManager.cc (modified) * code/trunk/src/orxonox/CameraManager.h (modified) * code/trunk/src/orxonox/OrxonoxPrereqs.h (modified) * code/trunk/src/orxonox/gamestates/GSLevel.cc (modified) * code/trunk/src/orxonox/objects/CMakeLists.txt (modified) * code/trunk/src/orxonox/objects/Level.cc (modified) * code/trunk/src/orxonox/objects/Level.h (modified) * code/trunk/src/orxonox/objects/Teamcolourable.cc (copied) * code/trunk/src/orxonox/objects/Teamcolourable.h (copied) * code/trunk/src/orxonox/objects/collisionshapes (modified) * code/trunk/src/orxonox/objects/controllers/Controller.cc (modified) * code/trunk/src/orxonox/objects/controllers/Controller.h (modified) * code/trunk/src/orxonox/objects/gametypes/CMakeLists.txt (modified) * code/trunk/src/orxonox/objects/gametypes/Deathmatch.cc (copied) * code/trunk/src/orxonox/objects/gametypes/Deathmatch.h (copied) * code/trunk/src/orxonox/objects/gametypes/Gametype.cc (modified) * code/trunk/src/orxonox/objects/gametypes/Gametype.h (modified) * code/trunk/src/orxonox/objects/gametypes/Pong.cc (copied) * code/trunk/src/orxonox/objects/gametypes/Pong.h (copied) * code/trunk/src/orxonox/objects/gametypes/TeamDeathmatch.cc (copied) * code/trunk/src/orxonox/objects/gametypes/TeamDeathmatch.h (copied) * code/trunk/src/orxonox/objects/infos/GametypeInfo.cc (modified) * code/trunk/src/orxonox/objects/infos/GametypeInfo.h (modified) * code/trunk/src/orxonox/objects/infos/HumanPlayer.cc (modified) * code/trunk/src/orxonox/objects/infos/HumanPlayer.h (modified) * code/trunk/src/orxonox/objects/infos/PlayerInfo.cc (modified) * code/trunk/src/orxonox/objects/infos/PlayerInfo.h (modified) * code/trunk/src/orxonox/objects/pickup/Usable.h (modified) * code/trunk/src/orxonox/objects/quest/AddQuest.cc (modified) * code/trunk/src/orxonox/objects/quest/AddQuest.h (modified) * code/trunk/src/orxonox/objects/quest/AddQuestHint.cc (modified) * code/trunk/src/orxonox/objects/quest/AddQuestHint.h (modified) * code/trunk/src/orxonox/objects/quest/AddReward.cc (modified) * code/trunk/src/orxonox/objects/quest/AddReward.h (modified) * code/trunk/src/orxonox/objects/quest/ChangeQuestStatus.cc (modified) * code/trunk/src/orxonox/objects/quest/ChangeQuestStatus.h (modified) * code/trunk/src/orxonox/objects/quest/CompleteQuest.cc (modified) * code/trunk/src/orxonox/objects/quest/CompleteQuest.h (modified) * code/trunk/src/orxonox/objects/quest/FailQuest.cc (modified) * code/trunk/src/orxonox/objects/quest/FailQuest.h (modified) * code/trunk/src/orxonox/objects/quest/GlobalQuest.cc (modified) * code/trunk/src/orxonox/objects/quest/GlobalQuest.h (modified) * code/trunk/src/orxonox/objects/quest/LocalQuest.cc (modified) * code/trunk/src/orxonox/objects/quest/LocalQuest.h (modified) * code/trunk/src/orxonox/objects/quest/Quest.cc (modified) * code/trunk/src/orxonox/objects/quest/Quest.h (modified) * code/trunk/src/orxonox/objects/quest/QuestDescription.cc (modified) * code/trunk/src/orxonox/objects/quest/QuestDescription.h (modified) * code/trunk/src/orxonox/objects/quest/QuestEffect.cc (modified) * code/trunk/src/orxonox/objects/quest/QuestEffect.h (modified) * code/trunk/src/orxonox/objects/quest/QuestHint.cc (modified) * code/trunk/src/orxonox/objects/quest/QuestHint.h (modified) * code/trunk/src/orxonox/objects/quest/QuestItem.cc (modified) * code/trunk/src/orxonox/objects/quest/QuestItem.h (modified) * code/trunk/src/orxonox/objects/quest/QuestManager.cc (modified) * code/trunk/src/orxonox/objects/quest/QuestManager.h (modified) * code/trunk/src/orxonox/objects/quest/Rewardable.cc (modified) * code/trunk/src/orxonox/objects/quest/Rewardable.h (modified) * code/trunk/src/orxonox/objects/weaponSystem/WeaponSystem.cc (modified) * code/trunk/src/orxonox/objects/weaponSystem/WeaponSystem.h (modified) * code/trunk/src/orxonox/objects/worldentities/Backlight.cc (modified) * code/trunk/src/orxonox/objects/worldentities/Backlight.h (modified) * code/trunk/src/orxonox/objects/worldentities/Billboard.h (modified) * code/trunk/src/orxonox/objects/worldentities/CMakeLists.txt (modified) * code/trunk/src/orxonox/objects/worldentities/Camera.cc (modified) * code/trunk/src/orxonox/objects/worldentities/Camera.h (modified) * code/trunk/src/orxonox/objects/worldentities/CameraPosition.cc (modified) * code/trunk/src/orxonox/objects/worldentities/CameraPosition.h (modified) * code/trunk/src/orxonox/objects/worldentities/ControllableEntity.cc (modified) * code/trunk/src/orxonox/objects/worldentities/Light.h (modified) * code/trunk/src/orxonox/objects/worldentities/MobileEntity.cc (modified) * code/trunk/src/orxonox/objects/worldentities/MobileEntity.h (modified) * code/trunk/src/orxonox/objects/worldentities/ParticleSpawner.cc (modified) * code/trunk/src/orxonox/objects/worldentities/ParticleSpawner.h (modified) * code/trunk/src/orxonox/objects/worldentities/PongBall.cc (copied) * code/trunk/src/orxonox/objects/worldentities/PongBall.h (copied) * code/trunk/src/orxonox/objects/worldentities/PongBat.cc (copied) * code/trunk/src/orxonox/objects/worldentities/PongBat.h (copied) * code/trunk/src/orxonox/objects/worldentities/PongCenterpoint.cc (copied) * code/trunk/src/orxonox/objects/worldentities/PongCenterpoint.h (copied) * code/trunk/src/orxonox/objects/worldentities/StaticEntity.cc (modified) * code/trunk/src/orxonox/objects/worldentities/StaticEntity.h (modified) * code/trunk/src/orxonox/objects/worldentities/TeamSpawnPoint.cc (copied) * code/trunk/src/orxonox/objects/worldentities/TeamSpawnPoint.h (copied) * code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) * code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.h (modified) * code/trunk/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified) * code/trunk/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h (modified) * code/trunk/src/orxonox/objects/worldentities/triggers/Trigger.cc (modified) * code/trunk/src/orxonox/objects/worldentities/triggers/Trigger.h (modified) * code/trunk/src/tolua/all-5.0.lua (modified) * code/trunk/src/tolua/all-5.1.lua (modified) * code/trunk/src/util (modified) * code/trunk/src/util/Exception.cc (modified) * code/trunk/src/util/Exception.h (modified) * code/trunk/src/util/SignalHandler.cc (modified) * code/trunk/src/util/SignalHandler.h (modified) merged miniprojects branch back to trunk Mon, 23 Mar 2009 10:32:02 GMT landauf [2825] * code/branches/miniprojects/src/orxonox/objects/Teamcolourable.cc (modified) * code/branches/miniprojects/src/orxonox/objects/Teamcolourable.h (modified) * code/branches/miniprojects/src/orxonox/objects/gametypes/Deathmatch.cc (modified) * code/branches/miniprojects/src/orxonox/objects/gametypes/Deathmatch.h (modified) * code/branches/miniprojects/src/orxonox/objects/gametypes/Pong.cc (modified) * code/branches/miniprojects/src/orxonox/objects/gametypes/Pong.h (modified) * code/branches/miniprojects/src/orxonox/objects/gametypes/TeamDeathmatch.cc (modified) * code/branches/miniprojects/src/orxonox/objects/gametypes/TeamDeathmatch.h (modified) * code/branches/miniprojects/src/orxonox/objects/worldentities/PongBall.cc (modified) * code/branches/miniprojects/src/orxonox/objects/worldentities/PongBall.h (modified) * code/branches/miniprojects/src/orxonox/objects/worldentities/PongBat.cc (modified) * code/branches/miniprojects/src/orxonox/objects/worldentities/PongBat.h (modified) * code/branches/miniprojects/src/orxonox/objects/worldentities/PongCenterpoint.cc (modified) * code/branches/miniprojects/src/orxonox/objects/worldentities/PongCenterpoint.h (modified) * code/branches/miniprojects/src/orxonox/objects/worldentities/TeamSpawnPoint.cc (modified) * code/branches/miniprojects/src/orxonox/objects/worldentities/TeamSpawnPoint.h (modified) eol-style:native Mon, 23 Mar 2009 10:26:46 GMT landauf [2824] * code/branches/miniprojects/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/miniprojects/src/orxonox/objects/gametypes/CMakeLists.txt (modified) * code/branches/miniprojects/src/orxonox/objects/gametypes/Deathmatch.cc (modified) * code/branches/miniprojects/src/orxonox/objects/gametypes/Deathmatch.h (modified) * code/branches/miniprojects/src/orxonox/objects/gametypes/Gametype.cc (modified) * code/branches/miniprojects/src/orxonox/objects/gametypes/Gametype.h (modified) * code/branches/miniprojects/src/orxonox/objects/gametypes/Pong.cc (added) * code/branches/miniprojects/src/orxonox/objects/gametypes/Pong.h (added) * code/branches/miniprojects/src/orxonox/objects/worldentities/CMakeLists.txt (modified) * code/branches/miniprojects/src/orxonox/objects/worldentities/CameraPosition.cc (modified) * code/branches/miniprojects/src/orxonox/objects/worldentities/CameraPosition.h (modified) * code/branches/miniprojects/src/orxonox/objects/worldentities/ControllableEntity.cc (modified) * code/branches/miniprojects/src/orxonox/objects/worldentities/PongBall.cc (added) * code/branches/miniprojects/src/orxonox/objects/worldentities/PongBall.h (added) * code/branches/miniprojects/src/orxonox/objects/worldentities/PongBat.cc (added) * code/branches/miniprojects/src/orxonox/objects/worldentities/PongBat.h (added) * code/branches/miniprojects/src/orxonox/objects/worldentities/PongCenterpoint.cc (added) * code/branches/miniprojects/src/orxonox/objects/worldentities/PongCenterpoint.h (added) Added "Pong" minigame Mon, 23 Mar 2009 10:12:14 GMT rgrieder [2823] * code/branches/netp/src/network/synchronisable/Synchronisable.cc (modified) * code/branches/netp/src/network/synchronisable/Synchronisable.h (modified) Further optimisations by using std::vector instead of std::list for ... Mon, 23 Mar 2009 09:28:25 GMT scheusso [2822] * code/branches/netp/src/network/synchronisable/Synchronisable.cc (modified) * code/branches/netp/src/network/synchronisable/Synchronisable.h (modified) * code/branches/netp/src/network/synchronisable/SynchronisableSpecialisations.cc (modified) * code/branches/netp/src/network/synchronisable/SynchronisableVariable.h (modified) reduced overhead/load of Synchronisable::getSize quite a lot Mon, 23 Mar 2009 00:04:52 GMT landauf [2821] * code/branches/miniprojects/src/orxonox/objects/gametypes/CMakeLists.txt (modified) * code/branches/miniprojects/src/orxonox/objects/gametypes/TeamDeathmatch.cc (moved) * code/branches/miniprojects/src/orxonox/objects/gametypes/TeamDeathmatch.h (moved) renamed TeamGametype to TeamDeathmatch. Sun, 22 Mar 2009 23:44:10 GMT landauf [2820] * code/branches/miniprojects/src/orxonox/objects/gametypes/CMakeLists.txt (modified) * code/branches/miniprojects/src/orxonox/objects/gametypes/Deathmatch.cc (added) * code/branches/miniprojects/src/orxonox/objects/gametypes/Deathmatch.h (added) * code/branches/miniprojects/src/orxonox/objects/gametypes/Gametype.cc (modified) * code/branches/miniprojects/src/orxonox/objects/gametypes/Gametype.h (modified) * code/branches/miniprojects/src/orxonox/objects/gametypes/TeamGametype.cc (modified) * code/branches/miniprojects/src/orxonox/objects/gametypes/TeamGametype.h (modified) Split Gametype into Gametype+Deathmatch. The only difference is ... Sun, 22 Mar 2009 20:59:34 GMT landauf [2819] * code/branches/miniprojects/src/orxonox/objects/infos/HumanPlayer.cc (modified) * code/branches/miniprojects/src/orxonox/objects/infos/HumanPlayer.h (modified) * code/branches/miniprojects/src/orxonox/objects/infos/PlayerInfo.cc (modified) * code/branches/miniprojects/src/orxonox/objects/infos/PlayerInfo.h (modified) moved gametype-HUD from PlayerInfo to HumanPlayer Sun, 22 Mar 2009 20:40:35 GMT landauf [2818] * code/branches/miniprojects/src/orxonox/objects/gametypes/Gametype.cc (modified) * code/branches/miniprojects/src/orxonox/objects/gametypes/Gametype.h (modified) * code/branches/miniprojects/src/orxonox/objects/gametypes/TeamGametype.cc (modified) * code/branches/miniprojects/src/orxonox/objects/gametypes/TeamGametype.h (modified) * code/branches/miniprojects/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) * code/branches/miniprojects/src/orxonox/objects/worldentities/pawns/Pawn.h (modified) added two new functions to Gametype Sat, 21 Mar 2009 21:17:59 GMT rgrieder [2817] * code/branches/gui/src/core/CorePrereqs.h (modified) * code/branches/gui/src/core/GameState.cc (modified) * code/branches/gui/src/core/GameState.h (modified) * code/branches/gui/src/core/RootGameState.cc (modified) * code/branches/gui/src/core/RootGameState.h (modified) * code/branches/gui/src/orxonox/Game.cc (modified) * code/branches/gui/src/orxonox/Game.h (modified) * code/branches/gui/src/orxonox/GraphicsManager.h (modified) * code/branches/gui/src/orxonox/gamestates/GSClient.cc (modified) * code/branches/gui/src/orxonox/gamestates/GSClient.h (modified) * code/branches/gui/src/orxonox/gamestates/GSDedicated.cc (modified) * code/branches/gui/src/orxonox/gamestates/GSDedicated.h (modified) * code/branches/gui/src/orxonox/gamestates/GSGUI.cc (modified) * code/branches/gui/src/orxonox/gamestates/GSGUI.h (modified) * code/branches/gui/src/orxonox/gamestates/GSGraphics.cc (modified) * code/branches/gui/src/orxonox/gamestates/GSGraphics.h (modified) * code/branches/gui/src/orxonox/gamestates/GSIOConsole.cc (modified) * code/branches/gui/src/orxonox/gamestates/GSIOConsole.h (modified) * code/branches/gui/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/gui/src/orxonox/gamestates/GSLevel.h (modified) * code/branches/gui/src/orxonox/gamestates/GSRoot.cc (modified) * code/branches/gui/src/orxonox/gamestates/GSRoot.h (modified) * code/branches/gui/src/orxonox/gamestates/GSServer.cc (modified) * code/branches/gui/src/orxonox/gamestates/GSServer.h (modified) * code/branches/gui/src/orxonox/gamestates/GSStandalone.cc (modified) * code/branches/gui/src/orxonox/gamestates/GSStandalone.h (modified) * code/branches/gui/src/orxonox/overlays/debug/DebugFPSText.cc (modified) * code/branches/gui/src/orxonox/overlays/debug/DebugRTRText.cc (modified) Removed GameState template and renamed GameStateBase to GameState. ... Sat, 21 Mar 2009 19:47:11 GMT rgrieder [2816] * code/branches/gui/src/core/input/InputManager.cc (modified) * code/branches/gui/src/core/input/InputManager.h (modified) * code/branches/gui/src/core/input/InputState.h (modified) * code/branches/gui/src/orxonox/gamestates/GSGraphics.cc (modified) * code/branches/gui/src/orxonox/gamestates/GSGraphics.h (modified) * code/branches/gui/src/orxonox/overlays/console/InGameConsole.cc (modified) Upgrade number two for the InputManager: An InputState can have two ... Sat, 21 Mar 2009 16:56:10 GMT rgrieder [2815] * code/branches/gui/src/core/ConfigFileManager.cc (modified) * code/branches/gui/src/core/Core.cc (modified) * code/branches/gui/src/core/GameState.cc (modified) * code/branches/gui/src/core/GameState.h (modified) * code/branches/gui/src/core/Iterator.h (modified) * code/branches/gui/src/core/ObjectListBase.h (modified) * code/branches/gui/src/core/RootGameState.cc (modified) * code/branches/gui/src/core/Template.cc (modified) * code/branches/gui/src/core/XMLPort.h (modified) * code/branches/gui/src/core/input/InputBuffer.h (modified) * code/branches/gui/src/orxonox/objects/EventTarget.cc (modified) * code/branches/gui/src/orxonox/objects/Radar.cc (modified) * code/branches/gui/src/orxonox/objects/pickup/PickupSpawner.cc (modified) * code/branches/gui/src/orxonox/overlays/hud/HUDRadar.cc (modified) various small changes: - Fixed a bug in the GameStates concerning ... Sat, 21 Mar 2009 16:30:16 GMT rgrieder [2814] * code/branches/gui/src/core/input/InputManager.cc (modified) * code/branches/gui/src/core/input/InputManager.h (modified) * code/branches/gui/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/gui/src/orxonox/gui/GUIManager.cc (modified) * code/branches/gui/src/orxonox/overlays/console/InGameConsole.cc (modified) InputManager upgrade number one: InputState priorities are managed ... Sat, 21 Mar 2009 14:28:07 GMT landauf [2813] * code/branches/netp/src/orxonox/objects/worldentities/pawns/SpaceShip.cc (modified) fixed shooting bug Sat, 21 Mar 2009 14:27:58 GMT landauf [2812] * code/branches/map/src/orxonox/objects/worldentities/pawns/SpaceShip.cc (modified) fixed shooting bug Sat, 21 Mar 2009 14:27:49 GMT landauf [2811] * code/branches/gui/src/orxonox/objects/worldentities/pawns/SpaceShip.cc (modified) fixed shooting bug Sat, 21 Mar 2009 14:27:40 GMT landauf [2810] * code/branches/ggz/src/orxonox/objects/worldentities/pawns/SpaceShip.cc (modified) fixed shooting bug