#
# ChangeLog for code/branches/merge/visual_studio
#
# Generated by Trac 1.0.9
# Nov 29, 2024, 2:19:31 AM

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


Wed, 14 May 2008 09:24:31 GMT rgrieder [1270]
	* code/branches/merge/src/orxonox/GraphicsEngine.cc (modified)
	* code/branches/merge/visual_studio/network_properties.vsprops (modified)
	* code/branches/merge/visual_studio/orxonox_properties.vsprops (modified)

	- little change with ogre logManager. Maybe that works now on Oli's
	box.


Tue, 13 May 2008 15:40:42 GMT rgrieder [1265]
	* code/branches/merge/src/network/GameStateManager.cc (modified)
	* code/branches/merge/src/orxonox/objects/SpaceShip.cc (modified)
	* code/branches/merge/visual_studio/network_properties.vsprops (modified)
	* code/branches/merge/visual_studio/orxonox_properties.vsprops (modified)
	* code/branches/merge/visual_studio/vc8/network.vcproj (modified)
	* code/branches/merge/visual_studio/vc8/orxonox.vcproj (modified)

	- filled initialiser list of SpaceShip
	- adapted VS files in order ...


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

	creating merge branch


Sat, 03 May 2008 15:26:41 GMT rgrieder [1223]
	* code/trunk/src/core/TclBind.h (modified)
	* code/trunk/src/orxonox/console/InGameConsole.cc (modified)
	* code/trunk/visual_studio/base_properties.vsprops (modified)
	* code/trunk/visual_studio/core_properties.vsprops (modified)
	* code/trunk/visual_studio/cpptcl_properties.vsprops (added)
	* code/trunk/visual_studio/orxonox_properties.vsprops (modified)
	* code/trunk/visual_studio/orxonox_vc8.sln (modified)
	* code/trunk/visual_studio/vc8/core.vcproj (modified)
	* code/trunk/visual_studio/vc8/cpptcl.vcproj (added)
	* code/trunk/visual_studio/vc8/tolua.vcproj (modified)

	- restored compatibility with new InputManager
	- update VS files for ...