#
# ChangeLog for code/branches/FICN/src/orxonox/orxonox.cc
#
# Generated by Trac 1.0.9
# May 29, 2024, 8:00:56 AM

Mon, 17 Dec 2007 19:59:31 GMT nicolasc [592]
	* code/branches/FICN/Media/particle/engineglow.particle (added)
	* code/branches/FICN/bin/levels/sample.oxw (modified)
	* code/branches/FICN/src/misc/String2Number.h (modified)
	* code/branches/FICN/src/misc/Tokenizer.h (modified)
	* code/branches/FICN/src/network/CMakeLists.txt (modified)
	* code/branches/FICN/src/network/PacketTypes.h (modified)
	* code/branches/FICN/src/network/Synchronisable.cc (modified)
	* code/branches/FICN/src/orxonox/core/ConfigValueContainer.cc (modified)
	* code/branches/FICN/src/orxonox/core/Identifier.h (modified)
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)
	* code/branches/FICN/src/orxonox/orxonox_ship.h (modified)
	* code/branches/FICN/src/orxonox/particle/ParticleInterface.cc (modified)
	* code/branches/FICN/src/orxonox/run_manager.cc (modified)
	* code/branches/weapon_system_fw/bin/run-script (modified)

	added engineglow particle effect - based of treibwerk
	other various ...


Mon, 17 Dec 2007 17:38:36 GMT bknecht [588]
	* code/branches/FICN/Media/materials/scripts/Ogre.material (modified)
	* code/branches/FICN/Media/materials/scripts/Orxonox.material (modified)
	* code/branches/FICN/Media/materials/scripts/OrxonoxSky.material (added)
	* code/branches/FICN/Media/materials/textures/EnergyBackground.png (added)
	* code/branches/FICN/Media/materials/textures/EnergyDistrBackground.png (added)
	* code/branches/FICN/Media/materials/textures/MapBackGround.png (added)
	* code/branches/FICN/Media/materials/textures/MyShip.png (added)
	* code/branches/FICN/Media/materials/textures/OrxonoxBlack.png (added)
	* code/branches/FICN/Media/materials/textures/OrxonoxORANGE.png (added)
	* code/branches/FICN/Media/materials/textures/OrxonoxRED.png (added)
	* code/branches/FICN/Media/materials/textures/PrimalWeaponBackground.png (added)
	* code/branches/FICN/Media/materials/textures/PrimarBackground.png (added)
	* code/branches/FICN/Media/materials/textures/PrimarChoice.png (added)
	* code/branches/FICN/Media/materials/textures/PrimarSample.png (added)
	* code/branches/FICN/Media/materials/textures/Racket.png (added)
	* code/branches/FICN/Media/materials/textures/RacketBackground.png (added)
	* code/branches/FICN/Media/materials/textures/RacketGrid.png (added)
	* code/branches/FICN/Media/materials/textures/RedPoint.png (added)
	* code/branches/FICN/Media/materials/textures/ShieldLeftBottom.png (added)
	* code/branches/FICN/Media/materials/textures/ShieldLeftTop.png (added)
	* code/branches/FICN/Media/materials/textures/ShieldRightBottom.png (added)
	* code/branches/FICN/Media/materials/textures/ShieldRightTop.png (added)
	* code/branches/FICN/Media/materials/textures/TargetBackground.png (added)
	* code/branches/FICN/Media/materials/textures/TimeBackground.png (added)
	* code/branches/FICN/Media/materials/textures/backGround.png (added)
	* code/branches/FICN/Media/materials/textures/clock.png (added)
	* code/branches/FICN/Media/materials/textures/gun.png (added)
	* code/branches/FICN/Media/materials/textures/man.png (added)
	* code/branches/FICN/Media/materials/textures/shot.png (added)
	* code/branches/FICN/Media/materials/textures/superegg.png (added)
	* code/branches/FICN/Media/overlay/EnergyBackground.png (deleted)
	* code/branches/FICN/Media/overlay/EnergyDistrBackground.png (deleted)
	* code/branches/FICN/Media/overlay/MapBackGround.png (deleted)
	* code/branches/FICN/Media/overlay/MyShip.png (deleted)
	* code/branches/FICN/Media/overlay/OrxonoxBlack.png (deleted)
	* code/branches/FICN/Media/overlay/OrxonoxHUD.overlay (deleted)
	* code/branches/FICN/Media/overlay/OrxonoxHUD1.1.overlay (deleted)
	* code/branches/FICN/Media/overlay/OrxonoxHUD1.2.overlay (modified)
	* code/branches/FICN/Media/overlay/OrxonoxORANGE.png (deleted)
	* code/branches/FICN/Media/overlay/OrxonoxRED.png (deleted)
	* code/branches/FICN/Media/overlay/PrimalWeaponBackground.png (deleted)
	* code/branches/FICN/Media/overlay/PrimarBackground.png (deleted)
	* code/branches/FICN/Media/overlay/PrimarChoice.png (deleted)
	* code/branches/FICN/Media/overlay/PrimarSample.png (deleted)
	* code/branches/FICN/Media/overlay/Racket.png (deleted)
	* code/branches/FICN/Media/overlay/RacketBackground.png (deleted)
	* code/branches/FICN/Media/overlay/RacketBackground.pxi (deleted)
	* code/branches/FICN/Media/overlay/RacketGrid.png (deleted)
	* code/branches/FICN/Media/overlay/RedPoint.png (deleted)
	* code/branches/FICN/Media/overlay/ShildLeftBottom.png (deleted)
	* code/branches/FICN/Media/overlay/ShildLeftTop.png (deleted)
	* code/branches/FICN/Media/overlay/ShildRightBottom.png (deleted)
	* code/branches/FICN/Media/overlay/ShildRightTop.png (deleted)
	* code/branches/FICN/Media/overlay/TargetBackground.png (deleted)
	* code/branches/FICN/Media/overlay/TimeBackground.png (deleted)
	* code/branches/FICN/Media/overlay/backGround.png (deleted)
	* code/branches/FICN/Media/overlay/clock.png (deleted)
	* code/branches/FICN/Media/overlay/gun.png (deleted)
	* code/branches/FICN/Media/overlay/man.png (deleted)
	* code/branches/FICN/Media/overlay/shot.png (deleted)
	* code/branches/FICN/Media/overlay/superegg.png (deleted)
	* code/branches/FICN/bin/levels/sample.oxw (modified)
	* code/branches/FICN/src/orxonox/hud/HUD.cc (modified)
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)
	* code/branches/FICN/src/orxonox/run_manager.cc (modified)
	* code/branches/FICN/src/orxonox/run_manager.h (modified)

	corrected strange behaviour


Mon, 17 Dec 2007 16:44:18 GMT nicolape [584]
	* code/branches/FICN/bin/levels/sample.oxw (modified)
	* code/branches/FICN/src/loader/LevelLoader.cc (modified)
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)
	* code/branches/FICN/src/orxonox/orxonox.h (modified)

	Music loads now from level file


Mon, 17 Dec 2007 14:39:17 GMT landauf [576]
	* code/branches/FICN/bin/levels/sample.oxw (modified)
	* code/branches/FICN/src/orxonox/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/objects/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/objects/Mesh.cc (added)
	* code/branches/FICN/src/orxonox/objects/Mesh.h (added)
	* 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)
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)

	added Mesh and Model (doesn't work yet, but i don't want to have ...


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


Mon, 17 Dec 2007 09:39:12 GMT scheusso [565]
	* code/branches/FICN/CMakeLists.txt (modified)
	* code/branches/FICN/bin/levels/sample.oxw (modified)
	* code/branches/FICN/src/network/Client.cc (modified)
	* code/branches/FICN/src/network/Synchronisable.cc (modified)
	* code/branches/FICN/src/network/Synchronisable.h (modified)
	* code/branches/FICN/src/orxonox/objects/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/objects/WorldEntity.cc (modified)
	* code/branches/FICN/src/orxonox/objects/WorldEntity.h (modified)
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)

	added class BaseEntity:
	- !!! please inherit from this class in ...


Mon, 17 Dec 2007 02:20:46 GMT landauf [560]
	* code/branches/FICN/src/audio/AudioManager.cc (modified)
	* code/branches/FICN/src/audio/AudioStream.cc (modified)
	* code/branches/FICN/src/audio/_AudioObject.cc (modified)
	* code/branches/FICN/src/loader/LevelLoader.cc (modified)
	* code/branches/FICN/src/misc/String2Number.h (modified)
	* code/branches/FICN/src/orxonox/core/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/core/Debug.h (modified)
	* code/branches/FICN/src/orxonox/core/Error.cc (modified)
	* code/branches/FICN/src/orxonox/core/SignalHandler.cc (modified)
	* code/branches/FICN/src/orxonox/graphicsEngine.cc (modified)
	* code/branches/FICN/src/orxonox/objects/Ambient.cc (modified)
	* code/branches/FICN/src/orxonox/objects/Camera.cc (modified)
	* code/branches/FICN/src/orxonox/objects/Entity.cc (modified)
	* code/branches/FICN/src/orxonox/objects/SceneNode.cc (modified)
	* code/branches/FICN/src/orxonox/objects/Skybox.cc (modified)
	* code/branches/FICN/src/orxonox/objects/SpaceshipSteeringObject.cc (modified)
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)
	* code/branches/FICN/src/orxonox/spaceship_steering.cc (modified)

	- changed output from std::cout to COUT(level)
	 - added ...


Sun, 16 Dec 2007 21:19:03 GMT bknecht [546]
	* code/branches/FICN/src/orxonox/graphicsEngine.cc (modified)
	* code/branches/FICN/src/orxonox/main.cc (modified)
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)

	suggestion for solution of WinMain problem


Sun, 16 Dec 2007 17:37:31 GMT nicolasc [545]
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)

	tmp workaround: uncomment the search for path


Sun, 16 Dec 2007 16:54:06 GMT bknecht [542]
	* code/branches/FICN/bin/resources.cfg (modified)
	* code/branches/FICN/src/orxonox/core/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)

	added an argument reader


Sun, 16 Dec 2007 16:40:34 GMT nicolasc [541]
	* code/branches/FICN/bin/levels/sample.oxw (modified)
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)

	- fixed the sample.oxw
	- cannot place comments withing <world>-tag
	 ...


Sun, 16 Dec 2007 01:04:21 GMT nicolasc [539]
	* code/branches/FICN/CMakeLists.txt (modified)
	* code/branches/FICN/Media/materials/textures/bigflame.png (added)
	* code/branches/FICN/Media/materials/textures/black.png (added)
	* code/branches/FICN/Media/materials/textures/explosion.png (added)
	* code/branches/FICN/Media/materials/textures/flaretrail.png (added)
	* code/branches/FICN/Media/materials/textures/human_assf.png (modified)
	* code/branches/FICN/Media/materials/textures/ring_flare.png (added)
	* code/branches/FICN/Media/materials/textures/ring_flare2.png (added)
	* code/branches/FICN/Media/materials/textures/streak.png (added)
	* code/branches/FICN/Media/textures (deleted)
	* code/branches/FICN/bin/resources.cfg (modified)
	* code/branches/FICN/cmake/FindZLIB.cmake (moved)
	* code/branches/FICN/src/network/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)

	- standardized FindZLIB.cmake
	- minor cleanup in Media


Sun, 16 Dec 2007 00:07:59 GMT nicolasc [537]
	* code/branches/FICN/Media/materials/scripts/assf2.material (modified)
	* code/branches/FICN/Media/particle/schuss.particle (modified)
	* code/branches/FICN/bin/levels/sample.oxw (modified)
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)

	got particle system wroking


Sat, 15 Dec 2007 23:44:44 GMT nicolasc [535]
	* code/branches/FICN/Media/materials/scripts/PE_materials.material (copied)
	* code/branches/FICN/bin/resources.cfg (modified)
	* code/branches/FICN/src/orxonox/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)
	* code/branches/FICN/src/orxonox/particle (added)
	* code/branches/FICN/src/orxonox/particle/CMakeLists.txt (added)
	* code/branches/FICN/src/orxonox/particle/ParticleInterface.cc (added)
	* code/branches/FICN/src/orxonox/particle/ParticleInterface.h (added)
	* code/branches/FICN/src/particle (deleted)
	* code/branches/particle-old/ParticleREADME.txt (modified)

	- moved particle(-system) to a better place
	- included ...


Sat, 15 Dec 2007 21:48:50 GMT bknecht [534]
	* code/branches/FICN/src/orxonox/main.cc (modified)
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)

	some updates


Sat, 15 Dec 2007 05:37:35 GMT scheusso [531]
	* code/branches/FICN/bin/run-script (modified)
	* code/branches/FICN/run (modified)
	* code/branches/FICN/src/network/PacketDecoder.cc (modified)
	* code/branches/FICN/src/network/PacketManager.h (modified)
	* code/branches/FICN/src/network/Synchronisable.cc (modified)
	* code/branches/FICN/src/orxonox/core/CoreIncludes.h (modified)
	* code/branches/FICN/src/orxonox/objects/Entity.cc (modified)
	* code/branches/FICN/src/orxonox/objects/Entity.h (modified)
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)
	* code/branches/FICN/src/orxonox/orxonox.h (modified)
	* code/branches/FICN/src/orxonox/spaceship_steering.cc (modified)

	started implementing presentation ;)


Fri, 14 Dec 2007 12:32:17 GMT nicolasc [530]
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)

	test upload


Thu, 13 Dec 2007 22:54:00 GMT nicolape [525]
	* code/branches/FICN/bin/levels/sample.oxw (modified)
	* code/branches/FICN/src/loader/LevelLoader.cc (modified)
	* code/branches/FICN/src/loader/LevelLoader.h (modified)
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)

	Running again, but only with hack, don't know why the loader can't ...


Thu, 13 Dec 2007 22:27:55 GMT nicolasc [523]
	* code/branches/FICN/src/orxonox/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/inertial_node.h (modified)
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)

	- removed an not needed header
	- made cmakeclearcache safe, that it ...


Thu, 13 Dec 2007 17:45:17 GMT nicolape [519]
	* code/branches/FICN/bin/levels/sample.oxw (modified)
	* code/branches/FICN/src/orxonox/objects/SpaceshipSteeringObject.cc (modified)
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)

	Loading the steering works, but there is something odd with the ...


Thu, 13 Dec 2007 17:21:22 GMT nicolape [515]
	* code/branches/FICN/bin/levels/sample.oxw (modified)
	* code/branches/FICN/src/orxonox/objects/CMakeFiles (added)
	* code/branches/FICN/src/orxonox/objects/CMakeFiles/CMakeDirectoryInformation.cmake (added)
	* code/branches/FICN/src/orxonox/objects/CMakeFiles/objects.dir (added)
	* code/branches/FICN/src/orxonox/objects/CMakeFiles/objects.dir/CXX.includecache (added)
	* code/branches/FICN/src/orxonox/objects/CMakeFiles/objects.dir/DependInfo.cmake (added)
	* code/branches/FICN/src/orxonox/objects/CMakeFiles/objects.dir/build.make (added)
	* code/branches/FICN/src/orxonox/objects/CMakeFiles/objects.dir/cmake_clean.cmake (added)
	* code/branches/FICN/src/orxonox/objects/CMakeFiles/objects.dir/cmake_clean_target.cmake (added)
	* code/branches/FICN/src/orxonox/objects/CMakeFiles/objects.dir/depend.internal (added)
	* code/branches/FICN/src/orxonox/objects/CMakeFiles/objects.dir/depend.make (added)
	* code/branches/FICN/src/orxonox/objects/CMakeFiles/objects.dir/depend.make.mark (added)
	* code/branches/FICN/src/orxonox/objects/CMakeFiles/objects.dir/flags.make (added)
	* code/branches/FICN/src/orxonox/objects/CMakeFiles/objects.dir/link.txt (added)
	* code/branches/FICN/src/orxonox/objects/CMakeFiles/objects.dir/progress.make (added)
	* code/branches/FICN/src/orxonox/objects/CMakeFiles/progress.make (added)
	* code/branches/FICN/src/orxonox/objects/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/objects/Camera.cc (added)
	* code/branches/FICN/src/orxonox/objects/Camera.h (added)
	* code/branches/FICN/src/orxonox/objects/Entity.cc (added)
	* code/branches/FICN/src/orxonox/objects/Entity.h (added)
	* code/branches/FICN/src/orxonox/objects/Makefile (added)
	* code/branches/FICN/src/orxonox/objects/SceneNode.cc (added)
	* code/branches/FICN/src/orxonox/objects/SceneNode.h (added)
	* code/branches/FICN/src/orxonox/objects/SpaceshipSteeringObject.cc (added)
	* code/branches/FICN/src/orxonox/objects/SpaceshipSteeringObject.h (added)
	* code/branches/FICN/src/orxonox/objects/cmake_install.cmake (added)
	* code/branches/FICN/src/orxonox/objects/libobjects.so (added)
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)
	* code/branches/FICN/src/orxonox/orxonox.h (modified)
	* code/branches/FICN/src/orxonox/spaceship_steering.cc (modified)
	* code/branches/FICN/src/orxonox/spaceship_steering.h (modified)

	Added some objects for the level loader


Thu, 13 Dec 2007 14:56:28 GMT nicolasc [512]
	* code/branches/FICN/src/orxonox/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/InputManager.cc (added)
	* code/branches/FICN/src/orxonox/InputManager.h (added)
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)

	- some minor check fix in steering
	- added template inputmanager ...


Thu, 13 Dec 2007 13:49:26 GMT nicolape [511]
	* code/branches/FICN/bin/levels/sample.oxw (modified)
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)

	Reto added steering bug fix


Thu, 13 Dec 2007 12:52:36 GMT nicolape [510]
	* code/branches/FICN/Media/materials/scripts/Orxonox.material (modified)
	* code/branches/FICN/Media/packs/skybox.zip (modified)
	* code/branches/FICN/bin/levels/sample.oxw (modified)
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)

	Added one more skybox


Wed, 12 Dec 2007 22:34:58 GMT nicolape [507]
	* code/branches/FICN/src/loader/LevelLoader.cc (modified)
	* code/branches/FICN/src/loader/LevelLoader.h (modified)
	* code/branches/FICN/src/loader/Light.cc (deleted)
	* code/branches/FICN/src/loader/Light.h (deleted)
	* code/branches/FICN/src/loader/LightManager.cc (deleted)
	* code/branches/FICN/src/loader/LightManager.h (deleted)
	* code/branches/FICN/src/misc (added)
	* code/branches/FICN/src/misc/String2Number.h (copied)
	* code/branches/FICN/src/misc/Tokenizer.h (added)
	* code/branches/FICN/src/orxonox/objects/Ambient.cc (added)
	* code/branches/FICN/src/orxonox/objects/Ambient.h (added)
	* code/branches/FICN/src/orxonox/objects/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/objects/Skybox.cc (added)
	* code/branches/FICN/src/orxonox/objects/Skybox.h (added)
	* code/branches/FICN/src/orxonox/objects/test1.cc (modified)
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)
	* code/branches/FICN/src/xml (deleted)

	- Skybox and ambient light load now from level file sample.oxw. Added ...


Wed, 12 Dec 2007 22:28:38 GMT scheusso [505]
	* 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/TODO (modified)
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)

	gamestateclient completet


Wed, 12 Dec 2007 21:37:30 GMT landauf [496]
	* code/branches/FICN/src/loader/LevelLoader.cc (modified)
	* code/branches/FICN/src/network/Client.cc (modified)
	* code/branches/FICN/src/network/Client.h (modified)
	* code/branches/FICN/src/network/ConnectionManager.cc (modified)
	* code/branches/FICN/src/network/ConnectionManager.h (modified)
	* code/branches/FICN/src/network/GameStateClient.h (modified)
	* code/branches/FICN/src/network/GameStateManager.h (modified)
	* code/branches/FICN/src/network/Synchronisable.h (modified)
	* code/branches/FICN/src/orxonox/core/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/core/ClassFactory.h (modified)
	* code/branches/FICN/src/orxonox/core/Factory.cc (modified)
	* code/branches/FICN/src/orxonox/core/Factory.h (modified)
	* code/branches/FICN/src/orxonox/core/Identifier.cc (modified)
	* code/branches/FICN/src/orxonox/core/Identifier.h (modified)
	* code/branches/FICN/src/orxonox/core/IdentifierList.cc (modified)
	* code/branches/FICN/src/orxonox/core/Iterator.h (modified)
	* code/branches/FICN/src/orxonox/core/MetaObjectList.h (modified)
	* code/branches/FICN/src/orxonox/core/ObjectList.h (modified)
	* code/branches/FICN/src/orxonox/core/OrxonoxClass.h (modified)
	* code/branches/FICN/src/orxonox/main.cc (modified)
	* code/branches/FICN/src/orxonox/objects/BaseObject.cc (modified)
	* code/branches/FICN/src/orxonox/objects/BaseObject.h (modified)
	* code/branches/FICN/src/orxonox/objects/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/objects/Test.h (modified)
	* code/branches/FICN/src/orxonox/objects/Tickable.h (modified)
	* code/branches/FICN/src/orxonox/objects/Timer.h (modified)
	* code/branches/FICN/src/orxonox/objects/test3.cc (modified)
	* code/branches/FICN/src/orxonox/objects/test3.h (modified)
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)

	added files from objecthierarchy, changed includes


Wed, 12 Dec 2007 20:56:56 GMT nicolasc [487]
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)

	fix


Wed, 12 Dec 2007 20:49:44 GMT nicolasc [486]
	* code/branches/FICN/src/audio/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)
	* code/branches/FICN/src/tinyxml/CMakeLists.txt (added)

	- added missing CML in tinyxml
	- minor cleanup in audio CML
	- ...


Wed, 12 Dec 2007 19:19:40 GMT nicolape [482]
	* code/branches/FICN/src/network/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/objects/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/objects/test1.cc (modified)
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)

	Added example implementation of world entity


Wed, 12 Dec 2007 18:54:44 GMT nicolape [480]
	* code/branches/FICN/bin/levels/sample.oxw (modified)
	* code/branches/FICN/bin/levels/sp_level_moonstation.oxw (deleted)
	* code/branches/FICN/src/CMakeLists.txt (modified)
	* code/branches/FICN/src/loader/CMakeLists.txt (modified)
	* code/branches/FICN/src/loader/LevelLoader.cc (modified)
	* code/branches/FICN/src/loader/LevelLoader.h (modified)
	* code/branches/FICN/src/orxonox/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/core/OrxonoxClass.h (modified)
	* code/branches/FICN/src/orxonox/objects/BaseObject.cc (modified)
	* code/branches/FICN/src/orxonox/objects/BaseObject.h (modified)
	* code/branches/FICN/src/orxonox/objects/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/objects/test1.cc (modified)
	* code/branches/FICN/src/orxonox/objects/test1.h (modified)
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)

	Level loader working, see test1 class


Wed, 12 Dec 2007 17:11:30 GMT bknecht [473]
	* code/branches/FICN/src/orxonox/graphicsEngine.cc (modified)
	* code/branches/FICN/src/orxonox/main.cc (modified)
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)
	* code/branches/FICN/src/orxonox/orxonox.h (modified)

	should work again, sorry


Wed, 12 Dec 2007 13:15:24 GMT nicolape [469]
	* code/branches/FICN/bin/levels/sample.oxw (moved)
	* code/branches/FICN/src/loader/LevelLoader.cc (modified)
	* code/branches/FICN/src/loader/LevelLoader.h (modified)
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)

	Disabled some stuff on loader


Wed, 12 Dec 2007 11:42:30 GMT bknecht [462]
	* code/branches/FICN/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/graphicsEngine.cc (added)
	* code/branches/FICN/src/orxonox/graphicsEngine.h (added)
	* code/branches/FICN/src/orxonox/main.cc (added)
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)
	* code/branches/FICN/src/orxonox/orxonox.h (added)
	* code/branches/FICN/src/orxonox/orxonoxOLD.cc (added)

	got my work to compile (it's all hacked together and I dunno if it ...


Tue, 11 Dec 2007 23:35:52 GMT scheusso [459]
	* code/branches/FICN/src/network/Client.cc (modified)
	* code/branches/FICN/src/network/Client.h (modified)
	* code/branches/FICN/src/network/Server.cc (modified)
	* code/branches/FICN/src/network/Server.h (modified)
	* code/branches/FICN/src/network/Synchronisable.h (modified)
	* code/branches/FICN/src/network/dummyclient3.cc (modified)
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)

	preparing clone mode for game (one server steers, all clients view ;)
	)


Tue, 11 Dec 2007 22:29:16 GMT nicolasc [458]
	* code/branches/FICN/src/audio/AudioManager.cc (modified)
	* code/branches/FICN/src/audio/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)

	- removed setupCEGUI as it is not used nor does it work
	- some minor ...


Wed, 05 Dec 2007 22:47:05 GMT nicolape [430]
	* code/branches/FICN/bin/audio/ambient/a1.ogg (added)
	* code/branches/FICN/bin/audio/ambient/a2.ogg (added)
	* code/branches/FICN/bin/audio/ambient/a3.ogg (added)
	* code/branches/FICN/src/audio/AudioManager.cc (modified)
	* code/branches/FICN/src/audio/AudioManager.h (modified)
	* code/branches/FICN/src/audio/AudioStream.cc (modified)
	* code/branches/FICN/src/audio/AudioStream.h (modified)
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)

	We now have a background sound playlist


Wed, 05 Dec 2007 21:21:12 GMT nicolasc [427]
	* code/branches/FICN/Media/models/razor.mesh (added)
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)

	exchanged ogrehead for razor-fighter


Wed, 05 Dec 2007 18:28:46 GMT nicolape [419]
	* code/branches/FICN/src/audio/AudioManager.cc (modified)
	* code/branches/FICN/src/audio/AudioManager.h (modified)
	* code/branches/FICN/src/audio/AudioStream.cc (modified)
	* code/branches/FICN/src/audio/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)

	We now have a nice backgroundsound playing


Wed, 05 Dec 2007 13:30:09 GMT nicolasc [389]
	* code/branches/FICN/CMakeLists.txt (modified)
	* code/branches/FICN/bin/audio (copied)
	* code/branches/FICN/bin/audio/ambient (copied)
	* code/branches/FICN/bin/audio/ambient/ambient1.ogg (copied)
	* code/branches/FICN/bin/audio/ambient/ambient2.ogg (copied)
	* code/branches/FICN/bin/audio/ambient/ambient3.ogg (copied)
	* code/branches/FICN/bin/audio/sounds (copied)
	* code/branches/FICN/cmake/FindALUT.cmake (copied)
	* code/branches/FICN/cmake/FindOggVorbis.cmake (copied)
	* code/branches/FICN/cmake/FindOpenAL.cmake (copied)
	* code/branches/FICN/cmakeclearcache (copied)
	* code/branches/FICN/src/CMakeLists.txt (modified)
	* code/branches/FICN/src/audio (copied)
	* code/branches/FICN/src/audio/AudioBuffer.cc (copied)
	* code/branches/FICN/src/audio/AudioBuffer.h (copied)
	* code/branches/FICN/src/audio/AudioManager.cc (copied)
	* code/branches/FICN/src/audio/AudioManager.h (copied)
	* code/branches/FICN/src/audio/AudioSource.cc (copied)
	* code/branches/FICN/src/audio/AudioSource.h (copied)
	* code/branches/FICN/src/audio/CMakeLists.txt (copied)
	* code/branches/FICN/src/audio/_Ambient.cc (copied)
	* code/branches/FICN/src/audio/_Ambient.h (copied)
	* code/branches/FICN/src/audio/_AudioObject.cc (copied)
	* code/branches/FICN/src/audio/_AudioObject.h (copied)
	* code/branches/FICN/src/class_hierarchy (added)
	* code/branches/FICN/src/class_hierarchy/BaseObject.cc (added)
	* code/branches/FICN/src/class_hierarchy/BaseObject.h (added)
	* code/branches/FICN/src/class_hierarchy/CMakeLists.txt (added)
	* code/branches/FICN/src/class_hierarchy/ClassHierarchy.cc (added)
	* code/branches/FICN/src/class_hierarchy/ClassHierarchy.h (added)
	* code/branches/FICN/src/class_hierarchy/Identifier.cc (added)
	* code/branches/FICN/src/class_hierarchy/Identifier.h (added)
	* code/branches/FICN/src/class_hierarchy/IdentifierIncludes.h (added)
	* code/branches/FICN/src/class_hierarchy/IdentifierList.cc (added)
	* code/branches/FICN/src/class_hierarchy/IdentifierList.h (added)
	* code/branches/FICN/src/class_hierarchy/ObjectList.cc (added)
	* code/branches/FICN/src/class_hierarchy/ObjectList.h (added)
	* code/branches/FICN/src/class_hierarchy/OrxonoxClass.cc (added)
	* code/branches/FICN/src/class_hierarchy/OrxonoxClass.h (added)
	* code/branches/FICN/src/class_hierarchy/Test.h (added)
	* code/branches/FICN/src/class_hierarchy/orxonox.cc (added)
	* code/branches/FICN/src/class_hierarchy/test1.cc (added)
	* code/branches/FICN/src/class_hierarchy/test1.h (added)
	* code/branches/FICN/src/class_hierarchy/test2.cc (added)
	* code/branches/FICN/src/class_hierarchy/test2.h (added)
	* code/branches/FICN/src/class_hierarchy/test3.cc (added)
	* code/branches/FICN/src/class_hierarchy/test3.h (added)
	* code/branches/FICN/src/orxonox/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)

	merged audio into FICN


Tue, 04 Dec 2007 19:21:47 GMT rgrieder [379]
	* code/branches/FICN/bin (modified)
	* code/branches/FICN/src/loader/LevelLoader.h (modified)
	* code/branches/FICN/src/loader/Light.h (modified)
	* code/branches/FICN/src/loader/LightManager.h (modified)
	* code/branches/FICN/src/loader/loader_platform.h (added)
	* code/branches/FICN/src/loader/loader_prereq.h (added)
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)
	* code/branches/FICN/src/orxonox/spaceship_steering.cc (modified)

	- converted loader library to be compilable as a DLL
	  - added ...


Sun, 02 Dec 2007 23:02:51 GMT nicolasc [368]
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)

	changed windows string to "OrxonoxV2"


Thu, 29 Nov 2007 15:32:22 GMT rgrieder [347]
	* code/branches/FICN/src/loader/LevelLoader.cc (modified)
	* code/branches/FICN/src/loader/Light.cc (modified)
	* code/branches/FICN/src/loader/LightManager.cc (modified)
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)
	* code/branches/FICN/src/xml/xmlParser.h (modified)

	- fixed a bug: under windows, XML uses wchar_t instead of char, but ...


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 20:54:59 GMT rgrieder [341]
	* code/branches/FICN/CMakeLists.txt (modified)
	* code/branches/FICN/src/CMakeLists.txt (modified)
	* code/branches/FICN/src/class_hierarchy (deleted)
	* code/branches/FICN/src/loader/CMakeLists.txt (modified)
	* code/branches/FICN/src/loader/LevelLoader.cc (modified)
	* code/branches/FICN/src/loader/LevelLoader.h (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/CMakeLists.txt (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/dummyserver.cc (modified)
	* code/branches/FICN/src/orxonox/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/Flocking.h (deleted)
	* code/branches/FICN/src/orxonox/core/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/hud/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/hud/hud_overlay.h (modified)
	* code/branches/FICN/src/orxonox/hud/test_overlay.h (modified)
	* code/branches/FICN/src/orxonox/inertial_node.h (deleted)
	* code/branches/FICN/src/orxonox/objects/BaseObject.h (modified)
	* code/branches/FICN/src/orxonox/objects/CMakeFiles (deleted)
	* code/branches/FICN/src/orxonox/objects/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/ogre_control.h (deleted)
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)
	* code/branches/FICN/src/orxonox/orxonox.h (deleted)
	* code/branches/FICN/src/orxonox/orxonox_prerequisites.h (deleted)
	* code/branches/FICN/src/orxonox/orxonox_scene.h (deleted)
	* code/branches/FICN/src/orxonox/orxonox_ship.h (deleted)
	* code/branches/FICN/src/orxonox/run_manager.h (deleted)
	* code/branches/FICN/src/orxonox/weapon/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/weapon/ammunition_dump.cc (modified)
	* code/branches/FICN/src/orxonox/weapon/ammunition_dump.h (modified)
	* code/branches/FICN/src/orxonox/weapon/barrel_gun.cc (modified)
	* code/branches/FICN/src/orxonox/weapon/barrel_gun.h (modified)
	* code/branches/FICN/src/orxonox/weapon/base_weapon.cc (modified)
	* code/branches/FICN/src/orxonox/weapon/base_weapon.h (modified)
	* code/branches/FICN/src/orxonox/weapon/bullet.h (modified)
	* code/branches/FICN/src/orxonox/weapon/bullet_manager.h (modified)
	* code/branches/FICN/src/orxonox/weapon/weapon_station.h (modified)

	- removed folder src/class_hierarchy
	- removed a few unnec. files in ...


Wed, 28 Nov 2007 20:36:07 GMT nicolasc [340]
	* code/branches/FICN/src/inertial_node.cc (deleted)
	* code/branches/FICN/src/ogre_control.cc (deleted)
	* code/branches/FICN/src/orxonox/Flocking.h (moved)
	* code/branches/FICN/src/orxonox/hud/hud_overlay.h (modified)
	* code/branches/FICN/src/orxonox/hud/test_overlay.h (modified)
	* code/branches/FICN/src/orxonox/inertial_node.h (moved)
	* code/branches/FICN/src/orxonox/ogre_control.h (moved)
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)
	* code/branches/FICN/src/orxonox/orxonox.h (moved)
	* code/branches/FICN/src/orxonox/orxonox_prerequisites.h (moved)
	* code/branches/FICN/src/orxonox/orxonox_scene.h (moved)
	* code/branches/FICN/src/orxonox/orxonox_ship.h (moved)
	* code/branches/FICN/src/orxonox/run_manager.h (moved)
	* code/branches/FICN/src/orxonox_scene.cc (deleted)
	* code/branches/FICN/src/orxonox_ship.cc (deleted)
	* code/branches/FICN/src/run_manager.cc (deleted)

	applied retos proposals


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:31:00 GMT landauf [333]
	* code/branches/FICN (copied)

	new branch for factory, input, core, network


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

	corrected spacing