#
# ChangeLog for code/branches/merge/bin
#
# Generated by Trac 1.0.9
# Nov 15, 2024, 9:49:41 AM

Thu, 15 May 2008 09:42:50 GMT scheusso [1279]
	* code/branches/merge/bin/levels/sample.oxw (modified)
	* code/branches/merge/bin/run-script (modified)
	* code/branches/merge/src/network/ClientConnection.cc (modified)
	* code/branches/merge/src/network/ClientConnection.h (modified)

	adapted boost threads in clientconnection
	added trap to runscript ...


Wed, 14 May 2008 18:19:49 GMT FelixSchulthess [1274]
	* code/branches/merge/bin/levels/sample.oxw (modified)

	created exception handler for Felix::FridgeUnderrunException()


Wed, 14 May 2008 11:01:11 GMT rgrieder [1273]
	* code/branches/merge/bin/keybindings.ini (modified)
	* code/branches/merge/bin/ogre.cfg-init (modified)
	* code/branches/merge/src/core/InputManager.cc (modified)
	* code/branches/merge/src/orxonox/objects/Explosion.cc (modified)
	* code/branches/merge/src/orxonox/objects/SpaceShip.cc (modified)

	- fixed the visual problem with overlays: They're now correctly ...


Wed, 14 May 2008 09:44:17 GMT rgrieder [1272]
	* code/branches/merge/bin/keybindings.ini (modified)
	* code/branches/merge/src/core/CommandExecutor.h (modified)
	* code/branches/merge/src/core/CorePrereqs.h (modified)
	* code/branches/merge/src/core/InputBuffer.cc (modified)
	* code/branches/merge/src/core/InputBuffer.h (modified)
	* code/branches/merge/src/core/InputHandler.cc (modified)
	* code/branches/merge/src/core/InputHandler.h (modified)
	* code/branches/merge/src/core/InputInterfaces.h (copied)
	* code/branches/merge/src/core/InputManager.cc (modified)
	* code/branches/merge/src/core/InputManager.h (modified)
	* code/branches/merge/src/core/SignalHandler.cc (modified)
	* code/branches/merge/src/core/SignalHandler.h (modified)
	* code/branches/merge/src/core/Tickable.cc (modified)
	* code/branches/merge/src/core/Tickable.h (modified)
	* code/branches/merge/src/orxonox/Orxonox.cc (modified)
	* code/branches/merge/src/orxonox/objects/SpaceShip.cc (modified)
	* code/branches/merge/src/orxonox/objects/SpaceShip.h (modified)
	* code/branches/merge/visual_studio/base_properties_debug.vsprops (modified)
	* code/branches/merge/visual_studio/vc8/core.vcproj (modified)
	* code/branches/merge/visual_studio/vc8/ois.vcproj (modified)

	merged input branch into merge branch


Tue, 13 May 2008 15:01:10 GMT scheusso [1264]
	* code/branches/merge/CMakeLists.txt (modified)
	* code/branches/merge/TODO (copied)
	* code/branches/merge/bin/levels/sample.oxw (modified)
	* code/branches/merge/cmake/FindBoost.cmake (modified)
	* code/branches/merge/src/network (copied)
	* code/branches/merge/src/network/CMakeLists.txt (copied)
	* code/branches/merge/src/network/Client.cc (copied)
	* code/branches/merge/src/network/Client.h (copied)
	* code/branches/merge/src/network/ClientConnection.cc (copied)
	* code/branches/merge/src/network/ClientConnection.h (copied)
	* code/branches/merge/src/network/ClientInformation.cc (copied)
	* code/branches/merge/src/network/ClientInformation.h (copied)
	* code/branches/merge/src/network/ConnectionManager.cc (copied)
	* code/branches/merge/src/network/ConnectionManager.h (copied)
	* code/branches/merge/src/network/GameStateClient.cc (copied)
	* code/branches/merge/src/network/GameStateClient.h (copied)
	* code/branches/merge/src/network/GameStateManager.cc (copied)
	* code/branches/merge/src/network/GameStateManager.h (copied)
	* code/branches/merge/src/network/Makefile.norm (copied)
	* code/branches/merge/src/network/Makefile.tardis (copied)
	* code/branches/merge/src/network/Makefile.test (copied)
	* code/branches/merge/src/network/NetworkPrereqs.h (copied)
	* code/branches/merge/src/network/PacketBuffer.cc (copied)
	* code/branches/merge/src/network/PacketBuffer.h (copied)
	* code/branches/merge/src/network/PacketDecoder.cc (copied)
	* code/branches/merge/src/network/PacketGenerator.cc (copied)
	* code/branches/merge/src/network/PacketManager.h (copied)
	* code/branches/merge/src/network/PacketTypes.h (copied)
	* code/branches/merge/src/network/Server.cc (copied)
	* code/branches/merge/src/network/Server.h (copied)
	* code/branches/merge/src/network/Synchronisable.cc (copied)
	* code/branches/merge/src/network/Synchronisable.h (copied)
	* code/branches/merge/src/network/TODO (copied)
	* code/branches/merge/src/network/diffTest.cc (copied)
	* code/branches/merge/src/network/dummyclient.cc (copied)
	* code/branches/merge/src/network/dummyclient2.cc (copied)
	* code/branches/merge/src/network/dummyclient3.cc (copied)
	* code/branches/merge/src/network/dummyserver.cc (copied)
	* code/branches/merge/src/network/dummyserver3.cc (copied)
	* code/branches/merge/src/orxonox/CMakeLists.txt (modified)
	* code/branches/merge/src/orxonox/Main.cc (modified)
	* code/branches/merge/src/orxonox/Orxonox.cc (modified)
	* code/branches/merge/src/orxonox/Orxonox.h (modified)
	* code/branches/merge/src/orxonox/objects/Ambient.cc (modified)
	* code/branches/merge/src/orxonox/objects/Ambient.h (modified)
	* code/branches/merge/src/orxonox/objects/Camera.cc (modified)
	* code/branches/merge/src/orxonox/objects/Camera.h (modified)
	* code/branches/merge/src/orxonox/objects/CameraHandler.cc (copied)
	* code/branches/merge/src/orxonox/objects/CameraHandler.h (copied)
	* code/branches/merge/src/orxonox/objects/Model.cc (modified)
	* code/branches/merge/src/orxonox/objects/NPC.cc (modified)
	* code/branches/merge/src/orxonox/objects/NPC.h (modified)
	* code/branches/merge/src/orxonox/objects/Skybox.cc (modified)
	* code/branches/merge/src/orxonox/objects/Skybox.h (modified)
	* code/branches/merge/src/orxonox/objects/SpaceShip.cc (modified)
	* code/branches/merge/src/orxonox/objects/SpaceShip.h (modified)
	* code/branches/merge/src/orxonox/objects/WorldEntity.cc (modified)
	* code/branches/merge/src/orxonox/particle/ParticleInterface.cc (modified)

	merge network3 and camera branch into merge branch


Tue, 13 May 2008 13:22:56 GMT scheusso [1262]
	* code/branches/merge (copied)

	creating merge branch


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