#
# ChangeLog for code/branches/FICN/src/network/GameStateManager.cc
#
# Generated by Trac 1.0.9
# May 28, 2024, 10:35:50 PM

Wed, 19 Dec 2007 12:33:30 GMT scheusso [656]
	* code/branches/FICN/src/network/ClientConnection.h (modified)
	* code/branches/FICN/src/network/GameStateManager.cc (modified)
	* code/branches/FICN/src/network/Synchronisable.cc (modified)

	some errors corrected in gamestatehandling


Tue, 18 Dec 2007 23:28:42 GMT dumenim [632]
	* code/branches/FICN/src/network/Client.cc (modified)
	* code/branches/FICN/src/network/ClientConnection.cc (modified)
	* code/branches/FICN/src/network/GameStateClient.cc (modified)
	* code/branches/FICN/src/network/GameStateManager.cc (modified)
	* code/branches/FICN/src/network/PacketBuffer.cc (modified)
	* code/branches/FICN/src/network/PacketDecoder.cc (modified)
	* code/branches/FICN/src/network/PacketGenerator.cc (modified)
	* code/branches/FICN/src/network/Server.cc (modified)
	* code/branches/FICN/src/network/dummyclient3.cc (modified)

	networkstuff bluber fubber


Tue, 18 Dec 2007 23:04:49 GMT scheusso [630]
	* code/branches/FICN/src/network/GameStateManager.cc (modified)
	* code/branches/FICN/src/network/Synchronisable.cc (modified)
	* code/branches/FICN/src/network/Synchronisable.h (modified)
	* code/branches/FICN/src/orxonox/objects/Model.cc (modified)
	* code/branches/FICN/src/orxonox/objects/Model.h (modified)
	* code/branches/FICN/src/orxonox/objects/WorldEntity.cc (modified)
	* code/branches/FICN/src/orxonox/objects/WorldEntity.h (modified)

	made Model and WorldEntity synchronisable


Tue, 18 Dec 2007 18:05:51 GMT scheusso [624]
	* code/branches/FICN/src/network/Client.cc (modified)
	* code/branches/FICN/src/network/GameStateClient.cc (modified)
	* code/branches/FICN/src/network/GameStateManager.cc (modified)
	* code/branches/FICN/src/network/GameStateManager.h (modified)
	* code/branches/FICN/src/network/PacketDecoder.cc (modified)
	* code/branches/FICN/src/network/PacketGenerator.cc (modified)
	* code/branches/FICN/src/network/Server.cc (modified)

	changes in gamestatehandling


Tue, 18 Dec 2007 16:51:47 GMT scheusso [620]
	* code/branches/FICN/src/network/Client.cc (modified)
	* code/branches/FICN/src/network/ClientConnection.cc (modified)
	* code/branches/FICN/src/network/ClientConnection.h (modified)
	* code/branches/FICN/src/network/ClientInformation.cc (modified)
	* code/branches/FICN/src/network/ConnectionManager.cc (modified)
	* code/branches/FICN/src/network/GameStateClient.cc (modified)
	* code/branches/FICN/src/network/GameStateClient.h (modified)
	* code/branches/FICN/src/network/GameStateManager.cc (modified)
	* code/branches/FICN/src/network/PacketDecoder.cc (modified)
	* code/branches/FICN/src/network/PacketGenerator.cc (modified)
	* code/branches/FICN/src/network/PacketManager.h (modified)
	* code/branches/FICN/src/network/Server.cc (modified)
	* code/branches/FICN/src/network/Server.h (modified)

	gamestatehandling, error correction


Mon, 17 Dec 2007 20:56:47 GMT scheusso [599]
	* code/branches/FICN/bin/run-script (modified)
	* code/branches/FICN/run (modified)
	* code/branches/FICN/src/network/GameStateManager.cc (modified)
	* code/branches/FICN/src/network/Synchronisable.cc (modified)
	* code/branches/FICN/src/orxonox/objects/SceneNode.cc (modified)
	* code/branches/FICN/src/orxonox/objects/SceneNode.h (modified)
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)
	* code/branches/FICN/src/orxonox/orxonox.h (modified)

	ip address with --ip=address


Mon, 17 Dec 2007 19:23:26 GMT scheusso [590]
	* code/branches/FICN/bin/levels/sample.oxw (modified)
	* code/branches/FICN/src/network/GameStateManager.cc (modified)
	* code/branches/FICN/src/orxonox/objects/BaseEntity.cc (modified)
	* code/branches/FICN/src/orxonox/objects/BaseEntity.h (modified)
	* code/branches/FICN/src/orxonox/objects/SceneNode.cc (modified)
	* code/branches/FICN/src/orxonox/objects/SceneNode.h (modified)

	enhanced memory handling


Mon, 17 Dec 2007 13:39:01 GMT scheusso [573]
	* code/branches/FICN/src/network/GameStateManager.cc (modified)
	* code/branches/FICN/src/network/Synchronisable.cc (modified)

	some small changes and debug output


Mon, 17 Dec 2007 12:51:14 GMT scheusso [571]
	* code/branches/FICN/CMakeLists.txt (modified)
	* code/branches/FICN/src/network/GameStateManager.cc (modified)
	* code/branches/FICN/src/network/Synchronisable.cc (modified)
	* code/branches/FICN/src/network/Synchronisable.h (modified)

	cmakelists


Mon, 17 Dec 2007 11:21:27 GMT scheusso [569]
	* code/branches/FICN/src/network/GameStateManager.cc (modified)
	* code/branches/FICN/src/network/Synchronisable.cc (modified)

	bugfix in Synchronisable


Mon, 17 Dec 2007 11:09:13 GMT scheusso [568]
	* code/branches/FICN/src/network/GameStateManager.cc (modified)
	* code/branches/FICN/src/orxonox/objects/BaseEntity.h (modified)
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)
	* code/branches/FICN/src/orxonox/orxonox.h (modified)

	added capability for presentation mode


Thu, 13 Dec 2007 17:02:07 GMT nicolasc [514]
	* code/branches/FICN/src/network/Client.cc (modified)
	* code/branches/FICN/src/network/ClientConnection.cc (modified)
	* code/branches/FICN/src/network/ClientInformation.cc (modified)
	* code/branches/FICN/src/network/ConnectionManager.cc (modified)
	* code/branches/FICN/src/network/GameStateClient.cc (modified)
	* code/branches/FICN/src/network/GameStateManager.cc (modified)
	* code/branches/FICN/src/network/PacketBuffer.cc (modified)
	* code/branches/FICN/src/network/PacketBufferTestExt.cc (modified)
	* code/branches/FICN/src/network/PacketDecoder.cc (modified)
	* code/branches/FICN/src/network/PacketGenerator.cc (modified)
	* code/branches/FICN/src/network/dummyclient.cc (modified)
	* code/branches/FICN/src/network/dummyclient2.cc (modified)
	* code/branches/FICN/src/network/dummyserver.cc (modified)

	added copyright notice


Sun, 09 Dec 2007 11:42:46 GMT scheusso [436]
	* code/branches/FICN/src/network/ClientInformation.cc (modified)
	* code/branches/FICN/src/network/ClientInformation.h (modified)
	* code/branches/FICN/src/network/ConnectionManager.cc (modified)
	* code/branches/FICN/src/network/ConnectionManager.h (modified)
	* code/branches/FICN/src/network/GameStateClient.cc (modified)
	* code/branches/FICN/src/network/GameStateClient.h (modified)
	* code/branches/FICN/src/network/GameStateManager.cc (modified)
	* code/branches/FICN/src/network/GameStateManager.h (modified)
	* code/branches/FICN/src/network/PacketTypes.h (modified)
	* code/branches/FICN/src/network/Server.cc (modified)
	* code/branches/FICN/src/network/Server.h (modified)
	* code/branches/FICN/src/network/TODO (modified)

	extended gamestatehandling for diffed and not diffed gamestates ...


Wed, 05 Dec 2007 21:06:29 GMT scheusso [425]
	* code/branches/FICN/src/network/Client.cc (modified)
	* code/branches/FICN/src/network/Client.h (modified)
	* code/branches/FICN/src/network/GameStateManager.cc (modified)
	* code/branches/FICN/src/network/GameStateManager.h (modified)
	* code/branches/FICN/src/network/Server.cc (modified)

	some minor changes


Wed, 05 Dec 2007 20:17:22 GMT scheusso [422]
	* code/branches/FICN/src/network/GameStateManager.cc (modified)
	* code/branches/FICN/src/network/GameStateManager.h (modified)
	* code/branches/FICN/src/network/PacketManager.h (modified)
	* code/branches/FICN/src/network/Server.cc (modified)
	* code/branches/FICN/src/network/Server.h (modified)

	extended GameStateManager


Wed, 05 Dec 2007 16:59:25 GMT scheusso [413]
	* code/branches/FICN/src/network/Client.cc (modified)
	* code/branches/FICN/src/network/Client.h (modified)
	* code/branches/FICN/src/network/GameStateManager.cc (modified)
	* code/branches/FICN/src/network/GameStateManager.h (modified)
	* code/branches/FICN/src/network/PacketManager.h (modified)
	* code/branches/FICN/src/network/Server.h (modified)

	still errors


Wed, 05 Dec 2007 15:58:02 GMT dumenim [407]
	* code/branches/FICN/src/network/GameStateManager.cc (modified)

	compress/decompress funcions added


Wed, 05 Dec 2007 15:40:46 GMT scheusso [405]
	* code/branches/FICN/src/network/Client.cc (modified)
	* code/branches/FICN/src/network/Client.h (modified)
	* code/branches/FICN/src/network/GameStateManager.cc (modified)
	* code/branches/FICN/src/network/GameStateManager.h (modified)
	* code/branches/FICN/src/network/PacketDecoder.cc (modified)
	* code/branches/FICN/src/network/PacketGenerator.cc (modified)
	* code/branches/FICN/src/network/PacketManager.h (modified)
	* code/branches/FICN/src/network/Synchronisable.cc (modified)

	corrected errors


Wed, 05 Dec 2007 15:23:52 GMT dumenim [403]
	* code/branches/FICN/src/network/GameStateManager.cc (modified)
	* code/branches/FICN/src/network/GameStateManager.h (modified)
	* code/branches/FICN/src/network/PacketDecoder.cc (modified)
	* code/branches/FICN/src/network/PacketGenerator.cc (modified)
	* code/branches/FICN/src/network/PacketManager.h (modified)

	compressed gamestates


Tue, 04 Dec 2007 23:05:46 GMT scheusso [385]
	* code/branches/FICN/src/network/GameStateManager.cc (modified)
	* code/branches/FICN/src/network/GameStateManager.h (modified)

	extended GameStateManager:
	added functions
	 - encode (takes two ...


Sun, 02 Dec 2007 23:28:19 GMT scheusso [369]
	* code/branches/FICN/src/network/Client.cc (modified)
	* code/branches/FICN/src/network/Client.h (modified)
	* code/branches/FICN/src/network/ClientConnection.cc (modified)
	* code/branches/FICN/src/network/ClientConnection.h (modified)
	* code/branches/FICN/src/network/ConnectionManager.cc (modified)
	* code/branches/FICN/src/network/ConnectionManager.h (modified)
	* code/branches/FICN/src/network/GameStateManager.cc (modified)
	* code/branches/FICN/src/network/PacketDecoder.cc (modified)
	* code/branches/FICN/src/network/PacketManager.h (modified)
	* code/branches/FICN/src/network/Server.cc (modified)
	* code/branches/FICN/src/network/Server.h (modified)

	PacketDecoder:
	  Extended Class to make inheriting easier...
	    ...


Thu, 29 Nov 2007 15:21:30 GMT rgrieder [346]
	* code/branches/FICN (modified)
	* code/branches/FICN/bin (modified)
	* code/branches/FICN/src/loader/LevelLoader.cc (modified)
	* code/branches/FICN/src/loader/Light.cc (modified)
	* code/branches/FICN/src/loader/Light.h (modified)
	* code/branches/FICN/src/loader/LightManager.cc (modified)
	* code/branches/FICN/src/loader/LightManager.h (modified)
	* code/branches/FICN/src/network/ClientConnection.cc (modified)
	* code/branches/FICN/src/network/GameStateManager.cc (modified)
	* code/branches/FICN/src/network/GameStateManager.h (modified)
	* code/branches/FICN/src/network/PacketBufferTest.cc (modified)
	* code/branches/FICN/src/network/PacketBufferTestExt.cc (modified)
	* code/branches/FICN/src/network/Synchronisable.cc (modified)
	* code/branches/FICN/src/network/Synchronisable.h (modified)
	* code/branches/FICN/src/network/dummyclient.cc (modified)
	* code/branches/FICN/src/network/dummyserver.cc (modified)
	* code/branches/FICN/src/orxonox/core/Identifier.h (modified)
	* code/branches/FICN/src/orxonox/inertial_node.cc (added)
	* code/branches/FICN/src/orxonox/objects/test3.cc (modified)
	* code/branches/FICN/src/orxonox/ogre_control.h (added)
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)
	* code/branches/FICN/src/orxonox/orxonox_scene.cc (added)
	* code/branches/FICN/src/orxonox/orxonox_scene.h (added)
	* code/branches/FICN/src/orxonox/orxonox_ship.cc (added)
	* code/branches/FICN/src/orxonox/orxonox_ship.h (added)
	* code/branches/FICN/src/orxonox/run_manager.cc (added)

	- adjusted the entire source to compile under windows visual studio ...


Wed, 28 Nov 2007 17:13:04 GMT bknecht [337]
	* code/branches/FICN/CMakeLists.txt (modified)
	* code/branches/FICN/INSTALL (modified)
	* code/branches/FICN/Media/materials (copied)
	* code/branches/FICN/Media/materials/scripts (copied)
	* code/branches/FICN/Media/materials/scripts/Example.material (copied)
	* code/branches/FICN/Media/materials/scripts/Examples.compositor (copied)
	* code/branches/FICN/Media/materials/scripts/Examples.program (copied)
	* code/branches/FICN/Media/materials/scripts/Ogre.material (copied)
	* code/branches/FICN/Media/materials/textures (copied)
	* code/branches/FICN/Media/materials/textures/Dirt.jpg (copied)
	* code/branches/FICN/Media/materials/textures/GreenSkin.jpg (copied)
	* code/branches/FICN/Media/materials/textures/RustyBarrel.png (copied)
	* code/branches/FICN/Media/materials/textures/RustySteel.jpg (copied)
	* code/branches/FICN/Media/materials/textures/WeirdEye.png (copied)
	* code/branches/FICN/Media/materials/textures/cursor.png (copied)
	* code/branches/FICN/Media/materials/textures/dirt01.jpg (copied)
	* code/branches/FICN/Media/materials/textures/flare.png (copied)
	* code/branches/FICN/Media/materials/textures/nskingr.jpg (copied)
	* code/branches/FICN/Media/materials/textures/ogreborder.png (copied)
	* code/branches/FICN/Media/materials/textures/ogreborderUp.png (copied)
	* code/branches/FICN/Media/materials/textures/ogrebordercenter.png (copied)
	* code/branches/FICN/Media/materials/textures/ogrelogo-small.jpg (copied)
	* code/branches/FICN/Media/materials/textures/ogrelogo.png (copied)
	* code/branches/FICN/Media/materials/textures/smoke.png (copied)
	* code/branches/FICN/Media/materials/textures/smokecolors.png (copied)
	* code/branches/FICN/Media/materials/textures/spheremap.png (copied)
	* code/branches/FICN/Media/materials/textures/steelhead.png (copied)
	* code/branches/FICN/Media/models (copied)
	* code/branches/FICN/Media/models/Barrel.mesh (copied)
	* code/branches/FICN/Media/models/cube.mesh (copied)
	* code/branches/FICN/Media/models/fish.mesh (copied)
	* code/branches/FICN/Media/models/fish.skeleton (copied)
	* code/branches/FICN/Media/models/ogrehead.mesh (copied)
	* code/branches/FICN/Media/overlay (copied)
	* code/branches/FICN/Media/overlay/EnergyBackground.png (copied)
	* code/branches/FICN/Media/overlay/EnergyDistrBackground.png (copied)
	* code/branches/FICN/Media/overlay/MapBackGround.png (copied)
	* code/branches/FICN/Media/overlay/MyShip.png (copied)
	* code/branches/FICN/Media/overlay/OrxonoxBlack.png (copied)
	* code/branches/FICN/Media/overlay/OrxonoxHUD.overlay (copied)
	* code/branches/FICN/Media/overlay/OrxonoxHUD1.1.overlay (copied)
	* code/branches/FICN/Media/overlay/OrxonoxHUD1.2.overlay (copied)
	* code/branches/FICN/Media/overlay/OrxonoxORANGE.png (copied)
	* code/branches/FICN/Media/overlay/OrxonoxRED.png (copied)
	* code/branches/FICN/Media/overlay/PrimalWeaponBackground.png (copied)
	* code/branches/FICN/Media/overlay/PrimarBackground.png (copied)
	* code/branches/FICN/Media/overlay/PrimarChoice.png (copied)
	* code/branches/FICN/Media/overlay/PrimarSample.png (copied)
	* code/branches/FICN/Media/overlay/Racket.png (copied)
	* code/branches/FICN/Media/overlay/RacketBackground.png (copied)
	* code/branches/FICN/Media/overlay/RacketBackground.pxi (copied)
	* code/branches/FICN/Media/overlay/RacketGrid.png (copied)
	* code/branches/FICN/Media/overlay/RedPoint.png (copied)
	* code/branches/FICN/Media/overlay/ShildLeftBottom.png (copied)
	* code/branches/FICN/Media/overlay/ShildLeftTop.png (copied)
	* code/branches/FICN/Media/overlay/ShildRightBottom.png (copied)
	* code/branches/FICN/Media/overlay/ShildRightTop.png (copied)
	* code/branches/FICN/Media/overlay/TargetBackground.png (copied)
	* code/branches/FICN/Media/overlay/TimeBackground.png (copied)
	* code/branches/FICN/Media/overlay/backGround.png (copied)
	* code/branches/FICN/Media/overlay/clock.png (copied)
	* code/branches/FICN/Media/overlay/gun.png (copied)
	* code/branches/FICN/Media/overlay/man.png (copied)
	* code/branches/FICN/Media/overlay/shot.png (copied)
	* code/branches/FICN/Media/overlay/superegg.png (copied)
	* code/branches/FICN/Media/packs/cubemap.zip (copied)
	* code/branches/FICN/Media/particle (copied)
	* code/branches/FICN/Media/particle/Example-Water.particle (copied)
	* code/branches/FICN/Media/particle/Example.particle (copied)
	* code/branches/FICN/Media/particle/emitted_emitter.particle (copied)
	* code/branches/FICN/Media/particle/smoke.particle (copied)
	* code/branches/FICN/bin/CMakeCache.txt (copied)
	* code/branches/FICN/bin/resources.cfg (modified)
	* code/branches/FICN/cmake/FindBoost.cmake (copied)
	* code/branches/FICN/cmake/FindENet.cmake (copied)
	* code/branches/FICN/cmake/FindODE.cmake (copied)
	* code/branches/FICN/src/CMakeLists.txt (modified)
	* code/branches/FICN/src/Flocking.h (copied)
	* code/branches/FICN/src/class_hierarchy (copied)
	* code/branches/FICN/src/class_hierarchy/BaseObject.cc (copied)
	* code/branches/FICN/src/class_hierarchy/BaseObject.h (copied)
	* code/branches/FICN/src/class_hierarchy/CMakeLists.txt (copied)
	* code/branches/FICN/src/class_hierarchy/ClassHierarchy.cc (copied)
	* code/branches/FICN/src/class_hierarchy/ClassHierarchy.h (copied)
	* code/branches/FICN/src/class_hierarchy/Identifier.cc (copied)
	* code/branches/FICN/src/class_hierarchy/Identifier.h (copied)
	* code/branches/FICN/src/class_hierarchy/IdentifierIncludes.h (copied)
	* code/branches/FICN/src/class_hierarchy/IdentifierList.cc (copied)
	* code/branches/FICN/src/class_hierarchy/IdentifierList.h (copied)
	* code/branches/FICN/src/class_hierarchy/ObjectList.cc (copied)
	* code/branches/FICN/src/class_hierarchy/ObjectList.h (copied)
	* code/branches/FICN/src/class_hierarchy/OrxonoxClass.cc (copied)
	* code/branches/FICN/src/class_hierarchy/OrxonoxClass.h (copied)
	* code/branches/FICN/src/class_hierarchy/Test.h (copied)
	* code/branches/FICN/src/class_hierarchy/orxonox.cc (copied)
	* code/branches/FICN/src/class_hierarchy/test1.cc (copied)
	* code/branches/FICN/src/class_hierarchy/test1.h (copied)
	* code/branches/FICN/src/class_hierarchy/test2.cc (copied)
	* code/branches/FICN/src/class_hierarchy/test2.h (copied)
	* code/branches/FICN/src/class_hierarchy/test3.cc (copied)
	* code/branches/FICN/src/class_hierarchy/test3.h (copied)
	* code/branches/FICN/src/inertial_node.cc (copied)
	* code/branches/FICN/src/inertial_node.h (copied)
	* code/branches/FICN/src/loader/CMakeLists.txt (copied)
	* code/branches/FICN/src/network/CMakeLists.txt (copied)
	* code/branches/FICN/src/network/Client.cc (copied)
	* code/branches/FICN/src/network/Client.h (copied)
	* code/branches/FICN/src/network/ClientConnection.cc (copied)
	* code/branches/FICN/src/network/ClientConnection.h (copied)
	* code/branches/FICN/src/network/ConnectionManager.cc (copied)
	* code/branches/FICN/src/network/ConnectionManager.h (copied)
	* code/branches/FICN/src/network/GameStateManager.cc (copied)
	* code/branches/FICN/src/network/GameStateManager.h (copied)
	* code/branches/FICN/src/network/Makefile.norm (copied)
	* code/branches/FICN/src/network/Makefile.tardis (copied)
	* code/branches/FICN/src/network/PacketBuffer.cc (copied)
	* code/branches/FICN/src/network/PacketBuffer.h (copied)
	* code/branches/FICN/src/network/PacketBufferTest.cc (copied)
	* code/branches/FICN/src/network/PacketBufferTestExt.cc (copied)
	* code/branches/FICN/src/network/PacketDecoder.cc (copied)
	* code/branches/FICN/src/network/PacketGenerator.cc (copied)
	* code/branches/FICN/src/network/PacketManager.h (copied)
	* code/branches/FICN/src/network/Server.cc (copied)
	* code/branches/FICN/src/network/Server.h (copied)
	* code/branches/FICN/src/network/Synchronisable.cc (copied)
	* code/branches/FICN/src/network/Synchronisable.h (copied)
	* code/branches/FICN/src/network/dummyclient.cc (copied)
	* code/branches/FICN/src/network/dummyclient2.cc (copied)
	* code/branches/FICN/src/network/dummyserver.cc (copied)
	* code/branches/FICN/src/ogre_control.cc (copied)
	* code/branches/FICN/src/ogre_control.h (copied)
	* code/branches/FICN/src/orxonox.h (copied)
	* code/branches/FICN/src/orxonox/CMakeLists.txt (copied)
	* code/branches/FICN/src/orxonox/core/CMakeLists.txt (copied)
	* code/branches/FICN/src/orxonox/core/Iterator.h (modified)
	* code/branches/FICN/src/orxonox/hud (copied)
	* code/branches/FICN/src/orxonox/hud/CMakeLists.txt (copied)
	* code/branches/FICN/src/orxonox/hud/hud_overlay.cc (copied)
	* code/branches/FICN/src/orxonox/hud/hud_overlay.h (copied)
	* code/branches/FICN/src/orxonox/hud/test_overlay.cc (copied)
	* code/branches/FICN/src/orxonox/hud/test_overlay.h (copied)
	* code/branches/FICN/src/orxonox/objects/CMakeFiles (copied)
	* code/branches/FICN/src/orxonox/objects/CMakeLists.txt (copied)
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)
	* code/branches/FICN/src/orxonox/spaceship_steering.cc (copied)
	* code/branches/FICN/src/orxonox/spaceship_steering.h (copied)
	* code/branches/FICN/src/orxonox/weapon (copied)
	* code/branches/FICN/src/orxonox/weapon/CMakeLists.txt (copied)
	* code/branches/FICN/src/orxonox/weapon/ammunition_dump.cc (copied)
	* code/branches/FICN/src/orxonox/weapon/ammunition_dump.h (copied)
	* code/branches/FICN/src/orxonox/weapon/barrel_gun.cc (copied)
	* code/branches/FICN/src/orxonox/weapon/barrel_gun.h (copied)
	* code/branches/FICN/src/orxonox/weapon/base_weapon.cc (copied)
	* code/branches/FICN/src/orxonox/weapon/base_weapon.h (copied)
	* code/branches/FICN/src/orxonox/weapon/bullet.cc (copied)
	* code/branches/FICN/src/orxonox/weapon/bullet.h (copied)
	* code/branches/FICN/src/orxonox/weapon/bullet_manager.cc (copied)
	* code/branches/FICN/src/orxonox/weapon/bullet_manager.h (copied)
	* code/branches/FICN/src/orxonox/weapon/weapon_station.cc (copied)
	* code/branches/FICN/src/orxonox/weapon/weapon_station.h (copied)
	* code/branches/FICN/src/orxonox_prerequisites.h (copied)
	* code/branches/FICN/src/orxonox_scene.cc (copied)
	* code/branches/FICN/src/orxonox_scene.h (copied)
	* code/branches/FICN/src/orxonox_ship.cc (copied)
	* code/branches/FICN/src/orxonox_ship.h (copied)
	* code/branches/FICN/src/run_manager.cc (copied)
	* code/branches/FICN/src/run_manager.h (copied)

	merged merger to FICN branch


Wed, 28 Nov 2007 16:20:23 GMT nicolasc [332]
	* code/branches/AI/bin/resources.cfg (modified)
	* code/branches/merger/CMakeLists.txt (modified)
	* code/branches/merger/src/network/CMakeLists.txt (modified)
	* code/branches/merger/src/network/GameStateManager.cc (modified)
	* code/branches/merger/src/network/GameStateManager.h (modified)
	* code/branches/merger/src/network/PacketDecoder.cc (modified)
	* code/branches/merger/src/network/PacketGenerator.cc (modified)
	* code/branches/merger/src/network/PacketManager.h (modified)
	* code/branches/merger/src/network/Synchronisable.h (modified)
	* code/branches/merger/src/orxonox/core/Iterator.h (modified)

	merge network