#
# ChangeLog for /
#
# Generated by Trac 1.0.9
# Mar 16, 2025, 5:17:40 PM

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 14:04:53 GMT nicolape [318]
	* code/branches/audio/src/CMakeLists.txt (modified)
	* code/branches/audio/src/openal/CMakeLists.txt (modified)
	* code/branches/audio/src/openal/al.h (added)
	* code/branches/audio/src/openal/alc.h (added)
	* code/branches/audio/src/openal/alext.h (added)
	* code/branches/audio/src/openal/alut.h (added)
	* code/branches/audio/src/openal/lib (added)
	* code/branches/audio/src/openal/lib/libalut.a (added)
	* code/branches/audio/src/openal/lib/libalut.so (added)
	* code/branches/audio/src/openal/lib/libalut.so.0.1.0 (added)
	* code/branches/audio/src/openal/lib/libopenal.a (added)
	* code/branches/audio/src/openal/lib/libopenal.so (added)
	* code/branches/audio/src/openal/lib/libopenal.so.0.0.0 (added)
	* code/branches/audio/src/openal/lib/pkgconfig (added)
	* code/branches/audio/src/openal/lib/pkgconfig/freealut.pc (added)
	* code/branches/audio/src/openal/lib/pkgconfig/openal.pc (added)

	Added OpenAL Includes and Libs, and a small starter script


Wed, 28 Nov 2007 14:00:45 GMT mbiber [317]
	* code/branches/steering/src/orxonox.cc (modified)
	* code/branches/steering/src/spaceship_steering.cc (modified)
	* code/branches/steering/src/spaceship_steering.h (modified)

	update steering


Wed, 28 Nov 2007 14:00:24 GMT mbiber [316]
	* code/branches/steering/bin/resources.cfg (modified)

	update steering


Wed, 28 Nov 2007 13:56:26 GMT dumenim [315]
	* code/branches/network/src/network/PacketDecoder.cc (modified)

	added enet_packet_destroy to PacketGenerator/Decoder


Wed, 28 Nov 2007 13:41:41 GMT scheusso [314]
	* code/branches/network/CMakeLists.txt (modified)
	* code/branches/network/Ogre.log (modified)
	* code/branches/network/src/network/GameStateManager.cc (modified)
	* code/branches/network/src/network/GameStateManager.h (modified)
	* code/branches/network/src/network/Synchronisable.h (modified)

	implementing GameStateManager


Wed, 28 Nov 2007 13:39:12 GMT dumenim [313]
	* code/branches/network/src/network/PacketDecoder.cc (modified)
	* code/branches/network/src/network/PacketGenerator.cc (modified)
	* code/branches/network/src/network/PacketManager.h (modified)

	correct gamestate, comment


Wed, 28 Nov 2007 13:31:38 GMT rgrieder [312]
	* code/branches/main_reto/bin/run-script (modified)

	- fixed a large issue: PBuffer mode causes problems, deleted section ...


Wed, 28 Nov 2007 13:24:56 GMT nicolape [311]
	* code/branches/audio/src/openal/include (deleted)
	* code/branches/audio/src/openal/lib (deleted)




Wed, 28 Nov 2007 13:16:11 GMT nicolape [310]
	* code/branches/audio (copied)
	* code/branches/audio/src/CMakeLists.txt (modified)
	* code/branches/audio/src/openal (added)
	* code/branches/audio/src/openal/CMakeLists.txt (added)
	* code/branches/audio/src/openal/include (added)
	* code/branches/audio/src/openal/include/AL (added)
	* code/branches/audio/src/openal/include/AL/al.h (added)
	* code/branches/audio/src/openal/include/AL/alc.h (added)
	* code/branches/audio/src/openal/include/AL/alext.h (added)
	* code/branches/audio/src/openal/include/AL/alut.h (added)
	* code/branches/audio/src/openal/include/CMakeLists.txt (added)
	* code/branches/audio/src/openal/lib (added)
	* code/branches/audio/src/openal/lib/libalut.so (added)
	* code/branches/audio/src/openal/lib/libalut.so.0 (added)
	* code/branches/audio/src/openal/lib/libopenal.so (added)
	* code/branches/audio/src/openal/lib/libopenal.so.0 (added)

	Readded audio branch


Wed, 28 Nov 2007 13:05:25 GMT nicolape [309]
	* code/branches/audio (deleted)
	* code/branches/main_reto_vs05/media/materials/scripts/Example.material (modified)




Wed, 28 Nov 2007 12:38:13 GMT rgrieder [308]
	* code/branches/main_reto/Media/overlay/BasicOgreGuiTemplates.inc (deleted)
	* code/branches/main_reto/Media/overlay/Compositor.overlay (deleted)
	* code/branches/main_reto/Media/overlay/DP3.overlay (deleted)
	* code/branches/main_reto/Media/overlay/EnergyBackground.png (deleted)
	* code/branches/main_reto/Media/overlay/EnergyDistrBackground.png (deleted)
	* code/branches/main_reto/Media/overlay/Example-CubeMapping.overlay (deleted)
	* code/branches/main_reto/Media/overlay/Example-DynTex.overlay (deleted)
	* code/branches/main_reto/Media/overlay/Example-Water.overlay (deleted)
	* code/branches/main_reto/Media/overlay/MapBackGround.png (deleted)
	* code/branches/main_reto/Media/overlay/MyShip.png (deleted)
	* code/branches/main_reto/Media/overlay/OrxonoxBlack.png (deleted)
	* code/branches/main_reto/Media/overlay/OrxonoxHUD.overlay (deleted)
	* code/branches/main_reto/Media/overlay/OrxonoxHUD1.1.overlay (deleted)
	* code/branches/main_reto/Media/overlay/OrxonoxHUD1.2.overlay (deleted)
	* code/branches/main_reto/Media/overlay/OrxonoxORANGE.png (deleted)
	* code/branches/main_reto/Media/overlay/OrxonoxRED.png (deleted)
	* code/branches/main_reto/Media/overlay/PrimalWeaponBackground.png (deleted)
	* code/branches/main_reto/Media/overlay/PrimarBackground.png (deleted)
	* code/branches/main_reto/Media/overlay/PrimarChoice.png (deleted)
	* code/branches/main_reto/Media/overlay/PrimarSample.png (deleted)
	* code/branches/main_reto/Media/overlay/Racket.png (deleted)
	* code/branches/main_reto/Media/overlay/RacketBackground.png (deleted)
	* code/branches/main_reto/Media/overlay/RacketBackground.pxi (deleted)
	* code/branches/main_reto/Media/overlay/RacketGrid.png (deleted)
	* code/branches/main_reto/Media/overlay/RedPoint.png (deleted)
	* code/branches/main_reto/Media/overlay/Shadows.overlay (deleted)
	* code/branches/main_reto/Media/overlay/ShildLeftBottom.png (deleted)
	* code/branches/main_reto/Media/overlay/ShildLeftTop.png (deleted)
	* code/branches/main_reto/Media/overlay/ShildRightBottom.png (deleted)
	* code/branches/main_reto/Media/overlay/ShildRightTop.png (deleted)
	* code/branches/main_reto/Media/overlay/TargetBackground.png (deleted)
	* code/branches/main_reto/Media/overlay/TimeBackground.png (deleted)
	* code/branches/main_reto/Media/overlay/backGround.png (deleted)
	* code/branches/main_reto/Media/overlay/clock.png (deleted)
	* code/branches/main_reto/Media/overlay/gun.png (deleted)
	* code/branches/main_reto/Media/overlay/man.png (deleted)
	* code/branches/main_reto/Media/overlay/omitted (added)
	* code/branches/main_reto/Media/overlay/omitted/BasicOgreGuiTemplates.inc (added)
	* code/branches/main_reto/Media/overlay/omitted/Compositor.overlay (added)
	* code/branches/main_reto/Media/overlay/omitted/DP3.overlay (added)
	* code/branches/main_reto/Media/overlay/omitted/EnergyBackground.png (added)
	* code/branches/main_reto/Media/overlay/omitted/EnergyDistrBackground.png (added)
	* code/branches/main_reto/Media/overlay/omitted/Example-CubeMapping.overlay (added)
	* code/branches/main_reto/Media/overlay/omitted/Example-DynTex.overlay (added)
	* code/branches/main_reto/Media/overlay/omitted/Example-Water.overlay (added)
	* code/branches/main_reto/Media/overlay/omitted/MapBackGround.png (added)
	* code/branches/main_reto/Media/overlay/omitted/MyShip.png (added)
	* code/branches/main_reto/Media/overlay/omitted/OrxonoxBlack.png (added)
	* code/branches/main_reto/Media/overlay/omitted/OrxonoxHUD.overlay (added)
	* code/branches/main_reto/Media/overlay/omitted/OrxonoxHUD1.1.overlay (added)
	* code/branches/main_reto/Media/overlay/omitted/OrxonoxHUD1.2.overlay (added)
	* code/branches/main_reto/Media/overlay/omitted/OrxonoxORANGE.png (added)
	* code/branches/main_reto/Media/overlay/omitted/OrxonoxRED.png (added)
	* code/branches/main_reto/Media/overlay/omitted/PrimalWeaponBackground.png (added)
	* code/branches/main_reto/Media/overlay/omitted/PrimarBackground.png (added)
	* code/branches/main_reto/Media/overlay/omitted/PrimarChoice.png (added)
	* code/branches/main_reto/Media/overlay/omitted/PrimarSample.png (added)
	* code/branches/main_reto/Media/overlay/omitted/Racket.png (added)
	* code/branches/main_reto/Media/overlay/omitted/RacketBackground.png (added)
	* code/branches/main_reto/Media/overlay/omitted/RacketBackground.pxi (added)
	* code/branches/main_reto/Media/overlay/omitted/RacketGrid.png (added)
	* code/branches/main_reto/Media/overlay/omitted/RedPoint.png (added)
	* code/branches/main_reto/Media/overlay/omitted/Shadows.overlay (added)
	* code/branches/main_reto/Media/overlay/omitted/ShildLeftBottom.png (added)
	* code/branches/main_reto/Media/overlay/omitted/ShildLeftTop.png (added)
	* code/branches/main_reto/Media/overlay/omitted/ShildRightBottom.png (added)
	* code/branches/main_reto/Media/overlay/omitted/ShildRightTop.png (added)
	* code/branches/main_reto/Media/overlay/omitted/TargetBackground.png (added)
	* code/branches/main_reto/Media/overlay/omitted/TimeBackground.png (added)
	* code/branches/main_reto/Media/overlay/omitted/backGround.png (added)
	* code/branches/main_reto/Media/overlay/omitted/clock.png (added)
	* code/branches/main_reto/Media/overlay/omitted/gun.png (added)
	* code/branches/main_reto/Media/overlay/omitted/man.png (added)
	* code/branches/main_reto/Media/overlay/omitted/shot.png (added)
	* code/branches/main_reto/Media/overlay/omitted/superegg.png (added)
	* code/branches/main_reto/Media/overlay/shot.png (deleted)
	* code/branches/main_reto/Media/overlay/superegg.png (deleted)

	- excluded overlay-folder


Wed, 28 Nov 2007 12:23:56 GMT rgrieder [307]
	* code/branches/main_reto/Media/overlay/BasicOgreGuiTemplates.inc (added)
	* code/branches/main_reto/Media/overlay/Compositor.overlay (added)
	* code/branches/main_reto/Media/overlay/DP3.overlay (added)
	* code/branches/main_reto/Media/overlay/Example-CubeMapping.overlay (added)
	* code/branches/main_reto/Media/overlay/Example-DynTex.overlay (added)
	* code/branches/main_reto/Media/overlay/Example-Water.overlay (added)
	* code/branches/main_reto/Media/overlay/Shadows.overlay (added)

	- probably unsuccessful fix with a few files in media folder


Wed, 28 Nov 2007 12:01:42 GMT rgrieder [306]
	* code/branches/main_reto/bin/resources.cfg (modified)

	- fixed hopefully last issue (resources.cfg)


Wed, 28 Nov 2007 11:59:46 GMT rgrieder [305]
	* code/branches/main_reto/Media/materials/scripts/smoke.material (added)

	- added smoke.material to fix an fatal issue


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 23:09:44 GMT rgrieder [292]
	* code/branches/main_reto/src/run_manager.cc (modified)

	- fixed issue with string --> string& conversion


Tue, 27 Nov 2007 23:08:40 GMT rgrieder [291]
	* code/branches/main_reto_vs05/src/run_manager.cc (modified)

	- fixed a minor bug with string --> string& conversion (illegal with
	gcc)


Tue, 27 Nov 2007 23:08:09 GMT dumenim [290]
	* code/branches/network/src/network/GameStateManager.cc (modified)
	* code/branches/network/src/network/PacketDecoder.cc (modified)
	* code/branches/network/src/network/PacketGenerator.cc (modified)
	* code/branches/network/src/network/PacketManager.h (modified)

	added gamestates to packetCode/Decode classes


Tue, 27 Nov 2007 22:54:13 GMT rgrieder [289]
	* code/branches/main_reto/bin/resources.cfg (modified)
	* code/branches/main_reto/src/CMakeLists.txt (modified)
	* code/branches/main_reto/src/camera_manager.cc (deleted)
	* code/branches/main_reto/src/camera_manager.h (deleted)
	* code/branches/main_reto/src/hud/CMakeLists.txt (modified)
	* code/branches/main_reto/src/hud/test_overlay.cc (added)
	* code/branches/main_reto/src/hud/test_overlay.h (added)
	* code/branches/main_reto/src/main.cc (modified)
	* code/branches/main_reto/src/orxonox.cc (modified)
	* code/branches/main_reto/src/orxonox_prerequisites.h (modified)
	* code/branches/main_reto/src/run_manager.cc (modified)
	* code/branches/main_reto/src/run_manager.h (modified)
	* code/branches/main_reto/src/weapon/barrel_gun.cc (modified)

	- updated the source files and CMLs
	- adjusted resources.cfg for the ...


Tue, 27 Nov 2007 22:49:42 GMT rgrieder [288]
	* code/branches/main_reto_vs05/bin/Debug (modified)
	* code/branches/main_reto_vs05/bin/Debug/Plugins.cfg (modified)
	* code/branches/main_reto_vs05/bin/Debug/resources.cfg (modified)
	* code/branches/main_reto_vs05/bin/Release (modified)
	* code/branches/main_reto_vs05/bin/Release/Plugins.cfg (modified)
	* code/branches/main_reto_vs05/bin/Release/resources.cfg (modified)
	* code/branches/main_reto_vs05/media/materials/scripts/Ogre.material (modified)
	* code/branches/main_reto_vs05/media/materials/scripts/Ogre.material.asdf (added)
	* code/branches/main_reto_vs05/media/materials/scripts/smoke.material (added)
	* code/branches/main_reto_vs05/media/materials/textures/smoke.png (added)
	* code/branches/main_reto_vs05/media/materials/textures/smokecolors.png (added)
	* code/branches/main_reto_vs05/media/overlay (added)
	* code/branches/main_reto_vs05/media/overlay/BasicOgreGuiTemplates.inc (added)
	* code/branches/main_reto_vs05/media/overlay/Compositor.overlay (added)
	* code/branches/main_reto_vs05/media/overlay/DP3.overlay (added)
	* code/branches/main_reto_vs05/media/overlay/EnergyBackground.png (added)
	* code/branches/main_reto_vs05/media/overlay/EnergyDistrBackground.png (added)
	* code/branches/main_reto_vs05/media/overlay/Example-CubeMapping.overlay (added)
	* code/branches/main_reto_vs05/media/overlay/Example-DynTex.overlay (added)
	* code/branches/main_reto_vs05/media/overlay/Example-Water.overlay (added)
	* code/branches/main_reto_vs05/media/overlay/MapBackGround.png (added)
	* code/branches/main_reto_vs05/media/overlay/MyShip.png (added)
	* code/branches/main_reto_vs05/media/overlay/OrxonoxBlack.png (added)
	* code/branches/main_reto_vs05/media/overlay/OrxonoxHUD.overlay (added)
	* code/branches/main_reto_vs05/media/overlay/OrxonoxHUD1.1.overlay (added)
	* code/branches/main_reto_vs05/media/overlay/OrxonoxHUD1.2.overlay (added)
	* code/branches/main_reto_vs05/media/overlay/OrxonoxORANGE.png (added)
	* code/branches/main_reto_vs05/media/overlay/OrxonoxRED.png (added)
	* code/branches/main_reto_vs05/media/overlay/PrimalWeaponBackground.png (added)
	* code/branches/main_reto_vs05/media/overlay/PrimarBackground.png (added)
	* code/branches/main_reto_vs05/media/overlay/PrimarChoice.png (added)
	* code/branches/main_reto_vs05/media/overlay/PrimarSample.png (added)
	* code/branches/main_reto_vs05/media/overlay/Racket.png (added)
	* code/branches/main_reto_vs05/media/overlay/RacketBackground.png (added)
	* code/branches/main_reto_vs05/media/overlay/RacketBackground.pxi (added)
	* code/branches/main_reto_vs05/media/overlay/RacketGrid.png (added)
	* code/branches/main_reto_vs05/media/overlay/RedPoint.png (added)
	* code/branches/main_reto_vs05/media/overlay/Shadows.overlay (added)
	* code/branches/main_reto_vs05/media/overlay/ShildLeftBottom.png (added)
	* code/branches/main_reto_vs05/media/overlay/ShildLeftTop.png (added)
	* code/branches/main_reto_vs05/media/overlay/ShildRightBottom.png (added)
	* code/branches/main_reto_vs05/media/overlay/ShildRightTop.png (added)
	* code/branches/main_reto_vs05/media/overlay/TargetBackground.png (added)
	* code/branches/main_reto_vs05/media/overlay/TimeBackground.png (added)
	* code/branches/main_reto_vs05/media/overlay/backGround.png (added)
	* code/branches/main_reto_vs05/media/overlay/clock.png (added)
	* code/branches/main_reto_vs05/media/overlay/gun.png (added)
	* code/branches/main_reto_vs05/media/overlay/man.png (added)
	* code/branches/main_reto_vs05/media/overlay/shot.png (added)
	* code/branches/main_reto_vs05/media/overlay/superegg.png (added)
	* code/branches/main_reto_vs05/media/packs/models.zip (added)
	* code/branches/main_reto_vs05/media/particle (added)
	* code/branches/main_reto_vs05/media/particle/Example-Water.particle (added)
	* code/branches/main_reto_vs05/media/particle/Example.particle (added)
	* code/branches/main_reto_vs05/media/particle/emitted_emitter.particle (added)
	* code/branches/main_reto_vs05/media/particle/smoke.particle (added)
	* code/branches/main_reto_vs05/scripts/weapon_framework.vcproj (modified)
	* code/branches/main_reto_vs05/src/Lighting.h (added)
	* code/branches/main_reto_vs05/src/camera_manager.cc (deleted)
	* code/branches/main_reto_vs05/src/camera_manager.h (deleted)
	* code/branches/main_reto_vs05/src/hud (added)
	* code/branches/main_reto_vs05/src/hud/hud_overlay.cc (added)
	* code/branches/main_reto_vs05/src/hud/hud_overlay.h (added)
	* code/branches/main_reto_vs05/src/hud/test_overlay.cc (added)
	* code/branches/main_reto_vs05/src/hud/test_overlay.h (added)
	* code/branches/main_reto_vs05/src/main.cc (modified)
	* code/branches/main_reto_vs05/src/orxonox.cc (modified)
	* code/branches/main_reto_vs05/src/orxonox_prerequisites.h (modified)
	* code/branches/main_reto_vs05/src/orxonox_ship.cc (modified)
	* code/branches/main_reto_vs05/src/run_manager.cc (modified)
	* code/branches/main_reto_vs05/src/run_manager.h (modified)
	* code/branches/main_reto_vs05/src/weapon/barrel_gun.cc (modified)
	* code/branches/main_reto_vs05/src/weapon/base_weapon.cc (moved)
	* code/branches/main_reto_vs05/src/weapon/weapon.h (deleted)

	- added Chai's HUD overlay
	- abstracted debugOverlay --> TestOverlay ...


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:31:39 GMT rgrieder [286]
	* code/branches/hud/src/hud/hud_overlay.h (modified)

	- fixed a little bug (orxonox_prerequisites.h is not required and not ...


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:29:04 GMT rgrieder [284]
	* code/branches/hud/Media/materials (added)
	* code/branches/hud/Media/materials/scripts (added)
	* code/branches/hud/Media/materials/scripts/Example.material (added)
	* code/branches/hud/Media/materials/scripts/Examples.compositor (added)
	* code/branches/hud/Media/materials/scripts/Examples.program (added)
	* code/branches/hud/Media/materials/scripts/Ogre.material (added)
	* code/branches/hud/Media/materials/textures (added)
	* code/branches/hud/Media/materials/textures/Dirt.jpg (added)
	* code/branches/hud/Media/materials/textures/GreenSkin.jpg (added)
	* code/branches/hud/Media/materials/textures/RustyBarrel.png (added)
	* code/branches/hud/Media/materials/textures/RustySteel.jpg (added)
	* code/branches/hud/Media/materials/textures/WeirdEye.png (added)
	* code/branches/hud/Media/materials/textures/cursor.png (added)
	* code/branches/hud/Media/materials/textures/dirt01.jpg (added)
	* code/branches/hud/Media/materials/textures/flare.png (added)
	* code/branches/hud/Media/materials/textures/nskingr.jpg (added)
	* code/branches/hud/Media/materials/textures/ogreborder.png (added)
	* code/branches/hud/Media/materials/textures/ogreborderUp.png (added)
	* code/branches/hud/Media/materials/textures/ogrebordercenter.png (added)
	* code/branches/hud/Media/materials/textures/ogrelogo-small.jpg (added)
	* code/branches/hud/Media/materials/textures/ogrelogo.png (added)
	* code/branches/hud/Media/materials/textures/smoke.png (added)
	* code/branches/hud/Media/materials/textures/smokecolors.png (added)
	* code/branches/hud/Media/materials/textures/spheremap.png (added)
	* code/branches/hud/Media/materials/textures/steelhead.png (added)
	* code/branches/hud/Media/models (added)
	* code/branches/hud/Media/models/Barrel.mesh (added)
	* code/branches/hud/Media/models/cube.mesh (added)
	* code/branches/hud/Media/models/fish.mesh (added)
	* code/branches/hud/Media/models/fish.skeleton (added)
	* code/branches/hud/Media/models/ogrehead.mesh (added)
	* code/branches/hud/Media/overlay (added)
	* code/branches/hud/Media/overlay/EnergyBackground.png (added)
	* code/branches/hud/Media/overlay/EnergyDistrBackground.png (added)
	* code/branches/hud/Media/overlay/MapBackGround.png (added)
	* code/branches/hud/Media/overlay/MyShip.png (added)
	* code/branches/hud/Media/overlay/OrxonoxBlack.png (added)
	* code/branches/hud/Media/overlay/OrxonoxHUD.overlay (added)
	* code/branches/hud/Media/overlay/OrxonoxHUD1.1.overlay (added)
	* code/branches/hud/Media/overlay/OrxonoxHUD1.2.overlay (added)
	* code/branches/hud/Media/overlay/OrxonoxORANGE.png (added)
	* code/branches/hud/Media/overlay/OrxonoxRED.png (added)
	* code/branches/hud/Media/overlay/PrimalWeaponBackground.png (added)
	* code/branches/hud/Media/overlay/PrimarBackground.png (added)
	* code/branches/hud/Media/overlay/PrimarChoice.png (added)
	* code/branches/hud/Media/overlay/PrimarSample.png (added)
	* code/branches/hud/Media/overlay/Racket.png (added)
	* code/branches/hud/Media/overlay/RacketBackground.png (added)
	* code/branches/hud/Media/overlay/RacketBackground.pxi (added)
	* code/branches/hud/Media/overlay/RacketGrid.png (added)
	* code/branches/hud/Media/overlay/RedPoint.png (added)
	* code/branches/hud/Media/overlay/ShildLeftBottom.png (added)
	* code/branches/hud/Media/overlay/ShildLeftTop.png (added)
	* code/branches/hud/Media/overlay/ShildRightBottom.png (added)
	* code/branches/hud/Media/overlay/ShildRightTop.png (added)
	* code/branches/hud/Media/overlay/TargetBackground.png (added)
	* code/branches/hud/Media/overlay/TimeBackground.png (added)
	* code/branches/hud/Media/overlay/backGround.png (added)
	* code/branches/hud/Media/overlay/clock.png (added)
	* code/branches/hud/Media/overlay/gun.png (added)
	* code/branches/hud/Media/overlay/man.png (added)
	* code/branches/hud/Media/overlay/shot.png (added)
	* code/branches/hud/Media/overlay/superegg.png (added)
	* code/branches/hud/Media/packs/cubemap.zip (added)
	* code/branches/hud/Media/particle (added)
	* code/branches/hud/Media/particle/Example-Water.particle (added)
	* code/branches/hud/Media/particle/Example.particle (added)
	* code/branches/hud/Media/particle/emitted_emitter.particle (added)
	* code/branches/hud/Media/particle/smoke.particle (added)
	* code/branches/hud/bin/resources.cfg (modified)

	- added the necessary media material for the overlay
	- adjustd the ...


Tue, 27 Nov 2007 22:19:44 GMT rgrieder [283]
	* code/branches/hud/CMakeLists.txt (modified)
	* code/branches/hud/src/CMakeLists.txt (modified)
	* code/branches/hud/src/hud/CMakeLists.txt (added)
	* code/branches/hud/src/loader (deleted)
	* code/branches/hud/src/network (deleted)
	* code/branches/hud/src/orxonox.cc (modified)
	* code/branches/hud/src/xml (deleted)

	- removed the loader files due to several compiler errors (not needed ...


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:52:46 GMT nicolasc [277]
	* code/branches/tutorial (deleted)

	removed tutorial branch


Tue, 27 Nov 2007 20:52:17 GMT nicolasc [276]
	* code/branches/ode (deleted)

	removed ode branch - requested by mathias


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

	created merger branch


Tue, 27 Nov 2007 20:46:18 GMT nicolasc [274]
	* code/branches/merger (deleted)

	removed merge branch


Tue, 27 Nov 2007 17:33:17 GMT rgrieder [273]
	* code/branches/main_reto/src/CMakeLists.txt (modified)
	* code/branches/main_reto/src/class_hierarchy/CMakeLists.txt (modified)
	* code/branches/main_reto/src/weapon/CMakeLists.txt (modified)

	- fixed the last bug (BaseObjet.cc --> BaseObject.cc)
	- removed the ...


Tue, 27 Nov 2007 17:20:45 GMT rgrieder [272]
	* code/branches/main_reto/src/class_hierarchy/CMakeLists.txt (modified)
	* code/branches/main_reto/src/hud/CMakeLists.txt (modified)
	* code/branches/main_reto/src/weapon/CMakeLists.txt (modified)

	- fixed another bug (deleted some "#")


Tue, 27 Nov 2007 17:16:27 GMT rgrieder [271]
	* code/branches/main_reto/CMakeLists.txt (modified)

	-fixed a bug (added "src" as in include directory) in CMakeLists.text


Tue, 27 Nov 2007 17:09:22 GMT rgrieder [270]
	* code/branches/main_reto/Media/materials/scripts/Ogre.material (modified)
	* code/branches/main_reto/Media/materials/textures/smoke.png (added)
	* code/branches/main_reto/Media/materials/textures/smokecolors.png (added)
	* code/branches/main_reto/Media/overlay (added)
	* code/branches/main_reto/Media/overlay/EnergyBackground.png (added)
	* code/branches/main_reto/Media/overlay/EnergyDistrBackground.png (added)
	* code/branches/main_reto/Media/overlay/MapBackGround.png (added)
	* code/branches/main_reto/Media/overlay/MyShip.png (added)
	* code/branches/main_reto/Media/overlay/OrxonoxBlack.png (added)
	* code/branches/main_reto/Media/overlay/OrxonoxHUD.overlay (added)
	* code/branches/main_reto/Media/overlay/OrxonoxHUD1.1.overlay (added)
	* code/branches/main_reto/Media/overlay/OrxonoxHUD1.2.overlay (added)
	* code/branches/main_reto/Media/overlay/OrxonoxORANGE.png (added)
	* code/branches/main_reto/Media/overlay/OrxonoxRED.png (added)
	* code/branches/main_reto/Media/overlay/PrimalWeaponBackground.png (added)
	* code/branches/main_reto/Media/overlay/PrimarBackground.png (added)
	* code/branches/main_reto/Media/overlay/PrimarChoice.png (added)
	* code/branches/main_reto/Media/overlay/PrimarSample.png (added)
	* code/branches/main_reto/Media/overlay/Racket.png (added)
	* code/branches/main_reto/Media/overlay/RacketBackground.png (added)
	* code/branches/main_reto/Media/overlay/RacketBackground.pxi (added)
	* code/branches/main_reto/Media/overlay/RacketGrid.png (added)
	* code/branches/main_reto/Media/overlay/RedPoint.png (added)
	* code/branches/main_reto/Media/overlay/ShildLeftBottom.png (added)
	* code/branches/main_reto/Media/overlay/ShildLeftTop.png (added)
	* code/branches/main_reto/Media/overlay/ShildRightBottom.png (added)
	* code/branches/main_reto/Media/overlay/ShildRightTop.png (added)
	* code/branches/main_reto/Media/overlay/TargetBackground.png (added)
	* code/branches/main_reto/Media/overlay/TimeBackground.png (added)
	* code/branches/main_reto/Media/overlay/backGround.png (added)
	* code/branches/main_reto/Media/overlay/clock.png (added)
	* code/branches/main_reto/Media/overlay/gun.png (added)
	* code/branches/main_reto/Media/overlay/man.png (added)
	* code/branches/main_reto/Media/overlay/shot.png (added)
	* code/branches/main_reto/Media/overlay/superegg.png (added)
	* code/branches/main_reto/Media/particle (added)
	* code/branches/main_reto/Media/particle/Example-Water.particle (added)
	* code/branches/main_reto/Media/particle/Example.particle (added)
	* code/branches/main_reto/Media/particle/emitted_emitter.particle (added)
	* code/branches/main_reto/Media/particle/smoke.particle (added)
	* code/branches/main_reto/bin/src (deleted)
	* code/branches/main_reto/src/CMakeLists.txt (modified)
	* code/branches/main_reto/src/class_hierarchy (added)
	* code/branches/main_reto/src/class_hierarchy/BaseObject.cc (added)
	* code/branches/main_reto/src/class_hierarchy/BaseObject.h (added)
	* code/branches/main_reto/src/class_hierarchy/CMakeLists.txt (added)
	* code/branches/main_reto/src/class_hierarchy/ClassHierarchy.cc (added)
	* code/branches/main_reto/src/class_hierarchy/ClassHierarchy.h (added)
	* code/branches/main_reto/src/class_hierarchy/Identifier.cc (added)
	* code/branches/main_reto/src/class_hierarchy/Identifier.h (added)
	* code/branches/main_reto/src/class_hierarchy/IdentifierIncludes.h (added)
	* code/branches/main_reto/src/class_hierarchy/IdentifierList.cc (added)
	* code/branches/main_reto/src/class_hierarchy/IdentifierList.h (added)
	* code/branches/main_reto/src/class_hierarchy/ObjectList.cc (added)
	* code/branches/main_reto/src/class_hierarchy/ObjectList.h (added)
	* code/branches/main_reto/src/class_hierarchy/OrxonoxClass.cc (added)
	* code/branches/main_reto/src/class_hierarchy/OrxonoxClass.h (added)
	* code/branches/main_reto/src/class_hierarchy/Test.h (added)
	* code/branches/main_reto/src/class_hierarchy/orxonox.cc (added)
	* code/branches/main_reto/src/class_hierarchy/test1.cc (added)
	* code/branches/main_reto/src/class_hierarchy/test1.h (added)
	* code/branches/main_reto/src/class_hierarchy/test2.cc (added)
	* code/branches/main_reto/src/class_hierarchy/test2.h (added)
	* code/branches/main_reto/src/class_hierarchy/test3.cc (added)
	* code/branches/main_reto/src/class_hierarchy/test3.h (added)
	* code/branches/main_reto/src/hud (added)
	* code/branches/main_reto/src/hud/CMakeLists.txt (added)
	* code/branches/main_reto/src/hud/hud_overlay.cc (added)
	* code/branches/main_reto/src/hud/hud_overlay.h (added)

	- added old version of class hierarchy in order to make things work ...


Tue, 27 Nov 2007 14:13:00 GMT nicolape [269]
	* code/branches/xml/test.txt (deleted)

	removed test file :) (was only for some demo purposes)


Tue, 27 Nov 2007 14:11:43 GMT nicolape [268]
	* code/branches/xml/test.txt (added)

	added test file


Tue, 27 Nov 2007 14:02:03 GMT rgrieder [267]
	* code/branches/main_reto/bin/CMakeCache.txt (added)
	* code/branches/main_reto/src/CMakeLists.txt (modified)
	* code/branches/main_reto/src/main.cc (modified)
	* code/branches/main_reto/src/orxonox_prerequisites.h (modified)
	* code/branches/main_reto/src/orxonox_scene.cc (modified)
	* code/branches/main_reto/src/orxonox_ship.cc (modified)
	* code/branches/main_reto/src/orxonox_ship.h (modified)
	* code/branches/main_reto/src/run_manager.cc (modified)
	* code/branches/main_reto/src/run_manager.h (modified)
	* code/branches/main_reto/src/weapon/CMakeLists.txt (modified)
	* code/branches/main_reto/src/weapon/ammunition_dump.cc (modified)
	* code/branches/main_reto/src/weapon/ammunition_dump.h (modified)
	* code/branches/main_reto/src/weapon/barrel_gun.cc (added)
	* code/branches/main_reto/src/weapon/barrel_gun.h (added)
	* code/branches/main_reto/src/weapon/base_weapon.cc (added)
	* code/branches/main_reto/src/weapon/base_weapon.h (added)
	* code/branches/main_reto/src/weapon/weapon.h (deleted)
	* code/branches/main_reto/src/weapon/weapon_manager.cc (deleted)
	* code/branches/main_reto/src/weapon/weapon_manager.h (deleted)
	* code/branches/main_reto/src/weapon/weapon_station.cc (added)
	* code/branches/main_reto/src/weapon/weapon_station.h (added)

	- updated to current revision from Visual studio directory
	- ...


Mon, 26 Nov 2007 16:26:36 GMT landauf [266]
	* code/branches/objecthierarchy/src/orxonox/orxonox.cc (modified)

	spacing in oh-branch


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

	corrected spacing


Mon, 26 Nov 2007 16:19:23 GMT landauf [264]
	* code/branches/objecthierarchy/src/orxonox/orxonox.cc (modified)

	added tests


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

	removed "using namespace Ogre"
	added "namespace orxonox{}"
	added ...


Mon, 26 Nov 2007 15:40:22 GMT landauf [262]
	* code/branches/objecthierarchie (deleted)

	removed old object-hierarchy branch


Mon, 26 Nov 2007 15:36:14 GMT landauf [261]
	* code/branches/objecthierarchy (copied)

	created new object-hierarchy branch for documenting and, if needed, ...


Mon, 26 Nov 2007 15:35:04 GMT landauf [260]
	* code/objecthierarchy (deleted)

	sorry, wrong path


Mon, 26 Nov 2007 15:31:52 GMT landauf [259]
	* code/objecthierarchy (copied)

	created new object-hierarchy branch for documenting and, if needed, ...


Mon, 26 Nov 2007 15:26:17 GMT landauf [258]
	* code/trunk/src/CMakeLists.txt (modified)
	* code/trunk/src/orxonox (copied)
	* code/trunk/src/orxonox/core (copied)
	* code/trunk/src/orxonox/core/ClassFactory.h (copied)
	* code/trunk/src/orxonox/core/Factory.cc (copied)
	* code/trunk/src/orxonox/core/Factory.h (copied)
	* code/trunk/src/orxonox/core/Identifier.cc (copied)
	* code/trunk/src/orxonox/core/Identifier.h (copied)
	* code/trunk/src/orxonox/core/IdentifierIncludes.h (copied)
	* code/trunk/src/orxonox/core/IdentifierList.cc (copied)
	* code/trunk/src/orxonox/core/IdentifierList.h (copied)
	* code/trunk/src/orxonox/core/Iterator.h (copied)
	* code/trunk/src/orxonox/core/MetaObjectList.cc (copied)
	* code/trunk/src/orxonox/core/MetaObjectList.h (copied)
	* code/trunk/src/orxonox/core/ObjectList.h (copied)
	* code/trunk/src/orxonox/core/OrxonoxClass.cc (copied)
	* code/trunk/src/orxonox/core/OrxonoxClass.h (copied)
	* code/trunk/src/orxonox/objects (copied)
	* code/trunk/src/orxonox/objects/BaseObject.cc (copied)
	* code/trunk/src/orxonox/objects/BaseObject.h (copied)
	* code/trunk/src/orxonox/objects/Test.h (copied)
	* code/trunk/src/orxonox/objects/test1.cc (copied)
	* code/trunk/src/orxonox/objects/test1.h (copied)
	* code/trunk/src/orxonox/objects/test2.cc (copied)
	* code/trunk/src/orxonox/objects/test2.h (copied)
	* code/trunk/src/orxonox/objects/test3.cc (copied)
	* code/trunk/src/orxonox/objects/test3.h (copied)
	* code/trunk/src/orxonox/orxonox.cc (moved)

	merged object-hierarchy back to trunk


Mon, 26 Nov 2007 15:05:39 GMT landauf [257]
	* code/branches/objecthierarchie/src/orxonox/core/Identifier.h (modified)

	removed newly unused friend qualifier


Mon, 26 Nov 2007 15:00:50 GMT landauf [256]
	* code/branches/objecthierarchie/src/orxonox/core/Factory.cc (modified)
	* code/branches/objecthierarchie/src/orxonox/objects/BaseObject.h (modified)
	* code/branches/objecthierarchie/src/orxonox/objects/Test.h (modified)
	* code/branches/objecthierarchie/src/orxonox/orxonox.cc (modified)

	changed include paths


Mon, 26 Nov 2007 14:58:34 GMT landauf [255]
	* code/branches/objecthierarchie/src/CMakeLists.txt (modified)
	* code/branches/objecthierarchie/src/orxonox/core/ClassFactory.h (moved)
	* code/branches/objecthierarchie/src/orxonox/core/Factory.cc (moved)
	* code/branches/objecthierarchie/src/orxonox/core/Factory.h (moved)
	* code/branches/objecthierarchie/src/orxonox/core/Identifier.cc (moved)
	* code/branches/objecthierarchie/src/orxonox/core/Identifier.h (moved)
	* code/branches/objecthierarchie/src/orxonox/core/IdentifierIncludes.h (moved)
	* code/branches/objecthierarchie/src/orxonox/core/IdentifierList.cc (moved)
	* code/branches/objecthierarchie/src/orxonox/core/IdentifierList.h (moved)
	* code/branches/objecthierarchie/src/orxonox/core/Iterator.h (moved)
	* code/branches/objecthierarchie/src/orxonox/core/MetaObjectList.cc (moved)
	* code/branches/objecthierarchie/src/orxonox/core/MetaObjectList.h (moved)
	* code/branches/objecthierarchie/src/orxonox/core/ObjectList.h (moved)
	* code/branches/objecthierarchie/src/orxonox/core/OrxonoxClass.cc (moved)
	* code/branches/objecthierarchie/src/orxonox/core/OrxonoxClass.h (moved)
	* code/branches/objecthierarchie/src/orxonox/objects/BaseObject.cc (moved)
	* code/branches/objecthierarchie/src/orxonox/objects/BaseObject.h (moved)
	* code/branches/objecthierarchie/src/orxonox/objects/Test.h (moved)
	* code/branches/objecthierarchie/src/orxonox/objects/test1.cc (moved)
	* code/branches/objecthierarchie/src/orxonox/objects/test1.h (moved)
	* code/branches/objecthierarchie/src/orxonox/objects/test2.cc (moved)
	* code/branches/objecthierarchie/src/orxonox/objects/test2.h (moved)
	* code/branches/objecthierarchie/src/orxonox/objects/test3.cc (moved)
	* code/branches/objecthierarchie/src/orxonox/objects/test3.h (moved)
	* code/branches/objecthierarchie/src/orxonox/orxonox.cc (moved)

	moved files into the new folders


Mon, 26 Nov 2007 14:50:41 GMT landauf [254]
	* code/branches/objecthierarchie/src/ObjectList.h (modified)

	no idea why it compiled and worked without a "return" value...


Mon, 26 Nov 2007 13:17:14 GMT rgrieder [253]
	* code/branches/hud/src/hud (added)
	* code/branches/hud/src/hud/hud_overlay.cc (added)
	* code/branches/hud/src/hud/hud_overlay.h (added)

	- added 2 files for Chai's HUD
	- files contain a wrapper class for ...


Mon, 26 Nov 2007 13:14:10 GMT rgrieder [252]
	* code/branches/hud (copied)

	made a copy


Mon, 26 Nov 2007 02:41:38 GMT landauf [251]
	* code/branches/objecthierarchie/src/orxonox (added)
	* code/branches/objecthierarchie/src/orxonox/core (added)
	* code/branches/objecthierarchie/src/orxonox/objects (added)

	added folders for new file-hierarchy


Mon, 26 Nov 2007 01:55:54 GMT landauf [250]
	* code/trunk/bin/run-script.bat (added)

	added run-script.bat which apparently got lost in a merge of mr. ...


Mon, 26 Nov 2007 01:27:34 GMT landauf [249]
	* code/branches/objecthierarchie/bin/run-script.bat (modified)

	don't close console after orxonox exits


Mon, 26 Nov 2007 00:57:37 GMT landauf [248]
	* code/branches/objecthierarchie/src/IdentifierIncludes.h (modified)
	* code/branches/objecthierarchie/src/Iterator.h (modified)
	* code/branches/objecthierarchie/src/ObjectList.h (modified)
	* code/branches/objecthierarchie/src/orxonox.cc (modified)

	changed iterator: it now needs a list-element to start from ...


Sun, 25 Nov 2007 22:06:13 GMT scheusso [247]
	* code/branches/network/src/network/GameStateManager.cc (added)
	* code/branches/network/src/network/GameStateManager.h (added)
	* code/branches/network/src/network/Makefile (modified)
	* code/branches/network/src/network/Makefile.tardis (modified)
	* code/branches/network/src/network/Synchronisable.cc (modified)
	* code/branches/network/src/network/Synchronisable.h (modified)

	added GameStateManager class:
	- gets snapshots of the universe ...


Sun, 25 Nov 2007 18:19:54 GMT landauf [246]
	* code/branches/objecthierarchie/src/BaseObject.cc (modified)
	* code/branches/objecthierarchie/src/CMakeLists.txt (modified)
	* code/branches/objecthierarchie/src/Identifier.h (modified)
	* code/branches/objecthierarchie/src/IdentifierIncludes.h (modified)
	* code/branches/objecthierarchie/src/MetaObjectList.cc (added)
	* code/branches/objecthierarchie/src/MetaObjectList.h (added)
	* code/branches/objecthierarchie/src/ObjectList.h (modified)
	* code/branches/objecthierarchie/src/OrxonoxClass.cc (modified)
	* code/branches/objecthierarchie/src/OrxonoxClass.h (modified)
	* code/branches/objecthierarchie/src/orxonox.cc (modified)

	added "MetaObjectList", containing the list-element of the ObjectList ...


Sun, 25 Nov 2007 16:22:22 GMT scheusso [245]
	* code/branches/network/src/network/Synchronisable.cc (modified)

	some minor change/bugfix in Synchronisable.cc


Sun, 25 Nov 2007 16:21:53 GMT landauf [244]
	* code/branches/objecthierarchie/src/BaseObject.cc (modified)
	* code/branches/objecthierarchie/src/CMakeLists.txt (modified)
	* code/branches/objecthierarchie/src/ClassFactory.h (added)
	* code/branches/objecthierarchie/src/Factory.cc (modified)
	* code/branches/objecthierarchie/src/Factory.h (modified)
	* code/branches/objecthierarchie/src/Identifier.cc (modified)
	* code/branches/objecthierarchie/src/Identifier.h (modified)
	* code/branches/objecthierarchie/src/IdentifierIncludes.h (modified)
	* code/branches/objecthierarchie/src/Test.h (modified)
	* code/branches/objecthierarchie/src/orxonox.cc (modified)
	* code/branches/objecthierarchie/src/test1.cc (modified)
	* code/branches/objecthierarchie/src/test2.cc (modified)
	* code/branches/objecthierarchie/src/test3.cc (modified)

	reimplementation of the factory and parts of the class-hierarchy- ...


Sun, 25 Nov 2007 03:07:56 GMT landauf [243]
	* code/branches/objecthierarchie/src/BaseObject.h (modified)
	* code/branches/objecthierarchie/src/Identifier.cc (modified)
	* code/branches/objecthierarchie/src/Identifier.h (modified)
	* code/branches/objecthierarchie/src/IdentifierList.cc (modified)
	* code/branches/objecthierarchie/src/IdentifierList.h (modified)
	* code/branches/objecthierarchie/src/orxonox.cc (modified)

	removed the "directParent" feature - it was a clever but unnecessary ...


Sun, 25 Nov 2007 02:34:55 GMT landauf [242]
	* code/branches/objecthierarchie/src/BaseObject.h (modified)
	* code/branches/objecthierarchie/src/Identifier.h (modified)
	* code/branches/objecthierarchie/src/orxonox.cc (modified)
	* code/branches/objecthierarchie/src/test1.h (modified)
	* code/branches/objecthierarchie/src/test2.h (modified)

	renamed "BaseIdentifier" to "SubclassIdentifier" to avoid ...


Sun, 25 Nov 2007 02:24:17 GMT landauf [241]
	* code/branches/objecthierarchie/src/Identifier.cc (modified)
	* code/branches/objecthierarchie/src/Identifier.h (modified)
	* code/branches/objecthierarchie/src/IdentifierList.cc (modified)
	* code/branches/objecthierarchie/src/IdentifierList.h (modified)

	added some "const" qualifiers


Sun, 25 Nov 2007 02:08:49 GMT landauf [240]
	* code/branches/objecthierarchie/src/IdentifierList.cc (modified)
	* code/branches/objecthierarchie/src/IdentifierList.h (modified)
	* code/branches/objecthierarchie/src/OrxonoxClass.h (modified)

	removed some "const" qualifiers


Sun, 25 Nov 2007 01:59:58 GMT landauf [239]
	* code/branches/objecthierarchie/src/BaseObject.h (modified)
	* code/branches/objecthierarchie/src/Identifier.cc (modified)
	* code/branches/objecthierarchie/src/Identifier.h (modified)
	* code/branches/objecthierarchie/src/IdentifierList.cc (modified)
	* code/branches/objecthierarchie/src/IdentifierList.h (modified)
	* code/branches/objecthierarchie/src/Iterator.h (modified)
	* code/branches/objecthierarchie/src/OrxonoxClass.h (modified)

	added some "const" qualifiers to the identifier-functions


Sat, 24 Nov 2007 13:22:45 GMT dumenim [238]
	* code/branches/network/src/network/Synchronisable.cc (modified)

	changed Synchronise.cc, compiles now


Wed, 21 Nov 2007 17:08:34 GMT scheusso [237]
	* code/branches/network/src/network/Makefile (modified)
	* code/branches/network/src/network/Makefile.tardis (modified)
	* code/branches/network/src/network/PacketDecoder.cc (modified)
	* code/branches/network/src/network/Synchronisable.cc (modified)
	* code/branches/network/src/network/Synchronisable.h (modified)

	synchronisable


Wed, 21 Nov 2007 15:34:44 GMT nicolasc [236]
	* code/branches/xml/src/xml/CMakeLists.txt (added)

	example included subdir in CML


Wed, 21 Nov 2007 15:34:18 GMT nicolasc [235]
	* code/branches/xml/src/CMakeLists.txt (modified)

	example included subdir in CML


Wed, 21 Nov 2007 15:16:16 GMT nicolape [234]
	* code/branches/audio (copied)

	created audio branch


Wed, 21 Nov 2007 14:49:34 GMT motth [233]
	* code/branches/AI/src/Flocking.h (modified)
	* code/branches/AI/src/orxonox.cc (modified)

	added Flocking


Tue, 20 Nov 2007 23:44:02 GMT rgrieder [232]
	* code/branches/main_reto_vs05/scripts/weapon_framework.vcproj (modified)
	* code/branches/main_reto_vs05/src/class_hierarchy (added)
	* code/branches/main_reto_vs05/src/class_hierarchy/BaseObject.cc (added)
	* code/branches/main_reto_vs05/src/class_hierarchy/BaseObject.h (added)
	* code/branches/main_reto_vs05/src/class_hierarchy/ClassHierarchy.cc (added)
	* code/branches/main_reto_vs05/src/class_hierarchy/ClassHierarchy.h (added)
	* code/branches/main_reto_vs05/src/class_hierarchy/Identifier.cc (added)
	* code/branches/main_reto_vs05/src/class_hierarchy/Identifier.h (added)
	* code/branches/main_reto_vs05/src/class_hierarchy/IdentifierIncludes.h (added)
	* code/branches/main_reto_vs05/src/class_hierarchy/IdentifierList.cc (added)
	* code/branches/main_reto_vs05/src/class_hierarchy/IdentifierList.h (added)
	* code/branches/main_reto_vs05/src/class_hierarchy/ObjectList.cc (added)
	* code/branches/main_reto_vs05/src/class_hierarchy/ObjectList.h (added)
	* code/branches/main_reto_vs05/src/class_hierarchy/OrxonoxClass.cc (added)
	* code/branches/main_reto_vs05/src/class_hierarchy/OrxonoxClass.h (added)
	* code/branches/main_reto_vs05/src/class_hierarchy/Test.h (added)
	* code/branches/main_reto_vs05/src/class_hierarchy/orxonox.cc (added)
	* code/branches/main_reto_vs05/src/class_hierarchy/test1.cc (added)
	* code/branches/main_reto_vs05/src/class_hierarchy/test1.h (added)
	* code/branches/main_reto_vs05/src/class_hierarchy/test2.cc (added)
	* code/branches/main_reto_vs05/src/class_hierarchy/test2.h (added)
	* code/branches/main_reto_vs05/src/class_hierarchy/test3.cc (added)
	* code/branches/main_reto_vs05/src/class_hierarchy/test3.h (added)
	* code/branches/main_reto_vs05/src/main.cc (modified)
	* code/branches/main_reto_vs05/src/orxonox_prerequisites.h (modified)
	* code/branches/main_reto_vs05/src/orxonox_ship.cc (modified)
	* code/branches/main_reto_vs05/src/orxonox_ship.h (modified)
	* code/branches/main_reto_vs05/src/run_manager.cc (modified)
	* code/branches/main_reto_vs05/src/run_manager.h (modified)
	* code/branches/main_reto_vs05/src/weapon/ammunition_dump.cc (modified)
	* code/branches/main_reto_vs05/src/weapon/ammunition_dump.h (modified)
	* code/branches/main_reto_vs05/src/weapon/barrel_gun.cc (added)
	* code/branches/main_reto_vs05/src/weapon/barrel_gun.h (added)
	* code/branches/main_reto_vs05/src/weapon/base_weapon.cpp (modified)
	* code/branches/main_reto_vs05/src/weapon/base_weapon.h (modified)

	- modified the AmmunitionDump to hold different types of ammo
	- ...


Tue, 20 Nov 2007 21:42:34 GMT landauf [231]
	* code/branches/objecthierarchie/src/Identifier.cc (modified)
	* code/branches/objecthierarchie/src/Identifier.h (modified)
	* code/branches/objecthierarchie/src/IdentifierIncludes.h (modified)

	added preprocessor-flag to change verbose mode of class-hierarchy and ...


Tue, 20 Nov 2007 21:18:11 GMT scheusso [230]
	* code/branches/network/src/network/Client.cc (modified)
	* code/branches/network/src/network/Client.h (modified)
	* code/branches/network/src/network/ConnectionManager.cc (modified)
	* code/branches/network/src/network/ConnectionManager.h (modified)
	* code/branches/network/src/network/Makefile (modified)
	* code/branches/network/src/network/Server.cc (added)
	* code/branches/network/src/network/Server.h (added)
	* code/branches/network/src/network/Synchronisable.cc (added)
	* code/branches/network/src/network/Synchronisable.h (added)

	created base-class Synchronisable; the files are still quite empty


Tue, 20 Nov 2007 20:36:41 GMT scheusso [229]
	* code/branches/network/src/network/Client.cc (added)
	* code/branches/network/src/network/Client.h (added)
	* code/branches/network/src/network/ClientConnection.cc (modified)
	* code/branches/network/src/network/ClientConnection.h (modified)
	* code/branches/network/src/network/ConnectionManager.cc (modified)
	* code/branches/network/src/network/Makefile (modified)

	added class Client (rootclass of the network module for the client) ...


Tue, 20 Nov 2007 20:03:57 GMT nicolasc [228]
	* code/branches/merger/bin/run-script (modified)
	* code/branches/merger/src/misc (copied)
	* code/branches/merger/src/misc/String2Number.h (copied)
	* code/branches/merger/src/orxonox.cc (modified)
	* code/branches/merger/src/tinyxml (copied)
	* code/branches/merger/src/tinyxml/tinystr.cc (copied)
	* code/branches/merger/src/tinyxml/tinystr.h (copied)
	* code/branches/merger/src/tinyxml/tinyxml.cc (copied)
	* code/branches/merger/src/tinyxml/tinyxml.h (copied)
	* code/branches/merger/src/tinyxml/tinyxmlerror.cc (copied)
	* code/branches/merger/src/tinyxml/tinyxmlparser.cc (copied)

	merged xml


Tue, 20 Nov 2007 20:00:19 GMT nicolasc [227]
	* code/branches/merger (copied)

	created merger branch for test merging


Tue, 20 Nov 2007 19:59:21 GMT nicolasc [226]
	* code/trunk/LICENSE (modified)

	changed license to gplv2


Tue, 20 Nov 2007 19:47:13 GMT landauf [225]
	* code/branches/objecthierarchie/src/Iterator.h (modified)
	* code/branches/objecthierarchie/src/orxonox.cc (modified)

	added ++it operator to the Iterator (because its faster than it++)


Tue, 20 Nov 2007 19:38:53 GMT landauf [224]
	* code/branches/objecthierarchie/src/CMakeLists.txt (modified)
	* code/branches/objecthierarchie/src/Identifier.cc (modified)
	* code/branches/objecthierarchie/src/Identifier.h (modified)
	* code/branches/objecthierarchie/src/IdentifierIncludes.h (modified)
	* code/branches/objecthierarchie/src/Iterator.h (modified)
	* code/branches/objecthierarchie/src/ObjectList.cc (deleted)
	* code/branches/objecthierarchie/src/ObjectList.h (modified)
	* code/branches/objecthierarchie/src/orxonox.cc (modified)

	- *cough* fixed another small bug in the object-list *cough*

	 - ...


Tue, 20 Nov 2007 19:33:15 GMT dumenim [223]
	* code/branches/network/src/network/PacketDecoder.cc (modified)
	* code/branches/network/src/network/PacketGenerator.cc (modified)
	* code/branches/network/src/network/PacketManager.h (modified)

	dumenim added some comment to the code


Tue, 20 Nov 2007 16:22:07 GMT landauf [222]
	* code/branches/objecthierarchie/src/ObjectList.cc (modified)

	fixed a small bug in the double-linked list


Tue, 20 Nov 2007 01:57:59 GMT landauf [221]
	* code/branches/objecthierarchie/src/BaseObject.h (modified)
	* code/branches/objecthierarchie/src/CMakeLists.txt (modified)
	* code/branches/objecthierarchie/src/Identifier.cc (modified)
	* code/branches/objecthierarchie/src/Identifier.h (modified)
	* code/branches/objecthierarchie/src/IdentifierIncludes.h (modified)
	* code/branches/objecthierarchie/src/Iterator.h (added)
	* code/branches/objecthierarchie/src/ObjectList.cc (modified)
	* code/branches/objecthierarchie/src/ObjectList.h (modified)
	* code/branches/objecthierarchie/src/orxonox.cc (modified)

	- made ObjectList double-linked to allow forward- and backward- ...