#
# ChangeLog for code/branches/merger
#
# Generated by Trac 1.0.9
# Nov 25, 2024, 12:55:39 PM

Wed, 28 Nov 2007 17:00:41 GMT bknecht [336]
	* code/branches/merger/src/Flocking.h (copied)

	added flocking.h for AI


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


Wed, 28 Nov 2007 15:06:35 GMT nicolasc [323]
	* code/branches/merger/src/orxonox/orxonox.cc (modified)

	steering merge complete - still some fixing needed


Wed, 28 Nov 2007 15:02:15 GMT nicolasc [322]
	* code/branches/merger/src/orxonox.cc (deleted)
	* code/branches/merger/src/spaceship_steering.cc (deleted)
	* code/branches/merger/src/spaceship_steering.h (deleted)

	bump


Wed, 28 Nov 2007 14:55:58 GMT nicolasc [321]
	* code/branches/merger/src/orxonox.cc (modified)
	* code/branches/merger/src/orxonox/orxonox.cc (modified)

	some better merge


Wed, 28 Nov 2007 14:24:13 GMT nicolasc [320]
	* code/branches/merger/bin/resources.cfg (modified)
	* code/branches/merger/src/orxonox.cc (copied)
	* code/branches/merger/src/orxonox/CMakeLists.txt (modified)
	* code/branches/merger/src/orxonox/spaceship_steering.cc (copied)
	* code/branches/merger/src/orxonox/spaceship_steering.h (copied)
	* code/branches/merger/src/spaceship_steering.cc (copied)
	* code/branches/merger/src/spaceship_steering.h (copied)

	dont ask: bump


Wed, 28 Nov 2007 14:10:28 GMT nicolasc [319]
	* code/branches/merger/bin/resources.cfg (modified)
	* code/branches/merger/src/CMakeLists.txt (modified)
	* code/branches/merger/src/loader/CMakeLists.txt (modified)
	* code/branches/merger/src/network/CMakeLists.txt (modified)
	* code/branches/merger/src/orxonox/CMakeLists.txt (modified)
	* code/branches/merger/src/orxonox/core/CMakeLists.txt (modified)
	* code/branches/merger/src/orxonox/hud/CMakeLists.txt (added)
	* code/branches/merger/src/orxonox/objects/CMakeLists.txt (modified)
	* code/branches/merger/src/spaceship_steering.cc (copied)
	* code/branches/merger/src/spaceship_steering.h (copied)

	initial merge of steering


Wed, 28 Nov 2007 08:50:28 GMT nicolasc [304]
	* code/branches/merger/src/orxonox/CMakeLists.txt (modified)
	* code/branches/merger/src/orxonox/orxonox.cc (modified)

	some cleanups


Wed, 28 Nov 2007 08:13:34 GMT nicolasc [303]
	* code/branches/merger/CMakeLists.txt (modified)
	* code/branches/merger/cmake/FindODE.cmake (added)
	* code/branches/merger/src/CMakeLists.txt (modified)
	* code/branches/merger/src/orxonox/CMakeLists.txt (modified)

	minor fixes
	add FindODE.cmake (if needed)


Wed, 28 Nov 2007 01:55:30 GMT nicolasc [302]
	* code/branches/merger/src/CMakeLists.txt (modified)
	* code/branches/merger/src/orxonox/CMakeLists.txt (modified)
	* code/branches/merger/src/orxonox/hud (moved)
	* code/branches/merger/src/orxonox/hud/hud_overlay.cc (copied)
	* code/branches/merger/src/orxonox/hud/hud_overlay.h (copied)
	* code/branches/merger/src/orxonox/hud/test_overlay.cc (copied)
	* code/branches/merger/src/orxonox/hud/test_overlay.h (copied)
	* code/branches/merger/src/orxonox/weapon (moved)
	* code/branches/merger/src/orxonox/weapon/CMakeLists.txt (copied)
	* code/branches/merger/src/orxonox/weapon/ammunition_dump.cc (copied)
	* code/branches/merger/src/orxonox/weapon/ammunition_dump.h (copied)
	* code/branches/merger/src/orxonox/weapon/barrel_gun.cc (copied)
	* code/branches/merger/src/orxonox/weapon/barrel_gun.h (copied)
	* code/branches/merger/src/orxonox/weapon/base_weapon.cc (copied)
	* code/branches/merger/src/orxonox/weapon/base_weapon.h (copied)
	* code/branches/merger/src/orxonox/weapon/bullet.cc (copied)
	* code/branches/merger/src/orxonox/weapon/bullet.h (copied)
	* code/branches/merger/src/orxonox/weapon/bullet_manager.cc (copied)
	* code/branches/merger/src/orxonox/weapon/bullet_manager.h (copied)
	* code/branches/merger/src/orxonox/weapon/weapon_station.cc (copied)
	* code/branches/merger/src/orxonox/weapon/weapon_station.h (copied)

	moved hud and weapon to orxonox


Wed, 28 Nov 2007 01:26:29 GMT nicolasc [301]
	* code/branches/merger/CMakeLists.txt (modified)
	* code/branches/merger/src/class_hierarchy/CMakeLists.txt (modified)
	* code/branches/merger/src/loader/CMakeLists.txt (modified)
	* code/branches/merger/src/main.cc (deleted)
	* code/branches/merger/src/orxonox/CMakeLists.txt (modified)
	* code/branches/merger/src/weapon/CMakeLists.txt (modified)

	2nd tier cleanup


Wed, 28 Nov 2007 01:12:56 GMT nicolasc [300]
	* code/branches/merger/CMakeLists.txt (modified)
	* code/branches/merger/INSTALL (modified)
	* code/branches/merger/Media/materials (copied)
	* code/branches/merger/Media/materials/scripts (copied)
	* code/branches/merger/Media/materials/scripts/Example.material (copied)
	* code/branches/merger/Media/materials/scripts/Examples.compositor (copied)
	* code/branches/merger/Media/materials/scripts/Examples.program (copied)
	* code/branches/merger/Media/materials/scripts/Ogre.material (copied)
	* code/branches/merger/Media/materials/textures (copied)
	* code/branches/merger/Media/materials/textures/Dirt.jpg (copied)
	* code/branches/merger/Media/materials/textures/GreenSkin.jpg (copied)
	* code/branches/merger/Media/materials/textures/RustyBarrel.png (copied)
	* code/branches/merger/Media/materials/textures/RustySteel.jpg (copied)
	* code/branches/merger/Media/materials/textures/WeirdEye.png (copied)
	* code/branches/merger/Media/materials/textures/cursor.png (copied)
	* code/branches/merger/Media/materials/textures/dirt01.jpg (copied)
	* code/branches/merger/Media/materials/textures/flare.png (copied)
	* code/branches/merger/Media/materials/textures/nskingr.jpg (copied)
	* code/branches/merger/Media/materials/textures/ogreborder.png (copied)
	* code/branches/merger/Media/materials/textures/ogreborderUp.png (copied)
	* code/branches/merger/Media/materials/textures/ogrebordercenter.png (copied)
	* code/branches/merger/Media/materials/textures/ogrelogo-small.jpg (copied)
	* code/branches/merger/Media/materials/textures/ogrelogo.png (copied)
	* code/branches/merger/Media/materials/textures/smoke.png (copied)
	* code/branches/merger/Media/materials/textures/smokecolors.png (copied)
	* code/branches/merger/Media/materials/textures/spheremap.png (copied)
	* code/branches/merger/Media/materials/textures/steelhead.png (copied)
	* code/branches/merger/Media/models (copied)
	* code/branches/merger/Media/models/Barrel.mesh (copied)
	* code/branches/merger/Media/models/cube.mesh (copied)
	* code/branches/merger/Media/models/fish.mesh (copied)
	* code/branches/merger/Media/models/fish.skeleton (copied)
	* code/branches/merger/Media/models/ogrehead.mesh (copied)
	* code/branches/merger/Media/overlay (copied)
	* code/branches/merger/Media/overlay/EnergyBackground.png (copied)
	* code/branches/merger/Media/overlay/EnergyDistrBackground.png (copied)
	* code/branches/merger/Media/overlay/MapBackGround.png (copied)
	* code/branches/merger/Media/overlay/MyShip.png (copied)
	* code/branches/merger/Media/overlay/OrxonoxBlack.png (copied)
	* code/branches/merger/Media/overlay/OrxonoxHUD.overlay (copied)
	* code/branches/merger/Media/overlay/OrxonoxHUD1.1.overlay (copied)
	* code/branches/merger/Media/overlay/OrxonoxHUD1.2.overlay (copied)
	* code/branches/merger/Media/overlay/OrxonoxORANGE.png (copied)
	* code/branches/merger/Media/overlay/OrxonoxRED.png (copied)
	* code/branches/merger/Media/overlay/PrimalWeaponBackground.png (copied)
	* code/branches/merger/Media/overlay/PrimarBackground.png (copied)
	* code/branches/merger/Media/overlay/PrimarChoice.png (copied)
	* code/branches/merger/Media/overlay/PrimarSample.png (copied)
	* code/branches/merger/Media/overlay/Racket.png (copied)
	* code/branches/merger/Media/overlay/RacketBackground.png (copied)
	* code/branches/merger/Media/overlay/RacketBackground.pxi (copied)
	* code/branches/merger/Media/overlay/RacketGrid.png (copied)
	* code/branches/merger/Media/overlay/RedPoint.png (copied)
	* code/branches/merger/Media/overlay/ShildLeftBottom.png (copied)
	* code/branches/merger/Media/overlay/ShildLeftTop.png (copied)
	* code/branches/merger/Media/overlay/ShildRightBottom.png (copied)
	* code/branches/merger/Media/overlay/ShildRightTop.png (copied)
	* code/branches/merger/Media/overlay/TargetBackground.png (copied)
	* code/branches/merger/Media/overlay/TimeBackground.png (copied)
	* code/branches/merger/Media/overlay/backGround.png (copied)
	* code/branches/merger/Media/overlay/clock.png (copied)
	* code/branches/merger/Media/overlay/gun.png (copied)
	* code/branches/merger/Media/overlay/man.png (copied)
	* code/branches/merger/Media/overlay/shot.png (copied)
	* code/branches/merger/Media/overlay/superegg.png (copied)
	* code/branches/merger/Media/packs/cubemap.zip (copied)
	* code/branches/merger/Media/particle (copied)
	* code/branches/merger/Media/particle/Example-Water.particle (copied)
	* code/branches/merger/Media/particle/Example.particle (copied)
	* code/branches/merger/Media/particle/emitted_emitter.particle (copied)
	* code/branches/merger/Media/particle/smoke.particle (copied)
	* code/branches/merger/bin/CMakeCache.txt (copied)
	* code/branches/merger/bin/resources.cfg (modified)
	* code/branches/merger/src/CMakeLists.txt (modified)
	* code/branches/merger/src/class_hierarchy (copied)
	* code/branches/merger/src/class_hierarchy/BaseObject.cc (copied)
	* code/branches/merger/src/class_hierarchy/BaseObject.h (copied)
	* code/branches/merger/src/class_hierarchy/CMakeLists.txt (copied)
	* code/branches/merger/src/class_hierarchy/ClassHierarchy.cc (copied)
	* code/branches/merger/src/class_hierarchy/ClassHierarchy.h (copied)
	* code/branches/merger/src/class_hierarchy/Identifier.cc (copied)
	* code/branches/merger/src/class_hierarchy/Identifier.h (copied)
	* code/branches/merger/src/class_hierarchy/IdentifierIncludes.h (copied)
	* code/branches/merger/src/class_hierarchy/IdentifierList.cc (copied)
	* code/branches/merger/src/class_hierarchy/IdentifierList.h (copied)
	* code/branches/merger/src/class_hierarchy/ObjectList.cc (copied)
	* code/branches/merger/src/class_hierarchy/ObjectList.h (copied)
	* code/branches/merger/src/class_hierarchy/OrxonoxClass.cc (copied)
	* code/branches/merger/src/class_hierarchy/OrxonoxClass.h (copied)
	* code/branches/merger/src/class_hierarchy/Test.h (copied)
	* code/branches/merger/src/class_hierarchy/orxonox.cc (copied)
	* code/branches/merger/src/class_hierarchy/test1.cc (copied)
	* code/branches/merger/src/class_hierarchy/test1.h (copied)
	* code/branches/merger/src/class_hierarchy/test2.cc (copied)
	* code/branches/merger/src/class_hierarchy/test2.h (copied)
	* code/branches/merger/src/class_hierarchy/test3.cc (copied)
	* code/branches/merger/src/class_hierarchy/test3.h (copied)
	* code/branches/merger/src/hud/hud_overlay.h (modified)
	* code/branches/merger/src/hud/test_overlay.cc (copied)
	* code/branches/merger/src/hud/test_overlay.h (copied)
	* code/branches/merger/src/inertial_node.cc (copied)
	* code/branches/merger/src/inertial_node.h (copied)
	* code/branches/merger/src/main.cc (copied)
	* code/branches/merger/src/ogre_control.cc (copied)
	* code/branches/merger/src/ogre_control.h (copied)
	* code/branches/merger/src/orxonox.h (copied)
	* code/branches/merger/src/orxonox_prerequisites.h (copied)
	* code/branches/merger/src/orxonox_scene.cc (copied)
	* code/branches/merger/src/orxonox_scene.h (copied)
	* code/branches/merger/src/orxonox_ship.cc (copied)
	* code/branches/merger/src/orxonox_ship.h (copied)
	* code/branches/merger/src/run_manager.cc (copied)
	* code/branches/merger/src/run_manager.h (copied)
	* code/branches/merger/src/weapon (copied)
	* code/branches/merger/src/weapon/CMakeLists.txt (copied)
	* code/branches/merger/src/weapon/ammunition_dump.cc (copied)
	* code/branches/merger/src/weapon/ammunition_dump.h (copied)
	* code/branches/merger/src/weapon/barrel_gun.cc (copied)
	* code/branches/merger/src/weapon/barrel_gun.h (copied)
	* code/branches/merger/src/weapon/base_weapon.cc (copied)
	* code/branches/merger/src/weapon/base_weapon.h (copied)
	* code/branches/merger/src/weapon/bullet.cc (copied)
	* code/branches/merger/src/weapon/bullet.h (copied)
	* code/branches/merger/src/weapon/bullet_manager.cc (copied)
	* code/branches/merger/src/weapon/bullet_manager.h (copied)
	* code/branches/merger/src/weapon/weapon_station.cc (copied)
	* code/branches/merger/src/weapon/weapon_station.h (copied)

	initial merge of main_reto


Wed, 28 Nov 2007 00:54:14 GMT nicolasc [299]
	* code/branches/merger/src/enet (deleted)

	removed unnescessary enet folder


Wed, 28 Nov 2007 00:41:53 GMT nicolasc [298]
	* code/branches/merger/CMakeLists.txt (modified)
	* code/branches/merger/src/network/ClientConnection.cc (modified)
	* code/branches/merger/src/network/dummyclient.cc (modified)

	some cleanups
	eNet code is currently enet-1.1 compatible ...


Wed, 28 Nov 2007 00:34:27 GMT nicolasc [297]
	* code/branches/merger/CMakeLists.txt (modified)
	* code/branches/merger/src/network/CMakeLists.txt (modified)
	* code/branches/merger/src/network/ClientConnection.cc (modified)
	* code/branches/merger/src/network/dummyclient.cc (modified)

	made enet and boost working on tardis; needed some minor changes in ...


Wed, 28 Nov 2007 00:09:17 GMT nicolasc [296]
	* code/branches/merger/CMakeLists.txt (modified)

	xfer


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


Wed, 28 Nov 2007 00:02:03 GMT nicolasc [294]
	* code/branches/merger/cmake/FindBoost.cmake (added)
	* code/branches/merger/cmake/FindENet.cmake (added)

	added FindENet and FindBoost
	FindBoost does not work (yet)


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