#
# ChangeLog for code/branches/weapons
#
# Generated by Trac 1.0.9
# Nov 5, 2024, 3:48:50 AM

Mon, 18 May 2009 17:26:11 GMT rgrieder [2987]
	* code/branches/weapons/src/orxonox/objects/weaponsystem/CMakeLists.txt~ (deleted)
	* code/branches/weapons/src/orxonox/objects/weaponsystem/MuzzleFlash.h~ (deleted)
	* code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/CMakeLists.txt~ (deleted)
	* code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/EnergyDrink.cc~ (deleted)
	* code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/EnergyDrink.h~ (deleted)
	* code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/HsW01.cc~ (deleted)
	* code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/HsW01.h~ (deleted)

	Removed temporary editor files.


Mon, 18 May 2009 14:29:40 GMT Hagen [2983]
	* code/branches/weapons/src/orxonox/objects/weaponsystem/CMakeLists.txt~ (added)
	* code/branches/weapons/src/orxonox/objects/weaponsystem/MuzzleFlash.cc (added)
	* code/branches/weapons/src/orxonox/objects/weaponsystem/MuzzleFlash.h (added)
	* code/branches/weapons/src/orxonox/objects/weaponsystem/MuzzleFlash.h~ (added)
	* code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/CMakeLists.txt (modified)
	* code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/CMakeLists.txt~ (added)
	* code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/EnergyDrink.cc (added)
	* code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/EnergyDrink.cc~ (added)
	* code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/EnergyDrink.h (added)
	* code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/EnergyDrink.h~ (added)
	* code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/HsW01.cc (modified)
	* code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/HsW01.cc~ (added)
	* code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/HsW01.h~ (added)

	MuzzleFlash finally there, EnergyDrink weapon


Mon, 18 May 2009 12:46:12 GMT Hagen [2981]
	* code/branches/weapons/src/orxonox/objects/weaponsystem/CMakeLists.txt (modified)
	* code/branches/weapons/src/orxonox/objects/worldentities/CMakeLists.txt (modified)

	moved MuzzleFlash into weaponsystem Folder


Mon, 18 May 2009 12:06:04 GMT Hagen [2979]
	* code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/CMakeLists.txt (modified)
	* code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/HsW01.cc (modified)
	* code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/HsW01.h (modified)
	* code/branches/weapons/src/orxonox/objects/worldentities/CMakeLists.txt (modified)

	working laser style weapon with muzzleflash


Mon, 11 May 2009 13:58:38 GMT jsmely [2969]
	* code/branches/weapons/src/orxonox/objects/weaponsystem/projectiles/BillboardProjectile.cc (modified)
	* code/branches/weapons/src/orxonox/objects/weaponsystem/projectiles/BillboardProjectile.h (modified)
	* code/branches/weapons/src/orxonox/objects/weaponsystem/projectiles/CMakeLists.txt (modified)
	* code/branches/weapons/src/orxonox/objects/weaponsystem/projectiles/LightningGunProjectile.cc (added)
	* code/branches/weapons/src/orxonox/objects/weaponsystem/projectiles/LightningGunProjectile.h (added)
	* code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/CMakeLists.txt (modified)
	* code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/LightningGun.cc (added)
	* code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/LightningGun.h (added)
	* code/branches/weapons/src/orxonox/objects/worldentities/Billboard.cc (modified)
	* code/branches/weapons/src/orxonox/objects/worldentities/Billboard.h (modified)

	weapon updated


Sat, 18 Apr 2009 17:28:41 GMT landauf [2924]
	* code/branches/weapons/src/orxonox/objects/weaponsystem/WeaponMode.cc (modified)

	fixed a small bug concerning the muzzle offset. it makes much more ...


Sat, 18 Apr 2009 17:21:36 GMT landauf [2923]
	* code/branches/weapons/src/orxonox/objects/CMakeLists.txt (modified)
	* code/branches/weapons/src/orxonox/objects/weaponsystem/munitions/FusionMunition.h (modified)
	* code/branches/weapons/src/orxonox/objects/weaponsystem/munitions/ReplenishingMunition.h (modified)
	* code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/FusionFire.cc (modified)
	* code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/FusionFire.h (modified)
	* code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/LaserFire.cc (modified)
	* code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/LaserFire.h (modified)
	* code/branches/weapons/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified)

	adjusted weaponsystem-path in (hopefully) all files.


Sat, 18 Apr 2009 17:12:25 GMT landauf [2922]
	* code/branches/weapons/src/orxonox/objects/weaponsystem (moved)

	Renamed directory 'weaponSystem' as 'weaponsystem' to avoid mixed- ...


Sat, 18 Apr 2009 17:06:36 GMT landauf [2921]
	* code/branches/weapons/src/orxonox/objects/weaponSystem/CMakeLists.txt (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes (moved)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes/CMakeLists.txt (copied)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/weapons/Fusion.cc (deleted)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/weapons/Fusion.h (deleted)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes/FusionFire.cc (copied)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes/FusionFire.h (copied)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes/LaserFire.cc (copied)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes/LaserFire.h (copied)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc (deleted)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/weapons/LaserGun.h (deleted)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/weapons/Missile.cc (deleted)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/weapons/Missile.h (deleted)

	renamed directory "weapons" as "weaponmodes"


Sat, 18 Apr 2009 16:59:02 GMT landauf [2920]
	* code/branches/weapons/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/munitions/CMakeLists.txt (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/munitions/LaserMunition.cc (moved)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/munitions/LaserMunition.h (moved)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/weapons/LaserFire.cc (modified)

	renamed LaserGunMunition as LaserMunition


Sat, 18 Apr 2009 16:41:00 GMT landauf [2919]
	* code/branches/weapons/src/orxonox/objects/weaponSystem/DefaultWeaponmodeLink.cc (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/Munition.cc (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/Weapon.cc (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponMode.cc (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponMode.h (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponPack.cc (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponSet.cc (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponSlot.cc (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponSystem.cc (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/weapons/FusionFire.cc (modified)

	removed some debug output, cleanup in WeaponMode


Sat, 18 Apr 2009 16:14:52 GMT landauf [2918]
	* code/branches/weapons/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/branches/weapons/src/orxonox/objects/controllers/HumanController.cc (modified)
	* code/branches/weapons/src/orxonox/objects/controllers/HumanController.h (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/CMakeLists.txt (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/Munition.cc (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/Munition.h (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/Weapon.cc (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/Weapon.h (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponMode.cc (added)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponMode.h (added)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponPack.cc (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponPack.h (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponSet.cc (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponSet.h (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponSlot.cc (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponSystem.cc (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponSystem.h (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/munitions/CMakeLists.txt (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/munitions/FusionMunition.cc (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/munitions/FusionMunition.h (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/munitions/LaserGunMunition.cc (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/munitions/LaserGunMunition.h (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/munitions/ReplenishingMunition.cc (added)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/munitions/ReplenishingMunition.h (added)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/projectiles/Projectile.cc (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/projectiles/Projectile.h (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/weapons/CMakeLists.txt (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/weapons/FusionFire.cc (moved)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/weapons/FusionFire.h (moved)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/weapons/LaserFire.cc (moved)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/weapons/LaserFire.h (moved)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/weapons/Missile.cc (deleted)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/weapons/Missile.h (deleted)
	* code/branches/weapons/src/orxonox/objects/worldentities/ControllableEntity.h (modified)
	* code/branches/weapons/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified)
	* code/branches/weapons/src/orxonox/objects/worldentities/pawns/Pawn.h (modified)

	Added many new features in the Munition class:
	 - there are now 3 ...


Sat, 11 Apr 2009 22:34:55 GMT landauf [2915]
	* code/branches/weapons/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/CMakeLists.txt (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/DefaultWeaponmodeLink.cc (added)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/DefaultWeaponmodeLink.h (added)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/Weapon.cc (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponPack.cc (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponPack.h (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponSet.cc (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponSystem.cc (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponSystem.h (modified)

	- switched back to std::vector for the WeaponSlots to keep them in ...


Thu, 09 Apr 2009 22:05:01 GMT landauf [2914]
	* code/branches/weapons/src/orxonox/objects/weaponSystem/Weapon.cc (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/Weapon.h (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponPack.cc (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponPack.h (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponSet.cc (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponSet.h (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponSlot.cc (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponSlot.h (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponSystem.cc (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponSystem.h (modified)
	* code/branches/weapons/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified)
	* code/branches/weapons/src/orxonox/objects/worldentities/pawns/Pawn.h (modified)

	More changes in the WeaponSystem:
	 - WeaponSets can now contain ...


Thu, 09 Apr 2009 01:18:11 GMT landauf [2912]
	* code/branches/weapons/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/branches/weapons/src/orxonox/objects/controllers/AIController.cc (modified)
	* code/branches/weapons/src/orxonox/objects/controllers/HumanController.cc (modified)
	* code/branches/weapons/src/orxonox/objects/controllers/HumanController.h (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/Munition.cc (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/Munition.h (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/Weapon.cc (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/Weapon.h (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponPack.cc (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponPack.h (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponSet.cc (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponSet.h (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponSlot.cc (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponSlot.h (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponSystem.cc (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponSystem.h (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/munitions/FusionMunition.cc (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/munitions/FusionMunition.h (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/munitions/LaserGunMunition.cc (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/munitions/LaserGunMunition.h (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/weapons/Fusion.cc (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/weapons/Fusion.h (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/weapons/HsW01.cc (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/weapons/LaserGun.h (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/weapons/Missile.cc (modified)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/weapons/Missile.h (modified)
	* code/branches/weapons/src/orxonox/objects/worldentities/ControllableEntity.h (modified)
	* code/branches/weapons/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified)
	* code/branches/weapons/src/orxonox/objects/worldentities/pawns/Pawn.h (modified)
	* code/branches/weapons/src/orxonox/objects/worldentities/pawns/Spectator.cc (modified)
	* code/branches/weapons/src/orxonox/objects/worldentities/pawns/Spectator.h (modified)

	Several small adjustments in the weaponsystem (like additional const ...


Mon, 06 Apr 2009 14:23:16 GMT Hagen [2901]
	* code/branches/weapons/src/orxonox/objects/weaponSystem/weapons/HsW01.cc (added)
	* code/branches/weapons/src/orxonox/objects/weaponSystem/weapons/HsW01.h (added)

	The class HsW01 was added, but is only a copy of LaserGun


Mon, 06 Apr 2009 12:34:01 GMT landauf [2898]
	* code/branches/weapons (copied)

	created new weapon branch


Sun, 05 Apr 2009 23:59:00 GMT landauf [2896]
	* code/trunk (modified)
	* code/trunk/bin/client1.bat.in (modified)
	* code/trunk/bin/client1.in (modified)
	* code/trunk/bin/client2.bat.in (modified)
	* code/trunk/bin/client2.in (modified)
	* code/trunk/bin/dedicated.bat.in (modified)
	* code/trunk/bin/dedicated.in (modified)
	* code/trunk/bin/run.bat.in (modified)
	* code/trunk/bin/server.bat.in (modified)
	* code/trunk/bin/server.in (modified)
	* code/trunk/bin/standalone.bat.in (modified)
	* code/trunk/bin/standalone.in (modified)
	* code/trunk/cmake/BuildConfig.cmake (modified)
	* code/trunk/cmake/BuildConfigGCC.cmake (modified)
	* code/trunk/cmake/FindDirectX.cmake (modified)
	* code/trunk/cmake/LibraryConfigTardis.cmake (modified)
	* code/trunk/src/core/CMakeLists.txt (modified)
	* code/trunk/src/core/Clock.h (modified)
	* code/trunk/src/core/ConfigFileManager.cc (modified)
	* code/trunk/src/core/Core.cc (modified)
	* code/trunk/src/core/Core.h (modified)
	* code/trunk/src/core/CorePrereqs.h (modified)
	* code/trunk/src/core/Game.cc (copied)
	* code/trunk/src/core/Game.h (copied)
	* code/trunk/src/core/GameMode.cc (copied)
	* code/trunk/src/core/GameMode.h (copied)
	* code/trunk/src/core/GameState.cc (modified)
	* code/trunk/src/core/GameState.h (modified)
	* code/trunk/src/core/Iterator.h (modified)
	* code/trunk/src/core/LuaBind.cc (modified)
	* code/trunk/src/core/LuaBind.h (modified)
	* code/trunk/src/core/ObjectListBase.h (modified)
	* code/trunk/src/core/RootGameState.cc (deleted)
	* code/trunk/src/core/RootGameState.h (deleted)
	* code/trunk/src/core/TclThreadManager.cc (modified)
	* code/trunk/src/core/TclThreadManager.h (modified)
	* code/trunk/src/core/Template.cc (modified)
	* code/trunk/src/core/Template.h (modified)
	* code/trunk/src/core/XMLFile.h (modified)
	* code/trunk/src/core/XMLIncludes.h (modified)
	* code/trunk/src/core/XMLPort.h (modified)
	* code/trunk/src/core/input/CalibratorCallback.h (modified)
	* code/trunk/src/core/input/ExtendedInputState.cc (modified)
	* code/trunk/src/core/input/ExtendedInputState.h (modified)
	* code/trunk/src/core/input/InputBuffer.cc (modified)
	* code/trunk/src/core/input/InputBuffer.h (modified)
	* code/trunk/src/core/input/InputInterfaces.h (modified)
	* code/trunk/src/core/input/InputManager.cc (modified)
	* code/trunk/src/core/input/InputManager.h (modified)
	* code/trunk/src/core/input/InputState.h (modified)
	* code/trunk/src/core/input/KeyBinder.cc (modified)
	* code/trunk/src/core/input/KeyBinder.h (modified)
	* code/trunk/src/core/input/SimpleInputState.h (modified)
	* code/trunk/src/cpptcl/cpptcl.cc (modified)
	* code/trunk/src/cpptcl/cpptcl.h (modified)
	* code/trunk/src/network/ChatListener.cc (modified)
	* code/trunk/src/network/Client.cc (modified)
	* code/trunk/src/network/Client.h (modified)
	* code/trunk/src/network/ClientConnectionListener.cc (modified)
	* code/trunk/src/network/ConnectionManager.cc (modified)
	* code/trunk/src/network/Server.cc (modified)
	* code/trunk/src/network/Server.h (modified)
	* code/trunk/src/network/TrafficControl.cc (modified)
	* code/trunk/src/network/packet/Gamestate.cc (modified)
	* code/trunk/src/network/packet/Gamestate.h (modified)
	* code/trunk/src/network/synchronisable/NetworkCallback.h (modified)
	* code/trunk/src/network/synchronisable/Synchronisable.cc (modified)
	* code/trunk/src/network/synchronisable/Synchronisable.h (modified)
	* code/trunk/src/network/synchronisable/SynchronisableVariable.cc (modified)
	* code/trunk/src/network/synchronisable/SynchronisableVariable.h (modified)
	* code/trunk/src/orxonox/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/CameraManager.cc (modified)
	* code/trunk/src/orxonox/CameraManager.h (modified)
	* code/trunk/src/orxonox/GraphicsEngine.cc (deleted)
	* code/trunk/src/orxonox/GraphicsEngine.h (deleted)
	* code/trunk/src/orxonox/GraphicsManager.cc (copied)
	* code/trunk/src/orxonox/GraphicsManager.h (copied)
	* code/trunk/src/orxonox/Main.cc (modified)
	* code/trunk/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/trunk/src/orxonox/PlayerManager.cc (modified)
	* code/trunk/src/orxonox/gamestates/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/gamestates/GSClient.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSClient.h (modified)
	* code/trunk/src/orxonox/gamestates/GSDedicated.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSDedicated.h (modified)
	* code/trunk/src/orxonox/gamestates/GSGUI.cc (deleted)
	* code/trunk/src/orxonox/gamestates/GSGUI.h (deleted)
	* code/trunk/src/orxonox/gamestates/GSGraphics.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSGraphics.h (modified)
	* code/trunk/src/orxonox/gamestates/GSIOConsole.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSIOConsole.h (modified)
	* code/trunk/src/orxonox/gamestates/GSLevel.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSLevel.h (modified)
	* code/trunk/src/orxonox/gamestates/GSMainMenu.cc (copied)
	* code/trunk/src/orxonox/gamestates/GSMainMenu.h (copied)
	* code/trunk/src/orxonox/gamestates/GSRoot.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSRoot.h (modified)
	* code/trunk/src/orxonox/gamestates/GSServer.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSServer.h (modified)
	* code/trunk/src/orxonox/gamestates/GSStandalone.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSStandalone.h (modified)
	* code/trunk/src/orxonox/gui/GUIManager.cc (modified)
	* code/trunk/src/orxonox/gui/GUIManager.h (modified)
	* code/trunk/src/orxonox/objects/EventTarget.cc (modified)
	* code/trunk/src/orxonox/objects/Level.cc (modified)
	* code/trunk/src/orxonox/objects/Level.h (modified)
	* code/trunk/src/orxonox/objects/Radar.cc (modified)
	* code/trunk/src/orxonox/objects/Scene.cc (modified)
	* code/trunk/src/orxonox/objects/collisionshapes (modified)
	* code/trunk/src/orxonox/objects/controllers/AIController.cc (modified)
	* code/trunk/src/orxonox/objects/gametypes/Gametype.cc (modified)
	* code/trunk/src/orxonox/objects/infos/Bot.cc (modified)
	* code/trunk/src/orxonox/objects/infos/HumanPlayer.cc (modified)
	* code/trunk/src/orxonox/objects/items/MultiStateEngine.cc (modified)
	* code/trunk/src/orxonox/objects/pickup/PickupSpawner.cc (modified)
	* code/trunk/src/orxonox/objects/pickup/Usable.h (modified)
	* code/trunk/src/orxonox/objects/quest/AddQuest.cc (modified)
	* code/trunk/src/orxonox/objects/quest/AddQuest.h (modified)
	* code/trunk/src/orxonox/objects/quest/AddQuestHint.cc (modified)
	* code/trunk/src/orxonox/objects/quest/AddQuestHint.h (modified)
	* code/trunk/src/orxonox/objects/quest/AddReward.cc (modified)
	* code/trunk/src/orxonox/objects/quest/AddReward.h (modified)
	* code/trunk/src/orxonox/objects/quest/ChangeQuestStatus.cc (modified)
	* code/trunk/src/orxonox/objects/quest/ChangeQuestStatus.h (modified)
	* code/trunk/src/orxonox/objects/quest/CompleteQuest.cc (modified)
	* code/trunk/src/orxonox/objects/quest/CompleteQuest.h (modified)
	* code/trunk/src/orxonox/objects/quest/FailQuest.cc (modified)
	* code/trunk/src/orxonox/objects/quest/FailQuest.h (modified)
	* code/trunk/src/orxonox/objects/quest/GlobalQuest.cc (modified)
	* code/trunk/src/orxonox/objects/quest/GlobalQuest.h (modified)
	* code/trunk/src/orxonox/objects/quest/LocalQuest.cc (modified)
	* code/trunk/src/orxonox/objects/quest/LocalQuest.h (modified)
	* code/trunk/src/orxonox/objects/quest/Quest.cc (modified)
	* code/trunk/src/orxonox/objects/quest/Quest.h (modified)
	* code/trunk/src/orxonox/objects/quest/QuestDescription.cc (modified)
	* code/trunk/src/orxonox/objects/quest/QuestDescription.h (modified)
	* code/trunk/src/orxonox/objects/quest/QuestEffect.cc (modified)
	* code/trunk/src/orxonox/objects/quest/QuestEffect.h (modified)
	* code/trunk/src/orxonox/objects/quest/QuestHint.cc (modified)
	* code/trunk/src/orxonox/objects/quest/QuestHint.h (modified)
	* code/trunk/src/orxonox/objects/quest/QuestItem.cc (modified)
	* code/trunk/src/orxonox/objects/quest/QuestItem.h (modified)
	* code/trunk/src/orxonox/objects/quest/QuestManager.cc (modified)
	* code/trunk/src/orxonox/objects/quest/QuestManager.h (modified)
	* code/trunk/src/orxonox/objects/quest/Rewardable.cc (modified)
	* code/trunk/src/orxonox/objects/quest/Rewardable.h (modified)
	* code/trunk/src/orxonox/objects/weaponSystem/WeaponSystem.cc (modified)
	* code/trunk/src/orxonox/objects/weaponSystem/WeaponSystem.h (modified)
	* code/trunk/src/orxonox/objects/weaponSystem/projectiles/BillboardProjectile.cc (modified)
	* code/trunk/src/orxonox/objects/weaponSystem/projectiles/ParticleProjectile.cc (modified)
	* code/trunk/src/orxonox/objects/weaponSystem/projectiles/Projectile.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/Backlight.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/Backlight.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/Billboard.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/BlinkingBillboard.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/Camera.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/Camera.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/ControllableEntity.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/ExplosionChunk.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/Light.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/MobileEntity.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/MobileEntity.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/Model.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/MovableEntity.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/ParticleEmitter.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/ParticleSpawner.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/ParticleSpawner.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/Planet.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/PongBall.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/StaticEntity.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/StaticEntity.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/pawns/Spectator.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/triggers/Trigger.cc (modified)
	* code/trunk/src/orxonox/objects/worldentities/triggers/Trigger.h (modified)
	* code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc (modified)
	* code/trunk/src/orxonox/overlays/OrxonoxOverlay.h (modified)
	* code/trunk/src/orxonox/overlays/console/InGameConsole.cc (modified)
	* code/trunk/src/orxonox/overlays/console/InGameConsole.h (modified)
	* code/trunk/src/orxonox/overlays/debug/DebugFPSText.cc (modified)
	* code/trunk/src/orxonox/overlays/debug/DebugRTRText.cc (modified)
	* code/trunk/src/orxonox/overlays/hud/HUDRadar.cc (modified)
	* code/trunk/src/orxonox/tools/BillboardSet.cc (modified)
	* code/trunk/src/orxonox/tools/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/tools/Mesh.cc (modified)
	* code/trunk/src/orxonox/tools/ParticleInterface.cc (modified)
	* code/trunk/src/orxonox/tools/ParticleInterface.h (modified)
	* code/trunk/src/orxonox/tools/Shader.cc (modified)
	* code/trunk/src/orxonox/tools/TimeFactorListener.cc (copied)
	* code/trunk/src/orxonox/tools/TimeFactorListener.h (copied)
	* code/trunk/src/orxonox/tools/Timer.h (modified)
	* code/trunk/src/orxonox/tools/WindowEventListener.h (modified)
	* code/trunk/src/tolua/all-5.0.lua (modified)
	* code/trunk/src/tolua/all-5.1.lua (modified)
	* code/trunk/src/util (modified)
	* code/trunk/src/util/Exception.cc (modified)
	* code/trunk/src/util/Exception.h (modified)
	* code/trunk/src/util/SignalHandler.cc (modified)
	* code/trunk/src/util/SignalHandler.h (modified)

	Merged gui branch back to trunk.

	I did 2 small changes in ...