#
# ChangeLog for code/branches/FICN
#
# Generated by Trac 1.0.9
# Nov 28, 2024, 4:07:01 PM

Mon, 17 Dec 2007 21:11:39 GMT nicolasc [600]
	* code/branches/FICN/Media/materials/scripts/assf.material (moved)
	* code/branches/FICN/Media/materials/textures/human_assf.png (modified)
	* code/branches/FICN/Media/models/assf3.mesh (added)
	* code/branches/FICN/bin/levels/sample.oxw (modified)

	updated assf model, use assf3, assf2 has no texture!!


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

	ip address with --ip=address


Mon, 17 Dec 2007 20:56:37 GMT bknecht [598]
	* code/branches/FICN/src/orxonox/core/ArgReader.h (modified)

	mandatory boolean changed to optional in argreader


Mon, 17 Dec 2007 20:51:26 GMT bknecht [597]
	* code/branches/FICN/src/orxonox/AIClass.h (added)
	* code/branches/FICN/src/orxonox/Arrival.h (added)

	added AI-files


Mon, 17 Dec 2007 20:50:55 GMT bknecht [596]
	* code/branches/FICN/src/orxonox/Flocking.h (modified)

	added/updated AI-files


Mon, 17 Dec 2007 20:23:52 GMT landauf [595]
	* code/branches/FICN/bin/levels/sample.oxw (modified)
	* code/branches/FICN/src/orxonox/objects/WorldEntity.cc (modified)

	spaceships are now models too (except the steered one)


Mon, 17 Dec 2007 20:06:41 GMT rgrieder [594]
	* code/branches/FICN/src/orxonox/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/inertial_node.cc (deleted)
	* code/branches/FICN/src/orxonox/inertial_node.h (deleted)
	* code/branches/FICN/src/orxonox/ogre_control.h (deleted)
	* code/branches/FICN/src/orxonox/orxonox_prerequisites.h (deleted)
	* code/branches/FICN/src/orxonox/orxonox_scene.cc (deleted)
	* code/branches/FICN/src/orxonox/orxonox_scene.h (deleted)
	* code/branches/FICN/src/orxonox/orxonox_ship.cc (deleted)
	* code/branches/FICN/src/orxonox/orxonox_ship.h (deleted)
	* code/branches/FICN/src/orxonox/run_manager.cc (deleted)
	* code/branches/FICN/src/orxonox/run_manager.h (deleted)
	* code/branches/FICN/src/orxonox/weapon/CMakeLists.txt (deleted)
	* code/branches/FICN/src/orxonox/weapon/ammunition_dump.cc (deleted)
	* code/branches/FICN/src/orxonox/weapon/ammunition_dump.h (deleted)
	* code/branches/FICN/src/orxonox/weapon/barrel_gun.cc (deleted)
	* code/branches/FICN/src/orxonox/weapon/barrel_gun.h (deleted)
	* code/branches/FICN/src/orxonox/weapon/base_weapon.cc (deleted)
	* code/branches/FICN/src/orxonox/weapon/base_weapon.h (deleted)
	* code/branches/FICN/src/orxonox/weapon/bullet.cc (deleted)
	* code/branches/FICN/src/orxonox/weapon/bullet.h (deleted)
	* code/branches/FICN/src/orxonox/weapon/bullet_manager.cc (deleted)
	* code/branches/FICN/src/orxonox/weapon/bullet_manager.h (deleted)
	* code/branches/FICN/src/orxonox/weapon/weapon_station.cc (deleted)
	* code/branches/FICN/src/orxonox/weapon/weapon_station.h (deleted)

	-finally removed my old framework stuff and with it the weapon system ...


Mon, 17 Dec 2007 20:06:17 GMT nicolasc [593]
	* code/branches/FICN/bin/levels/sample.oxw (modified)

	fixed level


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 19:34:55 GMT landauf [591]
	* code/branches/FICN/bin/levels/sample.oxw (modified)

	asteroids are now models (here comes orxonox' next supermodel!)


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

	enhanced memory handling


Mon, 17 Dec 2007 18:14:41 GMT landauf [589]
	* code/branches/FICN/src/orxonox/objects/Mesh.cc (modified)
	* code/branches/FICN/src/orxonox/objects/Mesh.h (modified)
	* code/branches/FICN/src/orxonox/objects/Model.cc (modified)
	* code/branches/FICN/src/orxonox/objects/WorldEntity.cc (modified)
	* code/branches/FICN/src/orxonox/objects/WorldEntity.h (modified)

	finally found the damn fkng bug.


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 17:24:56 GMT bknecht [587]
	* code/branches/FICN/src/orxonox/hud/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/hud/HUD.cc (added)
	* code/branches/FICN/src/orxonox/hud/HUD.h (added)

	added HUD


Mon, 17 Dec 2007 17:16:28 GMT landauf [586]
	* code/branches/FICN/src/orxonox/objects/Mesh.cc (modified)
	* code/branches/FICN/src/orxonox/objects/Model.cc (modified)
	* code/branches/FICN/src/orxonox/objects/WorldEntity.cc (modified)
	* code/branches/FICN/src/orxonox/objects/WorldEntity.h (modified)

	bump


Mon, 17 Dec 2007 16:59:53 GMT nicolape [585]
	* code/branches/FICN/bin/levels/sample.oxw (modified)
	* code/branches/FICN/src/audio/AudioBuffer.cc (modified)
	* code/branches/FICN/src/audio/AudioManager.cc (modified)
	* code/branches/FICN/src/loader/LevelLoader.cc (modified)

	Added some stuff to level


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 15:54:42 GMT landauf [583]
	* code/branches/FICN/src/orxonox/objects/Model.cc (modified)
	* code/branches/FICN/src/orxonox/objects/WorldEntity.cc (modified)
	* code/branches/FICN/src/orxonox/objects/WorldEntity.h (modified)

	loadParams


Mon, 17 Dec 2007 15:52:25 GMT nicolape [582]
	* code/branches/FICN/bin/audio/ambient/a1.ogg (deleted)
	* code/branches/FICN/bin/audio/ambient/a2.ogg (deleted)
	* code/branches/FICN/bin/audio/ambient/a3.ogg (deleted)
	* code/branches/FICN/bin/audio/ambient/allgorythm-lift_up.ogg (added)
	* code/branches/FICN/bin/audio/ambient/allgorythm-resonance_blaster.ogg (added)
	* code/branches/FICN/bin/audio/ambient/ambient1.ogg (deleted)
	* code/branches/FICN/bin/audio/ambient/ambient2.ogg (deleted)
	* code/branches/FICN/bin/audio/ambient/ambient3.ogg (deleted)
	* code/branches/FICN/bin/audio/ambient/luke_grey_-_hypermode.ogg (added)
	* code/branches/FICN/bin/audio/ambient/task_horizon_-_menu1.ogg (added)
	* code/branches/FICN/bin/audio/ambient/tha_silent_partner_-_void.ogg (added)
	* code/branches/FICN/bin/levels/sample.oxw (modified)

	Added background sound from old orxonox


Mon, 17 Dec 2007 15:40:55 GMT landauf [581]
	* code/branches/FICN/bin/levels/sample.oxw (modified)

	...


Mon, 17 Dec 2007 15:27:41 GMT rgrieder [580]
	* code/branches/FICN/bin/levels/sample.oxw (modified)
	* code/branches/FICN/src/orxonox/objects/BaseEntity.cc (modified)
	* code/branches/FICN/src/orxonox/objects/SceneNode.cc (modified)
	* code/branches/FICN/src/orxonox/objects/WorldEntity.cc (modified)
	* code/branches/FICN/src/orxonox/objects/WorldEntity.h (modified)

	- fixed the problem about the ship being static.
	- added SceneNode ...


Mon, 17 Dec 2007 15:23:41 GMT nicolasc [579]
	* code/branches/FICN/bin/levels/sample.oxw (modified)

	removed "conflict"


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 14:48:47 GMT rgrieder [577]
	* code/branches/FICN/src/orxonox/orxonox2.cc (deleted)

	- removed that *##&&%* orxonox2.cc 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 14:30:58 GMT landauf [575]
	* code/branches/FICN/src/orxonox/orxonox¨2.cc (deleted)

	deleted typo


Mon, 17 Dec 2007 14:30:07 GMT landauf [574]
	* code/branches/FICN/src/orxonox/orxonox2.cc (copied)

	changed filename


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

	some small changes and debug output


Mon, 17 Dec 2007 13:17:21 GMT rgrieder [572]
	* code/branches/FICN/src/orxonox/orxonox¨2.cc (copied)

	Copied remotely


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

	cmakelists


Mon, 17 Dec 2007 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


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

	bugfix in Synchronisable


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

	added capability for presentation mode


Mon, 17 Dec 2007 10:16:50 GMT scheusso [567]
	* code/branches/FICN/src/network/GameStateClient.cc (modified)
	* code/branches/FICN/src/orxonox/objects/BaseEntity.cc (modified)
	* code/branches/FICN/src/orxonox/objects/WorldEntity.cc (modified)
	* code/branches/FICN/src/orxonox/objects/WorldEntity.h (modified)

	some minor changes/enhancements in GameStateClient


Mon, 17 Dec 2007 10:03:24 GMT scheusso [566]
	* code/branches/FICN/src/orxonox/objects/BaseEntity.cc (added)
	* code/branches/FICN/src/orxonox/objects/BaseEntity.h (added)

	adding missing files ...


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 03:09:06 GMT landauf [564]
	* code/branches/FICN/src/orxonox/core/Factory.cc (modified)
	* code/branches/FICN/src/orxonox/core/Factory.h (modified)

	Right now I'm having amnesia and deja vu at the same time. I think ...


Mon, 17 Dec 2007 03:02:14 GMT landauf [563]
	* code/branches/FICN/src/orxonox/core/Factory.cc (modified)
	* code/branches/FICN/src/orxonox/core/Factory.h (modified)

	sorry, that was wrong (was just testing)


Mon, 17 Dec 2007 02:58:42 GMT landauf [562]
	* code/branches/FICN/src/orxonox/core/DebugLevel.cc (modified)
	* code/branches/FICN/src/orxonox/core/DebugLevel.h (modified)
	* code/branches/FICN/src/orxonox/core/Factory.cc (modified)
	* code/branches/FICN/src/orxonox/core/Factory.h (modified)

	modified DebugLevel-hack


Mon, 17 Dec 2007 02:21:26 GMT landauf [561]
	* code/branches/FICN/src/orxonox/core/DebugLevel.cc (added)
	* code/branches/FICN/src/orxonox/core/DebugLevel.h (added)

	stupid svn! added missing files


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


Mon, 17 Dec 2007 01:19:29 GMT landauf [559]
	* code/branches/FICN/src/loader/LevelLoader.cc (modified)

	added check, but orxonox still crashes when an unknown classname is ...


Mon, 17 Dec 2007 01:09:32 GMT landauf [558]
	* code/branches/FICN/bin/main.bat (added)

	for windows only: added another bat-file to see the console output ...


Mon, 17 Dec 2007 01:08:05 GMT landauf [557]
	* code/branches/FICN/bin/run-script.bat (modified)

	for windows only:
	modified run-script.bat, but you shouldn't use ...


Mon, 17 Dec 2007 01:06:02 GMT landauf [556]
	* code/branches/FICN/src/orxonox/objects/Model.cc (added)
	* code/branches/FICN/src/orxonox/objects/Model.h (added)

	added missing files


Mon, 17 Dec 2007 01:05:20 GMT landauf [555]
	* code/branches/FICN/src/loader/CMakeLists.txt (modified)
	* code/branches/FICN/src/network/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/core/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/hud/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/objects/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/particle/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/weapon/CMakeLists.txt (modified)
	* code/branches/FICN/src/tinyxml/CMakeLists.txt (modified)

	WIN32 hack in CLs


Mon, 17 Dec 2007 00:58:26 GMT landauf [554]
	* code/branches/FICN/src/orxonox/objects/WorldEntity.cc (modified)
	* code/branches/FICN/src/orxonox/objects/WorldEntity.h (modified)

	removed scenemanager hack and used orxonox.h


Mon, 17 Dec 2007 00:19:13 GMT rgrieder [553]
	* code/branches/FICN/src/loader/loader_platform.h (modified)
	* code/branches/FICN/src/orxonox/core/Factory.cc (modified)
	* code/branches/FICN/src/orxonox/core/Factory.h (modified)

	- some minor change in static initialisation of factory
	  (this ...


Mon, 17 Dec 2007 00:11:28 GMT landauf [552]
	* code/branches/FICN/src/orxonox/core/Factory.cc (modified)
	* code/branches/FICN/src/orxonox/core/Factory.h (modified)

	removed stupid hack


Mon, 17 Dec 2007 00:02:01 GMT landauf [551]
	* code/branches/FICN/src/orxonox/core/Factory.cc (modified)
	* code/branches/FICN/src/orxonox/core/Factory.h (modified)

	funny hack, i hope this works for reto


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 23:18:53 GMT landauf [549]
	* code/branches/FICN/cmake/FindENet.cmake (modified)

	spaaaaaaaaaaaaartaaaaaaaaaaaa!!!!!


Sun, 16 Dec 2007 23:16:51 GMT landauf [548]
	* code/branches/FICN/src/orxonox/CMakeLists.txt (modified)

	shared for nonwindows


Sun, 16 Dec 2007 23:16:02 GMT landauf [547]
	* code/branches/FICN/CMakeLists.txt (modified)
	* code/branches/FICN/cmake/FindENet.cmake (modified)
	* code/branches/FICN/cmake/FindZLIB.cmake (modified)
	* code/branches/FICN/src/orxonox/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/objects/CMakeLists.txt (modified)

	compiles with mingw


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 17:00:13 GMT rgrieder [544]
	* code/branches/FICN/src/orxonox/main.cc (modified)
	* code/branches/FICN/src/orxonox/particle/ParticleInterface.cc (modified)

	- added WinMain (no argument parser yet)
	- made a few more ...


Sun, 16 Dec 2007 16:54:49 GMT bknecht [543]
	* code/branches/FICN/src/orxonox/core/ArgReader.cc (added)
	* code/branches/FICN/src/orxonox/core/ArgReader.h (added)

	files added


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 02:29:10 GMT landauf [540]
	* code/branches/FICN/src/orxonox/core/ClassFactory.h (modified)

	debug output


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:34:51 GMT landauf [538]
	* code/branches/FICN/CMakeLists.txt (modified)
	* code/branches/FICN/src/network/CMakeLists.txt (modified)
	* code/branches/FICN/src/network/dummyclient2.cc (modified)
	* code/branches/FICN/src/orxonox/objects/CMakeLists.txt (modified)

	windows library include (for enet)


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:57:38 GMT landauf [536]
	* code/branches/FICN/cmake/FindALUT.cmake (modified)
	* code/branches/FICN/cmake/FindBoost.cmake (modified)
	* code/branches/FICN/cmake/FindCEGUI.cmake (modified)
	* code/branches/FICN/cmake/FindCEGUI_OGRE.cmake (modified)
	* code/branches/FICN/cmake/FindENet.cmake (modified)
	* code/branches/FICN/cmake/FindOGRE.cmake (modified)
	* code/branches/FICN/cmake/FindOIS.cmake (modified)
	* code/branches/FICN/cmake/FindOggVorbis.cmake (modified)
	* code/branches/FICN/cmake/FindOpenAL.cmake (modified)
	* code/branches/FICN/cmake/FindZlib.cmake (added)
	* code/branches/FICN/src/audio/CMakeLists.txt (modified)
	* code/branches/FICN/src/network/dummyclient3.cc (modified)

	adjustments for windows


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 18:32:23 GMT rgrieder [533]
	* code/branches/FICN/src/network/dummyserver3.cc (modified)
	* code/branches/FICN/src/orxonox/InputManager.h (modified)
	* code/branches/FICN/src/orxonox/objects/WorldEntity.h (modified)

	- some minor changes in order to make the project compile with VC08 ...


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 23:27:21 GMT nicolasc [529]
	* code/branches/FICN/bin/CMakeCache.txt (deleted)
	* code/branches/FICN/bin/levels/.dolphinview (deleted)

	unneeded files removed


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 23:08:20 GMT nicolape [527]
	* code/branches/FICN/bin/levels/sample.oxw (modified)

	changed some stuff on level file


Thu, 13 Dec 2007 23:06:31 GMT nicolape [526]
	* code/branches/FICN/bin/levels/sample.oxw (modified)

	changed some stuff on level file


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:28:55 GMT nicolasc [524]
	* code/branches/FICN/cmakeclearcache (modified)

	- made cmakeclearcache safe, that it only deletes files that it
	should


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 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 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:31:06 GMT nicolasc [518]
	* code/branches/FICN/src/orxonox/objects/libobjects.so (deleted)

	rmeoved unnescessary libojects


Thu, 13 Dec 2007 17:30:32 GMT nicolasc [517]
	* code/branches/FICN/src/orxonox/objects/Makefile (deleted)
	* code/branches/FICN/src/orxonox/objects/libobjects.so (modified)

	rmeoved unnescessary Makefile


Thu, 13 Dec 2007 17:28:15 GMT nicolape [516]
	* code/branches/FICN/src/orxonox/objects/CMakeFiles (deleted)
	* code/branches/FICN/src/orxonox/objects/cmake_install.cmake (deleted)

	Ups.. these cmake files should not be comitted


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 17:02:07 GMT nicolasc [514]
	* code/branches/FICN/src/network/Client.cc (modified)
	* code/branches/FICN/src/network/ClientConnection.cc (modified)
	* code/branches/FICN/src/network/ClientInformation.cc (modified)
	* code/branches/FICN/src/network/ConnectionManager.cc (modified)
	* code/branches/FICN/src/network/GameStateClient.cc (modified)
	* code/branches/FICN/src/network/GameStateManager.cc (modified)
	* code/branches/FICN/src/network/PacketBuffer.cc (modified)
	* code/branches/FICN/src/network/PacketBufferTestExt.cc (modified)
	* code/branches/FICN/src/network/PacketDecoder.cc (modified)
	* code/branches/FICN/src/network/PacketGenerator.cc (modified)
	* code/branches/FICN/src/network/dummyclient.cc (modified)
	* code/branches/FICN/src/network/dummyclient2.cc (modified)
	* code/branches/FICN/src/network/dummyserver.cc (modified)

	added copyright notice


Thu, 13 Dec 2007 16:58:14 GMT nicolasc [513]
	* code/branches/FICN/src/audio/AudioBuffer.cc (modified)
	* code/branches/FICN/src/audio/AudioManager.cc (modified)
	* code/branches/FICN/src/audio/AudioSource.cc (modified)
	* code/branches/FICN/src/audio/AudioStream.cc (modified)
	* code/branches/FICN/src/audio/_AudioObject.cc (modified)
	* code/branches/FICN/src/hud/hud_overlay.cc (modified)
	* code/branches/FICN/src/loader/LevelLoader.cc (modified)
	* code/branches/FICN/src/orxonox/core/ConfigValueContainer.cc (modified)
	* code/branches/FICN/src/orxonox/core/Error.cc (modified)
	* code/branches/FICN/src/orxonox/core/Factory.cc (modified)
	* code/branches/FICN/src/orxonox/core/Identifier.cc (modified)
	* code/branches/FICN/src/orxonox/core/IdentifierList.cc (modified)
	* code/branches/FICN/src/orxonox/core/MetaObjectList.cc (modified)
	* code/branches/FICN/src/orxonox/core/OrxonoxClass.cc (modified)
	* code/branches/FICN/src/orxonox/hud/hud_overlay.cc (modified)
	* code/branches/FICN/src/orxonox/hud/test_overlay.cc (modified)
	* code/branches/FICN/src/orxonox/inertial_node.cc (modified)
	* code/branches/FICN/src/orxonox/objects/Ambient.cc (modified)
	* code/branches/FICN/src/orxonox/objects/BaseObject.cc (modified)
	* code/branches/FICN/src/orxonox/objects/Skybox.cc (modified)
	* code/branches/FICN/src/orxonox/objects/WorldEntity.cc (modified)
	* code/branches/FICN/src/orxonox/orxonox_scene.cc (modified)
	* code/branches/FICN/src/orxonox/orxonox_ship.cc (modified)
	* code/branches/FICN/src/orxonox/run_manager.cc (modified)
	* code/branches/FICN/src/orxonox/spaceship_steering.cc (modified)
	* code/branches/FICN/src/orxonox/weapon/ammunition_dump.cc (modified)
	* code/branches/FICN/src/orxonox/weapon/barrel_gun.cc (modified)
	* code/branches/FICN/src/orxonox/weapon/base_weapon.cc (modified)
	* code/branches/FICN/src/orxonox/weapon/bullet.cc (modified)
	* code/branches/FICN/src/orxonox/weapon/bullet_manager.cc (modified)
	* code/branches/FICN/src/orxonox/weapon/weapon_station.cc (modified)
	* code/branches/FICN/src/particle/ParticleInterface.cc (modified)

	added copyright notice
	network still need to be done


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


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 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:32:18 GMT nicolape [506]
	* code/branches/FICN/bin/levels/sample.oxw (modified)

	Skybox and ambient light 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: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 21:41:23 GMT landauf [499]
	* code/branches/FICN/src/orxonox/core/Debug.h (added)

	added Debug.h from objecthierarchy


Wed, 12 Dec 2007 21:39:49 GMT landauf [497]
	* code/branches/FICN/src/orxonox/core/ConfigValueContainer.cc (added)
	* code/branches/FICN/src/orxonox/core/ConfigValueContainer.h (added)
	* code/branches/FICN/src/orxonox/core/CoreIncludes.h (added)
	* code/branches/FICN/src/orxonox/core/IdentifierIncludes.h (deleted)
	* code/branches/FICN/src/orxonox/core/SignalHandler.cc (added)
	* code/branches/FICN/src/orxonox/core/SignalHandler.h (added)
	* code/branches/FICN/src/orxonox/objects/WorldEntity.cc (added)
	* code/branches/FICN/src/orxonox/objects/WorldEntity.h (added)

	added the new files from objecthierarchy


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