[Orxonox-commit 2358] r7073 - in code/branches/presentation3: . cmake data/levels data/levels/includes data/levels/templates data/overlays src/libraries/tools src/libraries/tools/bsp src/orxonox/controllers src/orxonox/worldentities src/orxonox/worldentities/pawns

[Fabian Landau]

Author: landauf
Date: 2010-06-02 00:02:50 +0200 (Wed, 02 Jun 2010)
New Revision: 7073

Added:
    code/branches/presentation3/data/levels/fps_test.oxw
    code/branches/presentation3/data/levels/includes/weaponsettings_fps.oxi
    code/branches/presentation3/data/levels/presentation_FS10.oxw
    code/branches/presentation3/data/levels/presentation_FS10_ed.oxw
    code/branches/presentation3/data/levels/templates/fps.oxt
    code/branches/presentation3/data/overlays/hudtamplates_fps.oxo
    code/branches/presentation3/src/libraries/tools/bsp/
    code/branches/presentation3/src/libraries/tools/bsp/CMakeLists.txt
    code/branches/presentation3/src/libraries/tools/bsp/DemoApp.cpp
    code/branches/presentation3/src/libraries/tools/bsp/DemoApp.hpp
    code/branches/presentation3/src/libraries/tools/bsp/ExampleApplication.h
 
code/branches/presentation3/src/libraries/tools/bsp/ExampleFrameListener.h
    code/branches/presentation3/src/libraries/tools/bsp/OgreFramework.cpp
    code/branches/presentation3/src/libraries/tools/bsp/OgreFramework.hpp
 
code/branches/presentation3/src/libraries/tools/bsp/OgreGpuCommandBufferFlush.cpp
 
code/branches/presentation3/src/libraries/tools/bsp/OgreGpuCommandBufferFlush.h
    code/branches/presentation3/src/libraries/tools/bsp/Q3Map.cpp
    code/branches/presentation3/src/libraries/tools/bsp/Q3Map.h
    code/branches/presentation3/src/libraries/tools/bsp/Q3Map_Bezier.cpp
    code/branches/presentation3/src/libraries/tools/bsp/Q3Map_Bezier.h
    code/branches/presentation3/src/libraries/tools/bsp/Q3Map_BspVertex.cpp
    code/branches/presentation3/src/libraries/tools/bsp/Q3Map_BspVertex.h
    code/branches/presentation3/src/libraries/tools/bsp/Q3Map_misc.h
    code/branches/presentation3/src/orxonox/worldentities/pawns/FpsPlayer.cc
    code/branches/presentation3/src/orxonox/worldentities/pawns/FpsPlayer.h
Removed:
    code/branches/presentation3/src/libraries/tools/bsp/CMakeLists.txt
    code/branches/presentation3/src/libraries/tools/bsp/DemoApp.cpp
    code/branches/presentation3/src/libraries/tools/bsp/DemoApp.hpp
    code/branches/presentation3/src/libraries/tools/bsp/ExampleApplication.h
 
code/branches/presentation3/src/libraries/tools/bsp/ExampleFrameListener.h
    code/branches/presentation3/src/libraries/tools/bsp/OgreFramework.cpp
    code/branches/presentation3/src/libraries/tools/bsp/OgreFramework.hpp
 
code/branches/presentation3/src/libraries/tools/bsp/OgreGpuCommandBufferFlush.cpp
 
code/branches/presentation3/src/libraries/tools/bsp/OgreGpuCommandBufferFlush.h
    code/branches/presentation3/src/libraries/tools/bsp/Q3Map.cpp
    code/branches/presentation3/src/libraries/tools/bsp/Q3Map.h
    code/branches/presentation3/src/libraries/tools/bsp/Q3Map_Bezier.cpp
    code/branches/presentation3/src/libraries/tools/bsp/Q3Map_Bezier.h
    code/branches/presentation3/src/libraries/tools/bsp/Q3Map_BspVertex.cpp
    code/branches/presentation3/src/libraries/tools/bsp/Q3Map_BspVertex.h
    code/branches/presentation3/src/libraries/tools/bsp/Q3Map_misc.h
Modified:
    code/branches/presentation3/
    code/branches/presentation3/cmake/LibraryConfig.cmake
    code/branches/presentation3/src/libraries/tools/CMakeLists.txt
 
code/branches/presentation3/src/orxonox/controllers/NewHumanController.cc
 
code/branches/presentation3/src/orxonox/worldentities/ControllableEntity.h
 
code/branches/presentation3/src/orxonox/worldentities/pawns/CMakeLists.txt
    code/branches/presentation3/src/orxonox/worldentities/pawns/Pawn.cc
    code/branches/presentation3/src/orxonox/worldentities/pawns/Pawn.h
Log:
merged fps branch to presentation3