#
# ChangeLog for code/branches
#
# Generated by Trac 1.0.9
# Nov 14, 2024, 8:29:56 AM

Wed, 20 May 2009 14:18:02 GMT adrfried [2997]
	* code/branches/ggz/cmake/BuildConfigGCC.cmake (modified)
	* code/branches/ggz/src/orxonox/GGZClient.cc (modified)
	* code/branches/ggz/src/orxonox/GGZClient.h (modified)
	* code/branches/ggz/src/orxonox/objects/CMakeLists.txt (modified)
	* code/branches/ggz/src/orxonox/objects/FDWatcher.cc (deleted)
	* code/branches/ggz/src/orxonox/objects/FDWatcher.h (deleted)

	some asio functionality


Wed, 20 May 2009 14:13:26 GMT rgrieder [2996]
	* code/branches/netp3/src/core/Game.cc (modified)
	* code/branches/netp3/src/core/Game.h (modified)
	* code/branches/netp3/src/core/GameState.cc (modified)
	* code/branches/netp3/src/core/GameState.h (modified)
	* code/branches/netp3/src/orxonox/gamestates/GSGraphics.cc (modified)
	* code/branches/netp3/src/orxonox/gamestates/GSGraphics.h (modified)
	* code/branches/netp3/src/orxonox/gamestates/GSRoot.cc (modified)
	* code/branches/netp3/src/orxonox/gamestates/GSRoot.h (modified)

	Fixed tick-time issue: Not all tick times were being taken into ...


Wed, 20 May 2009 14:10:02 GMT rgrieder [2995]
	* code/branches/netp3/src/network/NetworkFunction.h (modified)
	* code/branches/netp3/src/orxonox/objects/quest/QuestManager.cc (modified)

	Fixed two small build problems.


Tue, 19 May 2009 20:05:30 GMT scheusso [2992]
	* code/branches/netp3/src/network/Client.cc (modified)
	* code/branches/netp3/src/network/ConnectionManager.cc (modified)

	some fixes (in tick, getDeltaTime) and error output


Tue, 19 May 2009 20:04:39 GMT scheusso [2991]
	* code/branches/netp3/src/network/synchronisable/SynchronisableVariable.cc (modified)
	* code/branches/netp3/src/network/synchronisable/SynchronisableVariable.h (modified)
	* code/branches/netp3/src/orxonox/objects/CMakeLists.txt (modified)
	* code/branches/netp3/src/orxonox/objects/controllers/AIController.cc (modified)
	* code/branches/netp3/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified)

	forgot some things


Tue, 19 May 2009 19:35:10 GMT scheusso [2990]
	* code/branches/netp3 (modified)
	* code/branches/netp3/bin/client1.bat.in (modified)
	* code/branches/netp3/bin/client2.bat.in (modified)
	* code/branches/netp3/bin/dedicated.bat.in (modified)
	* code/branches/netp3/bin/run.bat.in (modified)
	* code/branches/netp3/bin/server.bat.in (modified)
	* code/branches/netp3/bin/standalone.bat.in (modified)
	* code/branches/netp3/cmake/FindDirectX.cmake (modified)
	* code/branches/netp3/cmake/LibraryConfigTardis.cmake (modified)
	* code/branches/netp3/src/core/LuaBind.cc (modified)
	* code/branches/netp3/src/core/LuaBind.h (modified)
	* code/branches/netp3/src/core/Template.cc (modified)
	* code/branches/netp3/src/core/Template.h (modified)
	* code/branches/netp3/src/core/XMLFile.h (modified)
	* code/branches/netp3/src/core/XMLIncludes.h (modified)
	* code/branches/netp3/src/cpptcl/cpptcl.cc (modified)
	* code/branches/netp3/src/cpptcl/cpptcl.h (modified)
	* code/branches/netp3/src/network/CMakeLists.txt (modified)
	* code/branches/netp3/src/network/Client.cc (modified)
	* code/branches/netp3/src/network/Client.h (modified)
	* code/branches/netp3/src/network/ClientConnection.cc (modified)
	* code/branches/netp3/src/network/ClientConnection.h (modified)
	* code/branches/netp3/src/network/ConnectionManager.cc (modified)
	* code/branches/netp3/src/network/ConnectionManager.h (modified)
	* code/branches/netp3/src/network/FunctionCallManager.cc (copied)
	* code/branches/netp3/src/network/FunctionCallManager.h (copied)
	* code/branches/netp3/src/network/Host.h (modified)
	* code/branches/netp3/src/network/NetworkFunction.cc (copied)
	* code/branches/netp3/src/network/NetworkFunction.h (copied)
	* code/branches/netp3/src/network/NetworkPrereqs.h (modified)
	* code/branches/netp3/src/network/Server.cc (modified)
	* code/branches/netp3/src/network/Server.h (modified)
	* code/branches/netp3/src/network/TrafficControl.cc (modified)
	* code/branches/netp3/src/network/packet/CMakeLists.txt (modified)
	* code/branches/netp3/src/network/packet/ClassID.cc (modified)
	* code/branches/netp3/src/network/packet/FunctionCalls.cc (copied)
	* code/branches/netp3/src/network/packet/FunctionCalls.h (copied)
	* code/branches/netp3/src/network/packet/FunctionIDs.cc (copied)
	* code/branches/netp3/src/network/packet/FunctionIDs.h (copied)
	* code/branches/netp3/src/network/packet/Gamestate.cc (modified)
	* code/branches/netp3/src/network/packet/Packet.cc (modified)
	* code/branches/netp3/src/network/packet/Packet.h (modified)
	* code/branches/netp3/src/network/synchronisable/NetworkCallback.h (modified)
	* code/branches/netp3/src/network/synchronisable/NetworkCallbackManager.cc (modified)
	* code/branches/netp3/src/network/synchronisable/Synchronisable.cc (modified)
	* code/branches/netp3/src/network/synchronisable/Synchronisable.h (modified)
	* code/branches/netp3/src/network/synchronisable/SynchronisableSpecialisations.cc (modified)
	* code/branches/netp3/src/network/synchronisable/SynchronisableVariable.cc (copied)
	* code/branches/netp3/src/network/synchronisable/SynchronisableVariable.h (modified)
	* code/branches/netp3/src/orxonox/CameraManager.cc (modified)
	* code/branches/netp3/src/orxonox/CameraManager.h (modified)
	* code/branches/netp3/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/branches/netp3/src/orxonox/objects/Level.cc (modified)
	* code/branches/netp3/src/orxonox/objects/Level.h (modified)
	* code/branches/netp3/src/orxonox/objects/Test.cc (modified)
	* code/branches/netp3/src/orxonox/objects/Test.h (modified)
	* code/branches/netp3/src/orxonox/objects/collisionshapes (modified)
	* code/branches/netp3/src/orxonox/objects/controllers/AIController.cc (modified)
	* code/branches/netp3/src/orxonox/objects/gametypes/TeamDeathmatch.cc (modified)
	* code/branches/netp3/src/orxonox/objects/gametypes/TeamDeathmatch.h (modified)
	* code/branches/netp3/src/orxonox/objects/pickup/Usable.h (modified)
	* code/branches/netp3/src/orxonox/objects/quest/AddQuest.cc (modified)
	* code/branches/netp3/src/orxonox/objects/quest/AddQuest.h (modified)
	* code/branches/netp3/src/orxonox/objects/quest/AddQuestHint.cc (modified)
	* code/branches/netp3/src/orxonox/objects/quest/AddQuestHint.h (modified)
	* code/branches/netp3/src/orxonox/objects/quest/AddReward.cc (modified)
	* code/branches/netp3/src/orxonox/objects/quest/AddReward.h (modified)
	* code/branches/netp3/src/orxonox/objects/quest/ChangeQuestStatus.cc (modified)
	* code/branches/netp3/src/orxonox/objects/quest/ChangeQuestStatus.h (modified)
	* code/branches/netp3/src/orxonox/objects/quest/CompleteQuest.cc (modified)
	* code/branches/netp3/src/orxonox/objects/quest/CompleteQuest.h (modified)
	* code/branches/netp3/src/orxonox/objects/quest/FailQuest.cc (modified)
	* code/branches/netp3/src/orxonox/objects/quest/FailQuest.h (modified)
	* code/branches/netp3/src/orxonox/objects/quest/GlobalQuest.cc (modified)
	* code/branches/netp3/src/orxonox/objects/quest/GlobalQuest.h (modified)
	* code/branches/netp3/src/orxonox/objects/quest/LocalQuest.cc (modified)
	* code/branches/netp3/src/orxonox/objects/quest/LocalQuest.h (modified)
	* code/branches/netp3/src/orxonox/objects/quest/Quest.cc (modified)
	* code/branches/netp3/src/orxonox/objects/quest/Quest.h (modified)
	* code/branches/netp3/src/orxonox/objects/quest/QuestDescription.cc (modified)
	* code/branches/netp3/src/orxonox/objects/quest/QuestDescription.h (modified)
	* code/branches/netp3/src/orxonox/objects/quest/QuestEffect.cc (modified)
	* code/branches/netp3/src/orxonox/objects/quest/QuestEffect.h (modified)
	* code/branches/netp3/src/orxonox/objects/quest/QuestHint.cc (modified)
	* code/branches/netp3/src/orxonox/objects/quest/QuestHint.h (modified)
	* code/branches/netp3/src/orxonox/objects/quest/QuestItem.cc (modified)
	* code/branches/netp3/src/orxonox/objects/quest/QuestItem.h (modified)
	* code/branches/netp3/src/orxonox/objects/quest/QuestManager.cc (modified)
	* code/branches/netp3/src/orxonox/objects/quest/QuestManager.h (modified)
	* code/branches/netp3/src/orxonox/objects/quest/Rewardable.cc (modified)
	* code/branches/netp3/src/orxonox/objects/quest/Rewardable.h (modified)
	* code/branches/netp3/src/orxonox/objects/weaponSystem/WeaponSystem.cc (modified)
	* code/branches/netp3/src/orxonox/objects/weaponSystem/WeaponSystem.h (modified)
	* code/branches/netp3/src/orxonox/objects/worldentities/Backlight.cc (modified)
	* code/branches/netp3/src/orxonox/objects/worldentities/Backlight.h (modified)
	* code/branches/netp3/src/orxonox/objects/worldentities/Camera.cc (modified)
	* code/branches/netp3/src/orxonox/objects/worldentities/Camera.h (modified)
	* code/branches/netp3/src/orxonox/objects/worldentities/ControllableEntity.cc (modified)
	* code/branches/netp3/src/orxonox/objects/worldentities/ControllableEntity.h (modified)
	* code/branches/netp3/src/orxonox/objects/worldentities/MobileEntity.cc (modified)
	* code/branches/netp3/src/orxonox/objects/worldentities/MobileEntity.h (modified)
	* code/branches/netp3/src/orxonox/objects/worldentities/ParticleSpawner.cc (modified)
	* code/branches/netp3/src/orxonox/objects/worldentities/ParticleSpawner.h (modified)
	* code/branches/netp3/src/orxonox/objects/worldentities/StaticEntity.cc (modified)
	* code/branches/netp3/src/orxonox/objects/worldentities/StaticEntity.h (modified)
	* code/branches/netp3/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified)
	* code/branches/netp3/src/orxonox/objects/worldentities/pawns/Pawn.h (modified)
	* code/branches/netp3/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified)
	* code/branches/netp3/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h (modified)
	* code/branches/netp3/src/orxonox/objects/worldentities/triggers/Trigger.cc (modified)
	* code/branches/netp3/src/orxonox/objects/worldentities/triggers/Trigger.h (modified)
	* code/branches/netp3/src/tolua/all-5.0.lua (modified)
	* code/branches/netp3/src/tolua/all-5.1.lua (modified)
	* code/branches/netp3/src/util (modified)
	* code/branches/netp3/src/util/Exception.cc (modified)
	* code/branches/netp3/src/util/Exception.h (modified)
	* code/branches/netp3/src/util/MultiType.h (modified)
	* code/branches/netp3/src/util/MultiTypeValue.h (modified)
	* code/branches/netp3/src/util/Serialise.h (copied)
	* code/branches/netp3/src/util/SignalHandler.cc (modified)
	* code/branches/netp3/src/util/SignalHandler.h (modified)

	merged netp2 -> netp3


Tue, 19 May 2009 19:13:54 GMT scheusso [2989]
	* code/branches/netp3 (copied)

	created now netp3 branch


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 16:00:13 GMT Aurelian [2986]
	* code/branches/gametypes/src/orxonox/objects/gametypes/Asteroids.cc (modified)
	* code/branches/gametypes/src/orxonox/objects/gametypes/Asteroids.h (modified)
	* code/branches/gametypes/src/orxonox/objects/quest/QuestEffectBeacon.cc (modified)
	* code/branches/gametypes/src/orxonox/objects/worldentities/MovableEntity.cc (modified)
	* code/branches/gametypes/src/orxonox/objects/worldentities/MovableEntity.h (modified)
	* code/branches/gametypes/src/orxonox/objects/worldentities/triggers/CheckPoint.cc (modified)
	* code/branches/gametypes/src/orxonox/objects/worldentities/triggers/CheckPoint.h (modified)
	* code/branches/gametypes/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified)
	* code/branches/gametypes/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h (modified)
	* code/branches/gametypes/src/orxonox/objects/worldentities/triggers/PlayerTrigger.h (modified)

	Respawning changed, not possible anymore, not completely working. ...


Mon, 18 May 2009 15:01:45 GMT vmikos [2985]
	* code/branches/gametypes/src/orxonox/objects/gametypes/TeamBaseMatch.cc (modified)
	* code/branches/gametypes/src/orxonox/objects/gametypes/TeamBaseMatch.h (modified)
	* code/branches/gametypes/src/orxonox/objects/gametypes/TeamDeathmatch.h (modified)
	* code/branches/gametypes/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.cc (modified)
	* code/branches/gametypes/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.h (modified)

	final version


Mon, 18 May 2009 14:52:26 GMT erwin [2984]
	* code/branches/sound/cmake/LibraryConfig.cmake (modified)
	* code/branches/sound/src/orxonox/sound/SoundBase.cc (modified)
	* code/branches/sound/src/orxonox/sound/SoundManager.cc (modified)

	implemented a fallback ogg loader via libvorbisfile


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 13:38:22 GMT erwin [2982]
	* code/branches/sound/src/orxonox/objects/items/Engine.cc (modified)
	* code/branches/sound/src/orxonox/sound/SoundManager.cc (modified)

	added some error checking


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:24:34 GMT erwin [2980]
	* code/branches/sound/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/branches/sound/src/orxonox/objects/Level.cc (modified)
	* code/branches/sound/src/orxonox/objects/Level.h (modified)
	* code/branches/sound/src/orxonox/objects/items/Engine.cc (modified)
	* code/branches/sound/src/orxonox/objects/items/Engine.h (modified)
	* code/branches/sound/src/orxonox/sound/SoundBase.cc (modified)
	* code/branches/sound/src/orxonox/sound/SoundBase.h (modified)
	* code/branches/sound/src/orxonox/sound/SoundManager.cc (modified)

	added config ability to sound, few other changes


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


Sun, 17 May 2009 19:23:41 GMT Aurelian [2978]
	* code/branches/gametypes/src/orxonox/objects/gametypes/Asteroids.cc (modified)
	* code/branches/gametypes/src/orxonox/objects/gametypes/Gametype.h (modified)
	* code/branches/gametypes/src/orxonox/objects/worldentities/triggers/CheckPoint.cc (modified)
	* code/branches/gametypes/src/orxonox/overlays/hud/HUDTimer.cc (modified)

	some fixes on the timer, visibility of checkpoint removed (done in ...


Thu, 14 May 2009 12:35:54 GMT Naaduun [2977]
	* code/branches/map/src/orxonox/objects/RadarViewable.cc (modified)
	* code/branches/map/src/orxonox/overlays/map/Map.cc (modified)
	* code/branches/map/src/orxonox/overlays/map/Map.h (modified)
	* code/branches/map/src/util/SubString.cc (modified)

	=movable plane


Wed, 13 May 2009 13:14:08 GMT scheusso [2976]
	* code/branches/netp2/src/orxonox/objects/worldentities/ControllableEntity.cc (modified)

	removed some debug output


Wed, 13 May 2009 12:25:04 GMT rgrieder [2975]
	* code/branches/netp2/src/network/Host.h (modified)
	* code/branches/netp2/src/orxonox/objects/worldentities/MobileEntity.h (modified)

	- Fixed stupid bug in MobileEntity.h
	- Removed a compiler warning


Wed, 13 May 2009 11:58:44 GMT scheusso [2974]
	* code/branches/netp2/src/orxonox/objects/worldentities/ControllableEntity.cc (modified)

	debug output for reto


Mon, 11 May 2009 16:03:40 GMT danielh [2972]
	* code/branches/pickups2/src/orxonox/CMakeLists.txt (modified)
	* code/branches/pickups2/src/orxonox/objects/controllers/HumanController.h (modified)
	* code/branches/pickups2/src/orxonox/objects/pickup/BaseItem.cc (modified)
	* code/branches/pickups2/src/orxonox/objects/pickup/BaseItem.h (modified)
	* code/branches/pickups2/src/orxonox/objects/pickup/CMakeLists.txt (modified)
	* code/branches/pickups2/src/orxonox/objects/pickup/DroppedItem.cc (modified)
	* code/branches/pickups2/src/orxonox/objects/pickup/PickupCollection.cc (modified)
	* code/branches/pickups2/src/orxonox/objects/pickup/PickupCollection.h (modified)
	* code/branches/pickups2/src/orxonox/objects/pickup/PickupInventory.cc (added)
	* code/branches/pickups2/src/orxonox/objects/pickup/PickupInventory.h (added)
	* code/branches/pickups2/src/orxonox/objects/pickup/UsableItem.cc (modified)
	* code/branches/pickups2/src/orxonox/overlays/notifications/NotificationQueue.cc (modified)
	* code/branches/pickups2/src/orxonox/overlays/notifications/NotificationQueue.h (modified)

	Update

	- Minor changes in BaseItem
	- Updated to NotificationQueue ...


Mon, 11 May 2009 15:31:21 GMT mockm [2971]
	* code/branches/gametypes/src/orxonox/objects/gametypes/UnderAttack.cc (modified)
	* code/branches/gametypes/src/orxonox/objects/gametypes/UnderAttack.h (modified)

	new revision of Gametype UnderAttack: Timerfunction and some color
	added


Mon, 11 May 2009 15:00:55 GMT Aurelian [2970]
	* code/branches/gametypes/src/orxonox/objects/gametypes/Asteroids.cc (modified)
	* code/branches/gametypes/src/orxonox/objects/gametypes/Asteroids.h (modified)
	* code/branches/gametypes/src/orxonox/objects/gametypes/Gametype.cc (modified)
	* code/branches/gametypes/src/orxonox/objects/gametypes/Gametype.h (modified)
	* code/branches/gametypes/src/orxonox/objects/worldentities/triggers/CheckPoint.cc (modified)
	* code/branches/gametypes/src/orxonox/objects/worldentities/triggers/CheckPoint.h (modified)
	* code/branches/gametypes/src/orxonox/overlays/hud/CMakeLists.txt (modified)
	* code/branches/gametypes/src/orxonox/overlays/hud/HUDTimer.cc (added)
	* code/branches/gametypes/src/orxonox/overlays/hud/HUDTimer.h (added)

	Added timer in class gametype, timer working in asteroids, modified ...


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


Mon, 11 May 2009 13:37:19 GMT erwin [2968]
	* code/branches/sound/src/orxonox/sound/SoundBase.cc (modified)

	corrected typo


Mon, 11 May 2009 13:29:23 GMT erwin [2967]
	* code/branches/sound/src/CMakeLists.txt (modified)
	* code/branches/sound/src/orxonox/CMakeLists.txt (modified)
	* code/branches/sound/src/orxonox/sound/SoundBase.cc (modified)
	* code/branches/sound/src/orxonox/sound/SoundBase.h (modified)

	SoundBase now loads files relative to the mediapath


Mon, 11 May 2009 12:30:54 GMT erwin [2966]
	* code/branches/sound/src/orxonox/CMakeLists.txt (modified)
	* code/branches/sound/src/orxonox/objects/Level.cc (modified)
	* code/branches/sound/src/orxonox/objects/Level.h (modified)
	* code/branches/sound/src/orxonox/sound (added)
	* code/branches/sound/src/orxonox/sound/CMakeLists.txt (copied)
	* code/branches/sound/src/orxonox/sound/SoundBase.cc (copied)
	* code/branches/sound/src/orxonox/sound/SoundBase.h (copied)
	* code/branches/sound/src/orxonox/sound/SoundManager.cc (copied)
	* code/branches/sound/src/orxonox/sound/SoundManager.h (copied)
	* code/branches/sound/src/sound (deleted)

	moved files, modified to support multiple contexts


Mon, 11 May 2009 11:42:10 GMT scheusso [2965]
	* code/branches/netp2/src/network/Client.cc (modified)
	* code/branches/netp2/src/network/Client.h (modified)
	* code/branches/netp2/src/network/ClientConnection.cc (modified)
	* code/branches/netp2/src/network/ClientConnection.h (modified)
	* code/branches/netp2/src/network/ConnectionManager.cc (modified)
	* code/branches/netp2/src/network/ConnectionManager.h (modified)
	* code/branches/netp2/src/network/Host.h (modified)
	* code/branches/netp2/src/network/Server.h (modified)

	some fixes (bidirectional variables, ...), some changes (client ...


Mon, 11 May 2009 11:30:17 GMT scheusso [2964]
	* code/branches/netp2/src/orxonox/objects/worldentities/ControllableEntity.cc (modified)
	* code/branches/netp2/src/orxonox/objects/worldentities/ControllableEntity.h (modified)

	changed synchronisation of controllable entity steering
	not fully ...


Sun, 10 May 2009 20:49:36 GMT Aurelian [2961]
	* code/branches/gametypes/src/orxonox/objects/worldentities/ForceField.cc (modified)

	Gametype Asteroids - ForceField working


Thu, 07 May 2009 14:44:12 GMT Naaduun [2956]
	* code/branches/map/src/orxonox/objects/RadarViewable.cc (modified)
	* code/branches/map/src/orxonox/objects/RadarViewable.h (modified)
	* code/branches/map/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified)
	* code/branches/map/src/orxonox/objects/worldentities/pawns/Pawn.h (modified)
	* code/branches/map/src/orxonox/overlays/map/Map.cc (modified)
	* code/branches/map/src/orxonox/overlays/map/Map.h (modified)

	added rotate and zoom to map. using static mapscenemanager now


Mon, 04 May 2009 18:31:03 GMT erwin [2955]
	* code/branches/sound/src/orxonox/objects/Level.cc (modified)
	* code/branches/sound/src/sound/SoundBase.h (modified)

	corrected typo


Mon, 04 May 2009 15:28:59 GMT Aurelian [2954]
	* code/branches/gametypes/src/orxonox/objects/worldentities/CMakeLists.txt (modified)
	* code/branches/gametypes/src/orxonox/objects/worldentities/ForceField.cc (added)
	* code/branches/gametypes/src/orxonox/objects/worldentities/ForceField.h (added)
	* code/branches/gametypes/src/orxonox/objects/worldentities/MobileEntity.cc (modified)
	* code/branches/gametypes/src/orxonox/objects/worldentities/MobileEntity.h (modified)

	ForceField not working jet, but no errors...


Mon, 04 May 2009 15:04:58 GMT scheusso [2953]
	* code/branches/netp2/src/network/ConnectionManager.cc (modified)
	* code/branches/netp2/src/network/Server.cc (modified)

	some changes for testing purpose


Mon, 04 May 2009 14:34:48 GMT mockm [2952]
	* code/branches/gametypes/src/orxonox/objects/gametypes/Gametype.cc (modified)
	* code/branches/gametypes/src/orxonox/objects/gametypes/Gametype.h (modified)
	* code/branches/gametypes/src/orxonox/objects/gametypes/UnderAttack.cc (modified)
	* code/branches/gametypes/src/orxonox/objects/gametypes/UnderAttack.h (modified)
	* code/branches/gametypes/src/orxonox/objects/worldentities/SpawnPoint.cc (modified)

	new revision of gametype UnderAttack: Ship is now moving


Mon, 04 May 2009 14:03:02 GMT scheusso [2951]
	* code/branches/netp2/src/network/NetworkFunction.h (modified)

	small fix for memberfunction calls with non-existing (or not anymore ...


Mon, 04 May 2009 13:40:08 GMT erwin [2950]
	* code/branches/sound/cmake/LibraryConfig.cmake (modified)
	* code/branches/sound/src/orxonox/CMakeLists.txt (modified)
	* code/branches/sound/src/orxonox/objects/Level.cc (modified)
	* code/branches/sound/src/orxonox/objects/Level.h (modified)
	* code/branches/sound/src/sound/CMakeLists.txt (added)
	* code/branches/sound/src/sound/SoundBase.cc (modified)
	* code/branches/sound/src/sound/SoundBase.h (modified)
	* code/branches/sound/src/sound/SoundManager.cc (modified)
	* code/branches/sound/src/sound/SoundManager.h (modified)
	* code/branches/sound/src/sound/copyheader (deleted)

	ambient sound loading for levels


Sat, 02 May 2009 14:19:43 GMT scheusso [2949]
	* code/branches/netp2/src/network/FunctionCallManager.cc (modified)
	* code/branches/netp2/src/network/FunctionCallManager.h (modified)
	* code/branches/netp2/src/network/Server.cc (modified)
	* code/branches/netp2/src/network/packet/FunctionCalls.cc (modified)
	* code/branches/netp2/src/network/packet/FunctionCalls.h (modified)
	* code/branches/netp2/src/orxonox/objects/Test.cc (modified)
	* code/branches/netp2/src/orxonox/objects/Test.h (modified)
	* code/branches/netp2/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified)
	* code/branches/netp2/src/orxonox/objects/worldentities/pawns/Pawn.h (modified)
	* code/branches/netp2/src/util/MultiType.h (modified)

	Network Function calls possible now (already used in ...


Fri, 01 May 2009 21:34:14 GMT scheusso [2948]
	* code/branches/netp2/src/network/Client.cc (modified)
	* code/branches/netp2/src/network/NetworkFunction.cc (modified)
	* code/branches/netp2/src/network/NetworkFunction.h (modified)
	* code/branches/netp2/src/orxonox/objects/Test.cc (modified)
	* code/branches/netp2/src/orxonox/objects/Test.h (modified)

	member function calls should work now
	argument transfer still untested


Fri, 01 May 2009 20:24:27 GMT scheusso [2947]
	* code/branches/netp2/src/OrxonoxConfig.h.in (modified)

	applying change from trunk (r2946)


Fri, 01 May 2009 13:16:12 GMT scheusso [2945]
	* code/branches/netp2/src/network/FunctionCallManager.cc (modified)
	* code/branches/netp2/src/network/packet/FunctionCalls.cc (modified)

	fixed some bugs


Fri, 01 May 2009 07:47:34 GMT scheusso [2944]
	* code/branches/netp2/src/network/FunctionCallManager.cc (modified)
	* code/branches/netp2/src/network/NetworkFunction.cc (modified)
	* code/branches/netp2/src/network/NetworkFunction.h (modified)
	* code/branches/netp2/src/network/Server.cc (modified)
	* code/branches/netp2/src/network/packet/FunctionCalls.cc (modified)
	* code/branches/netp2/src/network/packet/Packet.cc (modified)
	* code/branches/netp2/src/network/synchronisable/SynchronisableVariable.h (modified)
	* code/branches/netp2/src/orxonox/objects/Test.cc (modified)
	* code/branches/netp2/src/orxonox/objects/Test.h (modified)

	this is another commit for testing purpose
	still trying to get ...


Thu, 30 Apr 2009 12:54:44 GMT scheusso [2943]
	* code/branches/netp2/src/network/NetworkFunction.h (modified)

	fixed a problem with copying function pointers


Thu, 30 Apr 2009 12:12:57 GMT Naaduun [2942]
	* code/branches/map/src/orxonox/objects/RadarViewable.cc (modified)
	* code/branches/map/src/orxonox/objects/RadarViewable.h (modified)
	* code/branches/map/src/orxonox/objects/controllers/HumanController.cc (modified)
	* code/branches/map/src/orxonox/objects/controllers/HumanController.h (modified)
	* code/branches/map/src/orxonox/overlays/map/Map.cc (modified)
	* code/branches/map/src/orxonox/overlays/map/Map.h (modified)
	* code/branches/map/src/orxonox/tools/CMakeLists.txt (modified)
	* code/branches/map/src/orxonox/tools/DynamicLines.cpp (added)
	* code/branches/map/src/orxonox/tools/DynamicLines.h (added)
	* code/branches/map/src/orxonox/tools/DynamicRenderable.cpp (added)
	* code/branches/map/src/orxonox/tools/DynamicRenderable.h (added)
	* code/branches/map/src/util/CMakeLists.txt (modified)

	=added dynamic libs to orxonox/tools. changed humancontroller to use ...


Wed, 29 Apr 2009 18:07:43 GMT rgrieder [2941]
	* code/branches/netp2/src/network/NetworkFunction.h (modified)

	Small mvsc build fix.


Wed, 29 Apr 2009 17:05:51 GMT scheusso [2940]
	* code/branches/netp2/src/network/synchronisable/Synchronisable.h (modified)

	fixed bug for bidirectional variables


Wed, 29 Apr 2009 14:38:35 GMT stefalie [2939]
	* code/branches/toonshader/src/orxonox/objects/worldentities/Model.cc (modified)

	ugly hacks to get shaders up runnin


Wed, 29 Apr 2009 14:10:35 GMT scheusso [2938]
	* code/branches/netp2/src/network/packet/FunctionCalls.cc (added)
	* code/branches/netp2/src/network/packet/FunctionCalls.h (added)

	forgot two files


Wed, 29 Apr 2009 14:05:35 GMT scheusso [2937]
	* code/branches/netp2/src/network/CMakeLists.txt (modified)
	* code/branches/netp2/src/network/FunctionCallManager.cc (added)
	* code/branches/netp2/src/network/FunctionCallManager.h (added)
	* code/branches/netp2/src/network/NetworkFunction.cc (added)
	* code/branches/netp2/src/network/NetworkFunction.h (added)
	* code/branches/netp2/src/network/NetworkPrereqs.h (modified)
	* code/branches/netp2/src/network/packet/CMakeLists.txt (modified)
	* code/branches/netp2/src/network/packet/ClassID.cc (modified)
	* code/branches/netp2/src/network/packet/FunctionIDs.cc (added)
	* code/branches/netp2/src/network/packet/FunctionIDs.h (added)
	* code/branches/netp2/src/network/packet/Packet.cc (modified)
	* code/branches/netp2/src/network/packet/Packet.h (modified)
	* code/branches/netp2/src/network/synchronisable/Synchronisable.h (modified)
	* code/branches/netp2/src/network/synchronisable/SynchronisableVariableSpecialisations.h (deleted)
	* code/branches/netp2/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/branches/netp2/src/orxonox/objects/Test.cc (modified)
	* code/branches/netp2/src/orxonox/objects/Test.h (modified)
	* code/branches/netp2/src/util/MultiType.h (modified)

	commit for testing reasons
	- added possibility to transfer function ...


Mon, 27 Apr 2009 15:15:04 GMT Aurelian [2936]
	* code/branches/gametypes/src/orxonox/objects/gametypes/Asteroids.cc (modified)
	* code/branches/gametypes/src/orxonox/objects/gametypes/CMakeLists.txt (modified)
	* code/branches/gametypes/src/orxonox/objects/worldentities/triggers/CMakeLists.txt (modified)
	* code/branches/gametypes/src/orxonox/objects/worldentities/triggers/CheckPoint.cc (modified)
	* code/branches/gametypes/src/orxonox/objects/worldentities/triggers/CheckPoint.h (modified)
	* code/branches/gametypes/src/orxonox/objects/worldentities/triggers/Trigger.h (modified)

	Checkpoints in a row working with final destination-> end of game


Mon, 27 Apr 2009 15:12:59 GMT mockm [2935]
	* code/branches/gametypes/src/orxonox/objects/gametypes/UnderAttack.cc (modified)
	* code/branches/gametypes/src/orxonox/objects/worldentities/pawns/Destroyer.cc (modified)

	new revision of gametype UnderAttack


Mon, 27 Apr 2009 14:26:49 GMT vmikos [2934]
	* code/branches/gametypes/src/orxonox/gamestates/GSLevel.cc (modified)
	* code/branches/gametypes/src/orxonox/objects/gametypes/CMakeLists.txt (modified)
	* code/branches/gametypes/src/orxonox/objects/gametypes/TeamBaseMatch.cc (modified)
	* code/branches/gametypes/src/orxonox/objects/gametypes/TeamBaseMatch.h (modified)
	* code/branches/gametypes/src/orxonox/objects/worldentities/pawns/CMakeLists.txt (modified)
	* code/branches/gametypes/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.cc (added)
	* code/branches/gametypes/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.h (modified)

	fast endversion TeamBaseMatch


Mon, 27 Apr 2009 13:58:25 GMT mockm [2933]
	* code/branches/gametypes/src/orxonox/objects/gametypes/CMakeLists.txt (modified)
	* code/branches/gametypes/src/orxonox/objects/gametypes/UnderAttack.cc (added)
	* code/branches/gametypes/src/orxonox/objects/gametypes/UnderAttack.h (added)
	* code/branches/gametypes/src/orxonox/objects/worldentities/pawns/CMakeLists.txt (modified)
	* code/branches/gametypes/src/orxonox/objects/worldentities/pawns/Destroyer.cc (added)
	* code/branches/gametypes/src/orxonox/objects/worldentities/pawns/Destroyer.h (added)

	Gametype UnderAttack added


Mon, 27 Apr 2009 13:30:34 GMT erwin [2932]
	* code/branches/sound/src/sound/SoundBase.cc (modified)
	* code/branches/sound/src/sound/SoundBase.h (modified)
	* code/branches/sound/src/sound/SoundManager.cc (modified)
	* code/branches/sound/src/sound/SoundManager.h (modified)

	Sound: implemented sample file loading via alut


Mon, 27 Apr 2009 12:41:50 GMT erwin [2931]
	* code/branches/sound/src/sound/SoundBase.cc (modified)
	* code/branches/sound/src/sound/SoundBase.h (modified)
	* code/branches/sound/src/sound/SoundManager.cc (modified)

	Sound: SoundBase complete


Mon, 27 Apr 2009 11:18:13 GMT erwin [2930]
	* code/branches/sound/src/CMakeLists.txt (modified)
	* code/branches/sound/src/sound/SoundBase.h (modified)
	* code/branches/sound/src/sound/SoundManager.cc (modified)
	* code/branches/sound/src/sound/SoundManager.h (modified)

	Sound: Added building things, corrected some typos


Thu, 23 Apr 2009 11:50:52 GMT stefalie [2929]
	* code/branches/toonshader (copied)

	new branch for toon/cell shading... lets go comic


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


Wed, 15 Apr 2009 15:03:58 GMT landauf [2917]
	* code/branches/pickups2 (modified)
	* code/branches/pickups2/bin/client1.bat.in (modified)
	* code/branches/pickups2/bin/client2.bat.in (modified)
	* code/branches/pickups2/bin/dedicated.bat.in (modified)
	* code/branches/pickups2/bin/run.bat.in (modified)
	* code/branches/pickups2/bin/server.bat.in (modified)
	* code/branches/pickups2/bin/standalone.bat.in (modified)
	* code/branches/pickups2/cmake/FindDirectX.cmake (modified)
	* code/branches/pickups2/cmake/LibraryConfigTardis.cmake (modified)
	* code/branches/pickups2/src/core/LuaBind.cc (modified)
	* code/branches/pickups2/src/core/LuaBind.h (modified)
	* code/branches/pickups2/src/core/Template.cc (modified)
	* code/branches/pickups2/src/core/Template.h (modified)
	* code/branches/pickups2/src/core/XMLFile.h (modified)
	* code/branches/pickups2/src/core/XMLIncludes.h (modified)
	* code/branches/pickups2/src/cpptcl/cpptcl.cc (modified)
	* code/branches/pickups2/src/cpptcl/cpptcl.h (modified)
	* code/branches/pickups2/src/network/synchronisable/NetworkCallback.h (modified)
	* code/branches/pickups2/src/network/synchronisable/Synchronisable.cc (modified)
	* code/branches/pickups2/src/network/synchronisable/Synchronisable.h (modified)
	* code/branches/pickups2/src/orxonox/CameraManager.cc (modified)
	* code/branches/pickups2/src/orxonox/CameraManager.h (modified)
	* code/branches/pickups2/src/orxonox/objects/Level.cc (modified)
	* code/branches/pickups2/src/orxonox/objects/Level.h (modified)
	* code/branches/pickups2/src/orxonox/objects/collisionshapes (modified)
	* code/branches/pickups2/src/orxonox/objects/controllers/HumanController.cc (modified)
	* code/branches/pickups2/src/orxonox/objects/controllers/HumanController.h (modified)
	* code/branches/pickups2/src/orxonox/objects/gametypes/TeamDeathmatch.cc (modified)
	* code/branches/pickups2/src/orxonox/objects/gametypes/TeamDeathmatch.h (modified)
	* code/branches/pickups2/src/orxonox/objects/items/Engine.cc (modified)
	* code/branches/pickups2/src/orxonox/objects/pickup/BaseItem.cc (copied)
	* code/branches/pickups2/src/orxonox/objects/pickup/BaseItem.h (copied)
	* code/branches/pickups2/src/orxonox/objects/pickup/CMakeLists.txt (modified)
	* code/branches/pickups2/src/orxonox/objects/pickup/DroppedItem.cc (copied)
	* code/branches/pickups2/src/orxonox/objects/pickup/DroppedItem.h (copied)
	* code/branches/pickups2/src/orxonox/objects/pickup/EquipmentItem.cc (copied)
	* code/branches/pickups2/src/orxonox/objects/pickup/EquipmentItem.h (copied)
	* code/branches/pickups2/src/orxonox/objects/pickup/Jump.cc (copied)
	* code/branches/pickups2/src/orxonox/objects/pickup/Jump.h (copied)
	* code/branches/pickups2/src/orxonox/objects/pickup/ModifierPickup.cc (copied)
	* code/branches/pickups2/src/orxonox/objects/pickup/ModifierPickup.h (copied)
	* code/branches/pickups2/src/orxonox/objects/pickup/ModifierType.h (copied)
	* code/branches/pickups2/src/orxonox/objects/pickup/PassiveItem.cc (copied)
	* code/branches/pickups2/src/orxonox/objects/pickup/PassiveItem.h (copied)
	* code/branches/pickups2/src/orxonox/objects/pickup/PickupCollection.cc (copied)
	* code/branches/pickups2/src/orxonox/objects/pickup/PickupCollection.h (copied)
	* code/branches/pickups2/src/orxonox/objects/pickup/PickupSpawner.cc (copied)
	* code/branches/pickups2/src/orxonox/objects/pickup/PickupSpawner.h (copied)
	* code/branches/pickups2/src/orxonox/objects/pickup/ShipEquipment.cc (deleted)
	* code/branches/pickups2/src/orxonox/objects/pickup/ShipEquipment.h (deleted)
	* code/branches/pickups2/src/orxonox/objects/pickup/ShipEquipmentClasses.cc (deleted)
	* code/branches/pickups2/src/orxonox/objects/pickup/ShipEquipmentClasses.h (deleted)
	* code/branches/pickups2/src/orxonox/objects/pickup/ShipItem.cc (deleted)
	* code/branches/pickups2/src/orxonox/objects/pickup/ShipItem.h (deleted)
	* code/branches/pickups2/src/orxonox/objects/pickup/Turbo.cc (deleted)
	* code/branches/pickups2/src/orxonox/objects/pickup/Turbo.h (deleted)
	* code/branches/pickups2/src/orxonox/objects/pickup/Usable.h (deleted)
	* code/branches/pickups2/src/orxonox/objects/pickup/UsableItem.cc (copied)
	* code/branches/pickups2/src/orxonox/objects/pickup/UsableItem.h (copied)
	* code/branches/pickups2/src/orxonox/objects/quest/AddQuest.cc (modified)
	* code/branches/pickups2/src/orxonox/objects/quest/AddQuest.h (modified)
	* code/branches/pickups2/src/orxonox/objects/quest/AddQuestHint.cc (modified)
	* code/branches/pickups2/src/orxonox/objects/quest/AddQuestHint.h (modified)
	* code/branches/pickups2/src/orxonox/objects/quest/AddReward.cc (modified)
	* code/branches/pickups2/src/orxonox/objects/quest/AddReward.h (modified)
	* code/branches/pickups2/src/orxonox/objects/quest/ChangeQuestStatus.cc (modified)
	* code/branches/pickups2/src/orxonox/objects/quest/ChangeQuestStatus.h (modified)
	* code/branches/pickups2/src/orxonox/objects/quest/CompleteQuest.cc (modified)
	* code/branches/pickups2/src/orxonox/objects/quest/CompleteQuest.h (modified)
	* code/branches/pickups2/src/orxonox/objects/quest/FailQuest.cc (modified)
	* code/branches/pickups2/src/orxonox/objects/quest/FailQuest.h (modified)
	* code/branches/pickups2/src/orxonox/objects/quest/GlobalQuest.cc (modified)
	* code/branches/pickups2/src/orxonox/objects/quest/GlobalQuest.h (modified)
	* code/branches/pickups2/src/orxonox/objects/quest/LocalQuest.cc (modified)
	* code/branches/pickups2/src/orxonox/objects/quest/LocalQuest.h (modified)
	* code/branches/pickups2/src/orxonox/objects/quest/Quest.cc (modified)
	* code/branches/pickups2/src/orxonox/objects/quest/Quest.h (modified)
	* code/branches/pickups2/src/orxonox/objects/quest/QuestDescription.cc (modified)
	* code/branches/pickups2/src/orxonox/objects/quest/QuestDescription.h (modified)
	* code/branches/pickups2/src/orxonox/objects/quest/QuestEffect.cc (modified)
	* code/branches/pickups2/src/orxonox/objects/quest/QuestEffect.h (modified)
	* code/branches/pickups2/src/orxonox/objects/quest/QuestHint.cc (modified)
	* code/branches/pickups2/src/orxonox/objects/quest/QuestHint.h (modified)
	* code/branches/pickups2/src/orxonox/objects/quest/QuestItem.cc (modified)
	* code/branches/pickups2/src/orxonox/objects/quest/QuestItem.h (modified)
	* code/branches/pickups2/src/orxonox/objects/quest/QuestManager.cc (modified)
	* code/branches/pickups2/src/orxonox/objects/quest/QuestManager.h (modified)
	* code/branches/pickups2/src/orxonox/objects/quest/Rewardable.cc (modified)
	* code/branches/pickups2/src/orxonox/objects/quest/Rewardable.h (modified)
	* code/branches/pickups2/src/orxonox/objects/weaponSystem/WeaponSystem.cc (modified)
	* code/branches/pickups2/src/orxonox/objects/weaponSystem/WeaponSystem.h (modified)
	* code/branches/pickups2/src/orxonox/objects/weaponSystem/projectiles/Projectile.cc (modified)
	* code/branches/pickups2/src/orxonox/objects/worldentities/Backlight.cc (modified)
	* code/branches/pickups2/src/orxonox/objects/worldentities/Backlight.h (modified)
	* code/branches/pickups2/src/orxonox/objects/worldentities/Camera.cc (modified)
	* code/branches/pickups2/src/orxonox/objects/worldentities/Camera.h (modified)
	* code/branches/pickups2/src/orxonox/objects/worldentities/ControllableEntity.h (modified)
	* code/branches/pickups2/src/orxonox/objects/worldentities/MobileEntity.cc (modified)
	* code/branches/pickups2/src/orxonox/objects/worldentities/MobileEntity.h (modified)
	* code/branches/pickups2/src/orxonox/objects/worldentities/ParticleSpawner.cc (modified)
	* code/branches/pickups2/src/orxonox/objects/worldentities/ParticleSpawner.h (modified)
	* code/branches/pickups2/src/orxonox/objects/worldentities/StaticEntity.cc (modified)
	* code/branches/pickups2/src/orxonox/objects/worldentities/StaticEntity.h (modified)
	* code/branches/pickups2/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified)
	* code/branches/pickups2/src/orxonox/objects/worldentities/pawns/Pawn.h (modified)
	* code/branches/pickups2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified)
	* code/branches/pickups2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h (modified)
	* code/branches/pickups2/src/orxonox/objects/worldentities/triggers/Trigger.cc (modified)
	* code/branches/pickups2/src/orxonox/objects/worldentities/triggers/Trigger.h (modified)
	* code/branches/pickups2/src/tolua/all-5.0.lua (modified)
	* code/branches/pickups2/src/tolua/all-5.1.lua (modified)
	* code/branches/pickups2/src/util (modified)
	* code/branches/pickups2/src/util/Exception.cc (modified)
	* code/branches/pickups2/src/util/Exception.h (modified)
	* code/branches/pickups2/src/util/SignalHandler.cc (modified)
	* code/branches/pickups2/src/util/SignalHandler.h (modified)

	merged pickup into pickup2


Wed, 15 Apr 2009 14:03:09 GMT bknecht [2916]
	* code/branches/pickups2 (copied)

	Creating new pickups branche. Changes from old pickups branch need ...


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 14:52:36 GMT Naaduun [2913]
	* code/branches/map/src/orxonox/objects/RadarViewable.cc (modified)
	* code/branches/map/src/orxonox/objects/RadarViewable.h (modified)
	* code/branches/map/src/orxonox/objects/worldentities/CameraPosition.cc (modified)
	* code/branches/map/src/orxonox/objects/worldentities/CameraPosition.h (modified)
	* code/branches/map/src/orxonox/objects/worldentities/ControllableEntity.cc (modified)
	* code/branches/map/src/orxonox/objects/worldentities/ControllableEntity.h (modified)
	* code/branches/map/src/orxonox/overlays/map/Map.cc (modified)
	* code/branches/map/src/orxonox/overlays/map/Map.h (modified)

	Added own scenemanager to map, added 2 pointer to contain mapentity ...


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


Tue, 07 Apr 2009 22:58:47 GMT dafrick [2908]
	* code/branches/questsystem5 (modified)
	* code/branches/questsystem5/CMakeLists.txt (modified)
	* code/branches/questsystem5/Doxyfile (modified)
	* code/branches/questsystem5/bin/client1.bat.in (modified)
	* code/branches/questsystem5/bin/client1.in (modified)
	* code/branches/questsystem5/bin/client2.bat.in (modified)
	* code/branches/questsystem5/bin/client2.in (modified)
	* code/branches/questsystem5/bin/dedicated.bat.in (modified)
	* code/branches/questsystem5/bin/dedicated.in (modified)
	* code/branches/questsystem5/bin/run.bat.in (modified)
	* code/branches/questsystem5/bin/server.bat.in (modified)
	* code/branches/questsystem5/bin/server.in (modified)
	* code/branches/questsystem5/bin/standalone.bat.in (modified)
	* code/branches/questsystem5/bin/standalone.in (modified)
	* code/branches/questsystem5/cmake/BuildConfig.cmake (modified)
	* code/branches/questsystem5/cmake/BuildConfigGCC.cmake (modified)
	* code/branches/questsystem5/cmake/FindDirectX.cmake (modified)
	* code/branches/questsystem5/cmake/FlagUtilities.cmake (modified)
	* code/branches/questsystem5/cmake/LibraryConfigTardis.cmake (modified)
	* code/branches/questsystem5/doc/api/doxy.config.in (modified)
	* code/branches/questsystem5/doc/examples (deleted)
	* code/branches/questsystem5/doc/images (deleted)
	* code/branches/questsystem5/src/OrxonoxConfig.h.in (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btAxisSweep3.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btDbvt.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btDbvt.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btCollisionObject.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btCollisionObject.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btCollisionWorld.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btCollisionWorld.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btGhostObject.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btManifoldResult.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btManifoldResult.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btSimulationIslandManager.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btUnionFind.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btUnionFind.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btBoxShape.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btCollisionShape.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btCompoundShape.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btCompoundShape.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btConeShape.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btConvexHullShape.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btConvexShape.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btSphereShape.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btTriangleMesh.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btTriangleMeshShape.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/Gimpact/btGImpactBvh.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/Gimpact/btGImpactShape.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/Gimpact/gim_box_set.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/Gimpact/gim_math.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/Gimpact/gim_tri_collision.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/CMakeLists.txt (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/Character/btCharacterControllerInterface.h (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/Character/btKinematicCharacterController.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/Character/btKinematicCharacterController.h (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btContactConstraint.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btContactSolverInfo.h (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btHingeConstraint.h (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btSliderConstraint.h (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btSolverBody.h (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btSolverConstraint.h (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btTypedConstraint.h (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/Dynamics/Bullet-C-API.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/Dynamics/btActionInterface.h (deleted)
	* code/branches/questsystem5/src/bullet/BulletDynamics/Dynamics/btContinuousDynamicsWorld.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/Dynamics/btDynamicsWorld.h (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/Dynamics/btRigidBody.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/Dynamics/btRigidBody.h (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/Vehicle/btRaycastVehicle.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/Vehicle/btRaycastVehicle.h (modified)
	* code/branches/questsystem5/src/bullet/LinearMath/btAlignedAllocator.cpp (modified)
	* code/branches/questsystem5/src/bullet/LinearMath/btAlignedAllocator.h (modified)
	* code/branches/questsystem5/src/bullet/LinearMath/btAlignedObjectArray.h (modified)
	* code/branches/questsystem5/src/bullet/LinearMath/btConvexHull.cpp (modified)
	* code/branches/questsystem5/src/bullet/LinearMath/btIDebugDraw.h (modified)
	* code/branches/questsystem5/src/bullet/LinearMath/btMatrix3x3.h (modified)
	* code/branches/questsystem5/src/bullet/LinearMath/btQuadWord.h (modified)
	* code/branches/questsystem5/src/bullet/LinearMath/btQuaternion.h (modified)
	* code/branches/questsystem5/src/bullet/LinearMath/btScalar.h (modified)
	* code/branches/questsystem5/src/bullet/LinearMath/btTransform.h (modified)
	* code/branches/questsystem5/src/bullet/LinearMath/btVector3.h (modified)
	* code/branches/questsystem5/src/bullet/changes_orxonox.diff (modified)
	* code/branches/questsystem5/src/core/CMakeLists.txt (modified)
	* code/branches/questsystem5/src/core/Clock.h (modified)
	* code/branches/questsystem5/src/core/ConfigFileManager.cc (modified)
	* code/branches/questsystem5/src/core/Core.cc (modified)
	* code/branches/questsystem5/src/core/Core.h (modified)
	* code/branches/questsystem5/src/core/CorePrereqs.h (modified)
	* code/branches/questsystem5/src/core/Game.cc (deleted)
	* code/branches/questsystem5/src/core/Game.h (deleted)
	* code/branches/questsystem5/src/core/GameMode.cc (deleted)
	* code/branches/questsystem5/src/core/GameMode.h (deleted)
	* code/branches/questsystem5/src/core/GameState.cc (modified)
	* code/branches/questsystem5/src/core/GameState.h (modified)
	* code/branches/questsystem5/src/core/Identifier.h (modified)
	* code/branches/questsystem5/src/core/Iterator.h (modified)
	* code/branches/questsystem5/src/core/LuaBind.cc (modified)
	* code/branches/questsystem5/src/core/LuaBind.h (modified)
	* code/branches/questsystem5/src/core/ObjectListBase.cc (modified)
	* code/branches/questsystem5/src/core/ObjectListBase.h (modified)
	* code/branches/questsystem5/src/core/ObjectListIterator.h (modified)
	* code/branches/questsystem5/src/core/RootGameState.cc (added)
	* code/branches/questsystem5/src/core/RootGameState.h (added)
	* code/branches/questsystem5/src/core/TclThreadManager.cc (modified)
	* code/branches/questsystem5/src/core/TclThreadManager.h (modified)
	* code/branches/questsystem5/src/core/Template.cc (modified)
	* code/branches/questsystem5/src/core/Template.h (modified)
	* code/branches/questsystem5/src/core/XMLFile.h (modified)
	* code/branches/questsystem5/src/core/XMLIncludes.h (modified)
	* code/branches/questsystem5/src/core/XMLPort.h (modified)
	* code/branches/questsystem5/src/core/input/CalibratorCallback.h (modified)
	* code/branches/questsystem5/src/core/input/ExtendedInputState.cc (modified)
	* code/branches/questsystem5/src/core/input/ExtendedInputState.h (modified)
	* code/branches/questsystem5/src/core/input/InputBuffer.cc (modified)
	* code/branches/questsystem5/src/core/input/InputBuffer.h (modified)
	* code/branches/questsystem5/src/core/input/InputInterfaces.h (modified)
	* code/branches/questsystem5/src/core/input/InputManager.cc (modified)
	* code/branches/questsystem5/src/core/input/InputManager.h (modified)
	* code/branches/questsystem5/src/core/input/InputState.h (modified)
	* code/branches/questsystem5/src/core/input/KeyBinder.cc (modified)
	* code/branches/questsystem5/src/core/input/KeyBinder.h (modified)
	* code/branches/questsystem5/src/core/input/SimpleInputState.h (modified)
	* code/branches/questsystem5/src/cpptcl/cpptcl.cc (modified)
	* code/branches/questsystem5/src/cpptcl/cpptcl.h (modified)
	* code/branches/questsystem5/src/network/ChatListener.cc (modified)
	* code/branches/questsystem5/src/network/Client.cc (modified)
	* code/branches/questsystem5/src/network/Client.h (modified)
	* code/branches/questsystem5/src/network/ClientConnectionListener.cc (modified)
	* code/branches/questsystem5/src/network/ConnectionManager.cc (modified)
	* code/branches/questsystem5/src/network/Server.cc (modified)
	* code/branches/questsystem5/src/network/Server.h (modified)
	* code/branches/questsystem5/src/network/TrafficControl.cc (modified)
	* code/branches/questsystem5/src/network/packet/Gamestate.cc (modified)
	* code/branches/questsystem5/src/network/packet/Gamestate.h (modified)
	* code/branches/questsystem5/src/network/synchronisable/NetworkCallback.h (modified)
	* code/branches/questsystem5/src/network/synchronisable/Synchronisable.cc (modified)
	* code/branches/questsystem5/src/network/synchronisable/Synchronisable.h (modified)
	* code/branches/questsystem5/src/network/synchronisable/SynchronisableVariable.cc (modified)
	* code/branches/questsystem5/src/network/synchronisable/SynchronisableVariable.h (modified)
	* code/branches/questsystem5/src/orxonox/CMakeLists.txt (modified)
	* code/branches/questsystem5/src/orxonox/CameraManager.cc (modified)
	* code/branches/questsystem5/src/orxonox/CameraManager.h (modified)
	* code/branches/questsystem5/src/orxonox/GraphicsEngine.cc (added)
	* code/branches/questsystem5/src/orxonox/GraphicsEngine.h (added)
	* code/branches/questsystem5/src/orxonox/GraphicsManager.cc (deleted)
	* code/branches/questsystem5/src/orxonox/GraphicsManager.h (deleted)
	* code/branches/questsystem5/src/orxonox/Main.cc (modified)
	* code/branches/questsystem5/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/branches/questsystem5/src/orxonox/PlayerManager.cc (modified)
	* code/branches/questsystem5/src/orxonox/gamestates/CMakeLists.txt (modified)
	* code/branches/questsystem5/src/orxonox/gamestates/GSClient.cc (modified)
	* code/branches/questsystem5/src/orxonox/gamestates/GSClient.h (modified)
	* code/branches/questsystem5/src/orxonox/gamestates/GSDedicated.cc (modified)
	* code/branches/questsystem5/src/orxonox/gamestates/GSDedicated.h (modified)
	* code/branches/questsystem5/src/orxonox/gamestates/GSGUI.cc (added)
	* code/branches/questsystem5/src/orxonox/gamestates/GSGUI.h (added)
	* code/branches/questsystem5/src/orxonox/gamestates/GSGraphics.cc (modified)
	* code/branches/questsystem5/src/orxonox/gamestates/GSGraphics.h (modified)
	* code/branches/questsystem5/src/orxonox/gamestates/GSIOConsole.cc (modified)
	* code/branches/questsystem5/src/orxonox/gamestates/GSIOConsole.h (modified)
	* code/branches/questsystem5/src/orxonox/gamestates/GSLevel.cc (modified)
	* code/branches/questsystem5/src/orxonox/gamestates/GSLevel.h (modified)
	* code/branches/questsystem5/src/orxonox/gamestates/GSMainMenu.cc (deleted)
	* code/branches/questsystem5/src/orxonox/gamestates/GSMainMenu.h (deleted)
	* code/branches/questsystem5/src/orxonox/gamestates/GSRoot.cc (modified)
	* code/branches/questsystem5/src/orxonox/gamestates/GSRoot.h (modified)
	* code/branches/questsystem5/src/orxonox/gamestates/GSServer.cc (modified)
	* code/branches/questsystem5/src/orxonox/gamestates/GSServer.h (modified)
	* code/branches/questsystem5/src/orxonox/gamestates/GSStandalone.cc (modified)
	* code/branches/questsystem5/src/orxonox/gamestates/GSStandalone.h (modified)
	* code/branches/questsystem5/src/orxonox/gui/GUIManager.cc (modified)
	* code/branches/questsystem5/src/orxonox/gui/GUIManager.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/CMakeLists.txt (modified)
	* code/branches/questsystem5/src/orxonox/objects/EventTarget.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/Level.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/Level.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/Radar.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/Scene.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/Teamcolourable.cc (deleted)
	* code/branches/questsystem5/src/orxonox/objects/Teamcolourable.h (deleted)
	* code/branches/questsystem5/src/orxonox/objects/collisionshapes (modified)
	* code/branches/questsystem5/src/orxonox/objects/controllers/AIController.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/controllers/CMakeLists.txt (modified)
	* code/branches/questsystem5/src/orxonox/objects/controllers/Controller.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/controllers/Controller.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/controllers/HumanController.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/controllers/PongAI.cc (deleted)
	* code/branches/questsystem5/src/orxonox/objects/controllers/PongAI.h (deleted)
	* code/branches/questsystem5/src/orxonox/objects/gametypes/CMakeLists.txt (modified)
	* code/branches/questsystem5/src/orxonox/objects/gametypes/Deathmatch.cc (deleted)
	* code/branches/questsystem5/src/orxonox/objects/gametypes/Deathmatch.h (deleted)
	* code/branches/questsystem5/src/orxonox/objects/gametypes/Gametype.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/gametypes/Gametype.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/gametypes/Pong.cc (deleted)
	* code/branches/questsystem5/src/orxonox/objects/gametypes/Pong.h (deleted)
	* code/branches/questsystem5/src/orxonox/objects/gametypes/TeamDeathmatch.cc (deleted)
	* code/branches/questsystem5/src/orxonox/objects/gametypes/TeamDeathmatch.h (deleted)
	* code/branches/questsystem5/src/orxonox/objects/infos/Bot.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/infos/CMakeLists.txt (modified)
	* code/branches/questsystem5/src/orxonox/objects/infos/GametypeInfo.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/infos/GametypeInfo.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/infos/HumanPlayer.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/infos/HumanPlayer.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/infos/PlayerInfo.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/infos/PlayerInfo.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/infos/PongBot.cc (deleted)
	* code/branches/questsystem5/src/orxonox/objects/infos/PongBot.h (deleted)
	* code/branches/questsystem5/src/orxonox/objects/items/MultiStateEngine.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/pickup/PickupSpawner.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/pickup/Usable.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/AddQuest.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/AddQuest.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/AddQuestHint.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/AddQuestHint.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/AddReward.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/AddReward.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/ChangeQuestStatus.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/ChangeQuestStatus.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/CompleteQuest.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/CompleteQuest.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/FailQuest.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/FailQuest.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/GlobalQuest.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/GlobalQuest.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/LocalQuest.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/LocalQuest.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/Quest.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/Quest.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/QuestDescription.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/QuestDescription.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/QuestEffect.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/QuestEffect.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/QuestHint.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/QuestHint.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/QuestItem.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/QuestItem.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/QuestManager.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/QuestManager.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/Rewardable.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/Rewardable.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/weaponSystem/Munition.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/weaponSystem/Weapon.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/weaponSystem/Weapon.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/weaponSystem/WeaponPack.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/weaponSystem/WeaponPack.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/weaponSystem/WeaponSet.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/weaponSystem/WeaponSystem.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/weaponSystem/WeaponSystem.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/weaponSystem/munitions/CMakeLists.txt (modified)
	* code/branches/questsystem5/src/orxonox/objects/weaponSystem/munitions/FusionMunition.cc (deleted)
	* code/branches/questsystem5/src/orxonox/objects/weaponSystem/munitions/FusionMunition.h (deleted)
	* code/branches/questsystem5/src/orxonox/objects/weaponSystem/munitions/LaserGunMunition.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/weaponSystem/projectiles/BillboardProjectile.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/weaponSystem/projectiles/ParticleProjectile.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/weaponSystem/projectiles/Projectile.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/weaponSystem/weapons/LaserGun.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/Backlight.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/Backlight.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/Billboard.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/Billboard.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/BlinkingBillboard.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/CMakeLists.txt (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/Camera.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/Camera.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/CameraPosition.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/CameraPosition.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/ControllableEntity.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/ControllableEntity.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/ExplosionChunk.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/Light.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/Light.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/MobileEntity.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/MobileEntity.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/Model.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/MovableEntity.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/ParticleEmitter.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/ParticleSpawner.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/ParticleSpawner.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/Planet.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/PongBall.cc (deleted)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/PongBall.h (deleted)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/PongBat.cc (deleted)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/PongBat.h (deleted)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/PongCenterpoint.cc (deleted)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/PongCenterpoint.h (deleted)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/StaticEntity.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/StaticEntity.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/TeamSpawnPoint.cc (deleted)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/TeamSpawnPoint.h (deleted)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/WorldEntity.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/WorldEntity.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/pawns/Pawn.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/pawns/Spectator.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/triggers/Trigger.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/triggers/Trigger.h (modified)
	* code/branches/questsystem5/src/orxonox/overlays/OrxonoxOverlay.cc (modified)
	* code/branches/questsystem5/src/orxonox/overlays/OrxonoxOverlay.h (modified)
	* code/branches/questsystem5/src/orxonox/overlays/OverlayGroup.cc (modified)
	* code/branches/questsystem5/src/orxonox/overlays/OverlayGroup.h (modified)
	* code/branches/questsystem5/src/orxonox/overlays/console/InGameConsole.cc (modified)
	* code/branches/questsystem5/src/orxonox/overlays/console/InGameConsole.h (modified)
	* code/branches/questsystem5/src/orxonox/overlays/debug/DebugFPSText.cc (modified)
	* code/branches/questsystem5/src/orxonox/overlays/debug/DebugRTRText.cc (modified)
	* code/branches/questsystem5/src/orxonox/overlays/hud/CMakeLists.txt (modified)
	* code/branches/questsystem5/src/orxonox/overlays/hud/HUDRadar.cc (modified)
	* code/branches/questsystem5/src/orxonox/overlays/hud/PongScore.cc (deleted)
	* code/branches/questsystem5/src/orxonox/overlays/hud/PongScore.h (deleted)
	* code/branches/questsystem5/src/orxonox/overlays/notifications/NotificationQueue.cc (modified)
	* code/branches/questsystem5/src/orxonox/pch/havepch/OrxonoxStableHeaders.h (modified)
	* code/branches/questsystem5/src/orxonox/tools/BillboardSet.cc (modified)
	* code/branches/questsystem5/src/orxonox/tools/CMakeLists.txt (modified)
	* code/branches/questsystem5/src/orxonox/tools/Mesh.cc (modified)
	* code/branches/questsystem5/src/orxonox/tools/ParticleInterface.cc (modified)
	* code/branches/questsystem5/src/orxonox/tools/ParticleInterface.h (modified)
	* code/branches/questsystem5/src/orxonox/tools/Shader.cc (modified)
	* code/branches/questsystem5/src/orxonox/tools/TimeFactorListener.cc (deleted)
	* code/branches/questsystem5/src/orxonox/tools/TimeFactorListener.h (deleted)
	* code/branches/questsystem5/src/orxonox/tools/Timer.h (modified)
	* code/branches/questsystem5/src/orxonox/tools/WindowEventListener.h (modified)
	* code/branches/questsystem5/src/tolua/all-5.0.lua (modified)
	* code/branches/questsystem5/src/tolua/all-5.1.lua (modified)
	* code/branches/questsystem5/src/util (modified)
	* code/branches/questsystem5/src/util/CMakeLists.txt (modified)
	* code/branches/questsystem5/src/util/Exception.cc (modified)
	* code/branches/questsystem5/src/util/Exception.h (modified)
	* code/branches/questsystem5/src/util/Math.h (modified)
	* code/branches/questsystem5/src/util/SignalHandler.cc (modified)
	* code/branches/questsystem5/src/util/SignalHandler.h (modified)

	Reverted to revision 2906 (because I'm too stupid to merge correctly, ...


Tue, 07 Apr 2009 22:36:08 GMT dafrick [2907]
	* code/branches/questsystem5 (modified)
	* code/branches/questsystem5/CMakeLists.txt (modified)
	* code/branches/questsystem5/Doxyfile (modified)
	* code/branches/questsystem5/bin/client1.bat.in (modified)
	* code/branches/questsystem5/bin/client1.in (modified)
	* code/branches/questsystem5/bin/client2.bat.in (modified)
	* code/branches/questsystem5/bin/client2.in (modified)
	* code/branches/questsystem5/bin/dedicated.bat.in (modified)
	* code/branches/questsystem5/bin/dedicated.in (modified)
	* code/branches/questsystem5/bin/run.bat.in (modified)
	* code/branches/questsystem5/bin/server.bat.in (modified)
	* code/branches/questsystem5/bin/server.in (modified)
	* code/branches/questsystem5/bin/standalone.bat.in (modified)
	* code/branches/questsystem5/bin/standalone.in (modified)
	* code/branches/questsystem5/cmake/BuildConfig.cmake (modified)
	* code/branches/questsystem5/cmake/BuildConfigGCC.cmake (modified)
	* code/branches/questsystem5/cmake/FindDirectX.cmake (modified)
	* code/branches/questsystem5/cmake/FlagUtilities.cmake (modified)
	* code/branches/questsystem5/cmake/LibraryConfigTardis.cmake (modified)
	* code/branches/questsystem5/doc/api/doxy.config.in (modified)
	* code/branches/questsystem5/doc/examples (added)
	* code/branches/questsystem5/doc/images (added)
	* code/branches/questsystem5/src/OrxonoxConfig.h.in (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btAxisSweep3.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btDbvt.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btDbvt.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btCollisionObject.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btCollisionObject.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btCollisionWorld.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btCollisionWorld.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btGhostObject.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btManifoldResult.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btManifoldResult.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btSimulationIslandManager.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btUnionFind.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btUnionFind.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btBoxShape.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btCollisionShape.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btCompoundShape.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btCompoundShape.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btConeShape.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btConvexHullShape.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btConvexShape.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btSphereShape.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btTriangleMesh.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btTriangleMeshShape.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/Gimpact/btGImpactBvh.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/Gimpact/btGImpactShape.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/Gimpact/gim_box_set.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/Gimpact/gim_math.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/Gimpact/gim_tri_collision.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h (modified)
	* code/branches/questsystem5/src/bullet/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/CMakeLists.txt (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/Character/btCharacterControllerInterface.h (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/Character/btKinematicCharacterController.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/Character/btKinematicCharacterController.h (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btContactConstraint.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btContactSolverInfo.h (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btHingeConstraint.h (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btSliderConstraint.h (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btSolverBody.h (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btSolverConstraint.h (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/ConstraintSolver/btTypedConstraint.h (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/Dynamics/Bullet-C-API.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/Dynamics/btActionInterface.h (added)
	* code/branches/questsystem5/src/bullet/BulletDynamics/Dynamics/btContinuousDynamicsWorld.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/Dynamics/btDynamicsWorld.h (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/Dynamics/btRigidBody.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/Dynamics/btRigidBody.h (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/Vehicle/btRaycastVehicle.cpp (modified)
	* code/branches/questsystem5/src/bullet/BulletDynamics/Vehicle/btRaycastVehicle.h (modified)
	* code/branches/questsystem5/src/bullet/LinearMath/btAlignedAllocator.cpp (modified)
	* code/branches/questsystem5/src/bullet/LinearMath/btAlignedAllocator.h (modified)
	* code/branches/questsystem5/src/bullet/LinearMath/btAlignedObjectArray.h (modified)
	* code/branches/questsystem5/src/bullet/LinearMath/btConvexHull.cpp (modified)
	* code/branches/questsystem5/src/bullet/LinearMath/btIDebugDraw.h (modified)
	* code/branches/questsystem5/src/bullet/LinearMath/btMatrix3x3.h (modified)
	* code/branches/questsystem5/src/bullet/LinearMath/btQuadWord.h (modified)
	* code/branches/questsystem5/src/bullet/LinearMath/btQuaternion.h (modified)
	* code/branches/questsystem5/src/bullet/LinearMath/btScalar.h (modified)
	* code/branches/questsystem5/src/bullet/LinearMath/btTransform.h (modified)
	* code/branches/questsystem5/src/bullet/LinearMath/btVector3.h (modified)
	* code/branches/questsystem5/src/bullet/changes_orxonox.diff (modified)
	* code/branches/questsystem5/src/core/CMakeLists.txt (modified)
	* code/branches/questsystem5/src/core/Clock.h (modified)
	* code/branches/questsystem5/src/core/ConfigFileManager.cc (modified)
	* code/branches/questsystem5/src/core/Core.cc (modified)
	* code/branches/questsystem5/src/core/Core.h (modified)
	* code/branches/questsystem5/src/core/CorePrereqs.h (modified)
	* code/branches/questsystem5/src/core/Game.cc (added)
	* code/branches/questsystem5/src/core/Game.h (added)
	* code/branches/questsystem5/src/core/GameMode.cc (added)
	* code/branches/questsystem5/src/core/GameMode.h (added)
	* code/branches/questsystem5/src/core/GameState.cc (modified)
	* code/branches/questsystem5/src/core/GameState.h (modified)
	* code/branches/questsystem5/src/core/Identifier.h (modified)
	* code/branches/questsystem5/src/core/Iterator.h (modified)
	* code/branches/questsystem5/src/core/LuaBind.cc (modified)
	* code/branches/questsystem5/src/core/LuaBind.h (modified)
	* code/branches/questsystem5/src/core/ObjectListBase.cc (modified)
	* code/branches/questsystem5/src/core/ObjectListBase.h (modified)
	* code/branches/questsystem5/src/core/ObjectListIterator.h (modified)
	* code/branches/questsystem5/src/core/RootGameState.cc (deleted)
	* code/branches/questsystem5/src/core/RootGameState.h (deleted)
	* code/branches/questsystem5/src/core/TclThreadManager.cc (modified)
	* code/branches/questsystem5/src/core/TclThreadManager.h (modified)
	* code/branches/questsystem5/src/core/Template.cc (modified)
	* code/branches/questsystem5/src/core/Template.h (modified)
	* code/branches/questsystem5/src/core/XMLFile.h (modified)
	* code/branches/questsystem5/src/core/XMLIncludes.h (modified)
	* code/branches/questsystem5/src/core/XMLPort.h (modified)
	* code/branches/questsystem5/src/core/input/CalibratorCallback.h (modified)
	* code/branches/questsystem5/src/core/input/ExtendedInputState.cc (modified)
	* code/branches/questsystem5/src/core/input/ExtendedInputState.h (modified)
	* code/branches/questsystem5/src/core/input/InputBuffer.cc (modified)
	* code/branches/questsystem5/src/core/input/InputBuffer.h (modified)
	* code/branches/questsystem5/src/core/input/InputInterfaces.h (modified)
	* code/branches/questsystem5/src/core/input/InputManager.cc (modified)
	* code/branches/questsystem5/src/core/input/InputManager.h (modified)
	* code/branches/questsystem5/src/core/input/InputState.h (modified)
	* code/branches/questsystem5/src/core/input/KeyBinder.cc (modified)
	* code/branches/questsystem5/src/core/input/KeyBinder.h (modified)
	* code/branches/questsystem5/src/core/input/SimpleInputState.h (modified)
	* code/branches/questsystem5/src/cpptcl/cpptcl.cc (modified)
	* code/branches/questsystem5/src/cpptcl/cpptcl.h (modified)
	* code/branches/questsystem5/src/network/ChatListener.cc (modified)
	* code/branches/questsystem5/src/network/Client.cc (modified)
	* code/branches/questsystem5/src/network/Client.h (modified)
	* code/branches/questsystem5/src/network/ClientConnectionListener.cc (modified)
	* code/branches/questsystem5/src/network/ConnectionManager.cc (modified)
	* code/branches/questsystem5/src/network/Server.cc (modified)
	* code/branches/questsystem5/src/network/Server.h (modified)
	* code/branches/questsystem5/src/network/TrafficControl.cc (modified)
	* code/branches/questsystem5/src/network/packet/Gamestate.cc (modified)
	* code/branches/questsystem5/src/network/packet/Gamestate.h (modified)
	* code/branches/questsystem5/src/network/synchronisable/NetworkCallback.h (modified)
	* code/branches/questsystem5/src/network/synchronisable/Synchronisable.cc (modified)
	* code/branches/questsystem5/src/network/synchronisable/Synchronisable.h (modified)
	* code/branches/questsystem5/src/network/synchronisable/SynchronisableVariable.cc (modified)
	* code/branches/questsystem5/src/network/synchronisable/SynchronisableVariable.h (modified)
	* code/branches/questsystem5/src/orxonox/CMakeLists.txt (modified)
	* code/branches/questsystem5/src/orxonox/CameraManager.cc (modified)
	* code/branches/questsystem5/src/orxonox/CameraManager.h (modified)
	* code/branches/questsystem5/src/orxonox/GraphicsEngine.cc (deleted)
	* code/branches/questsystem5/src/orxonox/GraphicsEngine.h (deleted)
	* code/branches/questsystem5/src/orxonox/GraphicsManager.cc (added)
	* code/branches/questsystem5/src/orxonox/GraphicsManager.h (added)
	* code/branches/questsystem5/src/orxonox/Main.cc (modified)
	* code/branches/questsystem5/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/branches/questsystem5/src/orxonox/PlayerManager.cc (modified)
	* code/branches/questsystem5/src/orxonox/gamestates/CMakeLists.txt (modified)
	* code/branches/questsystem5/src/orxonox/gamestates/GSClient.cc (modified)
	* code/branches/questsystem5/src/orxonox/gamestates/GSClient.h (modified)
	* code/branches/questsystem5/src/orxonox/gamestates/GSDedicated.cc (modified)
	* code/branches/questsystem5/src/orxonox/gamestates/GSDedicated.h (modified)
	* code/branches/questsystem5/src/orxonox/gamestates/GSGUI.cc (deleted)
	* code/branches/questsystem5/src/orxonox/gamestates/GSGUI.h (deleted)
	* code/branches/questsystem5/src/orxonox/gamestates/GSGraphics.cc (modified)
	* code/branches/questsystem5/src/orxonox/gamestates/GSGraphics.h (modified)
	* code/branches/questsystem5/src/orxonox/gamestates/GSIOConsole.cc (modified)
	* code/branches/questsystem5/src/orxonox/gamestates/GSIOConsole.h (modified)
	* code/branches/questsystem5/src/orxonox/gamestates/GSLevel.cc (modified)
	* code/branches/questsystem5/src/orxonox/gamestates/GSLevel.h (modified)
	* code/branches/questsystem5/src/orxonox/gamestates/GSMainMenu.cc (added)
	* code/branches/questsystem5/src/orxonox/gamestates/GSMainMenu.h (added)
	* code/branches/questsystem5/src/orxonox/gamestates/GSRoot.cc (modified)
	* code/branches/questsystem5/src/orxonox/gamestates/GSRoot.h (modified)
	* code/branches/questsystem5/src/orxonox/gamestates/GSServer.cc (modified)
	* code/branches/questsystem5/src/orxonox/gamestates/GSServer.h (modified)
	* code/branches/questsystem5/src/orxonox/gamestates/GSStandalone.cc (modified)
	* code/branches/questsystem5/src/orxonox/gamestates/GSStandalone.h (modified)
	* code/branches/questsystem5/src/orxonox/gui/GUIManager.cc (modified)
	* code/branches/questsystem5/src/orxonox/gui/GUIManager.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/CMakeLists.txt (modified)
	* code/branches/questsystem5/src/orxonox/objects/EventTarget.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/Level.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/Level.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/Radar.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/Scene.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/Teamcolourable.cc (added)
	* code/branches/questsystem5/src/orxonox/objects/Teamcolourable.h (added)
	* code/branches/questsystem5/src/orxonox/objects/collisionshapes (modified)
	* code/branches/questsystem5/src/orxonox/objects/controllers/AIController.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/controllers/CMakeLists.txt (modified)
	* code/branches/questsystem5/src/orxonox/objects/controllers/Controller.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/controllers/Controller.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/controllers/HumanController.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/controllers/PongAI.cc (added)
	* code/branches/questsystem5/src/orxonox/objects/controllers/PongAI.h (added)
	* code/branches/questsystem5/src/orxonox/objects/gametypes/CMakeLists.txt (modified)
	* code/branches/questsystem5/src/orxonox/objects/gametypes/Deathmatch.cc (added)
	* code/branches/questsystem5/src/orxonox/objects/gametypes/Deathmatch.h (added)
	* code/branches/questsystem5/src/orxonox/objects/gametypes/Gametype.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/gametypes/Gametype.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/gametypes/Pong.cc (added)
	* code/branches/questsystem5/src/orxonox/objects/gametypes/Pong.h (added)
	* code/branches/questsystem5/src/orxonox/objects/gametypes/TeamDeathmatch.cc (added)
	* code/branches/questsystem5/src/orxonox/objects/gametypes/TeamDeathmatch.h (added)
	* code/branches/questsystem5/src/orxonox/objects/infos/Bot.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/infos/CMakeLists.txt (modified)
	* code/branches/questsystem5/src/orxonox/objects/infos/GametypeInfo.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/infos/GametypeInfo.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/infos/HumanPlayer.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/infos/HumanPlayer.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/infos/PlayerInfo.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/infos/PlayerInfo.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/infos/PongBot.cc (added)
	* code/branches/questsystem5/src/orxonox/objects/infos/PongBot.h (added)
	* code/branches/questsystem5/src/orxonox/objects/items/MultiStateEngine.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/pickup/PickupSpawner.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/pickup/Usable.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/AddQuest.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/AddQuest.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/AddQuestHint.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/AddQuestHint.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/AddReward.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/AddReward.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/ChangeQuestStatus.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/ChangeQuestStatus.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/CompleteQuest.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/CompleteQuest.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/FailQuest.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/FailQuest.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/GlobalQuest.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/GlobalQuest.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/LocalQuest.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/LocalQuest.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/Quest.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/Quest.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/QuestDescription.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/QuestDescription.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/QuestEffect.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/QuestEffect.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/QuestHint.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/QuestHint.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/QuestItem.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/QuestItem.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/QuestManager.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/QuestManager.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/Rewardable.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/quest/Rewardable.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/weaponSystem/Munition.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/weaponSystem/Weapon.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/weaponSystem/Weapon.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/weaponSystem/WeaponPack.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/weaponSystem/WeaponPack.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/weaponSystem/WeaponSet.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/weaponSystem/WeaponSystem.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/weaponSystem/WeaponSystem.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/weaponSystem/munitions/CMakeLists.txt (modified)
	* code/branches/questsystem5/src/orxonox/objects/weaponSystem/munitions/FusionMunition.cc (added)
	* code/branches/questsystem5/src/orxonox/objects/weaponSystem/munitions/FusionMunition.h (added)
	* code/branches/questsystem5/src/orxonox/objects/weaponSystem/munitions/LaserGunMunition.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/weaponSystem/projectiles/BillboardProjectile.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/weaponSystem/projectiles/ParticleProjectile.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/weaponSystem/projectiles/Projectile.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/weaponSystem/weapons/LaserGun.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/Backlight.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/Backlight.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/Billboard.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/Billboard.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/BlinkingBillboard.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/CMakeLists.txt (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/Camera.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/Camera.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/CameraPosition.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/CameraPosition.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/ControllableEntity.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/ControllableEntity.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/ExplosionChunk.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/Light.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/Light.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/MobileEntity.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/MobileEntity.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/Model.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/MovableEntity.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/ParticleEmitter.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/ParticleSpawner.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/ParticleSpawner.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/Planet.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/PongBall.cc (added)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/PongBall.h (added)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/PongBat.cc (added)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/PongBat.h (added)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/PongCenterpoint.cc (added)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/PongCenterpoint.h (added)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/StaticEntity.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/StaticEntity.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/TeamSpawnPoint.cc (added)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/TeamSpawnPoint.h (added)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/WorldEntity.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/WorldEntity.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/pawns/Pawn.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/pawns/Spectator.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/triggers/Trigger.cc (modified)
	* code/branches/questsystem5/src/orxonox/objects/worldentities/triggers/Trigger.h (modified)
	* code/branches/questsystem5/src/orxonox/overlays/OrxonoxOverlay.cc (modified)
	* code/branches/questsystem5/src/orxonox/overlays/OrxonoxOverlay.h (modified)
	* code/branches/questsystem5/src/orxonox/overlays/OverlayGroup.cc (modified)
	* code/branches/questsystem5/src/orxonox/overlays/OverlayGroup.h (modified)
	* code/branches/questsystem5/src/orxonox/overlays/console/InGameConsole.cc (modified)
	* code/branches/questsystem5/src/orxonox/overlays/console/InGameConsole.h (modified)
	* code/branches/questsystem5/src/orxonox/overlays/debug/DebugFPSText.cc (modified)
	* code/branches/questsystem5/src/orxonox/overlays/debug/DebugRTRText.cc (modified)
	* code/branches/questsystem5/src/orxonox/overlays/hud/CMakeLists.txt (modified)
	* code/branches/questsystem5/src/orxonox/overlays/hud/HUDRadar.cc (modified)
	* code/branches/questsystem5/src/orxonox/overlays/hud/PongScore.cc (added)
	* code/branches/questsystem5/src/orxonox/overlays/hud/PongScore.h (added)
	* code/branches/questsystem5/src/orxonox/overlays/notifications/NotificationQueue.cc (modified)
	* code/branches/questsystem5/src/orxonox/pch/havepch/OrxonoxStableHeaders.h (modified)
	* code/branches/questsystem5/src/orxonox/tools/BillboardSet.cc (modified)
	* code/branches/questsystem5/src/orxonox/tools/CMakeLists.txt (modified)
	* code/branches/questsystem5/src/orxonox/tools/Mesh.cc (modified)
	* code/branches/questsystem5/src/orxonox/tools/ParticleInterface.cc (modified)
	* code/branches/questsystem5/src/orxonox/tools/ParticleInterface.h (modified)
	* code/branches/questsystem5/src/orxonox/tools/Shader.cc (modified)
	* code/branches/questsystem5/src/orxonox/tools/TimeFactorListener.cc (added)
	* code/branches/questsystem5/src/orxonox/tools/TimeFactorListener.h (added)
	* code/branches/questsystem5/src/orxonox/tools/Timer.h (modified)
	* code/branches/questsystem5/src/orxonox/tools/WindowEventListener.h (modified)
	* code/branches/questsystem5/src/tolua/all-5.0.lua (modified)
	* code/branches/questsystem5/src/tolua/all-5.1.lua (modified)
	* code/branches/questsystem5/src/util (modified)
	* code/branches/questsystem5/src/util/CMakeLists.txt (modified)
	* code/branches/questsystem5/src/util/Exception.cc (modified)
	* code/branches/questsystem5/src/util/Exception.h (modified)
	* code/branches/questsystem5/src/util/Math.h (modified)
	* code/branches/questsystem5/src/util/SignalHandler.cc (modified)
	* code/branches/questsystem5/src/util/SignalHandler.h (modified)

	Merging of the current QuestSystem branch.


Tue, 07 Apr 2009 15:43:08 GMT landauf [2906]
	* code/branches/gametypes/src/orxonox/objects/gametypes/TeamDeathmatch.cc (modified)

	removed 3 warnings


Mon, 06 Apr 2009 15:25:22 GMT Aurelian [2905]
	* code/branches/gametypes/src/orxonox/objects/gametypes/Asteroids.cc (added)
	* code/branches/gametypes/src/orxonox/objects/gametypes/Asteroids.h (added)
	* code/branches/gametypes/src/orxonox/objects/worldentities/triggers/CheckPoint.cc (added)
	* code/branches/gametypes/src/orxonox/objects/worldentities/triggers/CheckPoint.h (added)
	* code/branches/gametypes/src/orxonox/objects/worldentities/triggers/Trigger.cc (modified)
	* code/branches/gametypes/src/orxonox/objects/worldentities/triggers/Trigger.h (modified)

	My first version with working triggers in a row...


Mon, 06 Apr 2009 14:48:32 GMT scheusso [2903]
	* code/branches/gametypes/src/orxonox/objects/gametypes/TeamBaseMatch.cc (added)
	* code/branches/gametypes/src/orxonox/objects/gametypes/TeamBaseMatch.h (added)
	* code/branches/gametypes/src/orxonox/objects/gametypes/TeamDeathmatch.cc (modified)
	* code/branches/gametypes/src/orxonox/objects/gametypes/TeamDeathmatch.h (modified)
	* code/branches/gametypes/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified)
	* code/branches/gametypes/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.h (added)

	merged changes made to trunk (r2902) into branch


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 13:53:50 GMT danielh [2900]
	* code/branches/pickups (modified)
	* code/branches/pickups/src/orxonox/objects/controllers/HumanController.cc (modified)
	* code/branches/pickups/src/orxonox/objects/controllers/HumanController.h (modified)
	* code/branches/pickups/src/orxonox/objects/items/Engine.cc (modified)
	* code/branches/pickups/src/orxonox/objects/pickup/BaseItem.cc (modified)
	* code/branches/pickups/src/orxonox/objects/pickup/CMakeLists.txt (modified)
	* code/branches/pickups/src/orxonox/objects/pickup/DroppedItem.cc (added)
	* code/branches/pickups/src/orxonox/objects/pickup/DroppedItem.h (added)
	* code/branches/pickups/src/orxonox/objects/pickup/Jump.cc (added)
	* code/branches/pickups/src/orxonox/objects/pickup/Jump.h (added)
	* code/branches/pickups/src/orxonox/objects/pickup/ModifierPickup.cc (modified)
	* code/branches/pickups/src/orxonox/objects/pickup/ModifierPickup.h (modified)
	* code/branches/pickups/src/orxonox/objects/pickup/ModifierType.h (modified)
	* code/branches/pickups/src/orxonox/objects/pickup/PickupCollection.cc (modified)
	* code/branches/pickups/src/orxonox/objects/pickup/PickupCollection.h (modified)
	* code/branches/pickups/src/orxonox/objects/pickup/UsableItem.h (modified)
	* code/branches/pickups/src/orxonox/objects/worldentities/ControllableEntity.h (modified)
	* code/branches/pickups/src/orxonox/objects/worldentities/pawns/Pawn.h (modified)

	- some changes to the base framework
	- added DroppedItem
	- ...


Mon, 06 Apr 2009 13:08:09 GMT erwin [2899]
	* code/branches/sound/src/sound/SoundBase.cc (added)
	* code/branches/sound/src/sound/SoundBase.h (modified)
	* code/branches/sound/src/sound/SoundManager.cc (added)
	* code/branches/sound/src/sound/SoundManager.h (modified)

	implemented SoundManager class


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

	created new weapon branch


Mon, 06 Apr 2009 12:33:23 GMT landauf [2897]
	* code/branches/weapon1 (deleted)

	removed weapon1 branch


Sun, 05 Apr 2009 22:00:51 GMT landauf [2895]
	* code/branches/miniprojects (deleted)

	removed miniprojects branch


Sun, 05 Apr 2009 21:26:23 GMT bknecht [2892]
	* code/branches/gui/src/orxonox/gui/GUIManager.cc (modified)

	catching CEGUI error to avoid sigabrt. ready for merge


Thu, 02 Apr 2009 16:36:23 GMT adrfried [2889]
	* code/branches/ggz/cmake/FindGGZ.cmake (added)
	* code/branches/ggz/cmake/LibraryConfig.cmake (modified)
	* code/branches/ggz/src/orxonox/CMakeLists.txt (modified)
	* code/branches/ggz/src/orxonox/GGZClient.cc (added)
	* code/branches/ggz/src/orxonox/GGZClient.h (added)
	* code/branches/ggz/src/orxonox/objects/CMakeLists.txt (modified)
	* code/branches/ggz/src/orxonox/objects/FDWatcher.cc (added)
	* code/branches/ggz/src/orxonox/objects/FDWatcher.h (added)

	FDWatcher and GGZClient Objects introduced


Thu, 02 Apr 2009 16:36:19 GMT adrfried [2888]
	* code/branches/ggz/CMakeLists.txt (modified)
	* code/branches/ggz/cmake/BuildConfigGCC.cmake (modified)

	cmake install prefix reset, compiler flags fixed


Thu, 02 Apr 2009 15:03:16 GMT bknecht [2887]
	* code/branches/gui/src/orxonox/gamestates/GSLevel.cc (modified)
	* code/branches/gui/src/orxonox/gamestates/GSMainMenu.cc (modified)
	* code/branches/gui/src/orxonox/gui/GUIManager.cc (modified)
	* code/branches/gui/src/orxonox/gui/GUIManager.h (modified)

	first part of finishing up to merge back. solving some issues I ran ...


Thu, 02 Apr 2009 14:07:24 GMT polakma [2886]
	* code/branches/weaponsystem/src/orxonox/objects/weaponSystem/munitions/FusionMunition.cc (added)
	* code/branches/weaponsystem/src/orxonox/objects/weaponSystem/munitions/FusionMunition.h (added)

	forgot to add a file


Tue, 31 Mar 2009 12:14:09 GMT bknecht [2875]
	* code/branches/gui/src/orxonox/gamestates/GSGraphics.cc (modified)
	* code/branches/gui/src/orxonox/gamestates/GSGraphics.h (modified)
	* code/branches/gui/src/orxonox/gamestates/GSLevel.cc (modified)
	* code/branches/gui/src/orxonox/gamestates/GSLevel.h (modified)
	* code/branches/gui/src/orxonox/gui/GUIManager.cc (modified)
	* code/branches/gui/src/orxonox/gui/GUIManager.h (modified)

	(Doxygen) Documentation added for GUIManager and some GameState
	classes.


Mon, 30 Mar 2009 21:34:51 GMT bknecht [2869]
	* code/branches/gui/src/orxonox/gamestates/GSGraphics.cc (modified)
	* code/branches/gui/src/orxonox/gamestates/GSGraphics.h (modified)
	* code/branches/gui/src/orxonox/gamestates/GSLevel.cc (modified)
	* code/branches/gui/src/orxonox/gamestates/GSLevel.h (modified)
	* code/branches/gui/src/orxonox/gamestates/GSMainMenu.cc (modified)
	* code/branches/gui/src/orxonox/gamestates/GSStandalone.cc (modified)
	* code/branches/gui/src/orxonox/gamestates/GSStandalone.h (modified)
	* code/branches/gui/src/orxonox/gui/GUIManager.cc (modified)

	Including some features to use only mouse or keys in a GUI, also ...


Mon, 30 Mar 2009 13:34:39 GMT erwin [2866]
	* code/branches/sound/src/audio (deleted)
	* code/branches/sound/src/sound (added)
	* code/branches/sound/src/sound/SoundBase.h (added)
	* code/branches/sound/src/sound/SoundManager.h (added)
	* code/branches/sound/src/sound/copyheader (added)

	Added src/sound and some files


Mon, 30 Mar 2009 13:21:25 GMT FelixSchulthess [2865]
	* code/branches/weapon1 (copied)

	created branch for weapon development


Mon, 30 Mar 2009 12:27:26 GMT danielh [2864]
	* code/branches/pickups/src/orxonox/objects/pickup/BaseItem.cc (added)
	* code/branches/pickups/src/orxonox/objects/pickup/BaseItem.h (added)
	* code/branches/pickups/src/orxonox/objects/pickup/CMakeLists.txt (modified)
	* code/branches/pickups/src/orxonox/objects/pickup/EquipmentItem.cc (added)
	* code/branches/pickups/src/orxonox/objects/pickup/EquipmentItem.h (added)
	* code/branches/pickups/src/orxonox/objects/pickup/ModifierPickup.cc (added)
	* code/branches/pickups/src/orxonox/objects/pickup/ModifierPickup.h (added)
	* code/branches/pickups/src/orxonox/objects/pickup/ModifierType.h (added)
	* code/branches/pickups/src/orxonox/objects/pickup/PassiveItem.cc (added)
	* code/branches/pickups/src/orxonox/objects/pickup/PassiveItem.h (added)
	* code/branches/pickups/src/orxonox/objects/pickup/PickupCollection.cc (added)
	* code/branches/pickups/src/orxonox/objects/pickup/PickupCollection.h (added)
	* code/branches/pickups/src/orxonox/objects/pickup/PickupSpawner.cc (added)
	* code/branches/pickups/src/orxonox/objects/pickup/PickupSpawner.h (added)
	* code/branches/pickups/src/orxonox/objects/pickup/UsableItem.cc (added)
	* code/branches/pickups/src/orxonox/objects/pickup/UsableItem.h (added)
	* code/branches/pickups/src/orxonox/objects/weaponSystem/projectiles/Projectile.cc (modified)
	* code/branches/pickups/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified)
	* code/branches/pickups/src/orxonox/objects/worldentities/pawns/Pawn.h (modified)

	first commit of pickup system

	- working PickupCollection
	- working ...


Sun, 29 Mar 2009 22:26:52 GMT rgrieder [2863]
	* code/branches/gui/cmake/BuildConfigGCC.cmake (modified)

	-Wno-deprecated is only available for C++, but fortunately the ...


Sun, 29 Mar 2009 22:14:36 GMT rgrieder [2862]
	* code/branches/gui/cmake/BuildConfig.cmake (modified)
	* code/branches/gui/cmake/BuildConfigGCC.cmake (modified)

	quote: "Fixed some bugs. Please do not break the code, when working ...


Sat, 28 Mar 2009 22:19:06 GMT scheusso [2861]
	* code/branches/netp2/src/network/synchronisable/SynchronisableSpecialisations.cc (modified)
	* code/branches/netp2/src/network/synchronisable/SynchronisableVariable.h (modified)
	* code/branches/netp2/src/util/MultiType.h (modified)
	* code/branches/netp2/src/util/MultiTypeValue.h (modified)
	* code/branches/netp2/src/util/Serialise.h (added)

	- moved serialise functions from ...


Fri, 27 Mar 2009 15:04:24 GMT rgrieder [2859]
	* code/branches/gui/src/core/Core.cc (modified)

	Infinite loop bugfix if orxonox_dev_build.keep_me is missing.


Thu, 26 Mar 2009 20:45:23 GMT dafrick [2858]
	* code/branches/questsystem5/src/orxonox/overlays/notifications/NotificationManager.cc (modified)
	* code/branches/questsystem5/src/orxonox/overlays/notifications/NotificationManager.h (modified)
	* code/branches/questsystem5/src/orxonox/overlays/notifications/NotificationOverlay.cc (modified)
	* code/branches/questsystem5/src/orxonox/overlays/notifications/NotificationOverlay.h (modified)
	* code/branches/questsystem5/src/orxonox/overlays/notifications/NotificationQueue.cc (modified)
	* code/branches/questsystem5/src/orxonox/overlays/notifications/NotificationQueue.h (modified)

	Done some documenting, and resolved some (possible) issues. So the ...


Thu, 26 Mar 2009 16:06:25 GMT Naaduun [2856]
	* code/branches/map/src/orxonox/overlays/map/Map.cc (modified)
	* code/branches/map/src/orxonox/overlays/map/Map.h (modified)

	implemented Map::openMap()


Thu, 26 Mar 2009 15:33:32 GMT rgrieder [2854]
	* code/branches/gui/src/orxonox/gamestates/GSGraphics.cc (modified)
	* code/branches/gui/src/orxonox/gamestates/GSRoot.cc (modified)

	small fixes with game states.


Thu, 26 Mar 2009 14:18:08 GMT bknecht [2853]
	* code/branches/gui/cmake/BuildConfig.cmake (modified)
	* code/branches/gui/src/core/Game.h (modified)
	* code/branches/gui/src/network/packet/Gamestate.h (modified)
	* code/branches/gui/src/orxonox/gamestates/GSMainMenu.cc (modified)
	* code/branches/gui/src/orxonox/gui/GUIManager.cc (modified)
	* code/branches/gui/src/orxonox/gui/GUIManager.h (modified)

	Fixed some bugs. Please do not break the code, when working with ...