#
# ChangeLog for code/branches/merger/src
#
# Generated by Trac 1.0.9
# Nov 25, 2024, 5:05:31 AM

Wed, 28 Nov 2007 00:05:53 GMT nicolasc [295]
	* code/branches/merger/cmake/FindENet.cmake (modified)
	* code/branches/merger/src/network/CMakeLists.txt (modified)

	minor fixes


Tue, 27 Nov 2007 23:59:55 GMT nicolasc [293]
	* code/branches/merger/CMakeLists.txt (modified)
	* code/branches/merger/src/CMakeLists.txt (modified)
	* code/branches/merger/src/hud/hud_overlay.h (modified)
	* code/branches/merger/src/orxonox/CMakeLists.txt (modified)

	added FindENet and FindBoost
	FindBoost does not work (yet)


Tue, 27 Nov 2007 22:32:48 GMT nicolasc [287]
	* code/branches/merger/src/network/Makefile.norm (moved)

	renamed Makefile, to prevent unnescessary uploading


Tue, 27 Nov 2007 22:30:17 GMT nicolasc [285]
	* code/branches/merger/src/CMakeLists.txt (modified)
	* code/branches/merger/src/network/CMakeLists.txt (added)
	* code/branches/merger/src/network/Client.cc (modified)
	* code/branches/merger/src/network/Client.h (modified)
	* code/branches/merger/src/network/ClientConnection.cc (modified)
	* code/branches/merger/src/network/ClientConnection.h (modified)
	* code/branches/merger/src/network/ConnectionManager.cc (modified)
	* code/branches/merger/src/network/ConnectionManager.h (modified)
	* code/branches/merger/src/network/Makefile (modified)
	* code/branches/merger/src/network/PacketBuffer.cc (modified)
	* code/branches/merger/src/network/PacketBufferTest.cc (modified)
	* code/branches/merger/src/network/PacketBufferTestExt.cc (modified)
	* code/branches/merger/src/network/Server.cc (modified)
	* code/branches/merger/src/network/Server.h (modified)
	* code/branches/merger/src/network/Synchronisable.cc (modified)
	* code/branches/merger/src/network/dummyclient.cc (modified)
	* code/branches/merger/src/network/dummyclient2.cc (modified)
	* code/branches/merger/src/network/dummyserver.cc (modified)
	* code/branches/merger/src/orxonox/CMakeLists.txt (modified)

	cleaned up network, builds with CML


Tue, 27 Nov 2007 22:07:15 GMT nicolasc [282]
	* code/branches/merger/src/loader/CMakeLists.txt (modified)
	* code/branches/merger/src/orxonox/objects/CMakeLists.txt (modified)

	minor fix


Tue, 27 Nov 2007 21:58:08 GMT nicolasc [281]
	* code/branches/merger/src/loader/CMakeLists.txt (added)
	* code/branches/merger/src/orxonox/objects/CMakeLists.txt (added)

	added to missing CMLs


Tue, 27 Nov 2007 21:52:22 GMT nicolasc [280]
	* code/branches/merger/src/CMakeLists.txt (modified)
	* code/branches/merger/src/orxonox/CMakeLists.txt (added)
	* code/branches/merger/src/orxonox/core/CMakeLists.txt (added)
	* code/branches/merger/src/orxonox/objects/CMakeFiles (added)

	some cleanup in CMLs...


Tue, 27 Nov 2007 21:26:29 GMT nicolasc [279]
	* code/branches/merger/src/hud (copied)
	* code/branches/merger/src/hud/hud_overlay.cc (copied)
	* code/branches/merger/src/hud/hud_overlay.h (copied)

	merged hud


Tue, 27 Nov 2007 21:24:27 GMT nicolasc [278]
	* code/branches/merger/src/enet (copied)
	* code/branches/merger/src/enet/Makefile (copied)
	* code/branches/merger/src/enet/Makefile.am (copied)
	* code/branches/merger/src/enet/Makefile.in (copied)
	* code/branches/merger/src/enet/callbacks.h (copied)
	* code/branches/merger/src/enet/enet.h (copied)
	* code/branches/merger/src/enet/list.h (copied)
	* code/branches/merger/src/enet/protocol.h (copied)
	* code/branches/merger/src/enet/time.h (copied)
	* code/branches/merger/src/enet/types.h (copied)
	* code/branches/merger/src/enet/unix.h (copied)
	* code/branches/merger/src/enet/utility.h (copied)
	* code/branches/merger/src/enet/win32.h (copied)
	* code/branches/merger/src/network/Client.cc (copied)
	* code/branches/merger/src/network/Client.h (copied)
	* code/branches/merger/src/network/ClientConnection.cc (copied)
	* code/branches/merger/src/network/ClientConnection.h (copied)
	* code/branches/merger/src/network/ConnectionManager.cc (copied)
	* code/branches/merger/src/network/ConnectionManager.h (copied)
	* code/branches/merger/src/network/GameStateManager.cc (copied)
	* code/branches/merger/src/network/GameStateManager.h (copied)
	* code/branches/merger/src/network/Makefile (copied)
	* code/branches/merger/src/network/Makefile.tardis (copied)
	* code/branches/merger/src/network/PacketBuffer.cc (copied)
	* code/branches/merger/src/network/PacketBuffer.h (copied)
	* code/branches/merger/src/network/PacketBufferTest.cc (copied)
	* code/branches/merger/src/network/PacketBufferTestExt.cc (copied)
	* code/branches/merger/src/network/PacketDecoder.cc (copied)
	* code/branches/merger/src/network/PacketGenerator.cc (copied)
	* code/branches/merger/src/network/PacketManager.h (copied)
	* code/branches/merger/src/network/Server.cc (copied)
	* code/branches/merger/src/network/Server.h (copied)
	* code/branches/merger/src/network/Synchronisable.cc (copied)
	* code/branches/merger/src/network/Synchronisable.h (copied)
	* code/branches/merger/src/network/dummyclient.cc (copied)
	* code/branches/merger/src/network/dummyclient2.cc (copied)
	* code/branches/merger/src/network/dummyserver.cc (copied)

	merged network


Tue, 27 Nov 2007 20:47:07 GMT nicolasc [275]
	* code/branches/merger (copied)

	created merger branch


Mon, 26 Nov 2007 16:24:39 GMT landauf [265]
	* code/trunk/src/orxonox/orxonox.cc (modified)

	corrected spacing