#
# ChangeLog for code/branches/libraries2/src/orxonox/OrxonoxPrereqs.h
#
# Generated by Trac 1.0.9
# May 20, 2024, 9:28:26 PM

Mon, 31 Aug 2009 22:38:36 GMT landauf [5735]
	* code/branches/libraries2/src/modules/gamestates/GSLevel.cc (modified)
	* code/branches/libraries2/src/modules/gamestates/GSMainMenu.cc (modified)
	* code/branches/libraries2/src/modules/objects/Attacher.h (modified)
	* code/branches/libraries2/src/modules/objects/ForceField.cc (modified)
	* code/branches/libraries2/src/modules/objects/ForceField.h (modified)
	* code/branches/libraries2/src/modules/objects/Planet.cc (modified)
	* code/branches/libraries2/src/modules/objects/Planet.h (modified)
	* code/branches/libraries2/src/modules/objects/collisionshapes/BoxCollisionShape.h (modified)
	* code/branches/libraries2/src/modules/objects/collisionshapes/ConeCollisionShape.h (modified)
	* code/branches/libraries2/src/modules/objects/collisionshapes/PlaneCollisionShape.h (modified)
	* code/branches/libraries2/src/modules/objects/collisionshapes/SphereCollisionShape.h (modified)
	* code/branches/libraries2/src/modules/objects/triggers/CheckPoint.cc (modified)
	* code/branches/libraries2/src/modules/objects/triggers/DistanceTrigger.cc (modified)
	* code/branches/libraries2/src/modules/objects/triggers/Trigger.cc (modified)
	* code/branches/libraries2/src/modules/objects/triggers/Trigger.h (modified)
	* code/branches/libraries2/src/modules/overlays/GUIOverlay.cc (modified)
	* code/branches/libraries2/src/modules/overlays/hud/AnnounceMessage.cc (modified)
	* code/branches/libraries2/src/modules/overlays/hud/ChatOverlay.cc (modified)
	* code/branches/libraries2/src/modules/overlays/hud/DeathMessage.cc (modified)
	* code/branches/libraries2/src/modules/overlays/hud/GametypeStatus.cc (modified)
	* code/branches/libraries2/src/modules/overlays/hud/HUDHealthBar.cc (modified)
	* code/branches/libraries2/src/modules/overlays/hud/HUDNavigation.cc (modified)
	* code/branches/libraries2/src/modules/overlays/hud/HUDRadar.cc (modified)
	* code/branches/libraries2/src/modules/overlays/hud/HUDSpeedBar.cc (modified)
	* code/branches/libraries2/src/modules/overlays/hud/HUDTimer.cc (modified)
	* code/branches/libraries2/src/modules/overlays/hud/KillMessage.cc (modified)
	* code/branches/libraries2/src/modules/overlays/hud/TeamBaseMatchScore.cc (modified)
	* code/branches/libraries2/src/modules/overlays/hud/UnderAttackHealthBar.cc (modified)
	* code/branches/libraries2/src/modules/overlays/stats/Scoreboard.cc (modified)
	* code/branches/libraries2/src/modules/pong/Pong.h (modified)
	* code/branches/libraries2/src/modules/pong/PongAI.cc (modified)
	* code/branches/libraries2/src/modules/pong/PongAI.h (modified)
	* code/branches/libraries2/src/modules/pong/PongBall.cc (modified)
	* code/branches/libraries2/src/modules/pong/PongBall.h (modified)
	* code/branches/libraries2/src/modules/pong/PongBat.h (modified)
	* code/branches/libraries2/src/modules/pong/PongBot.h (modified)
	* code/branches/libraries2/src/modules/pong/PongCenterpoint.h (modified)
	* code/branches/libraries2/src/modules/pong/PongScore.cc (modified)
	* code/branches/libraries2/src/modules/questsystem/QuestEffectBeacon.cc (modified)
	* code/branches/libraries2/src/modules/questsystem/QuestEffectBeacon.h (modified)
	* code/branches/libraries2/src/modules/questsystem/QuestManager.cc (modified)
	* code/branches/libraries2/src/modules/weapons/MuzzleFlash.h (modified)
	* code/branches/libraries2/src/modules/weapons/munitions/FusionMunition.h (modified)
	* code/branches/libraries2/src/modules/weapons/munitions/ReplenishingMunition.h (modified)
	* code/branches/libraries2/src/modules/weapons/projectiles/BillboardProjectile.cc (modified)
	* code/branches/libraries2/src/modules/weapons/projectiles/ParticleProjectile.cc (modified)
	* code/branches/libraries2/src/modules/weapons/projectiles/Projectile.cc (modified)
	* code/branches/libraries2/src/modules/weapons/projectiles/Projectile.h (modified)
	* code/branches/libraries2/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified)
	* code/branches/libraries2/src/modules/weapons/weaponmodes/EnergyDrink.h (modified)
	* code/branches/libraries2/src/modules/weapons/weaponmodes/FusionFire.cc (modified)
	* code/branches/libraries2/src/modules/weapons/weaponmodes/FusionFire.h (modified)
	* code/branches/libraries2/src/modules/weapons/weaponmodes/HsW01.cc (modified)
	* code/branches/libraries2/src/modules/weapons/weaponmodes/HsW01.h (modified)
	* code/branches/libraries2/src/modules/weapons/weaponmodes/LaserFire.cc (modified)
	* code/branches/libraries2/src/modules/weapons/weaponmodes/LaserFire.h (modified)
	* code/branches/libraries2/src/modules/weapons/weaponmodes/LightningGun.cc (modified)
	* code/branches/libraries2/src/modules/weapons/weaponmodes/LightningGun.h (modified)
	* code/branches/libraries2/src/orxonox/CMakeLists.txt (modified)
	* code/branches/libraries2/src/orxonox/CameraManager.cc (modified)
	* code/branches/libraries2/src/orxonox/GlobalShader.cc (modified)
	* code/branches/libraries2/src/orxonox/Level.cc (modified)
	* code/branches/libraries2/src/orxonox/LevelManager.cc (modified)
	* code/branches/libraries2/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/branches/libraries2/src/orxonox/PawnManager.cc (modified)
	* code/branches/libraries2/src/orxonox/PlayerManager.cc (modified)
	* code/branches/libraries2/src/orxonox/Scene.cc (modified)
	* code/branches/libraries2/src/orxonox/collisionshapes/CollisionShape.cc (modified)
	* code/branches/libraries2/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc (modified)
	* code/branches/libraries2/src/orxonox/controllers/AIController.cc (modified)
	* code/branches/libraries2/src/orxonox/controllers/ArtificialController.cc (modified)
	* code/branches/libraries2/src/orxonox/controllers/HumanController.cc (modified)
	* code/branches/libraries2/src/orxonox/controllers/WaypointController.cc (modified)
	* code/branches/libraries2/src/orxonox/controllers/WaypointPatrolController.cc (modified)
	* code/branches/libraries2/src/orxonox/gametypes/Asteroids.cc (modified)
	* code/branches/libraries2/src/orxonox/gametypes/Deathmatch.cc (modified)
	* code/branches/libraries2/src/orxonox/gametypes/Gametype.cc (modified)
	* code/branches/libraries2/src/orxonox/gametypes/Gametype.h (modified)
	* code/branches/libraries2/src/orxonox/gametypes/TeamBaseMatch.cc (modified)
	* code/branches/libraries2/src/orxonox/gametypes/TeamDeathmatch.cc (modified)
	* code/branches/libraries2/src/orxonox/gametypes/UnderAttack.cc (modified)
	* code/branches/libraries2/src/orxonox/infos/Bot.cc (modified)
	* code/branches/libraries2/src/orxonox/infos/HumanPlayer.cc (modified)
	* code/branches/libraries2/src/orxonox/infos/PlayerInfo.cc (modified)
	* code/branches/libraries2/src/orxonox/infos/PlayerInfo.h (modified)
	* code/branches/libraries2/src/orxonox/interfaces/RadarViewable.cc (modified)
	* code/branches/libraries2/src/orxonox/items/Engine.cc (modified)
	* code/branches/libraries2/src/orxonox/items/MultiStateEngine.cc (modified)
	* code/branches/libraries2/src/orxonox/overlays/Map.cc (modified)
	* code/branches/libraries2/src/orxonox/pickup/BaseItem.cc (modified)
	* code/branches/libraries2/src/orxonox/pickup/DroppedItem.cc (modified)
	* code/branches/libraries2/src/orxonox/pickup/DroppedItem.h (modified)
	* code/branches/libraries2/src/orxonox/pickup/ModifierPickup.cc (modified)
	* code/branches/libraries2/src/orxonox/pickup/PickupInventory.cc (modified)
	* code/branches/libraries2/src/orxonox/pickup/PickupSpawner.cc (modified)
	* code/branches/libraries2/src/orxonox/pickup/PickupSpawner.h (modified)
	* code/branches/libraries2/src/orxonox/pickup/items/HealthImmediate.cc (modified)
	* code/branches/libraries2/src/orxonox/pickup/items/HealthImmediate.h (modified)
	* code/branches/libraries2/src/orxonox/pickup/items/HealthUsable.cc (modified)
	* code/branches/libraries2/src/orxonox/pickup/items/HealthUsable.h (modified)
	* code/branches/libraries2/src/orxonox/pickup/items/Jump.cc (modified)
	* code/branches/libraries2/src/orxonox/pickup/items/Jump.h (modified)
	* code/branches/libraries2/src/orxonox/sound/SoundBase.cc (modified)
	* code/branches/libraries2/src/orxonox/sound/SoundManager.cc (modified)
	* code/branches/libraries2/src/orxonox/weaponsystem/Weapon.h (modified)
	* code/branches/libraries2/src/orxonox/weaponsystem/WeaponSlot.h (modified)
	* code/branches/libraries2/src/orxonox/weaponsystem/WeaponSystem.cc (modified)
	* code/branches/libraries2/src/orxonox/worldentities/Backlight.cc (modified)
	* code/branches/libraries2/src/orxonox/worldentities/BigExplosion.cc (modified)
	* code/branches/libraries2/src/orxonox/worldentities/Billboard.cc (modified)
	* code/branches/libraries2/src/orxonox/worldentities/Camera.cc (modified)
	* code/branches/libraries2/src/orxonox/worldentities/Camera.h (modified)
	* code/branches/libraries2/src/orxonox/worldentities/CameraPosition.h (modified)
	* code/branches/libraries2/src/orxonox/worldentities/ControllableEntity.cc (modified)
	* code/branches/libraries2/src/orxonox/worldentities/ExplosionChunk.cc (modified)
	* code/branches/libraries2/src/orxonox/worldentities/Light.cc (modified)
	* code/branches/libraries2/src/orxonox/worldentities/MobileEntity.cc (modified)
	* code/branches/libraries2/src/orxonox/worldentities/Model.cc (modified)
	* code/branches/libraries2/src/orxonox/worldentities/MovableEntity.cc (modified)
	* code/branches/libraries2/src/orxonox/worldentities/ParticleEmitter.cc (modified)
	* code/branches/libraries2/src/orxonox/worldentities/SpawnPoint.cc (modified)
	* code/branches/libraries2/src/orxonox/worldentities/SpawnPoint.h (modified)
	* code/branches/libraries2/src/orxonox/worldentities/TeamSpawnPoint.h (modified)
	* code/branches/libraries2/src/orxonox/worldentities/WorldEntity.cc (modified)
	* code/branches/libraries2/src/orxonox/worldentities/pawns/Destroyer.cc (modified)
	* code/branches/libraries2/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/branches/libraries2/src/orxonox/worldentities/pawns/Pawn.h (modified)
	* code/branches/libraries2/src/orxonox/worldentities/pawns/SpaceShip.cc (modified)
	* code/branches/libraries2/src/orxonox/worldentities/pawns/Spectator.cc (modified)
	* code/branches/libraries2/src/orxonox/worldentities/pawns/Spectator.h (modified)
	* code/branches/libraries2/src/orxonox/worldentities/pawns/TeamBaseMatchBase.cc (modified)

	Removed /objects/ from all paths (except from those in the objects ...


Mon, 31 Aug 2009 20:38:48 GMT landauf [5730]
	* code/branches/libraries2/src/modules/CMakeLists.txt (modified)
	* code/branches/libraries2/src/modules/objects/Attacher.h (modified)
	* code/branches/libraries2/src/modules/objects/CMakeLists.txt (added)
	* code/branches/libraries2/src/modules/objects/ForceField.h (modified)
	* code/branches/libraries2/src/modules/objects/ObjectsPrereqs.h (added)
	* code/branches/libraries2/src/modules/objects/Planet.cc (modified)
	* code/branches/libraries2/src/modules/objects/Planet.h (modified)
	* code/branches/libraries2/src/modules/objects/Script.h (modified)
	* code/branches/libraries2/src/modules/objects/collisionshapes/BoxCollisionShape.h (modified)
	* code/branches/libraries2/src/modules/objects/collisionshapes/CMakeLists.txt (added)
	* code/branches/libraries2/src/modules/objects/collisionshapes/ConeCollisionShape.h (modified)
	* code/branches/libraries2/src/modules/objects/collisionshapes/PlaneCollisionShape.h (modified)
	* code/branches/libraries2/src/modules/objects/collisionshapes/SphereCollisionShape.h (modified)
	* code/branches/libraries2/src/modules/objects/eventsystem/CMakeLists.txt (added)
	* code/branches/libraries2/src/modules/objects/eventsystem/EventDispatcher.h (modified)
	* code/branches/libraries2/src/modules/objects/eventsystem/EventListener.h (modified)
	* code/branches/libraries2/src/modules/objects/eventsystem/EventTarget.h (modified)
	* code/branches/libraries2/src/modules/objects/triggers/CMakeLists.txt (modified)
	* code/branches/libraries2/src/modules/objects/triggers/CheckPoint.h (modified)
	* code/branches/libraries2/src/modules/objects/triggers/DistanceTrigger.h (modified)
	* code/branches/libraries2/src/modules/objects/triggers/EventTrigger.h (modified)
	* code/branches/libraries2/src/modules/objects/triggers/Trigger.h (modified)
	* code/branches/libraries2/src/modules/weapons/CMakeLists.txt (modified)
	* code/branches/libraries2/src/orxonox/OrxonoxPrereqs.h (modified)

	Added CMakeLists, ObjectsPrereqs.h and _ObjectsExport
	Changed Paths ...


Mon, 31 Aug 2009 19:18:17 GMT landauf [5727]
	* code/branches/libraries2/src/modules/questsystem/QuestEffectBeacon.cc (modified)
	* code/branches/libraries2/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/branches/libraries2/src/orxonox/interfaces/InterfaceCompilation.cc (modified)
	* code/branches/libraries2/src/orxonox/interfaces/PlayerTrigger.h (moved)
	* code/branches/libraries2/src/orxonox/objects/worldentities/triggers/CMakeLists.txt (modified)
	* code/branches/libraries2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified)
	* code/branches/libraries2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h (modified)
	* code/branches/libraries2/src/orxonox/objects/worldentities/triggers/PlayerTrigger.cc (deleted)

	PlayerTrigger is now an interface instead of a child of Trigger. ...


Mon, 31 Aug 2009 18:23:07 GMT landauf [5725]
	* code/branches/libraries2/src/modules/CMakeLists.txt (modified)
	* code/branches/libraries2/src/modules/overlays/hud/CMakeLists.txt (modified)
	* code/branches/libraries2/src/modules/pong (added)
	* code/branches/libraries2/src/modules/pong/CMakeLists.txt (added)
	* code/branches/libraries2/src/modules/pong/Pong.cc (moved)
	* code/branches/libraries2/src/modules/pong/Pong.h (moved)
	* code/branches/libraries2/src/modules/pong/PongAI.cc (moved)
	* code/branches/libraries2/src/modules/pong/PongAI.h (moved)
	* code/branches/libraries2/src/modules/pong/PongBall.cc (moved)
	* code/branches/libraries2/src/modules/pong/PongBall.h (moved)
	* code/branches/libraries2/src/modules/pong/PongBat.cc (moved)
	* code/branches/libraries2/src/modules/pong/PongBat.h (moved)
	* code/branches/libraries2/src/modules/pong/PongBot.cc (moved)
	* code/branches/libraries2/src/modules/pong/PongBot.h (moved)
	* code/branches/libraries2/src/modules/pong/PongCenterpoint.cc (moved)
	* code/branches/libraries2/src/modules/pong/PongCenterpoint.h (moved)
	* code/branches/libraries2/src/modules/pong/PongPrereqs.h (added)
	* code/branches/libraries2/src/modules/pong/PongScore.cc (moved)
	* code/branches/libraries2/src/modules/pong/PongScore.h (moved)
	* code/branches/libraries2/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/branches/libraries2/src/orxonox/objects/controllers/CMakeLists.txt (modified)
	* code/branches/libraries2/src/orxonox/objects/gametypes/CMakeLists.txt (modified)
	* code/branches/libraries2/src/orxonox/objects/infos/CMakeLists.txt (modified)
	* code/branches/libraries2/src/orxonox/objects/worldentities/CMakeLists.txt (modified)

	added a new module for the pong gametype and all related classes


Mon, 31 Aug 2009 12:42:03 GMT landauf [5703]
	* code/branches/libraries2 (copied)

	created new branch to move libraries


Sat, 29 Aug 2009 20:19:38 GMT landauf [5693]
	* code/trunk (modified)
	* code/trunk/cmake/BuildConfig.cmake (modified)
	* code/trunk/cmake/TargetUtilities.cmake (modified)
	* code/trunk/src/SpecialConfig.h.in (modified)
	* code/trunk/src/core/CMakeLists.txt (modified)
	* code/trunk/src/core/Core.cc (modified)
	* code/trunk/src/core/Core.h (modified)
	* code/trunk/src/core/CorePrereqs.h (modified)
	* code/trunk/src/core/DynLib.cc (copied)
	* code/trunk/src/core/DynLib.h (copied)
	* code/trunk/src/core/DynLibManager.cc (copied)
	* code/trunk/src/core/DynLibManager.h (copied)
	* code/trunk/src/core/GUIManager.h (modified)
	* code/trunk/src/core/Game.cc (modified)
	* code/trunk/src/core/Game.h (modified)
	* code/trunk/src/core/TclThreadList.h (modified)
	* code/trunk/src/core/Thread.cc (modified)
	* code/trunk/src/core/Thread.h (modified)
	* code/trunk/src/core/ThreadPool.cc (modified)
	* code/trunk/src/core/ThreadPool.h (modified)
	* code/trunk/src/network/TODO (modified)
	* code/trunk/src/orxonox/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/InGameConsole.cc (copied)
	* code/trunk/src/orxonox/InGameConsole.h (copied)
	* code/trunk/src/orxonox/Main.cc (modified)
	* code/trunk/src/orxonox/Main.h (copied)
	* code/trunk/src/orxonox/Map.cc (copied)
	* code/trunk/src/orxonox/Map.h (copied)
	* code/trunk/src/orxonox/Orxonox.cc (copied)
	* code/trunk/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/trunk/src/orxonox/PawnManager.h (modified)
	* code/trunk/src/orxonox/gamestates/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/gamestates/GSClient.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSClient.h (modified)
	* code/trunk/src/orxonox/gamestates/GSDedicated.h (modified)
	* code/trunk/src/orxonox/gamestates/GSGraphics.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSGraphics.h (modified)
	* code/trunk/src/orxonox/gamestates/GSIOConsole.h (modified)
	* code/trunk/src/orxonox/gamestates/GSLevel.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSLevel.h (modified)
	* code/trunk/src/orxonox/gamestates/GSMainMenu.h (modified)
	* code/trunk/src/orxonox/gamestates/GSRoot.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSRoot.h (modified)
	* code/trunk/src/orxonox/gamestates/GSServer.h (modified)
	* code/trunk/src/orxonox/gamestates/GSStandalone.h (modified)
	* code/trunk/src/orxonox/gamestates/GameStatesPrereqs.h (copied)
	* code/trunk/src/orxonox/interfaces/InterfaceCompilation.cc (modified)
	* code/trunk/src/orxonox/interfaces/NotificationListener.h (copied)
	* code/trunk/src/orxonox/interfaces/RadarViewable.cc (modified)
	* code/trunk/src/orxonox/interfaces/Tickable.h (deleted)
	* code/trunk/src/orxonox/interfaces/TimeFactorListener.h (deleted)
	* code/trunk/src/orxonox/objects/Radar.h (modified)
	* code/trunk/src/orxonox/objects/Scene.h (modified)
	* code/trunk/src/orxonox/objects/Test.h (modified)
	* code/trunk/src/orxonox/objects/controllers/AIController.h (modified)
	* code/trunk/src/orxonox/objects/controllers/HumanController.cc (modified)
	* code/trunk/src/orxonox/objects/controllers/PongAI.h (modified)
	* code/trunk/src/orxonox/objects/controllers/WaypointController.h (modified)
	* code/trunk/src/orxonox/objects/gametypes/Gametype.h (modified)
	* code/trunk/src/orxonox/objects/items/Engine.h (modified)
	* code/trunk/src/orxonox/objects/pickup/DroppedItem.h (modified)
	* code/trunk/src/orxonox/objects/pickup/PickupSpawner.h (modified)
	* code/trunk/src/orxonox/objects/quest/AddQuest.h (modified)
	* code/trunk/src/orxonox/objects/quest/AddQuestHint.h (modified)
	* code/trunk/src/orxonox/objects/quest/AddReward.h (modified)
	* code/trunk/src/orxonox/objects/quest/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/objects/quest/ChangeQuestStatus.h (modified)
	* code/trunk/src/orxonox/objects/quest/CompleteQuest.h (modified)
	* code/trunk/src/orxonox/objects/quest/FailQuest.h (modified)
	* code/trunk/src/orxonox/objects/quest/GlobalQuest.h (modified)
	* code/trunk/src/orxonox/objects/quest/LocalQuest.h (modified)
	* code/trunk/src/orxonox/objects/quest/Quest.h (modified)
	* code/trunk/src/orxonox/objects/quest/QuestDescription.h (modified)
	* code/trunk/src/orxonox/objects/quest/QuestEffect.h (modified)
	* code/trunk/src/orxonox/objects/quest/QuestEffectBeacon.h (modified)
	* code/trunk/src/orxonox/objects/quest/QuestHint.h (modified)
	* code/trunk/src/orxonox/objects/quest/QuestItem.h (modified)
	* code/trunk/src/orxonox/objects/quest/QuestListener.h (modified)
	* code/trunk/src/orxonox/objects/quest/QuestManager.cc (modified)
	* code/trunk/src/orxonox/objects/quest/QuestManager.h (modified)
	* code/trunk/src/orxonox/objects/quest/QuestNotification.h (modified)
	* code/trunk/src/orxonox/objects/quest/QuestPrereqs.h (copied)
	* code/trunk/src/orxonox/objects/quest/notifications (copied)
	* code/trunk/src/orxonox/objects/quest/notifications/CMakeLists.txt (copied)
	* code/trunk/src/orxonox/objects/quest/notifications/Notification.cc (copied)
	* code/trunk/src/orxonox/objects/quest/notifications/Notification.h (copied)
	* code/trunk/src/orxonox/objects/quest/notifications/NotificationManager.cc (copied)
	* code/trunk/src/orxonox/objects/quest/notifications/NotificationManager.h (copied)
	* code/trunk/src/orxonox/objects/quest/notifications/NotificationOverlay.cc (copied)
	* code/trunk/src/orxonox/objects/quest/notifications/NotificationOverlay.h (copied)
	* code/trunk/src/orxonox/objects/quest/notifications/NotificationQueue.cc (copied)
	* code/trunk/src/orxonox/objects/quest/notifications/NotificationQueue.h (copied)
	* code/trunk/src/orxonox/objects/weaponsystem/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/objects/weaponsystem/MuzzleFlash.h (modified)
	* code/trunk/src/orxonox/objects/weaponsystem/WeaponsystemPrereqs.h (copied)
	* code/trunk/src/orxonox/objects/weaponsystem/munitions/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/objects/weaponsystem/munitions/FusionMunition.h (modified)
	* code/trunk/src/orxonox/objects/weaponsystem/munitions/LaserMunition.h (modified)
	* code/trunk/src/orxonox/objects/weaponsystem/munitions/ReplenishingMunition.h (modified)
	* code/trunk/src/orxonox/objects/weaponsystem/projectiles/BillboardProjectile.h (modified)
	* code/trunk/src/orxonox/objects/weaponsystem/projectiles/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/objects/weaponsystem/projectiles/LightningGunProjectile.h (modified)
	* code/trunk/src/orxonox/objects/weaponsystem/projectiles/ParticleProjectile.h (modified)
	* code/trunk/src/orxonox/objects/weaponsystem/projectiles/Projectile.h (modified)
	* code/trunk/src/orxonox/objects/weaponsystem/weaponmodes/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/objects/weaponsystem/weaponmodes/EnergyDrink.h (modified)
	* code/trunk/src/orxonox/objects/weaponsystem/weaponmodes/FusionFire.h (modified)
	* code/trunk/src/orxonox/objects/weaponsystem/weaponmodes/HsW01.h (modified)
	* code/trunk/src/orxonox/objects/weaponsystem/weaponmodes/LaserFire.h (modified)
	* code/trunk/src/orxonox/objects/weaponsystem/weaponmodes/LightningGun.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/Backlight.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/BlinkingBillboard.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/Camera.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/FadingBillboard.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/ForceField.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/MobileEntity.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/triggers/PlayerTrigger.h (modified)
	* code/trunk/src/orxonox/objects/worldentities/triggers/Trigger.h (modified)
	* code/trunk/src/orxonox/orxonox-main.vcproj.user.in (copied)
	* code/trunk/src/orxonox/orxonox.vcproj.user.in (deleted)
	* code/trunk/src/orxonox/overlays/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/overlays/FadeoutText.h (modified)
	* code/trunk/src/orxonox/overlays/GUIOverlay.cc (modified)
	* code/trunk/src/orxonox/overlays/GUIOverlay.h (modified)
	* code/trunk/src/orxonox/overlays/OverlayText.h (modified)
	* code/trunk/src/orxonox/overlays/OverlaysPrereqs.h (copied)
	* code/trunk/src/orxonox/overlays/console (deleted)
	* code/trunk/src/orxonox/overlays/debug/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/overlays/debug/DebugFPSText.h (modified)
	* code/trunk/src/orxonox/overlays/debug/DebugRTRText.h (modified)
	* code/trunk/src/orxonox/overlays/hud/AnnounceMessage.h (modified)
	* code/trunk/src/orxonox/overlays/hud/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/overlays/hud/ChatOverlay.h (modified)
	* code/trunk/src/orxonox/overlays/hud/DeathMessage.h (modified)
	* code/trunk/src/orxonox/overlays/hud/GametypeStatus.h (modified)
	* code/trunk/src/orxonox/overlays/hud/HUDBar.h (modified)
	* code/trunk/src/orxonox/overlays/hud/HUDHealthBar.h (modified)
	* code/trunk/src/orxonox/overlays/hud/HUDNavigation.h (modified)
	* code/trunk/src/orxonox/overlays/hud/HUDRadar.h (modified)
	* code/trunk/src/orxonox/overlays/hud/HUDSpeedBar.h (modified)
	* code/trunk/src/orxonox/overlays/hud/HUDTimer.h (modified)
	* code/trunk/src/orxonox/overlays/hud/KillMessage.h (modified)
	* code/trunk/src/orxonox/overlays/hud/PongScore.h (modified)
	* code/trunk/src/orxonox/overlays/hud/TeamBaseMatchScore.h (modified)
	* code/trunk/src/orxonox/overlays/hud/UnderAttackHealthBar.h (modified)
	* code/trunk/src/orxonox/overlays/map (deleted)
	* code/trunk/src/orxonox/overlays/notifications (deleted)
	* code/trunk/src/orxonox/overlays/stats/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/overlays/stats/CreateLines.h (modified)
	* code/trunk/src/orxonox/overlays/stats/Scoreboard.h (modified)
	* code/trunk/src/orxonox/overlays/stats/Stats.h (modified)
	* code/trunk/src/orxonox/sound/SoundBase.h (modified)
	* code/trunk/src/orxonox/sound/SoundManager.h (modified)
	* code/trunk/src/orxonox/tools/BillboardSet.h (modified)
	* code/trunk/src/orxonox/tools/BulletConversions.h (modified)
	* code/trunk/src/orxonox/tools/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/tools/DynamicLines.h (modified)
	* code/trunk/src/orxonox/tools/DynamicRenderable.h (modified)
	* code/trunk/src/orxonox/tools/Mesh.h (modified)
	* code/trunk/src/orxonox/tools/ParticleInterface.h (modified)
	* code/trunk/src/orxonox/tools/Shader.h (modified)
	* code/trunk/src/orxonox/tools/TextureGenerator.h (modified)
	* code/trunk/src/orxonox/tools/Timer.h (modified)
	* code/trunk/src/orxonox/tools/ToolsPrereqs.h (copied)
	* code/trunk/src/orxonox/tools/interfaces (copied)
	* code/trunk/src/orxonox/tools/interfaces/CMakeLists.txt (copied)
	* code/trunk/src/orxonox/tools/interfaces/Tickable.h (copied)
	* code/trunk/src/orxonox/tools/interfaces/TimeFactorListener.h (copied)
	* code/trunk/src/orxonox/tools/interfaces/ToolsInterfaceCompilation.cc (copied)
	* code/trunk/src/util/CMakeLists.txt (modified)
	* code/trunk/src/util/Scope.cc (copied)
	* code/trunk/src/util/Scope.h (copied)
	* code/trunk/src/util/ScopedSingleton.h (copied)

	merged libraries branch back to trunk