# # ChangeLog for code/branches/kicklib2/src/libraries/core/Resource.cc # # Generated by Trac 1.0.9 # May 29, 2024, 4:44:47 PM Thu, 21 Apr 2011 17:43:10 GMT rgrieder [8285] * code/branches/kicklib2 (modified) * code/branches/kicklib2/CMakeLists.txt (modified) * code/branches/kicklib2/bin/client1.bat.in (modified) * code/branches/kicklib2/bin/client2.bat.in (modified) * code/branches/kicklib2/bin/dedicated.bat.in (modified) * code/branches/kicklib2/bin/dedicatedClient.bat.in (modified) * code/branches/kicklib2/bin/masterserver.bat.in (modified) * code/branches/kicklib2/bin/run.bat.in (modified) * code/branches/kicklib2/bin/server.bat.in (modified) * code/branches/kicklib2/bin/standalone.bat.in (modified) * code/branches/kicklib2/cmake/BundleConfig.cmake (copied) * code/branches/kicklib2/cmake/CompilerConfigMSVC.cmake (modified) * code/branches/kicklib2/cmake/LibraryConfig.cmake (modified) * code/branches/kicklib2/cmake/PackageConfig.cmake (modified) * code/branches/kicklib2/cmake/PackageConfigMSVC.cmake (modified) * code/branches/kicklib2/cmake/PackageConfigOSX.cmake (modified) * code/branches/kicklib2/cmake/PrepareDevBundle.cmake (copied) * code/branches/kicklib2/cmake/tools/FindALUT.cmake (modified) * code/branches/kicklib2/cmake/tools/FindCEGUI.cmake (modified) * code/branches/kicklib2/cmake/tools/FindLua5.1.cmake (modified) * code/branches/kicklib2/cmake/tools/FindOGRE.cmake (modified) * code/branches/kicklib2/cmake/tools/FindOgg.cmake (modified) * code/branches/kicklib2/cmake/tools/FindVorbis.cmake (modified) * code/branches/kicklib2/cmake/tools/TargetUtilities.cmake (modified) * code/branches/kicklib2/contrib/CMakeLists.txt (copied) * code/branches/kicklib2/contrib/orxonox.desktop (modified) * code/branches/kicklib2/contrib/orxonox.png (copied) * code/branches/kicklib2/contrib/orxonox_old.svg (copied) * code/branches/kicklib2/data/CMakeLists.txt (modified) * code/branches/kicklib2/data/DataInstallScript.cmake (deleted) * code/branches/kicklib2/data/levels/planets.oxw (copied) * code/branches/kicklib2/data/mac (copied) * code/branches/kicklib2/data/mac/English.lproj (copied) * code/branches/kicklib2/data/mac/English.lproj/InfoPlist.strings (copied) * code/branches/kicklib2/data/mac/English.lproj/MainMenu.nib (copied) * code/branches/kicklib2/data/mac/English.lproj/MainMenu.nib/designable.nib (copied) * code/branches/kicklib2/data/mac/English.lproj/MainMenu.nib/keyedobjects.nib (copied) * code/branches/kicklib2/data/mac/English.lproj/MainMenu.xib (copied) * code/branches/kicklib2/data/mac/Icon.icns (copied) * code/branches/kicklib2/data/mac/Orxonox-Info.plist (copied) * code/branches/kicklib2/src/CMakeLists.txt (modified) * code/branches/kicklib2/src/Orxonox.cc (modified) * code/branches/kicklib2/src/OrxonoxConfig.cmake (modified) * code/branches/kicklib2/src/OrxonoxConfig.h.in (modified) * code/branches/kicklib2/src/OrxonoxMac.h (copied) * code/branches/kicklib2/src/OrxonoxMac.mm (copied) * code/branches/kicklib2/src/SpecialConfig.h.in (modified) * code/branches/kicklib2/src/external/ogreceguirenderer/CMakeLists.txt (modified) * code/branches/kicklib2/src/external/ois/CMakeLists.txt (modified) * code/branches/kicklib2/src/external/tinyxml/CMakeLists.txt (modified) * code/branches/kicklib2/src/external/tinyxml/VERSION (modified) * code/branches/kicklib2/src/external/tinyxml/changes_orxonox.diff (modified) * code/branches/kicklib2/src/external/tinyxml/ticpp.cpp (modified) * code/branches/kicklib2/src/external/tinyxml/ticpp.h (modified) * code/branches/kicklib2/src/libraries/core/CorePrereqs.h (modified) * code/branches/kicklib2/src/libraries/core/GraphicsManager.cc (modified) * code/branches/kicklib2/src/libraries/core/GraphicsManager.h (modified) * code/branches/kicklib2/src/libraries/core/Identifier.h (modified) * code/branches/kicklib2/src/libraries/core/PathConfig.cc (modified) * code/branches/kicklib2/src/libraries/core/PathConfig.h (modified) * code/branches/kicklib2/src/libraries/core/Resource.cc (modified) * code/branches/kicklib2/src/libraries/core/command/ArgumentCompletionFunctions.cc (modified) * code/branches/kicklib2/src/orxonox/sound/SoundManager.cc (modified) Merged revisions 8098 - 8277 from kicklib to kicklib2. Thu, 21 Apr 2011 16:58:23 GMT rgrieder [8284] * code/branches/kicklib2 (modified) * code/branches/kicklib2/CMakeLists.txt (modified) * code/branches/kicklib2/cmake/CompilerConfig.cmake (modified) * code/branches/kicklib2/cmake/CompilerConfigGCC.cmake (modified) * code/branches/kicklib2/cmake/CompilerConfigMSVC.cmake (modified) * code/branches/kicklib2/cmake/LibraryConfig.cmake (modified) * code/branches/kicklib2/cmake/LibraryConfigApple.cmake (deleted) * code/branches/kicklib2/cmake/PackageConfig.cmake (modified) * code/branches/kicklib2/cmake/PackageConfigMSVC.cmake (modified) * code/branches/kicklib2/cmake/PackageConfigMinGW.cmake (modified) * code/branches/kicklib2/cmake/PackageConfigOSX.cmake (copied) * code/branches/kicklib2/cmake/tools/CheckOGREPlugins.cmake (modified) * code/branches/kicklib2/cmake/tools/CheckPackageVersion.cmake (copied) * code/branches/kicklib2/cmake/tools/FindALUT.cmake (modified) * code/branches/kicklib2/cmake/tools/FindCEGUI.cmake (modified) * code/branches/kicklib2/cmake/tools/FindOgg.cmake (modified) * code/branches/kicklib2/cmake/tools/FindPOCO.cmake (modified) * code/branches/kicklib2/cmake/tools/FindVorbis.cmake (modified) * code/branches/kicklib2/cmake/tools/GenerateToluaBindings.cmake (modified) * code/branches/kicklib2/cmake/tools/TargetUtilities.cmake (modified) * code/branches/kicklib2/data/gui/scripts/AudioMenu.lua (modified) * code/branches/kicklib2/src/CMakeLists.txt (modified) * code/branches/kicklib2/src/OrxonoxConfig.cmake (modified) * code/branches/kicklib2/src/OrxonoxConfig.h.in (modified) * code/branches/kicklib2/src/SpecialConfig.h.in (modified) * code/branches/kicklib2/src/external/bullet/Bullet-C-Api.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/BroadphaseCollision/btAxisSweep3.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/BroadphaseCollision/btDbvt.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/BroadphaseCollision/btDbvt.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/BroadphaseCollision/btDispatcher.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/BroadphaseCollision/btQuantizedBvh.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CMakeLists.txt (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionDispatch/SphereTriangleDetector.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp (copied) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h (copied) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionDispatch/btCollisionDispatcher.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionDispatch/btCollisionObject.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionDispatch/btCollisionObject.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionDispatch/btCollisionWorld.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionDispatch/btCollisionWorld.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp (copied) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h (copied) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionDispatch/btGhostObject.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp (copied) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionDispatch/btInternalEdgeUtility.h (copied) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionDispatch/btManifoldResult.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionDispatch/btManifoldResult.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionDispatch/btUnionFind.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionDispatch/btUnionFind.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btBox2dShape.cpp (copied) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btBox2dShape.h (copied) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btBoxShape.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btBoxShape.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btCapsuleShape.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btCapsuleShape.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btCollisionMargin.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btCollisionShape.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btCollisionShape.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btCompoundShape.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btCompoundShape.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btConcaveShape.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btConcaveShape.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btConeShape.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btConeShape.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btConvex2dShape.cpp (copied) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btConvex2dShape.h (copied) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btConvexHullShape.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btConvexHullShape.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btConvexInternalShape.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btConvexInternalShape.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btConvexPointCloudShape.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btConvexShape.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btConvexShape.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btCylinderShape.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btCylinderShape.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btEmptyShape.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btEmptyShape.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btMaterial.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btMinkowskiSumShape.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btMultiSphereShape.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btMultiSphereShape.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btOptimizedBvh.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btOptimizedBvh.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btShapeHull.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btShapeHull.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btSphereShape.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btSphereShape.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btStaticPlaneShape.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btStridingMeshInterface.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btTetrahedronShape.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btTetrahedronShape.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btTriangleBuffer.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btTriangleBuffer.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btTriangleCallback.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btTriangleCallback.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btTriangleInfoMap.h (copied) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btTriangleMesh.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btTriangleMesh.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btTriangleMeshShape.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btTriangleShape.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btUniformScalingShape.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btUniformScalingShape.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/Gimpact (deleted) * code/branches/kicklib2/src/external/bullet/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/NarrowPhaseCollision/btConvexCast.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/NarrowPhaseCollision/btPointCollector.h (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h (modified) * code/branches/kicklib2/src/external/bullet/BulletDynamics/CMakeLists.txt (modified) * code/branches/kicklib2/src/external/bullet/BulletDynamics/Character/btCharacterControllerInterface.h (modified) * code/branches/kicklib2/src/external/bullet/BulletDynamics/Character/btKinematicCharacterController.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletDynamics/Character/btKinematicCharacterController.h (modified) * code/branches/kicklib2/src/external/bullet/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h (modified) * code/branches/kicklib2/src/external/bullet/BulletDynamics/ConstraintSolver/btContactConstraint.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletDynamics/ConstraintSolver/btContactConstraint.h (modified) * code/branches/kicklib2/src/external/bullet/BulletDynamics/ConstraintSolver/btContactSolverInfo.h (modified) * code/branches/kicklib2/src/external/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h (modified) * code/branches/kicklib2/src/external/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.cpp (copied) * code/branches/kicklib2/src/external/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.h (copied) * code/branches/kicklib2/src/external/bullet/BulletDynamics/ConstraintSolver/btHinge2Constraint.cpp (copied) * code/branches/kicklib2/src/external/bullet/BulletDynamics/ConstraintSolver/btHinge2Constraint.h (copied) * code/branches/kicklib2/src/external/bullet/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletDynamics/ConstraintSolver/btHingeConstraint.h (modified) * code/branches/kicklib2/src/external/bullet/BulletDynamics/ConstraintSolver/btJacobianEntry.h (modified) * code/branches/kicklib2/src/external/bullet/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h (modified) * code/branches/kicklib2/src/external/bullet/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h (modified) * code/branches/kicklib2/src/external/bullet/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletDynamics/ConstraintSolver/btSliderConstraint.h (modified) * code/branches/kicklib2/src/external/bullet/BulletDynamics/ConstraintSolver/btSolverBody.h (modified) * code/branches/kicklib2/src/external/bullet/BulletDynamics/ConstraintSolver/btSolverConstraint.h (modified) * code/branches/kicklib2/src/external/bullet/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletDynamics/ConstraintSolver/btTypedConstraint.h (modified) * code/branches/kicklib2/src/external/bullet/BulletDynamics/ConstraintSolver/btUniversalConstraint.cpp (copied) * code/branches/kicklib2/src/external/bullet/BulletDynamics/ConstraintSolver/btUniversalConstraint.h (copied) * code/branches/kicklib2/src/external/bullet/BulletDynamics/Dynamics/Bullet-C-API.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletDynamics/Dynamics/btActionInterface.h (modified) * code/branches/kicklib2/src/external/bullet/BulletDynamics/Dynamics/btContinuousDynamicsWorld.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h (modified) * code/branches/kicklib2/src/external/bullet/BulletDynamics/Dynamics/btDynamicsWorld.h (modified) * code/branches/kicklib2/src/external/bullet/BulletDynamics/Dynamics/btRigidBody.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletDynamics/Dynamics/btRigidBody.h (modified) * code/branches/kicklib2/src/external/bullet/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h (modified) * code/branches/kicklib2/src/external/bullet/BulletDynamics/Vehicle/btRaycastVehicle.cpp (modified) * code/branches/kicklib2/src/external/bullet/BulletDynamics/Vehicle/btRaycastVehicle.h (modified) * code/branches/kicklib2/src/external/bullet/BulletDynamics/Vehicle/btWheelInfo.h (modified) * code/branches/kicklib2/src/external/bullet/BulletLicense.txt (modified) * code/branches/kicklib2/src/external/bullet/CMakeLists.txt (modified) * code/branches/kicklib2/src/external/bullet/ChangeLog (modified) * code/branches/kicklib2/src/external/bullet/LinearMath/CMakeLists.txt (modified) * code/branches/kicklib2/src/external/bullet/LinearMath/btAlignedAllocator.cpp (modified) * code/branches/kicklib2/src/external/bullet/LinearMath/btAlignedObjectArray.h (modified) * code/branches/kicklib2/src/external/bullet/LinearMath/btConvexHull.cpp (modified) * code/branches/kicklib2/src/external/bullet/LinearMath/btConvexHull.h (modified) * code/branches/kicklib2/src/external/bullet/LinearMath/btDefaultMotionState.h (modified) * code/branches/kicklib2/src/external/bullet/LinearMath/btHashMap.h (modified) * code/branches/kicklib2/src/external/bullet/LinearMath/btIDebugDraw.h (modified) * code/branches/kicklib2/src/external/bullet/LinearMath/btMatrix3x3.h (modified) * code/branches/kicklib2/src/external/bullet/LinearMath/btMinMax.h (modified) * code/branches/kicklib2/src/external/bullet/LinearMath/btPoolAllocator.h (modified) * code/branches/kicklib2/src/external/bullet/LinearMath/btQuaternion.h (modified) * code/branches/kicklib2/src/external/bullet/LinearMath/btQuickprof.cpp (modified) * code/branches/kicklib2/src/external/bullet/LinearMath/btQuickprof.h (modified) * code/branches/kicklib2/src/external/bullet/LinearMath/btScalar.h (modified) * code/branches/kicklib2/src/external/bullet/LinearMath/btSerializer.cpp (copied) * code/branches/kicklib2/src/external/bullet/LinearMath/btSerializer.h (copied) * code/branches/kicklib2/src/external/bullet/LinearMath/btTransform.h (modified) * code/branches/kicklib2/src/external/bullet/LinearMath/btTransformUtil.h (modified) * code/branches/kicklib2/src/external/bullet/LinearMath/btVector3.h (modified) * code/branches/kicklib2/src/external/bullet/NEWS (modified) * code/branches/kicklib2/src/external/bullet/README (modified) * code/branches/kicklib2/src/external/bullet/VERSION (modified) * code/branches/kicklib2/src/external/bullet/btBulletCollisionCommon.h (modified) * code/branches/kicklib2/src/external/bullet/btBulletDynamicsCommon.h (modified) * code/branches/kicklib2/src/external/bullet/changes_orxonox.diff (modified) * code/branches/kicklib2/src/external/ogreceguirenderer/CMakeLists.txt (modified) * code/branches/kicklib2/src/external/ois/CMakeLists.txt (modified) * code/branches/kicklib2/src/external/ois/OIS.h (modified) * code/branches/kicklib2/src/external/ois/OISConfig.h (modified) * code/branches/kicklib2/src/external/ois/OISInputManager.cpp (modified) * code/branches/kicklib2/src/external/ois/OISKeyboard.h (modified) * code/branches/kicklib2/src/external/ois/OISMultiTouch.h (copied) * code/branches/kicklib2/src/external/ois/OISPrereqs.h (modified) * code/branches/kicklib2/src/external/ois/ReadMe.txt (modified) * code/branches/kicklib2/src/external/ois/VERSION (modified) * code/branches/kicklib2/src/external/ois/changes_orxonox.diff (modified) * code/branches/kicklib2/src/external/ois/linux/LinuxInputManager.cpp (modified) * code/branches/kicklib2/src/external/ois/linux/LinuxInputManager.h (modified) * code/branches/kicklib2/src/external/ois/linux/LinuxJoyStickEvents.cpp (modified) * code/branches/kicklib2/src/external/ois/linux/LinuxKeyboard.cpp (modified) * code/branches/kicklib2/src/external/ois/linux/LinuxKeyboard.h (modified) * code/branches/kicklib2/src/external/ois/linux/LinuxMouse.cpp (modified) * code/branches/kicklib2/src/external/ois/linux/LinuxPrereqs.h (modified) * code/branches/kicklib2/src/external/ois/mac/CMakeLists.txt (modified) * code/branches/kicklib2/src/external/ois/mac/MacHIDManager.cpp (modified) * code/branches/kicklib2/src/external/ois/mac/MacHIDManager.h (modified) * code/branches/kicklib2/src/external/ois/mac/MacInputManager.cpp (modified) * code/branches/kicklib2/src/external/ois/mac/MacJoyStick.cpp (copied) * code/branches/kicklib2/src/external/ois/mac/MacJoyStick.h (copied) * code/branches/kicklib2/src/external/ois/mac/MacKeyboard.cpp (modified) * code/branches/kicklib2/src/external/ois/win32/Win32ForceFeedback.cpp (modified) * code/branches/kicklib2/src/external/ois/win32/Win32ForceFeedback.h (modified) * code/branches/kicklib2/src/external/ois/win32/Win32InputManager.cpp (modified) * code/branches/kicklib2/src/external/ois/win32/Win32InputManager.h (modified) * code/branches/kicklib2/src/external/ois/win32/Win32JoyStick.cpp (modified) * code/branches/kicklib2/src/external/ois/win32/Win32JoyStick.h (modified) * code/branches/kicklib2/src/external/ois/win32/Win32KeyBoard.cpp (modified) * code/branches/kicklib2/src/external/ois/win32/Win32KeyBoard.h (modified) * code/branches/kicklib2/src/external/ois/win32/Win32Mouse.cpp (modified) * code/branches/kicklib2/src/external/ois/win32/Win32Mouse.h (modified) * code/branches/kicklib2/src/external/ois/win32/Win32Prereqs.h (modified) * code/branches/kicklib2/src/libraries/core/Core.cc (modified) * code/branches/kicklib2/src/libraries/core/CorePrereqs.h (modified) * code/branches/kicklib2/src/libraries/core/DynLib.cc (modified) * code/branches/kicklib2/src/libraries/core/DynLib.h (modified) * code/branches/kicklib2/src/libraries/core/GUIManager.cc (modified) * code/branches/kicklib2/src/libraries/core/Game.cc (modified) * code/branches/kicklib2/src/libraries/core/GraphicsManager.cc (modified) * code/branches/kicklib2/src/libraries/core/Identifier.h (modified) * code/branches/kicklib2/src/libraries/core/OrxonoxClass.h (modified) * code/branches/kicklib2/src/libraries/core/PathConfig.cc (modified) * code/branches/kicklib2/src/libraries/core/Resource.cc (modified) * code/branches/kicklib2/src/libraries/core/Resource.h (modified) * code/branches/kicklib2/src/libraries/core/Super.h (modified) * code/branches/kicklib2/src/libraries/core/command/ArgumentCompletionFunctions.cc (modified) * code/branches/kicklib2/src/libraries/core/input/InputDevice.h (modified) * code/branches/kicklib2/src/libraries/core/input/InputManager.cc (modified) * code/branches/kicklib2/src/libraries/core/input/InputState.h (modified) * code/branches/kicklib2/src/libraries/network/LANDiscoverable.cc (modified) * code/branches/kicklib2/src/libraries/network/MasterServerComm.cc (modified) * code/branches/kicklib2/src/libraries/network/NetworkPrereqs.h (modified) * code/branches/kicklib2/src/libraries/tools/BulletConversions.h (modified) * code/branches/kicklib2/src/libraries/tools/ResourceCollection.cc (modified) * code/branches/kicklib2/src/libraries/tools/ToolsPrereqs.h (modified) * code/branches/kicklib2/src/libraries/util/Convert.h (modified) * code/branches/kicklib2/src/libraries/util/MathConvert.h (modified) * code/branches/kicklib2/src/libraries/util/SharedPtr.h (modified) * code/branches/kicklib2/src/libraries/util/SignalHandler.h (modified) * code/branches/kicklib2/src/libraries/util/UtilPrereqs.h (modified) * code/branches/kicklib2/src/modules/designtools/DesignToolsPrereqs.h (modified) * code/branches/kicklib2/src/modules/designtools/ScreenshotManager.cc (modified) * code/branches/kicklib2/src/modules/notifications/NotificationsPrereqs.h (modified) * code/branches/kicklib2/src/modules/objects/ObjectsPrereqs.h (modified) * code/branches/kicklib2/src/modules/overlays/OverlaysPrereqs.h (modified) * code/branches/kicklib2/src/modules/pickup/PickupPrereqs.h (modified) * code/branches/kicklib2/src/modules/pong/PongPrereqs.h (modified) * code/branches/kicklib2/src/modules/questsystem/QuestEffect.cc (modified) * code/branches/kicklib2/src/modules/questsystem/QuestEffectBeacon.cc (modified) * code/branches/kicklib2/src/modules/questsystem/QuestsystemPrereqs.h (modified) * code/branches/kicklib2/src/modules/questsystem/effects/AddReward.cc (modified) * code/branches/kicklib2/src/modules/weapons/WeaponsPrereqs.h (modified) * code/branches/kicklib2/src/orxonox-main.vcxproj.user.in (copied) * code/branches/kicklib2/src/orxonox/MoodManager.cc (modified) * code/branches/kicklib2/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/kicklib2/src/orxonox/sound/AmbientSound.cc (modified) * code/branches/kicklib2/src/orxonox/sound/SoundBuffer.cc (modified) * code/branches/kicklib2/src/orxonox/sound/SoundManager.cc (modified) * code/branches/kicklib2/src/orxonox/sound/WorldSound.cc (modified) Merged revisions 7978 - 8096 from kicklib to kicklib2. Thu, 21 Apr 2011 16:01:01 GMT rgrieder [8282] * code/branches/kicklib2 (copied) New kicklib branch to make final tests for Windows and Linux with all ... Fri, 16 Apr 2010 12:50:16 GMT rgrieder [6746] * code/trunk (modified) * code/trunk/cmake/LibraryConfigTardis.cmake (modified) * code/trunk/data/gui/configs/Falagard.xsd (deleted) * code/trunk/data/gui/configs/Font.xsd (deleted) * code/trunk/data/gui/configs/GUILayout.xsd (deleted) * code/trunk/data/gui/configs/GUIScheme.xsd (deleted) * code/trunk/data/gui/configs/Imageset.xsd (deleted) * code/trunk/data/gui/layouts/AudioMenu.layout (modified) * code/trunk/data/gui/layouts/CompositorDemo.layout (deleted) * code/trunk/data/gui/layouts/Console.wnd (deleted) * code/trunk/data/gui/layouts/ControlsMenu.layout (modified) * code/trunk/data/gui/layouts/CreditsMenu.layout (modified) * code/trunk/data/gui/layouts/CrowdDemo.layout (deleted) * code/trunk/data/gui/layouts/DecisionPopup.layout (modified) * code/trunk/data/gui/layouts/Demo7Windows.layout (deleted) * code/trunk/data/gui/layouts/Demo8.layout (deleted) * code/trunk/data/gui/layouts/DragDropDemo.layout (deleted) * code/trunk/data/gui/layouts/FontDemo.layout (deleted) * code/trunk/data/gui/layouts/GameplayMenu.layout (modified) * code/trunk/data/gui/layouts/GraphicsMenu.layout (modified) * code/trunk/data/gui/layouts/InGameMenu.layout (modified) * code/trunk/data/gui/layouts/InGameTest.layout (modified) * code/trunk/data/gui/layouts/InfoPopup.layout (modified) * code/trunk/data/gui/layouts/InstancingDemo.layout (deleted) * code/trunk/data/gui/layouts/KeyBindMenu.layout (modified) * code/trunk/data/gui/layouts/MainMenu.layout (modified) * code/trunk/data/gui/layouts/MainMenuBackground.layout (modified) * code/trunk/data/gui/layouts/MouseControlsMenu.layout (modified) * code/trunk/data/gui/layouts/MultiplayerMenu.layout (modified) * code/trunk/data/gui/layouts/MultiplayerOptionsMenu.layout (modified) * code/trunk/data/gui/layouts/PickupInventory.layout (modified) * code/trunk/data/gui/layouts/QuestGUI.layout (modified) * code/trunk/data/gui/layouts/SettingsMenu.layout (modified) * code/trunk/data/gui/layouts/SingleplayerMenu.layout (modified) * code/trunk/data/gui/layouts/TabControlDemo.layout (deleted) * code/trunk/data/gui/layouts/TabPage.layout (deleted) * code/trunk/data/gui/layouts/TabPage1.layout (deleted) * code/trunk/data/gui/layouts/TabPage2.layout (deleted) * code/trunk/data/gui/layouts/TextDemo.layout (deleted) * code/trunk/data/gui/layouts/TreeDemoTaharez.layout (deleted) * code/trunk/data/gui/layouts/VanillaConsole.layout (deleted) * code/trunk/data/gui/layouts/VanillaWindows.layout (deleted) * code/trunk/data/gui/layouts/cegui8.layout (deleted) * code/trunk/data/gui/layouts/facial.layout (deleted) * code/trunk/data/gui/layouts/ogregui.layout (deleted) * code/trunk/data/gui/layouts/shadows.layout (deleted) * code/trunk/data/gui/schemes/Demo8.scheme (deleted) * code/trunk/data/gui/schemes/Looks.txt (copied) * code/trunk/data/gui/schemes/OrxonoxGUIScheme.scheme (modified) * code/trunk/data/gui/schemes/SleekSpaceHUDWidgets.scheme (copied) * code/trunk/data/gui/schemes/SleekSpaceLook.scheme (copied) * code/trunk/data/gui/schemes/SleekSpaceMenuWidgets.scheme (copied) * code/trunk/data/gui/schemes/TaharezGreenHUDWidgets.scheme (copied) * code/trunk/data/gui/schemes/TaharezGreenLook.scheme (copied) * code/trunk/data/gui/schemes/TaharezGreenMenuWidgets.scheme (copied) * code/trunk/data/gui/schemes/TaharezHUDWidgets.scheme (copied) * code/trunk/data/gui/schemes/TaharezLook.scheme (modified) * code/trunk/data/gui/schemes/TaharezLookSkin.scheme (deleted) * code/trunk/data/gui/schemes/TaharezLookWidgetAliases.scheme (deleted) * code/trunk/data/gui/schemes/TaharezLookWidgets.scheme (deleted) * code/trunk/data/gui/schemes/TaharezMenuWidgets.scheme (copied) * code/trunk/data/gui/schemes/VanillaHUDWidgets.scheme (copied) * code/trunk/data/gui/schemes/VanillaLook.scheme (copied) * code/trunk/data/gui/schemes/VanillaMenuWidgets.scheme (copied) * code/trunk/data/gui/schemes/VanillaSkin.scheme (deleted) * code/trunk/data/gui/schemes/WindowsHUDWidgets.scheme (copied) * code/trunk/data/gui/schemes/WindowsLook.scheme (modified) * code/trunk/data/gui/schemes/WindowsLookWidgets.scheme (deleted) * code/trunk/data/gui/schemes/WindowsMenuWidgets.scheme (copied) * code/trunk/data/gui/scripts/AudioMenu.lua (modified) * code/trunk/data/gui/scripts/BasicGUI.lua (deleted) * code/trunk/data/gui/scripts/ControlsMenu.lua (modified) * code/trunk/data/gui/scripts/CreditsMenu.lua (modified) * code/trunk/data/gui/scripts/DecisionPopup.lua (modified) * code/trunk/data/gui/scripts/GUISheet.lua (copied) * code/trunk/data/gui/scripts/GUITools.lua (modified) * code/trunk/data/gui/scripts/GameplayMenu.lua (modified) * code/trunk/data/gui/scripts/GraphicsMenu.lua (modified) * code/trunk/data/gui/scripts/HUDSheet.lua (copied) * code/trunk/data/gui/scripts/InGameMenu.lua (modified) * code/trunk/data/gui/scripts/InfoPopup.lua (modified) * code/trunk/data/gui/scripts/InitialiseGUI.lua (modified) * code/trunk/data/gui/scripts/KeyBindMenu.lua (modified) * code/trunk/data/gui/scripts/MainMenu.lua (modified) * code/trunk/data/gui/scripts/MenuSheet.lua (copied) * code/trunk/data/gui/scripts/MouseControlsMenu.lua (modified) * code/trunk/data/gui/scripts/MultiplayerMenu.lua (modified) * code/trunk/data/gui/scripts/MultiplayerOptionsMenu.lua (modified) * code/trunk/data/gui/scripts/PickupInventory.lua (modified) * code/trunk/data/gui/scripts/QuestGUI.lua (modified) * code/trunk/data/gui/scripts/SettingsMenu.lua (modified) * code/trunk/data/gui/scripts/SheetManager.lua (copied) * code/trunk/data/gui/scripts/SingleplayerMenu.lua (modified) * code/trunk/data/lua/Debugger.lua (copied) * code/trunk/data/lua/LuaStateInit.lua (modified) * code/trunk/data/lua/Strict.lua (copied) * code/trunk/data/lua/Tools.lua (copied) * code/trunk/src/libraries/core/Core.cc (modified) * code/trunk/src/libraries/core/Core.h (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/GUIManager.h (modified) * code/trunk/src/libraries/core/Game.h (modified) * code/trunk/src/libraries/core/IOConsole.cc (modified) * code/trunk/src/libraries/core/IOConsole.h (modified) * code/trunk/src/libraries/core/LuaState.cc (modified) * code/trunk/src/libraries/core/LuaState.h (modified) * code/trunk/src/libraries/core/Resource.cc (modified) * code/trunk/src/libraries/core/Resource.h (modified) * code/trunk/src/libraries/core/Template.cc (modified) * code/trunk/src/libraries/core/input/InputDevice.h (modified) * code/trunk/src/libraries/core/input/InputHandler.h (modified) * code/trunk/src/libraries/core/input/InputManager.cc (modified) * code/trunk/src/libraries/core/input/InputManager.h (modified) * code/trunk/src/libraries/core/input/InputPrereqs.h (modified) * code/trunk/src/libraries/core/input/InputState.cc (modified) * code/trunk/src/libraries/core/input/InputState.h (modified) * code/trunk/src/libraries/network/TrafficControl.h (modified) * code/trunk/src/libraries/util/Serialise.h (modified) * code/trunk/src/libraries/util/Singleton.h (modified) * code/trunk/src/libraries/util/TriBool.h (copied) * code/trunk/src/modules/pickup/PickupManager.cc (modified) * code/trunk/src/modules/questsystem/QuestGUI.cc (modified) * code/trunk/src/modules/questsystem/QuestGUINode.cc (modified) * code/trunk/src/orxonox/CameraManager.h (modified) * code/trunk/src/orxonox/Level.cc (modified) * code/trunk/src/orxonox/LevelManager.h (modified) * code/trunk/src/orxonox/PlayerManager.cc (modified) * code/trunk/src/orxonox/gamestates/GSLevel.cc (modified) * code/trunk/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/trunk/src/orxonox/gamestates/GSMainMenu.h (modified) * code/trunk/src/orxonox/overlays/CMakeLists.txt (modified) * code/trunk/src/orxonox/overlays/GUISheet.cc (copied) * code/trunk/src/orxonox/overlays/GUISheet.h (copied) Merged gamestates2 branch back to trunk. This brings in some heavy ...