#
# ChangeLog for code/trunk/bin
#
# Generated by Trac 1.0.9
# Apr 28, 2024, 11:40:42 PM

Thu, 22 May 2008 14:15:26 GMT FelixSchulthess [1376]
	* code/trunk/bin/keybindings.ini (modified)
	* code/trunk/bin/levels/sample.oxw (modified)

	modified level file


Thu, 22 May 2008 13:57:27 GMT FelixSchulthess [1374]
	* code/trunk/bin/keybindings.ini (modified)
	* code/trunk/src/orxonox/Orxonox.cc (modified)
	* code/trunk/src/orxonox/hud/HUD.cc (modified)
	* code/trunk/src/orxonox/hud/HUD.h (modified)

	added fps counter


Thu, 22 May 2008 13:26:05 GMT FelixSchulthess [1372]
	* code/trunk/bin/keybindings.ini (modified)

	added keybinding tab for radar cycle


Thu, 22 May 2008 13:03:14 GMT rgrieder [1364]
	* code/trunk/bin/keybindings.ini (modified)

	changed line endings in keybindings.ini


Thu, 22 May 2008 12:56:48 GMT scheusso [1362]
	* code/trunk/bin/keybindings.ini (modified)
	* code/trunk/bin/levels/sample.oxw (modified)
	* code/trunk/src/orxonox/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/Orxonox.cc (modified)
	* code/trunk/src/orxonox/console/InGameConsole.cc (modified)
	* code/trunk/src/orxonox/hud/BarOverlayElement.cc (copied)
	* code/trunk/src/orxonox/hud/BarOverlayElement.cc~ (copied)
	* code/trunk/src/orxonox/hud/BarOverlayElement.h (copied)
	* code/trunk/src/orxonox/hud/BarOverlayElement.h~ (copied)
	* code/trunk/src/orxonox/hud/HUD.cc (modified)
	* code/trunk/src/orxonox/hud/HUD.h (modified)
	* code/trunk/src/orxonox/hud/OverlayElementFactories.h (copied)
	* code/trunk/src/orxonox/hud/OverlayElementFactories.h~ (copied)
	* code/trunk/src/orxonox/hud/RadarObject.cc (copied)
	* code/trunk/src/orxonox/hud/RadarObject.h (copied)
	* code/trunk/src/orxonox/hud/RadarOverlayElement.cc (copied)
	* code/trunk/src/orxonox/hud/RadarOverlayElement.cc~ (copied)
	* code/trunk/src/orxonox/hud/RadarOverlayElement.h (copied)
	* code/trunk/src/orxonox/hud/RadarOverlayElement.h~ (copied)
	* code/trunk/src/orxonox/objects/SpaceShip.cc (modified)
	* code/trunk/src/orxonox/objects/SpaceShip.h (modified)

	merged hud3 branch into trunk and changed camera orientation


Wed, 21 May 2008 19:07:08 GMT rgrieder [1349]
	* code/trunk/bin/keybindings.ini (modified)
	* code/trunk/src/core/CommandExecutor.cc (modified)
	* code/trunk/src/core/CommandExecutor.h (modified)
	* code/trunk/src/core/CorePrereqs.h (modified)
	* code/trunk/src/core/Executor.cc (modified)
	* code/trunk/src/core/Executor.h (modified)
	* code/trunk/src/core/InputBuffer.cc (modified)
	* code/trunk/src/core/InputBuffer.h (modified)
	* code/trunk/src/core/InputHandler.cc (modified)
	* code/trunk/src/core/InputHandler.h (modified)
	* code/trunk/src/core/InputInterfaces.h (modified)
	* code/trunk/src/core/InputManager.cc (modified)
	* code/trunk/src/core/InputManager.h (modified)
	* code/trunk/src/core/SignalHandler.cc (modified)
	* code/trunk/src/ois/OISJoyStick.cpp (modified)
	* code/trunk/src/ois/OISJoyStick.h (modified)
	* code/trunk/src/ois/OISKeyboard.cpp (modified)
	* code/trunk/src/ois/OISKeyboard.h (modified)
	* code/trunk/src/ois/OISMouse.h (modified)
	* code/trunk/src/ois/OISObject.h (modified)
	* code/trunk/src/ois/linux/LinuxKeyboard.cpp (modified)
	* code/trunk/src/ois/linux/LinuxKeyboard.h (modified)
	* code/trunk/src/ois/mac/MacKeyboard.cpp (modified)
	* code/trunk/src/ois/mac/MacKeyboard.h (modified)
	* code/trunk/src/ois/win32/Win32JoyStick.cpp (modified)
	* code/trunk/src/ois/win32/Win32KeyBoard.cpp (modified)
	* code/trunk/src/ois/win32/Win32KeyBoard.h (modified)
	* code/trunk/src/orxonox/GraphicsEngine.cc (modified)
	* code/trunk/src/orxonox/Orxonox.cc (modified)
	* code/trunk/src/orxonox/objects/SpaceShip.cc (modified)
	* code/trunk/src/orxonox/objects/SpaceShip.h (modified)
	* code/trunk/src/util/Math.h (modified)
	* code/trunk/src/util/SubString.cc (modified)
	* code/trunk/src/util/SubString.h (modified)

	- merged input branch back to trunk


Thu, 15 May 2008 15:44:55 GMT scheusso [1293]
	* code/trunk/CMakeLists.txt (modified)
	* code/trunk/TODO (copied)
	* code/trunk/bin/keybindings.ini (modified)
	* code/trunk/bin/levels/sample.oxw (modified)
	* code/trunk/bin/ogre.cfg-init (modified)
	* code/trunk/bin/run-script (modified)
	* code/trunk/cmake/FindBoost.cmake (modified)
	* code/trunk/src/core/BaseObject.cc (modified)
	* code/trunk/src/core/CommandExecutor.h (modified)
	* code/trunk/src/core/CoreIncludes.h (modified)
	* code/trunk/src/core/CorePrereqs.h (modified)
	* code/trunk/src/core/Debug.h (modified)
	* code/trunk/src/core/Error.cc (modified)
	* code/trunk/src/core/Error.h (modified)
	* code/trunk/src/core/InputBuffer.cc (modified)
	* code/trunk/src/core/InputBuffer.h (modified)
	* code/trunk/src/core/InputHandler.cc (modified)
	* code/trunk/src/core/InputHandler.h (modified)
	* code/trunk/src/core/InputInterfaces.h (copied)
	* code/trunk/src/core/InputManager.cc (modified)
	* code/trunk/src/core/InputManager.h (modified)
	* code/trunk/src/core/Namespace.cc (modified)
	* code/trunk/src/core/OrxonoxClass.cc (modified)
	* code/trunk/src/core/SignalHandler.cc (modified)
	* code/trunk/src/core/SignalHandler.h (modified)
	* code/trunk/src/core/Tickable.cc (modified)
	* code/trunk/src/core/Tickable.h (modified)
	* code/trunk/src/network (copied)
	* code/trunk/src/network/CMakeLists.txt (copied)
	* code/trunk/src/network/Client.cc (copied)
	* code/trunk/src/network/Client.h (copied)
	* code/trunk/src/network/ClientConnection.cc (copied)
	* code/trunk/src/network/ClientConnection.h (copied)
	* code/trunk/src/network/ClientInformation.cc (copied)
	* code/trunk/src/network/ClientInformation.h (copied)
	* code/trunk/src/network/ConnectionManager.cc (copied)
	* code/trunk/src/network/ConnectionManager.h (copied)
	* code/trunk/src/network/GameStateClient.cc (copied)
	* code/trunk/src/network/GameStateClient.h (copied)
	* code/trunk/src/network/GameStateManager.cc (copied)
	* code/trunk/src/network/GameStateManager.h (copied)
	* code/trunk/src/network/Makefile.norm (copied)
	* code/trunk/src/network/Makefile.tardis (copied)
	* code/trunk/src/network/Makefile.test (copied)
	* code/trunk/src/network/NetworkPrereqs.h (copied)
	* code/trunk/src/network/PacketBuffer.cc (copied)
	* code/trunk/src/network/PacketBuffer.h (copied)
	* code/trunk/src/network/PacketDecoder.cc (copied)
	* code/trunk/src/network/PacketGenerator.cc (copied)
	* code/trunk/src/network/PacketManager.h (copied)
	* code/trunk/src/network/PacketTypes.h (copied)
	* code/trunk/src/network/Server.cc (copied)
	* code/trunk/src/network/Server.h (copied)
	* code/trunk/src/network/Synchronisable.cc (copied)
	* code/trunk/src/network/Synchronisable.h (copied)
	* code/trunk/src/network/TODO (copied)
	* code/trunk/src/network/diffTest.cc (copied)
	* code/trunk/src/network/dummyclient.cc (copied)
	* code/trunk/src/network/dummyclient2.cc (copied)
	* code/trunk/src/network/dummyclient3.cc (copied)
	* code/trunk/src/network/dummyclient4.cc (copied)
	* code/trunk/src/network/dummyserver.cc (copied)
	* code/trunk/src/network/dummyserver3.cc (copied)
	* code/trunk/src/network/dummyserver4.cc (copied)
	* code/trunk/src/orxonox/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/GraphicsEngine.cc (modified)
	* code/trunk/src/orxonox/GraphicsEngine.h (modified)
	* code/trunk/src/orxonox/Main.cc (modified)
	* code/trunk/src/orxonox/Orxonox.cc (modified)
	* code/trunk/src/orxonox/Orxonox.h (modified)
	* code/trunk/src/orxonox/OrxonoxPlatform.h (modified)
	* code/trunk/src/orxonox/console/InGameConsole.cc (modified)
	* code/trunk/src/orxonox/objects/Ambient.cc (modified)
	* code/trunk/src/orxonox/objects/Ambient.h (modified)
	* code/trunk/src/orxonox/objects/Camera.cc (modified)
	* code/trunk/src/orxonox/objects/Camera.h (modified)
	* code/trunk/src/orxonox/objects/CameraHandler.cc (copied)
	* code/trunk/src/orxonox/objects/CameraHandler.h (copied)
	* code/trunk/src/orxonox/objects/Explosion.cc (modified)
	* code/trunk/src/orxonox/objects/Model.cc (modified)
	* code/trunk/src/orxonox/objects/Model.h (modified)
	* code/trunk/src/orxonox/objects/NPC.cc (modified)
	* code/trunk/src/orxonox/objects/NPC.h (modified)
	* code/trunk/src/orxonox/objects/Projectile.cc (modified)
	* code/trunk/src/orxonox/objects/Skybox.cc (modified)
	* code/trunk/src/orxonox/objects/Skybox.h (modified)
	* code/trunk/src/orxonox/objects/SpaceShip.cc (modified)
	* code/trunk/src/orxonox/objects/SpaceShip.h (modified)
	* code/trunk/src/orxonox/objects/WorldEntity.cc (modified)
	* code/trunk/src/orxonox/particle/ParticleInterface.cc (modified)
	* code/trunk/src/orxonox/tools/Timer.cc (modified)
	* code/trunk/visual_studio/base_properties_debug.vsprops (modified)
	* code/trunk/visual_studio/network_properties.vsprops (modified)
	* code/trunk/visual_studio/orxonox_properties.vsprops (modified)
	* code/trunk/visual_studio/vc8/core.vcproj (modified)
	* code/trunk/visual_studio/vc8/network.vcproj (modified)
	* code/trunk/visual_studio/vc8/ois.vcproj (modified)
	* code/trunk/visual_studio/vc8/orxonox.vcproj (modified)

	merged changes from input & camera & network branch into trunk


Fri, 02 May 2008 20:44:57 GMT rgrieder [1219]
	* code/trunk/CMakeLists.txt (modified)
	* code/trunk/bin/keybindings.ini (copied)
	* code/trunk/src/CMakeLists.txt (modified)
	* code/trunk/src/asylum/core (copied)
	* code/trunk/src/asylum/core/InputEvent.h (copied)
	* code/trunk/src/asylum/core/InputEventListener.cc (copied)
	* code/trunk/src/asylum/core/InputEventListener.h (copied)
	* code/trunk/src/core/CMakeLists.txt (modified)
	* code/trunk/src/core/CorePrereqs.h (modified)
	* code/trunk/src/core/Debug.h (modified)
	* code/trunk/src/core/InputBuffer.cc (modified)
	* code/trunk/src/core/InputBuffer.h (modified)
	* code/trunk/src/core/InputEvent.h (deleted)
	* code/trunk/src/core/InputEventListener.cc (deleted)
	* code/trunk/src/core/InputEventListener.h (deleted)
	* code/trunk/src/core/InputHandler.cc (modified)
	* code/trunk/src/core/InputHandler.h (modified)
	* code/trunk/src/core/InputManager.cc (modified)
	* code/trunk/src/core/InputManager.h (modified)
	* code/trunk/src/ois (copied)
	* code/trunk/src/ois/CMakeLists.txt (copied)
	* code/trunk/src/ois/OIS.h (copied)
	* code/trunk/src/ois/OISConfig.h (copied)
	* code/trunk/src/ois/OISEffect.cpp (copied)
	* code/trunk/src/ois/OISEffect.h (copied)
	* code/trunk/src/ois/OISEvents.h (copied)
	* code/trunk/src/ois/OISException.cpp (copied)
	* code/trunk/src/ois/OISException.h (copied)
	* code/trunk/src/ois/OISFactoryCreator.h (copied)
	* code/trunk/src/ois/OISForceFeedback.cpp (copied)
	* code/trunk/src/ois/OISForceFeedback.h (copied)
	* code/trunk/src/ois/OISInputManager.cpp (copied)
	* code/trunk/src/ois/OISInputManager.h (copied)
	* code/trunk/src/ois/OISInterface.h (copied)
	* code/trunk/src/ois/OISJoyStick.cpp (copied)
	* code/trunk/src/ois/OISJoyStick.h (copied)
	* code/trunk/src/ois/OISKeyboard.cpp (copied)
	* code/trunk/src/ois/OISKeyboard.h (copied)
	* code/trunk/src/ois/OISMouse.h (copied)
	* code/trunk/src/ois/OISObject.cpp (copied)
	* code/trunk/src/ois/OISObject.h (copied)
	* code/trunk/src/ois/OISPrereqs.h (copied)
	* code/trunk/src/ois/ReadMe.txt (copied)
	* code/trunk/src/ois/linux (copied)
	* code/trunk/src/ois/linux/EventHelpers.cpp (copied)
	* code/trunk/src/ois/linux/EventHelpers.h (copied)
	* code/trunk/src/ois/linux/LinuxForceFeedback.cpp (copied)
	* code/trunk/src/ois/linux/LinuxForceFeedback.h (copied)
	* code/trunk/src/ois/linux/LinuxInputManager.cpp (copied)
	* code/trunk/src/ois/linux/LinuxInputManager.h (copied)
	* code/trunk/src/ois/linux/LinuxJoyStickEvents.cpp (copied)
	* code/trunk/src/ois/linux/LinuxJoyStickEvents.h (copied)
	* code/trunk/src/ois/linux/LinuxKeyboard.cpp (copied)
	* code/trunk/src/ois/linux/LinuxKeyboard.h (copied)
	* code/trunk/src/ois/linux/LinuxMouse.cpp (copied)
	* code/trunk/src/ois/linux/LinuxMouse.h (copied)
	* code/trunk/src/ois/linux/LinuxPrereqs.h (copied)
	* code/trunk/src/ois/mac (copied)
	* code/trunk/src/ois/mac/MacHIDManager.cpp (copied)
	* code/trunk/src/ois/mac/MacHIDManager.h (copied)
	* code/trunk/src/ois/mac/MacHelpers.cpp (copied)
	* code/trunk/src/ois/mac/MacHelpers.h (copied)
	* code/trunk/src/ois/mac/MacInputManager.cpp (copied)
	* code/trunk/src/ois/mac/MacInputManager.h (copied)
	* code/trunk/src/ois/mac/MacKeyboard.cpp (copied)
	* code/trunk/src/ois/mac/MacKeyboard.h (copied)
	* code/trunk/src/ois/mac/MacMouse.cpp (copied)
	* code/trunk/src/ois/mac/MacMouse.h (copied)
	* code/trunk/src/ois/mac/MacPrereqs.h (copied)
	* code/trunk/src/ois/win32 (copied)
	* code/trunk/src/ois/win32/Win32ForceFeedback.cpp (copied)
	* code/trunk/src/ois/win32/Win32ForceFeedback.h (copied)
	* code/trunk/src/ois/win32/Win32InputManager.cpp (copied)
	* code/trunk/src/ois/win32/Win32InputManager.h (copied)
	* code/trunk/src/ois/win32/Win32JoyStick.cpp (copied)
	* code/trunk/src/ois/win32/Win32JoyStick.h (copied)
	* code/trunk/src/ois/win32/Win32KeyBoard.cpp (copied)
	* code/trunk/src/ois/win32/Win32KeyBoard.h (copied)
	* code/trunk/src/ois/win32/Win32Mouse.cpp (copied)
	* code/trunk/src/ois/win32/Win32Mouse.h (copied)
	* code/trunk/src/ois/win32/Win32Prereqs.h (copied)
	* code/trunk/src/orxonox/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/Orxonox.cc (modified)
	* code/trunk/src/orxonox/Orxonox.h (modified)
	* code/trunk/src/orxonox/OrxonoxStableHeaders.h (modified)
	* code/trunk/src/orxonox/objects/SpaceShip.cc (modified)
	* code/trunk/src/orxonox/objects/SpaceShip.h (modified)
	* code/trunk/src/util/String.cc (modified)
	* code/trunk/visual_studio/base_properties.vsprops (modified)
	* code/trunk/visual_studio/base_properties_release_sse.vsprops (deleted)
	* code/trunk/visual_studio/base_properties_release_sse2.vsprops (deleted)
	* code/trunk/visual_studio/core_properties.vsprops (modified)
	* code/trunk/visual_studio/loader_properties.vsprops (deleted)
	* code/trunk/visual_studio/orxonox_properties.vsprops (modified)
	* code/trunk/visual_studio/orxonox_vc8.sln (modified)
	* code/trunk/visual_studio/tolua++_properties.vsprops (deleted)
	* code/trunk/visual_studio/tolua_properties.vsprops (copied)
	* code/trunk/visual_studio/vc8/core.vcproj (modified)
	* code/trunk/visual_studio/vc8/ois.vcproj (copied)
	* code/trunk/visual_studio/vc8/orxonox.vcproj (modified)
	* code/trunk/visual_studio/vc8/tolua++.vcproj (deleted)
	* code/trunk/visual_studio/vc8/tolua.vcproj (copied)

	merged input branch back to trunk. Not yet tested on tardis


Sun, 20 Apr 2008 00:54:15 GMT landauf [1115]
	* code/trunk/CMakeLists.txt (modified)
	* code/trunk/bin/tolua-exec-script (deleted)
	* code/trunk/src/CMakeLists.txt (modified)
	* code/trunk/src/core/CMakeLists.txt (modified)
	* code/trunk/src/core/Script.cc (modified)
	* code/trunk/src/core/tolua (deleted)
	* code/trunk/src/tolua (moved)
	* code/trunk/src/tolua/CMakeLists.txt (modified)
	* code/trunk/src/tolua/tolua.pkg (copied)
	* code/trunk/src/util/CMakeLists.txt (modified)
	* code/trunk/tolua-build (deleted)
	* code/trunk/tolua-exec-script.bat (deleted)
	* code/trunk/tolua.cmake (deleted)

	tried to integrate the whole tolua-thing in proper cmake code


Thu, 17 Apr 2008 13:40:12 GMT bknecht [1102]
	* code/trunk/bin/levels/sample.oxw (modified)
	* code/trunk/src/core/Loader.cc (modified)
	* code/trunk/src/core/Script.cc (modified)
	* code/trunk/src/core/Script.h (modified)

	lua50 compatiple level code and loading, should work on tardis as ...


Thu, 17 Apr 2008 11:25:06 GMT rgrieder [1089]
	* code/trunk/bin/levels/sample.oxw (modified)
	* code/trunk/src/audio/AudioManager.cc (modified)
	* code/trunk/src/core/Debug.h (modified)
	* code/trunk/src/core/InputManager.cc (modified)
	* code/trunk/src/orxonox/Orxonox.cc (modified)
	* code/trunk/src/orxonox/Orxonox.h (modified)
	* code/trunk/visual_studio/base_properties_debug.vsprops (modified)
	* code/trunk/visual_studio/vc8/tolua++.vcproj (modified)

	- bugfix in audiomanager
	- added CCOUT(level): like COUT, but prints ...


Wed, 16 Apr 2008 20:04:17 GMT rgrieder [1086]
	* code/trunk/bin/levels/sample.oxw (modified)

	- commented lua section in sample.oxw (loader.cc has already been ...


Wed, 16 Apr 2008 20:00:56 GMT rgrieder [1085]
	* code/trunk/CMakeLists.txt (modified)
	* code/trunk/bin/levels/sample.oxw (modified)
	* code/trunk/src/core/Loader.cc (modified)
	* code/trunk/src/util/CMakeLists.txt (modified)

	stupid people should be punished...


Wed, 16 Apr 2008 19:22:50 GMT rgrieder [1084]
	* code/trunk/CMakeLists.txt (modified)
	* code/trunk/bin/levels/sample.oxw (modified)
	* code/trunk/src/core/CMakeLists.txt (modified)
	* code/trunk/src/core/InputManager.cc (modified)
	* code/trunk/src/core/InputManager.h (modified)
	* code/trunk/src/orxonox/Orxonox.cc (modified)
	* code/trunk/src/util/CMakeLists.txt (modified)
	* code/trunk/visual_studio/base_properties.vsprops (modified)
	* code/trunk/visual_studio/base_properties_debug.vsprops (modified)
	* code/trunk/visual_studio/core_properties.vsprops (modified)
	* code/trunk/visual_studio/network_properties.vsprops (modified)
	* code/trunk/visual_studio/orxonox_properties.vsprops (modified)
	* code/trunk/visual_studio/tolua++_properties.vsprops (modified)
	* code/trunk/visual_studio/util_properties.vsprops (modified)
	* code/trunk/visual_studio/vc8/core.vcproj (modified)
	* code/trunk/visual_studio/vc8/tolua++.vcproj (modified)

	- updated VC++ files for tolua
	- minor CMLs changes


Wed, 16 Apr 2008 08:05:37 GMT rgrieder [1076]
	* code/trunk/CMakeLists.txt (modified)
	* code/trunk/bin/tolua-exec-script (added)
	* code/trunk/cmake/FindLua.cmake (modified)
	* code/trunk/src/CMakeLists.txt (modified)
	* code/trunk/src/core/CMakeLists.txt (modified)
	* code/trunk/src/core/Script.cc (modified)
	* code/trunk/src/core/Script_clean.h (added)
	* code/trunk/src/core/ToLuaBind.cc (deleted)
	* code/trunk/src/core/ToLuaBind.h (deleted)
	* code/trunk/src/core/tolua (added)
	* code/trunk/src/core/tolua.pkg (deleted)
	* code/trunk/src/core/tolua/tolua.pkg (added)
	* code/trunk/src/util/CMakeLists.txt (modified)
	* code/trunk/src/util/tolua/CMakeLists.txt (modified)
	* code/trunk/tolua-build (added)

	two hours of Fuk is very 'enlighting', the whole thing works ...


Tue, 15 Apr 2008 10:28:45 GMT rgrieder [1069]
	* code/trunk/bin/disco.txt (modified)
	* code/trunk/src/audio/AudioPrereqs.h (modified)

	- bugfix with warning directives in AudioPrereqs.h


Mon, 14 Apr 2008 20:58:15 GMT rgrieder [1068]
	* code/trunk/bin/disco.txt (added)

	exec disco.txt   (console command)
	and you'll see the wonders of the core


Mon, 14 Apr 2008 14:17:11 GMT rgrieder [1061]
	* code/trunk/bin/plugins.cfg-init (modified)

	- Bugfix with plugins.cfg-init


Mon, 14 Apr 2008 01:42:49 GMT landauf [1052]
	* code/trunk/bin/levels/sample.oxw (modified)
	* code/trunk/bin/translation_german.lang (deleted)
	* code/trunk/src/CMakeLists.txt (modified)
	* code/trunk/src/asylum/orxonox/objects/Fighter.cc (modified)
	* code/trunk/src/asylum/orxonox/objects/Test.h (modified)
	* code/trunk/src/asylum/orxonox/objects/test2.cc (modified)
	* code/trunk/src/asylum/orxonox/objects/test3.cc (modified)
	* code/trunk/src/asylum/orxonox/objects/test3.h (modified)
	* code/trunk/src/orxonox/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/GraphicsEngine.cc (modified)
	* code/trunk/src/orxonox/Orxonox.cc (modified)
	* code/trunk/src/orxonox/Orxonox.h (modified)
	* code/trunk/src/orxonox/OrxonoxStableHeaders.h (modified)
	* code/trunk/src/orxonox/core/BaseObject.cc (modified)
	* code/trunk/src/orxonox/core/BaseObject.h (modified)
	* code/trunk/src/orxonox/core/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/core/ClassTreeMask.cc (modified)
	* code/trunk/src/orxonox/core/ClassTreeMask.h (modified)
	* code/trunk/src/orxonox/core/CommandExecutor.cc (copied)
	* code/trunk/src/orxonox/core/CommandExecutor.h (copied)
	* code/trunk/src/orxonox/core/ConfigFileManager.cc (copied)
	* code/trunk/src/orxonox/core/ConfigFileManager.h (copied)
	* code/trunk/src/orxonox/core/ConfigValueContainer.cc (modified)
	* code/trunk/src/orxonox/core/ConfigValueContainer.h (modified)
	* code/trunk/src/orxonox/core/ConfigValueIncludes.h (copied)
	* code/trunk/src/orxonox/core/ConsoleCommand.h (copied)
	* code/trunk/src/orxonox/core/CoreIncludes.h (modified)
	* code/trunk/src/orxonox/core/CorePrereqs.h (modified)
	* code/trunk/src/orxonox/core/CoreSettings.cc (copied)
	* code/trunk/src/orxonox/core/CoreSettings.h (copied)
	* code/trunk/src/orxonox/core/DebugLevel.cc (deleted)
	* code/trunk/src/orxonox/core/DebugLevel.h (deleted)
	* code/trunk/src/orxonox/core/Executor.cc (modified)
	* code/trunk/src/orxonox/core/Executor.h (modified)
	* code/trunk/src/orxonox/core/Functor.h (modified)
	* code/trunk/src/orxonox/core/Identifier.cc (modified)
	* code/trunk/src/orxonox/core/Identifier.h (modified)
	* code/trunk/src/orxonox/core/InputBuffer.cc (copied)
	* code/trunk/src/orxonox/core/InputBuffer.h (copied)
	* code/trunk/src/orxonox/core/InputHandler.cc (modified)
	* code/trunk/src/orxonox/core/Language.cc (modified)
	* code/trunk/src/orxonox/core/Language.h (modified)
	* code/trunk/src/orxonox/core/Loader.cc (modified)
	* code/trunk/src/orxonox/core/MetaObjectList.h (modified)
	* code/trunk/src/orxonox/core/Namespace.cc (copied)
	* code/trunk/src/orxonox/core/Namespace.h (copied)
	* code/trunk/src/orxonox/core/NamespaceNode.cc (copied)
	* code/trunk/src/orxonox/core/NamespaceNode.h (copied)
	* code/trunk/src/orxonox/core/OrxonoxClass.h (modified)
	* code/trunk/src/orxonox/core/OutputHandler.cc (modified)
	* code/trunk/src/orxonox/core/OutputHandler.h (modified)
	* code/trunk/src/orxonox/core/Tickable.cc (modified)
	* code/trunk/src/orxonox/core/XMLPort.cc (modified)
	* code/trunk/src/orxonox/core/XMLPort.h (modified)
	* code/trunk/src/orxonox/objects/Ambient.cc (modified)
	* code/trunk/src/orxonox/objects/Ambient.h (modified)
	* code/trunk/src/orxonox/objects/Explosion.cc (modified)
	* code/trunk/src/orxonox/objects/Model.cc (modified)
	* code/trunk/src/orxonox/objects/Model.h (modified)
	* code/trunk/src/orxonox/objects/Projectile.cc (modified)
	* code/trunk/src/orxonox/objects/Skybox.cc (modified)
	* code/trunk/src/orxonox/objects/Skybox.h (modified)
	* code/trunk/src/orxonox/objects/SpaceShip.cc (modified)
	* code/trunk/src/orxonox/objects/SpaceShip.h (modified)
	* code/trunk/src/orxonox/objects/WorldEntity.cc (modified)
	* code/trunk/src/orxonox/objects/WorldEntity.h (modified)
	* code/trunk/src/orxonox/tools/Timer.cc (modified)
	* code/trunk/src/orxonox/tools/Timer.h (modified)
	* code/trunk/src/util/CMakeLists.txt (modified)
	* code/trunk/src/util/Clipboard.cc (copied)
	* code/trunk/src/util/Clipboard.h (copied)
	* code/trunk/src/util/Convert.h (modified)
	* code/trunk/src/util/Math.h (modified)
	* code/trunk/src/util/MultiType.h (modified)
	* code/trunk/src/util/MultiTypeMath.cc (modified)
	* code/trunk/src/util/MultiTypeMath.h (modified)
	* code/trunk/src/util/MultiTypePrimitive.cc (modified)
	* code/trunk/src/util/MultiTypePrimitive.h (modified)
	* code/trunk/src/util/MultiTypeString.cc (modified)
	* code/trunk/src/util/MultiTypeString.h (modified)
	* code/trunk/src/util/String.cc (modified)
	* code/trunk/src/util/String.h (modified)
	* code/trunk/src/util/SubString.cc (modified)
	* code/trunk/src/util/SubString.h (modified)
	* code/trunk/src/util/UtilPrereqs.h (modified)
	* code/trunk/src/util/tinyxml/ticpp.h (modified)

	merged core2 back to trunk
	there might be some errors, wasn't able ...


Sat, 12 Apr 2008 14:08:29 GMT rgrieder [1032]
	* code/trunk/bin/levels/sample.oxw (modified)
	* code/trunk/src/asylum/orxonox/objects/Fighter.cc (moved)
	* code/trunk/src/asylum/orxonox/objects/Fighter.h (moved)
	* code/trunk/src/orxonox/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/GraphicsEngine.cc (modified)
	* code/trunk/src/orxonox/GraphicsEngine.h (modified)
	* code/trunk/src/orxonox/Orxonox.cc (modified)
	* code/trunk/src/orxonox/Orxonox.h (modified)
	* code/trunk/src/orxonox/OrxonoxPlatform.h (modified)
	* code/trunk/src/orxonox/OrxonoxStableHeaders.h (modified)
	* code/trunk/src/orxonox/objects/Ambient.cc (modified)
	* code/trunk/src/orxonox/objects/Camera.cc (modified)
	* code/trunk/src/orxonox/objects/Explosion.cc (modified)
	* code/trunk/src/orxonox/objects/Model.cc (modified)
	* code/trunk/src/orxonox/objects/Skybox.cc (modified)
	* code/trunk/src/orxonox/objects/SpaceShip.cc (modified)
	* code/trunk/src/orxonox/objects/WorldEntity.cc (modified)
	* code/trunk/src/orxonox/objects/weapon/BaseWeapon.cc (modified)
	* code/trunk/src/orxonox/tools/BillboardSet.cc (modified)
	* code/trunk/src/orxonox/tools/Light.cc (modified)
	* code/trunk/src/orxonox/tools/Mesh.cc (modified)
	* code/trunk/visual_studio/vc8/orxonox.vcproj (modified)

	- singletonized GraphicsEngine
	  --> Orxonox.h has to included only ...


Thu, 10 Apr 2008 15:35:49 GMT rgrieder [1024]
	* code/trunk/bin/resources.cfg (deleted)
	* code/trunk/src/CMakeLists.txt (modified)
	* code/trunk/src/asylum (copied)
	* code/trunk/src/asylum/audio (copied)
	* code/trunk/src/asylum/audio/_AudioObject.cc (copied)
	* code/trunk/src/asylum/loader (copied)
	* code/trunk/src/asylum/loader/CMakeLists.txt (copied)
	* code/trunk/src/asylum/loader/LevelLoader.cc (copied)
	* code/trunk/src/asylum/loader/LevelLoader.h (copied)
	* code/trunk/src/asylum/loader/LoaderPrereqs.h (copied)
	* code/trunk/src/asylum/network (copied)
	* code/trunk/src/asylum/network/PacketBufferTestExt.cc (copied)
	* code/trunk/src/asylum/orxonox (copied)
	* code/trunk/src/asylum/orxonox/AIClass.h (copied)
	* code/trunk/src/asylum/orxonox/Arrival.h (copied)
	* code/trunk/src/asylum/orxonox/Flocking.h (copied)
	* code/trunk/src/asylum/orxonox/InputManager.cc (copied)
	* code/trunk/src/asylum/orxonox/InputManager.h (copied)
	* code/trunk/src/asylum/orxonox/SpaceshipSteering.cc (copied)
	* code/trunk/src/asylum/orxonox/SpaceshipSteering.h (copied)
	* code/trunk/src/asylum/orxonox/objects (copied)
	* code/trunk/src/asylum/orxonox/objects/SpaceshipSteeringObject.cc (copied)
	* code/trunk/src/asylum/orxonox/objects/SpaceshipSteeringObject.h (copied)
	* code/trunk/src/asylum/orxonox/objects/Test.h (copied)
	* code/trunk/src/asylum/orxonox/objects/test1.cc (copied)
	* code/trunk/src/asylum/orxonox/objects/test1.h (copied)
	* code/trunk/src/asylum/orxonox/objects/test2.cc (copied)
	* code/trunk/src/asylum/orxonox/objects/test2.h (copied)
	* code/trunk/src/asylum/orxonox/objects/test3.cc (copied)
	* code/trunk/src/asylum/orxonox/objects/test3.h (copied)
	* code/trunk/src/audio/AudioPrereqs.h (modified)
	* code/trunk/src/audio/_AudioObject.cc (deleted)
	* code/trunk/src/loader (deleted)
	* code/trunk/src/network/NetworkPrereqs.h (modified)
	* code/trunk/src/network/PacketBufferTestExt.cc (deleted)
	* code/trunk/src/orxonox/AIClass.h (deleted)
	* code/trunk/src/orxonox/Arrival.h (deleted)
	* code/trunk/src/orxonox/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/Flocking.h (deleted)
	* code/trunk/src/orxonox/GraphicsEngine.cc (modified)
	* code/trunk/src/orxonox/GraphicsEngine.h (modified)
	* code/trunk/src/orxonox/InputEvent.h (deleted)
	* code/trunk/src/orxonox/InputEventListener.cc (deleted)
	* code/trunk/src/orxonox/InputEventListener.h (deleted)
	* code/trunk/src/orxonox/InputHandler.cc (deleted)
	* code/trunk/src/orxonox/InputHandler.h (deleted)
	* code/trunk/src/orxonox/InputManager.cc (deleted)
	* code/trunk/src/orxonox/InputManager.h (deleted)
	* code/trunk/src/orxonox/Main.cc (modified)
	* code/trunk/src/orxonox/Orxonox.cc (modified)
	* code/trunk/src/orxonox/Orxonox.h (modified)
	* code/trunk/src/orxonox/OrxonoxPlatform.h (modified)
	* code/trunk/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/trunk/src/orxonox/OrxonoxStableHeaders.h (modified)
	* code/trunk/src/orxonox/SpaceshipSteering.cc (deleted)
	* code/trunk/src/orxonox/SpaceshipSteering.h (deleted)
	* code/trunk/src/orxonox/core/ArgReader.cc (deleted)
	* code/trunk/src/orxonox/core/ArgReader.h (deleted)
	* code/trunk/src/orxonox/core/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/core/CorePrereqs.h (modified)
	* code/trunk/src/orxonox/core/Factory.h (modified)
	* code/trunk/src/orxonox/core/Identifier.h (modified)
	* code/trunk/src/orxonox/core/InputEvent.h (copied)
	* code/trunk/src/orxonox/core/InputEventListener.cc (copied)
	* code/trunk/src/orxonox/core/InputEventListener.h (copied)
	* code/trunk/src/orxonox/core/InputHandler.cc (copied)
	* code/trunk/src/orxonox/core/InputHandler.h (copied)
	* code/trunk/src/orxonox/core/InputManager.cc (copied)
	* code/trunk/src/orxonox/core/InputManager.h (copied)
	* code/trunk/src/orxonox/core/MetaObjectList.h (modified)
	* code/trunk/src/orxonox/core/Script.cc (modified)
	* code/trunk/src/orxonox/core/Tickable.h (modified)
	* code/trunk/src/orxonox/objects/Fighter.cc (modified)
	* code/trunk/src/orxonox/objects/Fighter.h (modified)
	* code/trunk/src/orxonox/objects/Model.h (modified)
	* code/trunk/src/orxonox/objects/NPC.h (modified)
	* code/trunk/src/orxonox/objects/Projectile.h (modified)
	* code/trunk/src/orxonox/objects/Skybox.h (modified)
	* code/trunk/src/orxonox/objects/SpaceShip.cc (modified)
	* code/trunk/src/orxonox/objects/SpaceShip.h (modified)
	* code/trunk/src/orxonox/objects/SpaceshipSteeringObject.cc (deleted)
	* code/trunk/src/orxonox/objects/SpaceshipSteeringObject.h (deleted)
	* code/trunk/src/orxonox/objects/Test.h (deleted)
	* code/trunk/src/orxonox/objects/test1.cc (deleted)
	* code/trunk/src/orxonox/objects/test1.h (deleted)
	* code/trunk/src/orxonox/objects/test2.cc (deleted)
	* code/trunk/src/orxonox/objects/test2.h (deleted)
	* code/trunk/src/orxonox/objects/test3.cc (deleted)
	* code/trunk/src/orxonox/objects/test3.h (deleted)
	* code/trunk/src/util/ArgReader.cc (copied)
	* code/trunk/src/util/ArgReader.h (copied)
	* code/trunk/src/util/CMakeLists.txt (modified)
	* code/trunk/src/util/UtilPrereqs.h (modified)
	* code/trunk/visual_studio/audio_properties.vsprops (modified)
	* code/trunk/visual_studio/base_properties.vsprops (modified)
	* code/trunk/visual_studio/base_properties_debug.vsprops (modified)
	* code/trunk/visual_studio/base_properties_release.vsprops (modified)
	* code/trunk/visual_studio/base_properties_release_sse.vsprops (modified)
	* code/trunk/visual_studio/base_properties_release_sse2.vsprops (modified)
	* code/trunk/visual_studio/core_properties.vsprops (modified)
	* code/trunk/visual_studio/network_properties.vsprops (modified)
	* code/trunk/visual_studio/orxonox_properties.vsprops (modified)
	* code/trunk/visual_studio/orxonox_vc8.sln (modified)
	* code/trunk/visual_studio/tixml_properties.vsprops (modified)
	* code/trunk/visual_studio/tolua++_properties.vsprops (copied)
	* code/trunk/visual_studio/vc8/audio.vcproj (modified)
	* code/trunk/visual_studio/vc8/core.vcproj (modified)
	* code/trunk/visual_studio/vc8/loader.vcproj (deleted)
	* code/trunk/visual_studio/vc8/network.vcproj (modified)
	* code/trunk/visual_studio/vc8/orxonox.vcproj (modified)
	* code/trunk/visual_studio/vc8/tixml.vcproj (modified)
	* code/trunk/visual_studio/vc8/tolua++.vcproj (copied)
	* code/trunk/visual_studio/vc8/util.vcproj (modified)

	merged input back into trunk
	note: I have created an asylum with ...


Thu, 10 Apr 2008 15:03:34 GMT bknecht [1021]
	* code/trunk/CMakeLists.txt (modified)
	* code/trunk/Media (deleted)
	* code/trunk/bin/audio (deleted)
	* code/trunk/bin/levels/sample.oxw (modified)
	* code/trunk/bin/plugins.cfg-init (modified)
	* code/trunk/cmake/FindLua.cmake (copied)
	* code/trunk/src/audio/AudioManager.cc (modified)
	* code/trunk/src/audio/AudioManager.h (modified)
	* code/trunk/src/network/Client.cc (modified)
	* code/trunk/src/network/Client.h (modified)
	* code/trunk/src/network/ClientConnection.cc (modified)
	* code/trunk/src/network/ConnectionManager.cc (modified)
	* code/trunk/src/network/ConnectionManager.h (modified)
	* code/trunk/src/network/GameStateClient.cc (modified)
	* code/trunk/src/network/GameStateClient.h (modified)
	* code/trunk/src/network/GameStateManager.cc (modified)
	* code/trunk/src/network/GameStateManager.h (modified)
	* code/trunk/src/network/NetworkPrereqs.h (modified)
	* code/trunk/src/network/PacketDecoder.cc (modified)
	* code/trunk/src/network/PacketGenerator.cc (modified)
	* code/trunk/src/network/PacketManager.h (modified)
	* code/trunk/src/network/Server.cc (modified)
	* code/trunk/src/network/Server.h (modified)
	* code/trunk/src/network/Synchronisable.h (modified)
	* code/trunk/src/network/dummyclient3.cc (modified)
	* code/trunk/src/orxonox/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/GraphicsEngine.cc (modified)
	* code/trunk/src/orxonox/GraphicsEngine.h (modified)
	* code/trunk/src/orxonox/InputEvent.h (copied)
	* code/trunk/src/orxonox/InputEventListener.cc (copied)
	* code/trunk/src/orxonox/InputEventListener.h (copied)
	* code/trunk/src/orxonox/InputHandler.cc (copied)
	* code/trunk/src/orxonox/InputHandler.h (copied)
	* code/trunk/src/orxonox/Main.cc (modified)
	* code/trunk/src/orxonox/Orxonox.cc (modified)
	* code/trunk/src/orxonox/Orxonox.h (modified)
	* code/trunk/src/orxonox/OrxonoxPlatform.h (modified)
	* code/trunk/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/trunk/src/orxonox/OrxonoxStableHeaders.h (modified)
	* code/trunk/src/orxonox/PrecompiledHeaderFiles.cc (modified)
	* code/trunk/src/orxonox/core/BaseObject.cc (modified)
	* code/trunk/src/orxonox/core/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/core/ClassTreeMask.cc (modified)
	* code/trunk/src/orxonox/core/DebugLevel.cc (modified)
	* code/trunk/src/orxonox/core/Loader.cc (modified)
	* code/trunk/src/orxonox/core/Script.cc (copied)
	* code/trunk/src/orxonox/core/Script.h (copied)
	* code/trunk/src/orxonox/core/Tickable.cc (copied)
	* code/trunk/src/orxonox/core/Tickable.h (copied)
	* code/trunk/src/orxonox/objects/Camera.cc (modified)
	* code/trunk/src/orxonox/objects/Fighter.cc (modified)
	* code/trunk/src/orxonox/objects/Model.cc (modified)
	* code/trunk/src/orxonox/objects/Model.h (modified)
	* code/trunk/src/orxonox/objects/NPC.cc (modified)
	* code/trunk/src/orxonox/objects/SpaceShip.cc (modified)
	* code/trunk/src/orxonox/objects/SpaceShip.h (modified)
	* code/trunk/src/orxonox/objects/Tickable.cc (deleted)
	* code/trunk/src/orxonox/objects/Tickable.h (deleted)
	* code/trunk/src/orxonox/objects/WorldEntity.cc (modified)
	* code/trunk/src/orxonox/objects/WorldEntity.h (modified)
	* code/trunk/src/orxonox/objects/weapon/AmmunitionDump.cc (modified)
	* code/trunk/src/orxonox/objects/weapon/AmmunitionDump.h (modified)
	* code/trunk/src/orxonox/objects/weapon/BulletManager.cc (modified)
	* code/trunk/src/orxonox/objects/weapon/BulletManager.h (modified)
	* code/trunk/src/orxonox/particle/ParticleInterface.cc (modified)
	* code/trunk/src/orxonox/particle/ParticleInterface.h (modified)
	* code/trunk/src/orxonox/script (copied)
	* code/trunk/src/orxonox/script/tolua++.h (copied)
	* code/trunk/src/orxonox/tools/Timer.cc (modified)
	* code/trunk/src/orxonox/tools/Timer.h (modified)
	* code/trunk/src/util/CMakeLists.txt (modified)
	* code/trunk/src/util/Sleep.h (modified)
	* code/trunk/src/util/tolua (copied)
	* code/trunk/src/util/tolua/tolua++.h (copied)
	* code/trunk/src/util/tolua/tolua.c (copied)
	* code/trunk/src/util/tolua/tolua.pkg (copied)
	* code/trunk/src/util/tolua/tolua_bind.cc (copied)
	* code/trunk/src/util/tolua/tolua_bind.h (copied)
	* code/trunk/src/util/tolua/tolua_event.c (copied)
	* code/trunk/src/util/tolua/tolua_event.h (copied)
	* code/trunk/src/util/tolua/tolua_is.c (copied)
	* code/trunk/src/util/tolua/tolua_map.c (copied)
	* code/trunk/src/util/tolua/tolua_push.c (copied)
	* code/trunk/src/util/tolua/tolua_to.c (copied)
	* code/trunk/src/util/tolua/toluabind.c (copied)
	* code/trunk/src/util/tolua/toluabind.h (copied)
	* code/trunk/src/util/tolua/toluabind_default.h (copied)
	* code/trunk/visual_studio/base_properties.vsprops (modified)
	* code/trunk/visual_studio/network_properties.vsprops (modified)
	* code/trunk/visual_studio/orxonox_vc8.sln (modified)
	* code/trunk/visual_studio/vc8/core.vcproj (modified)
	* code/trunk/visual_studio/vc8/orxonox.vcproj (modified)

	merged back that script-branch


Thu, 10 Apr 2008 11:28:37 GMT FelixSchulthess [1010]
	* code/trunk/bin/levels/sample.oxw (modified)

	replaced correct sample.oxw


Thu, 10 Apr 2008 11:19:07 GMT FelixSchulthess [1009]
	* code/trunk/Media/materials/scripts/asteroids.material (added)
	* code/trunk/Media/models/ast1.mesh (modified)
	* code/trunk/Media/models/ast2.mesh (modified)
	* code/trunk/Media/models/ast3.mesh (modified)
	* code/trunk/Media/models/ast4.mesh (modified)
	* code/trunk/Media/models/ast5.mesh (modified)
	* code/trunk/Media/models/ast6.mesh (modified)
	* code/trunk/bin/levels/sample.oxw (modified)

	added asteroids.material


Thu, 03 Apr 2008 11:59:46 GMT FelixSchulthess [976]
	* code/trunk/bin/levels/sample.oxw (modified)
	* code/trunk/src/orxonox/objects/SpaceShip.cc (modified)
	* code/trunk/src/orxonox/objects/SpaceShip.h (modified)

	changed level file so -> trunk runnable


Sun, 09 Mar 2008 15:44:36 GMT landauf [871]
	* code/trunk/bin/levels/sample.oxw (modified)
	* code/trunk/src/CMakeLists.txt (modified)
	* code/trunk/src/network/GameStateClient.cc (modified)
	* code/trunk/src/network/GameStateManager.cc (modified)
	* code/trunk/src/network/Synchronisable.cc (modified)
	* code/trunk/src/network/Synchronisable.h (modified)
	* code/trunk/src/orxonox/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/Orxonox.cc (modified)
	* code/trunk/src/orxonox/Orxonox.h (modified)
	* code/trunk/src/orxonox/OrxonoxStableHeaders.h (modified)
	* code/trunk/src/orxonox/core/BaseObject.cc (modified)
	* code/trunk/src/orxonox/core/BaseObject.h (modified)
	* code/trunk/src/orxonox/core/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/core/ClassFactory.h (modified)
	* code/trunk/src/orxonox/core/ClassManager.h (copied)
	* code/trunk/src/orxonox/core/ClassTreeMask.cc (copied)
	* code/trunk/src/orxonox/core/ClassTreeMask.h (copied)
	* code/trunk/src/orxonox/core/ConfigValueContainer.cc (modified)
	* code/trunk/src/orxonox/core/ConfigValueContainer.h (modified)
	* code/trunk/src/orxonox/core/CoreIncludes.h (modified)
	* code/trunk/src/orxonox/core/CorePrereqs.h (modified)
	* code/trunk/src/orxonox/core/Debug.h (modified)
	* code/trunk/src/orxonox/core/DebugLevel.cc (modified)
	* code/trunk/src/orxonox/core/DebugLevel.h (modified)
	* code/trunk/src/orxonox/core/Error.cc (modified)
	* code/trunk/src/orxonox/core/Error.h (modified)
	* code/trunk/src/orxonox/core/Executor.cc (copied)
	* code/trunk/src/orxonox/core/Executor.h (copied)
	* code/trunk/src/orxonox/core/Factory.cc (modified)
	* code/trunk/src/orxonox/core/Factory.h (modified)
	* code/trunk/src/orxonox/core/Functor.h (copied)
	* code/trunk/src/orxonox/core/Identifier.cc (modified)
	* code/trunk/src/orxonox/core/Identifier.h (modified)
	* code/trunk/src/orxonox/core/IdentifierDistributor.cc (copied)
	* code/trunk/src/orxonox/core/IdentifierDistributor.h (copied)
	* code/trunk/src/orxonox/core/IdentifierList.cc (deleted)
	* code/trunk/src/orxonox/core/IdentifierList.h (deleted)
	* code/trunk/src/orxonox/core/Iterator.h (modified)
	* code/trunk/src/orxonox/core/Language.cc (modified)
	* code/trunk/src/orxonox/core/Language.h (modified)
	* code/trunk/src/orxonox/core/Level.h (copied)
	* code/trunk/src/orxonox/core/Loader.cc (copied)
	* code/trunk/src/orxonox/core/Loader.h (copied)
	* code/trunk/src/orxonox/core/MetaObjectList.cc (modified)
	* code/trunk/src/orxonox/core/MetaObjectList.h (modified)
	* code/trunk/src/orxonox/core/ObjectList.h (modified)
	* code/trunk/src/orxonox/core/OrxonoxClass.cc (modified)
	* code/trunk/src/orxonox/core/OrxonoxClass.h (modified)
	* code/trunk/src/orxonox/core/OutputHandler.cc (modified)
	* code/trunk/src/orxonox/core/OutputHandler.h (modified)
	* code/trunk/src/orxonox/core/SignalHandler.cc (modified)
	* code/trunk/src/orxonox/core/SignalHandler.h (modified)
	* code/trunk/src/orxonox/core/XMLPort.cc (copied)
	* code/trunk/src/orxonox/core/XMLPort.h (copied)
	* code/trunk/src/orxonox/objects/Ambient.cc (modified)
	* code/trunk/src/orxonox/objects/Ambient.h (modified)
	* code/trunk/src/orxonox/objects/Camera.h (modified)
	* code/trunk/src/orxonox/objects/Explosion.h (modified)
	* code/trunk/src/orxonox/objects/Fighter.h (modified)
	* code/trunk/src/orxonox/objects/Model.cc (modified)
	* code/trunk/src/orxonox/objects/Model.h (modified)
	* code/trunk/src/orxonox/objects/NPC.h (modified)
	* code/trunk/src/orxonox/objects/Projectile.h (modified)
	* code/trunk/src/orxonox/objects/Skybox.cc (modified)
	* code/trunk/src/orxonox/objects/Skybox.h (modified)
	* code/trunk/src/orxonox/objects/SpaceShip.cc (modified)
	* code/trunk/src/orxonox/objects/SpaceShip.h (modified)
	* code/trunk/src/orxonox/objects/SpaceshipSteeringObject.cc (modified)
	* code/trunk/src/orxonox/objects/Test.h (modified)
	* code/trunk/src/orxonox/objects/Tickable.cc (copied)
	* code/trunk/src/orxonox/objects/Tickable.h (modified)
	* code/trunk/src/orxonox/objects/WorldEntity.cc (modified)
	* code/trunk/src/orxonox/objects/WorldEntity.h (modified)
	* code/trunk/src/orxonox/objects/test1.cc (modified)
	* code/trunk/src/orxonox/objects/test2.cc (modified)
	* code/trunk/src/orxonox/objects/test3.cc (modified)
	* code/trunk/src/orxonox/objects/test3.h (modified)
	* code/trunk/src/orxonox/objects/weapon/AmmunitionDump.cc (modified)
	* code/trunk/src/orxonox/objects/weapon/AmmunitionDump.h (modified)
	* code/trunk/src/orxonox/objects/weapon/BarrelGun.cc (modified)
	* code/trunk/src/orxonox/objects/weapon/BarrelGun.h (modified)
	* code/trunk/src/orxonox/objects/weapon/BaseWeapon.cc (modified)
	* code/trunk/src/orxonox/objects/weapon/BaseWeapon.h (modified)
	* code/trunk/src/orxonox/objects/weapon/Bullet.cc (modified)
	* code/trunk/src/orxonox/objects/weapon/Bullet.h (modified)
	* code/trunk/src/orxonox/objects/weapon/BulletManager.cc (modified)
	* code/trunk/src/orxonox/objects/weapon/BulletManager.h (modified)
	* code/trunk/src/orxonox/tools/BillboardSet.h (modified)
	* code/trunk/src/orxonox/tools/Timer.cc (copied)
	* code/trunk/src/orxonox/tools/Timer.h (modified)
	* code/trunk/src/util/CMakeLists.txt (modified)
	* code/trunk/src/util/Convert.h (modified)
	* code/trunk/src/util/Math.cc (copied)
	* code/trunk/src/util/Math.h (modified)
	* code/trunk/src/util/MultiType.h (copied)
	* code/trunk/src/util/MultiTypeMath.cc (copied)
	* code/trunk/src/util/MultiTypeMath.h (copied)
	* code/trunk/src/util/MultiTypePrimitive.cc (copied)
	* code/trunk/src/util/MultiTypePrimitive.h (copied)
	* code/trunk/src/util/MultiTypeString.cc (copied)
	* code/trunk/src/util/MultiTypeString.h (copied)
	* code/trunk/src/util/String.cc (copied)
	* code/trunk/src/util/String.h (copied)
	* code/trunk/src/util/String2Number.h (modified)
	* code/trunk/src/util/SubString.cc (copied)
	* code/trunk/src/util/SubString.h (copied)
	* code/trunk/src/util/UtilPrereqs.h (copied)
	* code/trunk/src/util/XMLIncludes.h (copied)
	* code/trunk/src/util/substring.cc (deleted)
	* code/trunk/src/util/substring.h (deleted)
	* code/trunk/src/util/tinyxml/TinyXMLPrereqs.h (modified)
	* code/trunk/src/util/tinyxml/ticpp.cc (modified)
	* code/trunk/src/util/tinyxml/ticpp.h (modified)
	* code/trunk/src/util/tinyxml/ticpprc.h (modified)
	* code/trunk/src/util/tinyxml/tinyxml.h (modified)

	merged core branch to trunk


Thu, 06 Mar 2008 14:11:29 GMT FelixSchulthess [863]
	* code/trunk/bin/levels/sample.oxw (modified)

	modified level file


Thu, 07 Feb 2008 16:01:44 GMT nicolasc [790]
	* code/trunk (modified)
	* code/trunk/CMakeLists.txt (modified)
	* code/trunk/INSTALL (modified)
	* code/trunk/Media/materials (copied)
	* code/trunk/Media/materials/scripts (copied)
	* code/trunk/Media/materials/scripts/Example.material (copied)
	* code/trunk/Media/materials/scripts/Examples.compositor (copied)
	* code/trunk/Media/materials/scripts/Examples.program (copied)
	* code/trunk/Media/materials/scripts/Ogre.material (copied)
	* code/trunk/Media/materials/scripts/Orxonox.material (copied)
	* code/trunk/Media/materials/scripts/OrxonoxSky.material (copied)
	* code/trunk/Media/materials/scripts/PE_materials.material (copied)
	* code/trunk/Media/materials/scripts/assf.material (copied)
	* code/trunk/Media/materials/scripts/assf5.material (copied)
	* code/trunk/Media/materials/scripts/ast.material (copied)
	* code/trunk/Media/materials/scripts/drone.material (copied)
	* code/trunk/Media/materials/scripts/hoover.material (copied)
	* code/trunk/Media/materials/scripts/spacecruiser.material (copied)
	* code/trunk/Media/materials/scripts/starship.material (copied)
	* code/trunk/Media/materials/textures (copied)
	* code/trunk/Media/materials/textures/Dirt.jpg (copied)
	* code/trunk/Media/materials/textures/EnergyBackground.png (copied)
	* code/trunk/Media/materials/textures/EnergyDistrBackground.png (copied)
	* code/trunk/Media/materials/textures/GreenSkin.jpg (copied)
	* code/trunk/Media/materials/textures/MapBackGround.png (copied)
	* code/trunk/Media/materials/textures/MyShip.png (copied)
	* code/trunk/Media/materials/textures/OrxonoxBlack.png (copied)
	* code/trunk/Media/materials/textures/OrxonoxORANGE.png (copied)
	* code/trunk/Media/materials/textures/OrxonoxRED.png (copied)
	* code/trunk/Media/materials/textures/PrimalWeaponBackground.png (copied)
	* code/trunk/Media/materials/textures/PrimarBackground.png (copied)
	* code/trunk/Media/materials/textures/PrimarChoice.png (copied)
	* code/trunk/Media/materials/textures/PrimarSample.png (copied)
	* code/trunk/Media/materials/textures/Racket.png (copied)
	* code/trunk/Media/materials/textures/RacketBackground.png (copied)
	* code/trunk/Media/materials/textures/RacketGrid.png (copied)
	* code/trunk/Media/materials/textures/RedPoint.png (copied)
	* code/trunk/Media/materials/textures/RustyBarrel.png (copied)
	* code/trunk/Media/materials/textures/RustySteel.jpg (copied)
	* code/trunk/Media/materials/textures/ShieldLeftBottom.png (copied)
	* code/trunk/Media/materials/textures/ShieldLeftTop.png (copied)
	* code/trunk/Media/materials/textures/ShieldRightBottom.png (copied)
	* code/trunk/Media/materials/textures/ShieldRightTop.png (copied)
	* code/trunk/Media/materials/textures/TargetBackground.png (copied)
	* code/trunk/Media/materials/textures/TimeBackground.png (copied)
	* code/trunk/Media/materials/textures/WeirdEye.png (copied)
	* code/trunk/Media/materials/textures/backGround.png (copied)
	* code/trunk/Media/materials/textures/bigflame.png (copied)
	* code/trunk/Media/materials/textures/black.png (copied)
	* code/trunk/Media/materials/textures/clock.png (copied)
	* code/trunk/Media/materials/textures/crosshair.png (copied)
	* code/trunk/Media/materials/textures/cursor.png (copied)
	* code/trunk/Media/materials/textures/dirt01.jpg (copied)
	* code/trunk/Media/materials/textures/drone.png (copied)
	* code/trunk/Media/materials/textures/explosion.png (copied)
	* code/trunk/Media/materials/textures/flare.png (copied)
	* code/trunk/Media/materials/textures/flaretrail.png (copied)
	* code/trunk/Media/materials/textures/gun.png (copied)
	* code/trunk/Media/materials/textures/hoover_body.png (copied)
	* code/trunk/Media/materials/textures/hoover_gear.png (copied)
	* code/trunk/Media/materials/textures/hoover_turbine.png (copied)
	* code/trunk/Media/materials/textures/human_assf.jpg (copied)
	* code/trunk/Media/materials/textures/human_assf.png (copied)
	* code/trunk/Media/materials/textures/human_assf5.png (copied)
	* code/trunk/Media/materials/textures/man.png (copied)
	* code/trunk/Media/materials/textures/nskingr.jpg (copied)
	* code/trunk/Media/materials/textures/ogreborder.png (copied)
	* code/trunk/Media/materials/textures/ogreborderUp.png (copied)
	* code/trunk/Media/materials/textures/ogrebordercenter.png (copied)
	* code/trunk/Media/materials/textures/ogrelogo-small.jpg (copied)
	* code/trunk/Media/materials/textures/ogrelogo.png (copied)
	* code/trunk/Media/materials/textures/ring_flare.png (copied)
	* code/trunk/Media/materials/textures/ring_flare2.png (copied)
	* code/trunk/Media/materials/textures/rock.png (copied)
	* code/trunk/Media/materials/textures/sample_loading.jpg (copied)
	* code/trunk/Media/materials/textures/shot.png (copied)
	* code/trunk/Media/materials/textures/smoke.png (copied)
	* code/trunk/Media/materials/textures/smokecolors.png (copied)
	* code/trunk/Media/materials/textures/spacesruiser.png (copied)
	* code/trunk/Media/materials/textures/spheremap.png (copied)
	* code/trunk/Media/materials/textures/starship.png (copied)
	* code/trunk/Media/materials/textures/steelhead.png (copied)
	* code/trunk/Media/materials/textures/streak.png (copied)
	* code/trunk/Media/materials/textures/superegg.png (copied)
	* code/trunk/Media/materials/textures/texmap2.jpg (copied)
	* code/trunk/Media/models (copied)
	* code/trunk/Media/models/Barrel.mesh (copied)
	* code/trunk/Media/models/assf2.mesh (copied)
	* code/trunk/Media/models/assf3.mesh (copied)
	* code/trunk/Media/models/assf5.mesh (copied)
	* code/trunk/Media/models/ast1.mesh (copied)
	* code/trunk/Media/models/ast2.mesh (copied)
	* code/trunk/Media/models/ast3.mesh (copied)
	* code/trunk/Media/models/ast4.mesh (copied)
	* code/trunk/Media/models/ast5.mesh (copied)
	* code/trunk/Media/models/ast6.mesh (copied)
	* code/trunk/Media/models/cube.mesh (copied)
	* code/trunk/Media/models/drone.mesh (copied)
	* code/trunk/Media/models/fish.mesh (copied)
	* code/trunk/Media/models/fish.skeleton (copied)
	* code/trunk/Media/models/hoover_body.mesh (copied)
	* code/trunk/Media/models/hoover_gear0.mesh (copied)
	* code/trunk/Media/models/hoover_gear1.mesh (copied)
	* code/trunk/Media/models/hoover_gear2.mesh (copied)
	* code/trunk/Media/models/hoover_turbine.mesh (copied)
	* code/trunk/Media/models/ogrehead.mesh (copied)
	* code/trunk/Media/models/razor.mesh (copied)
	* code/trunk/Media/models/spacecruiser.mesh (copied)
	* code/trunk/Media/models/starship.mesh (copied)
	* code/trunk/Media/overlay (copied)
	* code/trunk/Media/overlay/OrxonoxHUD1.2.overlay (copied)
	* code/trunk/Media/overlay/OrxonoxLoading.overlay (copied)
	* code/trunk/Media/packs/cubemap.zip (copied)
	* code/trunk/Media/packs/skybox.zip (modified)
	* code/trunk/Media/particle (copied)
	* code/trunk/Media/particle/Example-Water.particle (copied)
	* code/trunk/Media/particle/Example.particle (copied)
	* code/trunk/Media/particle/emitted_emitter.particle (copied)
	* code/trunk/Media/particle/engineglow.particle (copied)
	* code/trunk/Media/particle/rauch.particle (copied)
	* code/trunk/Media/particle/schuss.particle (copied)
	* code/trunk/Media/particle/smoke.particle (copied)
	* code/trunk/Media/particle/strahl.particle (copied)
	* code/trunk/Media/particle/strahl2.particle (copied)
	* code/trunk/Media/particle/treibwerk.particle (copied)
	* code/trunk/bin (copied)
	* code/trunk/bin/audio (copied)
	* code/trunk/bin/audio/ambient (copied)
	* code/trunk/bin/audio/ambient/allgorythm-lift_up.ogg (copied)
	* code/trunk/bin/audio/ambient/allgorythm-resonance_blaster.ogg (copied)
	* code/trunk/bin/audio/ambient/luke_grey_-_hypermode.ogg (copied)
	* code/trunk/bin/audio/ambient/task_horizon_-_menu1.ogg (copied)
	* code/trunk/bin/audio/ambient/tha_silent_partner_-_void.ogg (copied)
	* code/trunk/bin/audio/sounds (copied)
	* code/trunk/bin/audio/sounds/.dolphinview (copied)
	* code/trunk/bin/audio/sounds/laser1.wav (copied)
	* code/trunk/bin/levels (copied)
	* code/trunk/bin/levels/sample.oxw (copied)
	* code/trunk/bin/media.cfg (copied)
	* code/trunk/bin/ogre.cfg-init (copied)
	* code/trunk/bin/orxonox.bat (copied)
	* code/trunk/bin/plugins.cfg-init (copied)
	* code/trunk/bin/quake3settings.cfg (copied)
	* code/trunk/bin/resources.cfg (copied)
	* code/trunk/bin/run-script (copied)
	* code/trunk/bin/translation_german.lang (copied)
	* code/trunk/cmake/FindALUT.cmake (copied)
	* code/trunk/cmake/FindBoost.cmake (copied)
	* code/trunk/cmake/FindCEGUI.cmake (modified)
	* code/trunk/cmake/FindCEGUI_OGRE.cmake (modified)
	* code/trunk/cmake/FindENet.cmake (copied)
	* code/trunk/cmake/FindODE.cmake (copied)
	* code/trunk/cmake/FindOGRE.cmake (modified)
	* code/trunk/cmake/FindOIS.cmake (modified)
	* code/trunk/cmake/FindOggVorbis.cmake (copied)
	* code/trunk/cmake/FindOpenAL.cmake (copied)
	* code/trunk/cmake/FindZLIB.cmake (copied)
	* code/trunk/cmakeclearcache (copied)
	* code/trunk/run (copied)
	* code/trunk/src/CMakeLists.txt (modified)
	* code/trunk/src/audio (copied)
	* code/trunk/src/audio/AudioBuffer.cc (copied)
	* code/trunk/src/audio/AudioBuffer.h (copied)
	* code/trunk/src/audio/AudioIncludes.h (copied)
	* code/trunk/src/audio/AudioManager.cc (copied)
	* code/trunk/src/audio/AudioManager.h (copied)
	* code/trunk/src/audio/AudioPrereqs.h (copied)
	* code/trunk/src/audio/AudioSource.cc (copied)
	* code/trunk/src/audio/AudioSource.h (copied)
	* code/trunk/src/audio/AudioStream.cc (copied)
	* code/trunk/src/audio/AudioStream.h (copied)
	* code/trunk/src/audio/CMakeLists.txt (copied)
	* code/trunk/src/audio/_AudioObject.cc (copied)
	* code/trunk/src/loader/CMakeLists.txt (copied)
	* code/trunk/src/loader/LevelLoader.cc (modified)
	* code/trunk/src/loader/LevelLoader.h (modified)
	* code/trunk/src/loader/Light.cc (deleted)
	* code/trunk/src/loader/Light.h (deleted)
	* code/trunk/src/loader/LightManager.cc (deleted)
	* code/trunk/src/loader/LightManager.h (deleted)
	* code/trunk/src/loader/LoaderPrereqs.h (copied)
	* code/trunk/src/network/CMakeLists.txt (copied)
	* code/trunk/src/network/Client.cc (copied)
	* code/trunk/src/network/Client.h (copied)
	* code/trunk/src/network/ClientConnection.cc (copied)
	* code/trunk/src/network/ClientConnection.h (copied)
	* code/trunk/src/network/ClientInformation.cc (copied)
	* code/trunk/src/network/ClientInformation.h (copied)
	* code/trunk/src/network/ConnectionManager.cc (copied)
	* code/trunk/src/network/ConnectionManager.h (copied)
	* code/trunk/src/network/GameStateClient.cc (copied)
	* code/trunk/src/network/GameStateClient.h (copied)
	* code/trunk/src/network/GameStateManager.cc (copied)
	* code/trunk/src/network/GameStateManager.h (copied)
	* code/trunk/src/network/Makefile.norm (copied)
	* code/trunk/src/network/Makefile.tardis (copied)
	* code/trunk/src/network/Makefile.test (copied)
	* code/trunk/src/network/NetworkFrameListener.h (copied)
	* code/trunk/src/network/NetworkPrereqs.h (copied)
	* code/trunk/src/network/PacketBuffer.cc (copied)
	* code/trunk/src/network/PacketBuffer.h (copied)
	* code/trunk/src/network/PacketBufferTestExt.cc (copied)
	* code/trunk/src/network/PacketDecoder.cc (copied)
	* code/trunk/src/network/PacketGenerator.cc (copied)
	* code/trunk/src/network/PacketManager.h (copied)
	* code/trunk/src/network/PacketTypes.h (copied)
	* code/trunk/src/network/Server.cc (copied)
	* code/trunk/src/network/Server.h (copied)
	* code/trunk/src/network/Synchronisable.cc (copied)
	* code/trunk/src/network/Synchronisable.h (copied)
	* code/trunk/src/network/TODO (copied)
	* code/trunk/src/network/dummyclient.cc (copied)
	* code/trunk/src/network/dummyclient2.cc (copied)
	* code/trunk/src/network/dummyclient3.cc (copied)
	* code/trunk/src/network/dummyserver.cc (copied)
	* code/trunk/src/network/dummyserver3.cc (copied)
	* code/trunk/src/orxonox/AIClass.h (copied)
	* code/trunk/src/orxonox/Arrival.h (copied)
	* code/trunk/src/orxonox/CMakeLists.txt (copied)
	* code/trunk/src/orxonox/Flocking.h (copied)
	* code/trunk/src/orxonox/GraphicsEngine.cc (copied)
	* code/trunk/src/orxonox/GraphicsEngine.h (copied)
	* code/trunk/src/orxonox/InputManager.cc (copied)
	* code/trunk/src/orxonox/InputManager.h (copied)
	* code/trunk/src/orxonox/Main.cc (copied)
	* code/trunk/src/orxonox/Orxonox.cc (copied)
	* code/trunk/src/orxonox/Orxonox.h (copied)
	* code/trunk/src/orxonox/OrxonoxPlatform.h (copied)
	* code/trunk/src/orxonox/OrxonoxPrereqs.h (copied)
	* code/trunk/src/orxonox/OrxonoxStableHeaders.h (copied)
	* code/trunk/src/orxonox/PrecompiledHeaderFiles.cc (copied)
	* code/trunk/src/orxonox/SpaceshipSteering.cc (copied)
	* code/trunk/src/orxonox/SpaceshipSteering.h (copied)
	* code/trunk/src/orxonox/core/ArgReader.cc (copied)
	* code/trunk/src/orxonox/core/ArgReader.h (copied)
	* code/trunk/src/orxonox/core/BaseObject.cc (copied)
	* code/trunk/src/orxonox/core/BaseObject.h (copied)
	* code/trunk/src/orxonox/core/CMakeLists.txt (copied)
	* code/trunk/src/orxonox/core/ClassFactory.h (modified)
	* code/trunk/src/orxonox/core/ConfigValueContainer.cc (copied)
	* code/trunk/src/orxonox/core/ConfigValueContainer.h (copied)
	* code/trunk/src/orxonox/core/CoreIncludes.h (copied)
	* code/trunk/src/orxonox/core/CorePrereqs.h (copied)
	* code/trunk/src/orxonox/core/Debug.h (copied)
	* code/trunk/src/orxonox/core/DebugLevel.cc (copied)
	* code/trunk/src/orxonox/core/DebugLevel.h (copied)
	* code/trunk/src/orxonox/core/Error.cc (copied)
	* code/trunk/src/orxonox/core/Error.h (copied)
	* code/trunk/src/orxonox/core/Factory.cc (modified)
	* code/trunk/src/orxonox/core/Factory.h (modified)
	* code/trunk/src/orxonox/core/Identifier.cc (modified)
	* code/trunk/src/orxonox/core/Identifier.h (modified)
	* code/trunk/src/orxonox/core/IdentifierIncludes.h (deleted)
	* code/trunk/src/orxonox/core/IdentifierList.cc (modified)
	* code/trunk/src/orxonox/core/IdentifierList.h (modified)
	* code/trunk/src/orxonox/core/Iterator.h (modified)
	* code/trunk/src/orxonox/core/Language.cc (copied)
	* code/trunk/src/orxonox/core/Language.h (copied)
	* code/trunk/src/orxonox/core/MetaObjectList.cc (modified)
	* code/trunk/src/orxonox/core/MetaObjectList.h (modified)
	* code/trunk/src/orxonox/core/ObjectList.h (modified)
	* code/trunk/src/orxonox/core/OrxonoxClass.cc (modified)
	* code/trunk/src/orxonox/core/OrxonoxClass.h (modified)
	* code/trunk/src/orxonox/core/OutputHandler.cc (copied)
	* code/trunk/src/orxonox/core/OutputHandler.h (copied)
	* code/trunk/src/orxonox/core/SignalHandler.cc (copied)
	* code/trunk/src/orxonox/core/SignalHandler.h (copied)
	* code/trunk/src/orxonox/hud (copied)
	* code/trunk/src/orxonox/hud/HUD.cc (copied)
	* code/trunk/src/orxonox/hud/HUD.h (copied)
	* code/trunk/src/orxonox/objects/Ambient.cc (copied)
	* code/trunk/src/orxonox/objects/Ambient.h (copied)
	* code/trunk/src/orxonox/objects/BaseObject.cc (deleted)
	* code/trunk/src/orxonox/objects/BaseObject.h (deleted)
	* code/trunk/src/orxonox/objects/Camera.cc (copied)
	* code/trunk/src/orxonox/objects/Camera.h (copied)
	* code/trunk/src/orxonox/objects/Explosion.cc (copied)
	* code/trunk/src/orxonox/objects/Explosion.h (copied)
	* code/trunk/src/orxonox/objects/Fighter.cc (copied)
	* code/trunk/src/orxonox/objects/Fighter.h (copied)
	* code/trunk/src/orxonox/objects/Model.cc (copied)
	* code/trunk/src/orxonox/objects/Model.h (copied)
	* code/trunk/src/orxonox/objects/NPC.cc (copied)
	* code/trunk/src/orxonox/objects/NPC.h (copied)
	* code/trunk/src/orxonox/objects/Projectile.cc (copied)
	* code/trunk/src/orxonox/objects/Projectile.h (copied)
	* code/trunk/src/orxonox/objects/Skybox.cc (copied)
	* code/trunk/src/orxonox/objects/Skybox.h (copied)
	* code/trunk/src/orxonox/objects/SpaceShip.cc (copied)
	* code/trunk/src/orxonox/objects/SpaceShip.h (copied)
	* code/trunk/src/orxonox/objects/SpaceshipSteeringObject.cc (copied)
	* code/trunk/src/orxonox/objects/SpaceshipSteeringObject.h (copied)
	* code/trunk/src/orxonox/objects/Test.h (modified)
	* code/trunk/src/orxonox/objects/Tickable.h (copied)
	* code/trunk/src/orxonox/objects/WorldEntity.cc (copied)
	* code/trunk/src/orxonox/objects/WorldEntity.h (copied)
	* code/trunk/src/orxonox/objects/test1.cc (modified)
	* code/trunk/src/orxonox/objects/test1.h (modified)
	* code/trunk/src/orxonox/objects/test2.cc (modified)
	* code/trunk/src/orxonox/objects/test2.h (modified)
	* code/trunk/src/orxonox/objects/test3.cc (modified)
	* code/trunk/src/orxonox/objects/test3.h (modified)
	* code/trunk/src/orxonox/objects/weapon (copied)
	* code/trunk/src/orxonox/objects/weapon/AmmunitionDump.cc (copied)
	* code/trunk/src/orxonox/objects/weapon/AmmunitionDump.h (copied)
	* code/trunk/src/orxonox/objects/weapon/BarrelGun.cc (copied)
	* code/trunk/src/orxonox/objects/weapon/BarrelGun.h (copied)
	* code/trunk/src/orxonox/objects/weapon/BaseWeapon.cc (copied)
	* code/trunk/src/orxonox/objects/weapon/BaseWeapon.h (copied)
	* code/trunk/src/orxonox/objects/weapon/Bullet.cc (copied)
	* code/trunk/src/orxonox/objects/weapon/Bullet.h (copied)
	* code/trunk/src/orxonox/objects/weapon/BulletManager.cc (copied)
	* code/trunk/src/orxonox/objects/weapon/BulletManager.h (copied)
	* code/trunk/src/orxonox/objects/weapon/WeaponStation.cc (copied)
	* code/trunk/src/orxonox/objects/weapon/WeaponStation.h (copied)
	* code/trunk/src/orxonox/orxonox.cc (deleted)
	* code/trunk/src/orxonox/particle (copied)
	* code/trunk/src/orxonox/particle/ParticleInterface.cc (copied)
	* code/trunk/src/orxonox/particle/ParticleInterface.h (copied)
	* code/trunk/src/orxonox/tools (copied)
	* code/trunk/src/orxonox/tools/BillboardSet.cc (copied)
	* code/trunk/src/orxonox/tools/BillboardSet.h (copied)
	* code/trunk/src/orxonox/tools/Light.cc (copied)
	* code/trunk/src/orxonox/tools/Light.h (copied)
	* code/trunk/src/orxonox/tools/Mesh.cc (copied)
	* code/trunk/src/orxonox/tools/Mesh.h (copied)
	* code/trunk/src/orxonox/tools/Timer.h (copied)
	* code/trunk/src/util (copied)
	* code/trunk/src/util/CMakeLists.txt (copied)
	* code/trunk/src/util/Convert.h (copied)
	* code/trunk/src/util/Math.h (copied)
	* code/trunk/src/util/Sleep.h (copied)
	* code/trunk/src/util/String2Number.h (copied)
	* code/trunk/src/util/Tokenizer.h (copied)
	* code/trunk/src/util/substring.cc (copied)
	* code/trunk/src/util/substring.h (copied)
	* code/trunk/src/util/testing (copied)
	* code/trunk/src/util/testing/CMakeLists.txt (copied)
	* code/trunk/src/util/testing/TestConverter.cpp (copied)
	* code/trunk/src/util/tinyxml (copied)
	* code/trunk/src/util/tinyxml/TinyXMLPrereqs.h (copied)
	* code/trunk/src/util/tinyxml/ticpp.cc (copied)
	* code/trunk/src/util/tinyxml/ticpp.h (copied)
	* code/trunk/src/util/tinyxml/ticpprc.h (copied)
	* code/trunk/src/util/tinyxml/tinystr.cc (copied)
	* code/trunk/src/util/tinyxml/tinystr.h (copied)
	* code/trunk/src/util/tinyxml/tinyxml.cc (copied)
	* code/trunk/src/util/tinyxml/tinyxml.h (copied)
	* code/trunk/src/util/tinyxml/tinyxmlerror.cc (copied)
	* code/trunk/src/util/tinyxml/tinyxmlparser.cc (copied)
	* code/trunk/src/xml (deleted)
	* code/trunk/visual_studio (copied)
	* code/trunk/visual_studio/audio_properties.vsprops (copied)
	* code/trunk/visual_studio/base_properties.vsprops (copied)
	* code/trunk/visual_studio/base_properties_debug.vsprops (copied)
	* code/trunk/visual_studio/base_properties_release.vsprops (copied)
	* code/trunk/visual_studio/base_properties_release_sse.vsprops (copied)
	* code/trunk/visual_studio/base_properties_release_sse2.vsprops (copied)
	* code/trunk/visual_studio/core_properties.vsprops (copied)
	* code/trunk/visual_studio/directory_properties.vsprops (copied)
	* code/trunk/visual_studio/loader_properties.vsprops (copied)
	* code/trunk/visual_studio/network_properties.vsprops (copied)
	* code/trunk/visual_studio/orxonox_properties.vsprops (copied)
	* code/trunk/visual_studio/orxonox_vc8.sln (copied)
	* code/trunk/visual_studio/orxonox_vc9.sln (copied)
	* code/trunk/visual_studio/util_properties.vsprops (copied)
	* code/trunk/visual_studio/vc8 (copied)
	* code/trunk/visual_studio/vc8/audio.vcproj (copied)
	* code/trunk/visual_studio/vc8/core.vcproj (copied)
	* code/trunk/visual_studio/vc8/loader.vcproj (copied)
	* code/trunk/visual_studio/vc8/network.vcproj (copied)
	* code/trunk/visual_studio/vc8/orxonox.vcproj (copied)
	* code/trunk/visual_studio/vc8/util.vcproj (copied)
	* code/trunk/visual_studio/vc9 (copied)
	* code/trunk/visual_studio/vc9/audio.vcproj (copied)
	* code/trunk/visual_studio/vc9/core.vcproj (copied)
	* code/trunk/visual_studio/vc9/loader.vcproj (copied)
	* code/trunk/visual_studio/vc9/network.vcproj (copied)
	* code/trunk/visual_studio/vc9/orxonox.vcproj (copied)
	* code/trunk/visual_studio/vc9/util.vcproj (copied)

	merged FICN back into trunk
	awaiting release.


Tue, 15 Jan 2008 18:42:49 GMT nicolasc [787]
	* code/branches/FICN/Media/materials/scripts/assf5.material (added)
	* code/branches/FICN/Media/materials/textures/human_assf5.png (added)
	* code/branches/FICN/Media/models/assf5.mesh (added)
	* code/branches/FICN/bin/levels/sample.oxw (modified)

	added updated version of ASSF as mesh - currently default player
	model