#
# ChangeLog for code/branches/merge/src
#
# Generated by Trac 1.0.9
# Nov 25, 2024, 3:42:19 AM

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 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: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


Sat, 03 May 2008 19:05:19 GMT rgrieder [1227]
	* code/trunk/src/orxonox/objects/WorldEntity.h (modified)

	ha, found you! buggy little bug!
	- When setting the rotation axis of ...