#
# ChangeLog for code/branches/merge/src/orxonox/GraphicsEngine.cc
#
# Generated by Trac 1.0.9
# Jun 20, 2024, 9:42:43 AM

Thu, 15 May 2008 08:09:02 GMT scheusso [1278]
	* code/branches/merge/CMakeLists.txt (modified)
	* code/branches/merge/src/network/CMakeLists.txt (modified)
	* code/branches/merge/src/network/ConnectionManager.cc (modified)
	* code/branches/merge/src/network/ConnectionManager.h (modified)
	* code/branches/merge/src/network/dummyclient4.cc (added)
	* code/branches/merge/src/network/dummyserver4.cc (added)
	* code/branches/merge/src/orxonox/CMakeLists.txt (modified)
	* code/branches/merge/src/orxonox/GraphicsEngine.cc (modified)

	new dummy[server,client]4; adapted connectionmanager to new ...


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 20:13:17 GMT rgrieder [1268]
	* code/branches/merge/src/core/InputHandler.cc (modified)
	* code/branches/merge/src/core/InputManager.cc (modified)
	* code/branches/merge/src/orxonox/GraphicsEngine.cc (modified)
	* code/branches/merge/src/orxonox/Orxonox.cc (modified)

	- removed some debug output


Tue, 13 May 2008 13:45:19 GMT rgrieder [1263]
	* code/branches/merge/src/core/BaseObject.cc (modified)
	* code/branches/merge/src/core/CoreIncludes.h (modified)
	* code/branches/merge/src/core/Debug.h (modified)
	* code/branches/merge/src/core/Error.cc (modified)
	* code/branches/merge/src/core/Error.h (modified)
	* code/branches/merge/src/core/Namespace.cc (modified)
	* code/branches/merge/src/core/OrxonoxClass.cc (modified)
	* code/branches/merge/src/orxonox/GraphicsEngine.cc (modified)
	* code/branches/merge/src/orxonox/GraphicsEngine.h (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/OrxonoxPlatform.h (modified)
	* code/branches/merge/src/orxonox/console/InGameConsole.cc (modified)
	* code/branches/merge/src/orxonox/objects/Explosion.cc (modified)
	* code/branches/merge/src/orxonox/objects/Model.cc (modified)
	* code/branches/merge/src/orxonox/objects/Model.h (modified)
	* code/branches/merge/src/orxonox/objects/NPC.cc (modified)
	* code/branches/merge/src/orxonox/objects/Projectile.cc (modified)
	* code/branches/merge/src/orxonox/objects/SpaceShip.cc (modified)
	* code/branches/merge/src/orxonox/objects/WorldEntity.cc (modified)
	* code/branches/merge/src/orxonox/tools/Timer.cc (modified)

	- merged ogre 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:58:22 GMT rgrieder [1220]
	* code/trunk/src/core/InputBuffer.cc (modified)
	* code/trunk/src/orxonox/GraphicsEngine.cc (modified)

	compiles now on tardis