#
# ChangeLog for code/branches/FICN/Media
#
# Generated by Trac 1.0.9
# Nov 30, 2024, 2:11:27 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 15:15:18 GMT nicolape [578]
	* 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)

	Added a new skybox (Photoshop ftw


Mon, 17 Dec 2007 12:12:28 GMT nicolasc [570]
	* code/branches/FICN/Media/models/ast6.mesh (modified)
	* code/branches/FICN/bin/levels/sample.oxw (modified)

	fixed ast6.mesh
	added asteroid to sample.oxw


Sun, 16 Dec 2007 23:58:07 GMT nicolasc [550]
	* code/branches/FICN/Media/material (deleted)
	* code/branches/FICN/Media/materials/scripts/ast.material (added)
	* code/branches/FICN/Media/materials/textures/rock.png (added)
	* code/branches/FICN/Media/models/ast1.mesh (added)
	* code/branches/FICN/Media/models/ast2.mesh (added)
	* code/branches/FICN/Media/models/ast3.mesh (added)
	* code/branches/FICN/Media/models/ast4.mesh (added)
	* code/branches/FICN/Media/models/ast5.mesh (added)
	* code/branches/FICN/Media/models/ast6.mesh (added)

	- added asteroids - thanks to felix schulthess
	- replaced ogreheads ...


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 ...


Thu, 13 Dec 2007 23:14:48 GMT nicolasc [528]
	* code/branches/FICN/Media/materials/scripts/assf2.material (modified)
	* code/branches/FICN/Media/materials/textures/human_assf.jpg (added)

	uploaded missing jpg texture
	chaged texture back to jpg


Thu, 13 Dec 2007 22:07:00 GMT nicolape [522]
	* code/branches/FICN/Media/materials/textures/sample_loading.jpg (moved)

	Moved loading image to a better location


Thu, 13 Dec 2007 22:05:27 GMT nicolape [521]
	* code/branches/FICN/Media/materials/scripts/Orxonox.material (modified)
	* code/branches/FICN/Media/materials/scripts/assf2.material (modified)
	* code/branches/FICN/Media/overlay/OrxonoxLoading.overlay (added)
	* code/branches/FICN/src/loader/LevelLoader.cc (modified)

	Fixed bug for assf texture, added loading overlay (its now working, ...


Thu, 13 Dec 2007 19:39:18 GMT nicolape [520]
	* code/branches/FICN/Media/textures/sample_loading.jpg (added)

	Added loading screen for sample level


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


Thu, 13 Dec 2007 12:22:56 GMT nicolape [509]
	* code/branches/FICN/Media/materials/scripts/Orxonox.material (modified)
	* code/branches/FICN/Media/packs/skybox.zip (modified)

	Added sample skybox


Thu, 13 Dec 2007 11:53:36 GMT nicolape [508]
	* code/branches/FICN/Media/materials/scripts/Orxonox.material (added)
	* code/branches/FICN/bin/levels/sample.oxw (modified)

	Added orxonox material file


Wed, 12 Dec 2007 21:45:41 GMT nicolasc [502]
	* code/branches/FICN/Media/material (copied)
	* code/branches/FICN/Media/material/PE_materials.material (copied)
	* code/branches/FICN/Media/particle/rauch.particle (copied)
	* code/branches/FICN/Media/particle/schuss.particle (copied)
	* code/branches/FICN/Media/particle/strahl.particle (copied)
	* code/branches/FICN/Media/particle/strahl2.particle (copied)
	* code/branches/FICN/Media/particle/treibwerk.particle (copied)
	* code/branches/FICN/Media/textures (copied)
	* code/branches/FICN/Media/textures/Thumbs.db (copied)
	* code/branches/FICN/Media/textures/bigflame.png (copied)
	* code/branches/FICN/Media/textures/black.png (copied)
	* code/branches/FICN/Media/textures/explosion.png (copied)
	* code/branches/FICN/Media/textures/flare.png (copied)
	* code/branches/FICN/Media/textures/flaretrail.png (copied)
	* code/branches/FICN/Media/textures/ring_flare.png (copied)
	* code/branches/FICN/Media/textures/ring_flare2.png (copied)
	* code/branches/FICN/Media/textures/smoke.png (copied)
	* code/branches/FICN/Media/textures/streak.png (copied)
	* code/branches/FICN/bin/resources.cfg (modified)
	* code/branches/FICN/src/hud (copied)
	* code/branches/FICN/src/hud/CMakeLists.txt (copied)
	* code/branches/FICN/src/hud/hud_overlay.cc (copied)
	* code/branches/FICN/src/hud/hud_overlay.h (copied)
	* code/branches/FICN/src/particle (copied)
	* code/branches/FICN/src/particle/ParticleInterface.cc (copied)
	* code/branches/FICN/src/particle/ParticleInterface.h (copied)

	merged merger branch back in FICN


Wed, 12 Dec 2007 18:58:09 GMT nicolasc [481]
	* code/branches/FICN/Media/materials/scripts/assf2.material (added)
	* code/branches/FICN/Media/materials/textures/human_assf.png (added)
	* code/branches/FICN/Media/models/assf2.mesh (added)

	added first own model
	get display a little small, and in the wrong ...


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, 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


Wed, 24 Oct 2007 10:54:37 GMT bknecht [89]
	* code/trunk/CMakeLists.txt (copied)
	* code/trunk/INSTALL (copied)
	* code/trunk/LICENSE (copied)
	* code/trunk/Media (copied)
	* code/trunk/Media/fonts (copied)
	* code/trunk/Media/fonts/bluebold.ttf (copied)
	* code/trunk/Media/fonts/bluecond.ttf (copied)
	* code/trunk/Media/fonts/bluehigh.ttf (copied)
	* code/trunk/Media/fonts/read_me.html (copied)
	* code/trunk/Media/fonts/sample.fontdef (copied)
	* code/trunk/Media/fonts/solo5.ttf (copied)
	* code/trunk/Media/gui (copied)
	* code/trunk/Media/gui/CompositorDemo.layout (copied)
	* code/trunk/Media/gui/CompositorDemoCegui.config (copied)
	* code/trunk/Media/gui/CrowdDemo.layout (copied)
	* code/trunk/Media/gui/Falagard.xsd (copied)
	* code/trunk/Media/gui/Font.xsd (copied)
	* code/trunk/Media/gui/GUILayout.xsd (copied)
	* code/trunk/Media/gui/GUIScheme.xsd (copied)
	* code/trunk/Media/gui/Imageset.xsd (copied)
	* code/trunk/Media/gui/InstancingDemo.layout (copied)
	* code/trunk/Media/gui/OceanDemoCegui.config (copied)
	* code/trunk/Media/gui/OceanDemoLayout.xml (copied)
	* code/trunk/Media/gui/TaharezLook.imageset (copied)
	* code/trunk/Media/gui/TaharezLook.looknfeel (copied)
	* code/trunk/Media/gui/TaharezLook.tga (copied)
	* code/trunk/Media/gui/TaharezLookSkin.scheme (copied)
	* code/trunk/Media/gui/TaharezLookWidgetAliases.scheme (copied)
	* code/trunk/Media/gui/bluehighway-10.font (copied)
	* code/trunk/Media/gui/bluehighway-12.font (copied)
	* code/trunk/Media/gui/bluehighway-8.font (copied)
	* code/trunk/Media/gui/cegui8.layout (copied)
	* code/trunk/Media/gui/facial.layout (copied)
	* code/trunk/Media/gui/ogregui.layout (copied)
	* code/trunk/Media/gui/shadows.layout (copied)
	* code/trunk/Media/packs (copied)
	* code/trunk/Media/packs/OgreCore.zip (copied)
	* code/trunk/Media/packs/skybox.zip (copied)
	* code/trunk/README (copied)
	* code/trunk/Tutorial (deleted)
	* code/trunk/bin (copied)
	* code/trunk/bin/media.cfg (copied)
	* code/trunk/bin/ogre.cfg-init (copied)
	* code/trunk/bin/plugins.cfg-init (copied)
	* code/trunk/bin/quake3settings.cfg (copied)
	* code/trunk/bin/resources.cfg (copied)
	* code/trunk/bin/run-script (copied)
	* code/trunk/cmake (copied)
	* code/trunk/cmake/FindOGRE.cmake (copied)
	* code/trunk/cmake/FindOIS.cmake (copied)
	* code/trunk/cmake/FindPkgConfig.cmake (copied)
	* code/trunk/src (copied)
	* code/trunk/src/CMakeLists.txt (copied)
	* code/trunk/src/ExampleApplication.h (copied)
	* code/trunk/src/ExampleFrameListener.h (copied)
	* code/trunk/src/orxonox.cc (copied)

	merge of mainloop branch to trunk