#
# ChangeLog for code/trunk/src/modules/notifications/dispatchers
#
# Generated by Trac 1.0.9
# May 17, 2024, 9:09:51 AM

Sat, 09 Jan 2016 17:26:20 GMT landauf [11052]
	* code/trunk (modified)
	* code/trunk/data/defaultConfig/orxonox.ini (modified)
	* code/trunk/data/gui/layouts/CampaignMenu.layout (modified)
	* code/trunk/data/gui/layouts/InGameMenu.layout (modified)
	* code/trunk/data/gui/scripts/CampaignMenu.lua (modified)
	* code/trunk/data/gui/scripts/InGameMenu.lua (modified)
	* code/trunk/data/gui/scripts/SheetManager.lua (modified)
	* code/trunk/data/levels/AITest.oxw (copied)
	* code/trunk/data/levels/FPS_Level_HS14.oxw (modified)
	* code/trunk/data/levels/HeavyCruiser.oxw (modified)
	* code/trunk/data/levels/Hover.oxw (copied)
	* code/trunk/data/levels/emptyLevel.oxw (modified)
	* code/trunk/data/levels/expeditionSector.oxw (copied)
	* code/trunk/data/levels/iJohnVane_TriptoArea51.oxw (modified)
	* code/trunk/data/levels/iiiJohnVane_EscapeTheBastards.oxw (modified)
	* code/trunk/data/levels/includes/invaderWeapon.oxi (modified)
	* code/trunk/data/levels/includes/invaderWeaponEnemy.oxi (modified)
	* code/trunk/data/levels/includes/pickups.oxi (modified)
	* code/trunk/data/levels/includes/towerWeaponSettings.oxi (deleted)
	* code/trunk/data/levels/includes/weaponSettingsAssff.oxi (modified)
	* code/trunk/data/levels/includes/weaponSettingsAssff2.oxi (modified)
	* code/trunk/data/levels/includes/weaponSettingsCollateral.oxi (modified)
	* code/trunk/data/levels/includes/weaponSettingsEscort.oxi (modified)
	* code/trunk/data/levels/includes/weaponSettingsEscortMine.oxi (copied)
	* code/trunk/data/levels/includes/weaponSettingsFPS.oxi (modified)
	* code/trunk/data/levels/includes/weaponSettingsFPS_HS14.oxi (modified)
	* code/trunk/data/levels/includes/weaponSettingsFS15.oxi (modified)
	* code/trunk/data/levels/includes/weaponSettingsGhost.oxi (modified)
	* code/trunk/data/levels/includes/weaponSettingsH2.oxi (modified)
	* code/trunk/data/levels/includes/weaponSettingsHXY.oxi (modified)
	* code/trunk/data/levels/includes/weaponSettingsHeartAttack.oxi (modified)
	* code/trunk/data/levels/includes/weaponSettingsHeavyCruiser.oxi (modified)
	* code/trunk/data/levels/includes/weaponSettingsHeavyCruiserBody.oxi (modified)
	* code/trunk/data/levels/includes/weaponSettingsHover.oxi (copied)
	* code/trunk/data/levels/includes/weaponSettingsImmTest.oxi (modified)
	* code/trunk/data/levels/includes/weaponSettingsPirate.oxi (modified)
	* code/trunk/data/levels/includes/weaponSettingsRing.oxi (modified)
	* code/trunk/data/levels/includes/weaponSettingsSpacecruiser.oxi (modified)
	* code/trunk/data/levels/includes/weaponSettingsSwallow.oxi (modified)
	* code/trunk/data/levels/includes/weaponSettingsTransporter.oxi (modified)
	* code/trunk/data/levels/includes/weaponSettingsTurret.oxi (modified)
	* code/trunk/data/levels/includes/weaponSettingsTurret1.oxi (modified)
	* code/trunk/data/levels/includes/weaponSettingsbigship.oxi (modified)
	* code/trunk/data/levels/kecks.oxw (modified)
	* code/trunk/data/levels/mineLevel.oxw (copied)
	* code/trunk/data/levels/missionOne.oxw (modified)
	* code/trunk/data/levels/notifications.oxw (modified)
	* code/trunk/data/levels/pickups.oxw (modified)
	* code/trunk/data/levels/planetLevelHS15.oxw (copied)
	* code/trunk/data/levels/presentationHS13.oxw (modified)
	* code/trunk/data/levels/shieldTest.oxw (modified)
	* code/trunk/data/levels/shuttleAttack.oxw (copied)
	* code/trunk/data/levels/shuttleRetaliation.oxw (copied)
	* code/trunk/data/levels/templates/FPS.oxt (modified)
	* code/trunk/data/levels/templates/FPS_HS14.oxt (modified)
	* code/trunk/data/levels/templates/HeavyCruiser.oxt (modified)
	* code/trunk/data/levels/templates/HeavyCruiserBody.oxt (modified)
	* code/trunk/data/levels/templates/ModularSpaceShipTest.oxt (modified)
	* code/trunk/data/levels/templates/bigship.oxt (modified)
	* code/trunk/data/levels/templates/enemyInvader.oxt (modified)
	* code/trunk/data/levels/templates/pickupRepresentationTemplates.oxt (modified)
	* code/trunk/data/levels/templates/spaceshipAssff.oxt (modified)
	* code/trunk/data/levels/templates/spaceshipAssff2.oxt (modified)
	* code/trunk/data/levels/templates/spaceshipCollateralDamage.oxt (modified)
	* code/trunk/data/levels/templates/spaceshipDodgeRace.oxt (modified)
	* code/trunk/data/levels/templates/spaceshipEscort.oxt (modified)
	* code/trunk/data/levels/templates/spaceshipEscortMine.oxt (copied)
	* code/trunk/data/levels/templates/spaceshipGhost.oxt (modified)
	* code/trunk/data/levels/templates/spaceshipH2.oxt (modified)
	* code/trunk/data/levels/templates/spaceshipHXY.oxt (modified)
	* code/trunk/data/levels/templates/spaceshipHXYSL.oxt (modified)
	* code/trunk/data/levels/templates/spaceshipHeartAttack.oxt (modified)
	* code/trunk/data/levels/templates/spaceshipHover.oxt (copied)
	* code/trunk/data/levels/templates/spaceshipInvader.oxt (modified)
	* code/trunk/data/levels/templates/spaceshipPirate.oxt (modified)
	* code/trunk/data/levels/templates/spaceshipRace.oxt (modified)
	* code/trunk/data/levels/templates/spaceshipRing.oxt (modified)
	* code/trunk/data/levels/templates/spaceshipShuttle.oxt (copied)
	* code/trunk/data/levels/templates/spaceshipSpacecruiser.oxt (modified)
	* code/trunk/data/levels/templates/spaceshipSwallow.oxt (modified)
	* code/trunk/data/levels/templates/spaceshipTransporter.oxt (modified)
	* code/trunk/data/levels/templates/spaceshipTransporterSL.oxt (modified)
	* code/trunk/data/levels/templates/spaceshipTurret.oxt (modified)
	* code/trunk/data/levels/templates/towerdefensetower.oxt (modified)
	* code/trunk/data/levels/towerDefense.oxw (modified)
	* code/trunk/data/overlays/HUDTemplates3.oxo (modified)
	* code/trunk/data/overlays/HoverHUD.oxo (copied)
	* code/trunk/data/overlays/InvaderHUD.oxo (modified)
	* code/trunk/data/overlays/jumpHUD.oxo (modified)
	* code/trunk/data/particle/MineExpl.particle (copied)
	* code/trunk/data/particle/MineExpl1.particle (copied)
	* code/trunk/data/particle/MineExpl2.particle (copied)
	* code/trunk/data/particle/engine.particle (copied)
	* code/trunk/data/particle/engineglow.particle (modified)
	* code/trunk/data/particle/ice.particle (copied)
	* code/trunk/data/particle/mineparticle.particle (copied)
	* code/trunk/data/particle/psygun.particle (copied)
	* code/trunk/data/particle/rocketfire.particle (modified)
	* code/trunk/src/libraries/core/CoreConfig.cc (modified)
	* code/trunk/src/libraries/core/CoreConfig.h (modified)
	* code/trunk/src/libraries/core/GUIManager.cc (modified)
	* code/trunk/src/libraries/core/GUIManager.h (modified)
	* code/trunk/src/libraries/core/GameConfig.cc (modified)
	* code/trunk/src/libraries/core/GameConfig.h (modified)
	* code/trunk/src/libraries/core/command/ArgumentCompletionFunctions.h (modified)
	* code/trunk/src/libraries/core/command/ConsoleCommandIncludes.cc (modified)
	* code/trunk/src/libraries/core/command/ConsoleCommandManager.cc (modified)
	* code/trunk/src/libraries/core/commandline/CMakeLists.txt (modified)
	* code/trunk/src/libraries/core/input/KeyBinder.cc (modified)
	* code/trunk/src/libraries/core/input/KeyBinder.h (modified)
	* code/trunk/src/libraries/core/singleton/ScopedSingletonIncludes.cc (modified)
	* code/trunk/src/libraries/core/singleton/ScopedSingletonIncludes.h (modified)
	* code/trunk/src/libraries/network/NetworkFunctionIncludes.cc (modified)
	* code/trunk/src/libraries/network/NetworkFunctionIncludes.h (modified)
	* code/trunk/src/libraries/network/NetworkFunctionManager.cc (modified)
	* code/trunk/src/libraries/network/NetworkFunctionManager.h (modified)
	* code/trunk/src/libraries/tools/ParticleInterface.cc (modified)
	* code/trunk/src/libraries/tools/ParticleInterface.h (modified)
	* code/trunk/src/libraries/util/Math.cc (modified)
	* code/trunk/src/libraries/util/Math.h (modified)
	* code/trunk/src/modules/CMakeLists.txt (modified)
	* code/trunk/src/modules/docking/DockingController.cc (modified)
	* code/trunk/src/modules/dodgerace/DodgeRace.cc (modified)
	* code/trunk/src/modules/dodgerace/DodgeRace.h (modified)
	* code/trunk/src/modules/hover (copied)
	* code/trunk/src/modules/invader/Invader.cc (modified)
	* code/trunk/src/modules/notifications/dispatchers/CommandNotification.cc (modified)
	* code/trunk/src/modules/notifications/dispatchers/CommandNotification.h (modified)
	* code/trunk/src/modules/objects/Turret.h (modified)
	* code/trunk/src/modules/overlays/OverlaysPrereqs.h (modified)
	* code/trunk/src/modules/overlays/hud/CMakeLists.txt (modified)
	* code/trunk/src/modules/overlays/hud/HUDBar.cc (modified)
	* code/trunk/src/modules/overlays/hud/HUDBar.h (modified)
	* code/trunk/src/modules/overlays/hud/HUDBoostBar.cc (modified)
	* code/trunk/src/modules/overlays/hud/HUDEnemyShieldBar.cc (copied)
	* code/trunk/src/modules/overlays/hud/HUDEnemyShieldBar.h (copied)
	* code/trunk/src/modules/overlays/hud/HUDHealthBar.cc (modified)
	* code/trunk/src/modules/overlays/hud/HUDHealthBar.h (modified)
	* code/trunk/src/modules/overlays/hud/HUDRadar.cc (modified)
	* code/trunk/src/modules/overlays/hud/HUDRocketFuelBar.cc (copied)
	* code/trunk/src/modules/overlays/hud/HUDRocketFuelBar.h (copied)
	* code/trunk/src/modules/overlays/hud/HUDShieldBar.cc (copied)
	* code/trunk/src/modules/overlays/hud/HUDShieldBar.h (copied)
	* code/trunk/src/modules/overlays/hud/HUDWeapon.cc (copied)
	* code/trunk/src/modules/overlays/hud/HUDWeapon.h (copied)
	* code/trunk/src/modules/overlays/hud/HUDWeaponMode.cc (copied)
	* code/trunk/src/modules/overlays/hud/HUDWeaponMode.h (copied)
	* code/trunk/src/modules/overlays/hud/HUDWeaponSystem.cc (copied)
	* code/trunk/src/modules/overlays/hud/HUDWeaponSystem.h (copied)
	* code/trunk/src/modules/pickup/PickupPrereqs.h (modified)
	* code/trunk/src/modules/pickup/PickupRepresentation.cc (modified)
	* code/trunk/src/modules/pickup/items/BoostPickup.cc (copied)
	* code/trunk/src/modules/pickup/items/BoostPickup.h (copied)
	* code/trunk/src/modules/pickup/items/CMakeLists.txt (modified)
	* code/trunk/src/modules/pickup/items/DronePickup.h (modified)
	* code/trunk/src/modules/pickup/items/MunitionContainer.cc (copied)
	* code/trunk/src/modules/pickup/items/MunitionContainer.h (copied)
	* code/trunk/src/modules/pickup/items/MunitionPickup.cc (copied)
	* code/trunk/src/modules/pickup/items/MunitionPickup.h (copied)
	* code/trunk/src/modules/towerdefense/TowerDefenseField.cc (modified)
	* code/trunk/src/modules/towerdefense/TowerDefenseField.h (modified)
	* code/trunk/src/modules/towerdefense/TowerDefenseSelecter.cc (modified)
	* code/trunk/src/modules/towerdefense/TowerDefenseTower.cc (modified)
	* code/trunk/src/modules/weapons/IceGunFreezer.cc (modified)
	* code/trunk/src/modules/weapons/IceGunFreezer.h (modified)
	* code/trunk/src/modules/weapons/WeaponsPrereqs.h (modified)
	* code/trunk/src/modules/weapons/munitions/CMakeLists.txt (modified)
	* code/trunk/src/modules/weapons/munitions/FusionMunition.cc (modified)
	* code/trunk/src/modules/weapons/munitions/FusionMunition.h (modified)
	* code/trunk/src/modules/weapons/munitions/GravityBombMunition.cc (modified)
	* code/trunk/src/modules/weapons/munitions/GravityBombMunition.h (modified)
	* code/trunk/src/modules/weapons/munitions/IceMunition.cc (modified)
	* code/trunk/src/modules/weapons/munitions/IceMunition.h (modified)
	* code/trunk/src/modules/weapons/munitions/LaserMunition.cc (modified)
	* code/trunk/src/modules/weapons/munitions/LaserMunition.h (modified)
	* code/trunk/src/modules/weapons/munitions/LightningMunition.cc (copied)
	* code/trunk/src/modules/weapons/munitions/LightningMunition.h (copied)
	* code/trunk/src/modules/weapons/munitions/MineMunition.cc (copied)
	* code/trunk/src/modules/weapons/munitions/MineMunition.h (copied)
	* code/trunk/src/modules/weapons/munitions/ReplenishingMunition.cc (deleted)
	* code/trunk/src/modules/weapons/munitions/ReplenishingMunition.h (deleted)
	* code/trunk/src/modules/weapons/munitions/RocketMunition.cc (modified)
	* code/trunk/src/modules/weapons/munitions/RocketMunition.h (modified)
	* code/trunk/src/modules/weapons/munitions/SplitMunition.cc (modified)
	* code/trunk/src/modules/weapons/munitions/SplitMunition.h (modified)
	* code/trunk/src/modules/weapons/projectiles/BasicProjectile.cc (modified)
	* code/trunk/src/modules/weapons/projectiles/CMakeLists.txt (modified)
	* code/trunk/src/modules/weapons/projectiles/GravityBombField.cc (modified)
	* code/trunk/src/modules/weapons/projectiles/IceGunProjectile.cc (modified)
	* code/trunk/src/modules/weapons/projectiles/IceGunProjectile.h (modified)
	* code/trunk/src/modules/weapons/projectiles/MineProjectile.cc (copied)
	* code/trunk/src/modules/weapons/projectiles/MineProjectile.h (copied)
	* code/trunk/src/modules/weapons/projectiles/Projectile.h (modified)
	* code/trunk/src/modules/weapons/projectiles/Rocket.cc (modified)
	* code/trunk/src/modules/weapons/projectiles/Rocket.h (modified)
	* code/trunk/src/modules/weapons/projectiles/SimpleRocket.cc (modified)
	* code/trunk/src/modules/weapons/projectiles/SplitGunProjectile.cc (modified)
	* code/trunk/src/modules/weapons/projectiles/SplitGunProjectile.h (modified)
	* code/trunk/src/modules/weapons/weaponmodes/CMakeLists.txt (modified)
	* code/trunk/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified)
	* code/trunk/src/modules/weapons/weaponmodes/FusionFire.cc (modified)
	* code/trunk/src/modules/weapons/weaponmodes/GravityBombFire.cc (modified)
	* code/trunk/src/modules/weapons/weaponmodes/HsW01.cc (modified)
	* code/trunk/src/modules/weapons/weaponmodes/IceGun.cc (modified)
	* code/trunk/src/modules/weapons/weaponmodes/IceGun.h (modified)
	* code/trunk/src/modules/weapons/weaponmodes/LaserFire.cc (modified)
	* code/trunk/src/modules/weapons/weaponmodes/LightningGun.cc (modified)
	* code/trunk/src/modules/weapons/weaponmodes/MineGun.cc (copied)
	* code/trunk/src/modules/weapons/weaponmodes/MineGun.h (copied)
	* code/trunk/src/modules/weapons/weaponmodes/RocketFire.cc (modified)
	* code/trunk/src/modules/weapons/weaponmodes/RocketFire.h (modified)
	* code/trunk/src/modules/weapons/weaponmodes/RocketFireOld.cc (modified)
	* code/trunk/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified)
	* code/trunk/src/modules/weapons/weaponmodes/SplitGun.cc (modified)
	* code/trunk/src/modules/weapons/weaponmodes/SplitGun.h (modified)
	* code/trunk/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/trunk/src/orxonox/controllers/ActionpointController.cc (copied)
	* code/trunk/src/orxonox/controllers/ActionpointController.h (copied)
	* code/trunk/src/orxonox/controllers/ArtificialController.cc (modified)
	* code/trunk/src/orxonox/controllers/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/controllers/CommonController.cc (copied)
	* code/trunk/src/orxonox/controllers/CommonController.h (copied)
	* code/trunk/src/orxonox/controllers/DivisionController.cc (copied)
	* code/trunk/src/orxonox/controllers/DivisionController.h (copied)
	* code/trunk/src/orxonox/controllers/FightingController.cc (copied)
	* code/trunk/src/orxonox/controllers/FightingController.h (copied)
	* code/trunk/src/orxonox/controllers/FlyingController.cc (copied)
	* code/trunk/src/orxonox/controllers/FlyingController.h (copied)
	* code/trunk/src/orxonox/controllers/FormationController.cc (modified)
	* code/trunk/src/orxonox/controllers/HumanController.cc (modified)
	* code/trunk/src/orxonox/controllers/MasterController.cc (copied)
	* code/trunk/src/orxonox/controllers/MasterController.h (copied)
	* code/trunk/src/orxonox/controllers/SectionController.cc (copied)
	* code/trunk/src/orxonox/controllers/SectionController.h (copied)
	* code/trunk/src/orxonox/controllers/WingmanController.cc (copied)
	* code/trunk/src/orxonox/controllers/WingmanController.h (copied)
	* code/trunk/src/orxonox/gametypes/Dynamicmatch.cc (modified)
	* code/trunk/src/orxonox/gametypes/Dynamicmatch.h (modified)
	* code/trunk/src/orxonox/infos/PlayerInfo.cc (modified)
	* code/trunk/src/orxonox/items/ShipPart.cc (modified)
	* code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc (modified)
	* code/trunk/src/orxonox/overlays/OrxonoxOverlay.h (modified)
	* code/trunk/src/orxonox/overlays/OverlayGroup.cc (modified)
	* code/trunk/src/orxonox/weaponsystem/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/weaponsystem/Munition.cc (modified)
	* code/trunk/src/orxonox/weaponsystem/Munition.h (modified)
	* code/trunk/src/orxonox/weaponsystem/ReplenishingMunition.cc (copied)
	* code/trunk/src/orxonox/weaponsystem/ReplenishingMunition.h (copied)
	* code/trunk/src/orxonox/weaponsystem/Weapon.cc (modified)
	* code/trunk/src/orxonox/weaponsystem/Weapon.h (modified)
	* code/trunk/src/orxonox/weaponsystem/WeaponMode.cc (modified)
	* code/trunk/src/orxonox/weaponsystem/WeaponMode.h (modified)
	* code/trunk/src/orxonox/weaponsystem/WeaponPack.cc (modified)
	* code/trunk/src/orxonox/weaponsystem/WeaponPack.h (modified)
	* code/trunk/src/orxonox/weaponsystem/WeaponSystem.cc (modified)
	* code/trunk/src/orxonox/weaponsystem/WeaponSystem.h (modified)
	* code/trunk/src/orxonox/worldentities/Actionpoint.cc (copied)
	* code/trunk/src/orxonox/worldentities/Actionpoint.h (copied)
	* code/trunk/src/orxonox/worldentities/BigExplosion.cc (deleted)
	* code/trunk/src/orxonox/worldentities/BigExplosion.h (deleted)
	* code/trunk/src/orxonox/worldentities/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/worldentities/ExplosionPart.cc (copied)
	* code/trunk/src/orxonox/worldentities/ExplosionPart.h (copied)
	* code/trunk/src/orxonox/worldentities/MobileEntity.h (modified)
	* code/trunk/src/orxonox/worldentities/SpawnPoint.h (modified)
	* code/trunk/src/orxonox/worldentities/StaticEntity.h (modified)
	* code/trunk/src/orxonox/worldentities/TeamSpawnPoint.cc (modified)
	* code/trunk/src/orxonox/worldentities/TeamSpawnPoint.h (modified)
	* code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified)
	* code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc (modified)
	* code/trunk/src/orxonox/worldentities/pawns/SpaceShip.h (modified)
	* code/trunk/test/core/class/IdentifierNestedClassHierarchyTest.cc (modified)
	* code/trunk/test/util/MathTest.cc (modified)

	merged branch presentationHS15 back to trunk


Sun, 25 Aug 2013 19:08:42 GMT landauf [9667]
	* code/trunk (modified)
	* code/trunk/src/SourceConfig.cmake (modified)
	* code/trunk/src/libraries/core/BaseObject.cc (modified)
	* code/trunk/src/libraries/core/BaseObject.h (modified)
	* code/trunk/src/libraries/core/CMakeLists.txt (modified)
	* code/trunk/src/libraries/core/ClassFactory.h (deleted)
	* code/trunk/src/libraries/core/ClassTreeMask.cc (modified)
	* code/trunk/src/libraries/core/ClassTreeMask.h (modified)
	* code/trunk/src/libraries/core/CommandLineParser.cc (deleted)
	* code/trunk/src/libraries/core/CommandLineParser.h (deleted)
	* code/trunk/src/libraries/core/ConfigFileManager.cc (deleted)
	* code/trunk/src/libraries/core/ConfigFileManager.h (deleted)
	* code/trunk/src/libraries/core/ConfigValueContainer.cc (deleted)
	* code/trunk/src/libraries/core/ConfigValueContainer.h (deleted)
	* code/trunk/src/libraries/core/ConfigValueIncludes.h (deleted)
	* code/trunk/src/libraries/core/Core.cc (modified)
	* code/trunk/src/libraries/core/Core.h (modified)
	* code/trunk/src/libraries/core/CoreIncludes.h (modified)
	* code/trunk/src/libraries/core/CorePrereqs.h (modified)
	* code/trunk/src/libraries/core/Event.cc (modified)
	* code/trunk/src/libraries/core/GUIManager.cc (modified)
	* code/trunk/src/libraries/core/GUIManager.h (modified)
	* code/trunk/src/libraries/core/Game.cc (modified)
	* code/trunk/src/libraries/core/Game.h (modified)
	* code/trunk/src/libraries/core/GraphicsManager.cc (modified)
	* code/trunk/src/libraries/core/GraphicsManager.h (modified)
	* code/trunk/src/libraries/core/Identifier.cc (deleted)
	* code/trunk/src/libraries/core/Identifier.h (deleted)
	* code/trunk/src/libraries/core/Iterator.h (deleted)
	* code/trunk/src/libraries/core/Loader.cc (modified)
	* code/trunk/src/libraries/core/MetaObjectList.cc (deleted)
	* code/trunk/src/libraries/core/MetaObjectList.h (deleted)
	* code/trunk/src/libraries/core/Namespace.cc (modified)
	* code/trunk/src/libraries/core/Namespace.h (modified)
	* code/trunk/src/libraries/core/ObjectList.h (deleted)
	* code/trunk/src/libraries/core/ObjectListBase.cc (deleted)
	* code/trunk/src/libraries/core/ObjectListBase.h (deleted)
	* code/trunk/src/libraries/core/ObjectListIterator.h (deleted)
	* code/trunk/src/libraries/core/OrxonoxClass.cc (deleted)
	* code/trunk/src/libraries/core/OrxonoxClass.h (deleted)
	* code/trunk/src/libraries/core/PathConfig.cc (modified)
	* code/trunk/src/libraries/core/SmartPtr.h (deleted)
	* code/trunk/src/libraries/core/SubclassIdentifier.h (deleted)
	* code/trunk/src/libraries/core/Super.h (deleted)
	* code/trunk/src/libraries/core/Template.cc (modified)
	* code/trunk/src/libraries/core/Template.h (modified)
	* code/trunk/src/libraries/core/ViewportEventListener.cc (modified)
	* code/trunk/src/libraries/core/ViewportEventListener.h (modified)
	* code/trunk/src/libraries/core/WeakPtr.h (deleted)
	* code/trunk/src/libraries/core/WindowEventListener.cc (modified)
	* code/trunk/src/libraries/core/WindowEventListener.h (modified)
	* code/trunk/src/libraries/core/XMLNameListener.cc (modified)
	* code/trunk/src/libraries/core/XMLNameListener.h (modified)
	* code/trunk/src/libraries/core/XMLPort.cc (modified)
	* code/trunk/src/libraries/core/XMLPort.h (modified)
	* code/trunk/src/libraries/core/class (copied)
	* code/trunk/src/libraries/core/class/CMakeLists.txt (modified)
	* code/trunk/src/libraries/core/class/Identifiable.cc (modified)
	* code/trunk/src/libraries/core/class/Identifiable.h (modified)
	* code/trunk/src/libraries/core/class/Identifier.cc (modified)
	* code/trunk/src/libraries/core/class/Identifier.h (modified)
	* code/trunk/src/libraries/core/class/IdentifierManager.cc (modified)
	* code/trunk/src/libraries/core/class/IdentifierManager.h (modified)
	* code/trunk/src/libraries/core/class/OrxonoxClass.cc (copied)
	* code/trunk/src/libraries/core/class/OrxonoxClass.h (modified)
	* code/trunk/src/libraries/core/class/OrxonoxInterface.cc (copied)
	* code/trunk/src/libraries/core/class/OrxonoxInterface.h (modified)
	* code/trunk/src/libraries/core/class/SubclassIdentifier.h (modified)
	* code/trunk/src/libraries/core/class/Super.h (modified)
	* code/trunk/src/libraries/core/command/ArgumentCompletionFunctions.cc (modified)
	* code/trunk/src/libraries/core/command/Functor.h (modified)
	* code/trunk/src/libraries/core/command/IOConsolePOSIX.cc (modified)
	* code/trunk/src/libraries/core/command/IOConsoleWindows.cc (modified)
	* code/trunk/src/libraries/core/command/Shell.cc (modified)
	* code/trunk/src/libraries/core/command/Shell.h (modified)
	* code/trunk/src/libraries/core/config (copied)
	* code/trunk/src/libraries/core/config/CMakeLists.txt (modified)
	* code/trunk/src/libraries/core/config/ConfigValueContainer.h (modified)
	* code/trunk/src/libraries/core/config/Configurable.cc (copied)
	* code/trunk/src/libraries/core/config/Configurable.h (modified)
	* code/trunk/src/libraries/core/input/Button.cc (modified)
	* code/trunk/src/libraries/core/input/InputBuffer.cc (modified)
	* code/trunk/src/libraries/core/input/InputBuffer.h (modified)
	* code/trunk/src/libraries/core/input/InputManager.cc (modified)
	* code/trunk/src/libraries/core/input/JoyStick.cc (modified)
	* code/trunk/src/libraries/core/input/JoyStick.h (modified)
	* code/trunk/src/libraries/core/input/JoyStickQuantityListener.cc (modified)
	* code/trunk/src/libraries/core/input/JoyStickQuantityListener.h (modified)
	* code/trunk/src/libraries/core/input/KeyBinder.cc (modified)
	* code/trunk/src/libraries/core/input/KeyBinderManager.cc (modified)
	* code/trunk/src/libraries/core/input/KeyBinderManager.h (modified)
	* code/trunk/src/libraries/core/input/Mouse.cc (modified)
	* code/trunk/src/libraries/core/object (copied)
	* code/trunk/src/libraries/core/object/CMakeLists.txt (modified)
	* code/trunk/src/libraries/core/object/ClassFactory.h (modified)
	* code/trunk/src/libraries/core/object/Context.cc (modified)
	* code/trunk/src/libraries/core/object/Context.h (modified)
	* code/trunk/src/libraries/core/object/Iterator.h (modified)
	* code/trunk/src/libraries/core/object/IteratorBase.h (copied)
	* code/trunk/src/libraries/core/object/Listable.cc (modified)
	* code/trunk/src/libraries/core/object/Listable.h (modified)
	* code/branches/core6/src/libraries/core/object/MetaObjectList.cc (deleted)
	* code/branches/core6/src/libraries/core/object/MetaObjectList.h (deleted)
	* code/trunk/src/libraries/core/object/ObjectList.h (modified)
	* code/trunk/src/libraries/core/object/ObjectListBase.cc (modified)
	* code/trunk/src/libraries/core/object/ObjectListBase.h (modified)
	* code/trunk/src/libraries/core/object/ObjectListIterator.h (modified)
	* code/trunk/src/libraries/network/Client.cc (modified)
	* code/trunk/src/libraries/network/ClientConnectionListener.cc (modified)
	* code/trunk/src/libraries/network/ClientConnectionListener.h (modified)
	* code/trunk/src/libraries/network/Host.cc (modified)
	* code/trunk/src/libraries/network/NetworkChatListener.h (modified)
	* code/trunk/src/libraries/network/NetworkFunction.cc (modified)
	* code/trunk/src/libraries/network/NetworkFunction.h (modified)
	* code/trunk/src/libraries/network/Server.cc (modified)
	* code/trunk/src/libraries/network/TrafficControl.cc (modified)
	* code/trunk/src/libraries/network/WANDiscoverable.cc (modified)
	* code/trunk/src/libraries/network/WANDiscoverable.h (modified)
	* code/trunk/src/libraries/network/WANDiscovery.h (modified)
	* code/trunk/src/libraries/network/packet/ClassID.cc (modified)
	* code/trunk/src/libraries/network/packet/FunctionIDs.cc (modified)
	* code/trunk/src/libraries/network/packet/Gamestate.cc (modified)
	* code/trunk/src/libraries/network/synchronisable/Serialise.h (modified)
	* code/trunk/src/libraries/network/synchronisable/Synchronisable.cc (modified)
	* code/trunk/src/libraries/network/synchronisable/Synchronisable.h (modified)
	* code/trunk/src/libraries/tools/ParticleInterface.cc (modified)
	* code/trunk/src/libraries/tools/ResourceCollection.cc (modified)
	* code/trunk/src/libraries/tools/ResourceCollection.h (modified)
	* code/trunk/src/libraries/tools/ResourceLocation.cc (modified)
	* code/trunk/src/libraries/tools/ResourceLocation.h (modified)
	* code/trunk/src/libraries/tools/Shader.cc (modified)
	* code/trunk/src/libraries/tools/Timer.cc (modified)
	* code/trunk/src/libraries/tools/Timer.h (modified)
	* code/trunk/src/libraries/tools/interfaces/Tickable.h (modified)
	* code/trunk/src/libraries/tools/interfaces/TimeFactorListener.h (modified)
	* code/trunk/src/libraries/tools/interfaces/ToolsInterfaceCompilation.cc (modified)
	* code/trunk/src/libraries/util/ScopedSingletonManager.h (modified)
	* code/trunk/src/modules/designtools/CreateStars.cc (modified)
	* code/trunk/src/modules/designtools/CreateStars.h (modified)
	* code/trunk/src/modules/designtools/ScreenshotManager.cc (modified)
	* code/trunk/src/modules/designtools/ScreenshotManager.h (modified)
	* code/trunk/src/modules/designtools/SkyboxGenerator.cc (modified)
	* code/trunk/src/modules/designtools/SkyboxGenerator.h (modified)
	* code/trunk/src/modules/docking/Dock.cc (modified)
	* code/trunk/src/modules/docking/Dock.h (modified)
	* code/trunk/src/modules/docking/DockToShip.cc (modified)
	* code/trunk/src/modules/docking/DockToShip.h (modified)
	* code/trunk/src/modules/docking/DockingAnimation.cc (modified)
	* code/trunk/src/modules/docking/DockingAnimation.h (modified)
	* code/trunk/src/modules/docking/DockingController.cc (modified)
	* code/trunk/src/modules/docking/DockingController.h (modified)
	* code/trunk/src/modules/docking/DockingEffect.cc (modified)
	* code/trunk/src/modules/docking/DockingEffect.h (modified)
	* code/trunk/src/modules/docking/DockingPrecompiledHeaders.h (modified)
	* code/trunk/src/modules/docking/DockingTarget.cc (modified)
	* code/trunk/src/modules/docking/DockingTarget.h (modified)
	* code/trunk/src/modules/docking/MoveToDockingTarget.cc (modified)
	* code/trunk/src/modules/docking/MoveToDockingTarget.h (modified)
	* code/trunk/src/modules/gametypes/OldRaceCheckPoint.cc (modified)
	* code/trunk/src/modules/gametypes/OldRaceCheckPoint.h (modified)
	* code/trunk/src/modules/gametypes/OldSpaceRace.cc (modified)
	* code/trunk/src/modules/gametypes/OldSpaceRace.h (modified)
	* code/trunk/src/modules/gametypes/RaceCheckPoint.cc (modified)
	* code/trunk/src/modules/gametypes/RaceCheckPoint.h (modified)
	* code/trunk/src/modules/gametypes/SpaceRace.cc (modified)
	* code/trunk/src/modules/gametypes/SpaceRace.h (modified)
	* code/trunk/src/modules/gametypes/SpaceRaceBot.cc (modified)
	* code/trunk/src/modules/gametypes/SpaceRaceBot.h (modified)
	* code/trunk/src/modules/gametypes/SpaceRaceController.cc (modified)
	* code/trunk/src/modules/gametypes/SpaceRaceController.h (modified)
	* code/trunk/src/modules/gametypes/SpaceRaceManager.cc (modified)
	* code/trunk/src/modules/gametypes/SpaceRaceManager.h (modified)
	* code/trunk/src/modules/notifications/NotificationDispatcher.cc (modified)
	* code/trunk/src/modules/notifications/NotificationDispatcher.h (modified)
	* code/trunk/src/modules/notifications/NotificationManager.cc (modified)
	* code/trunk/src/modules/notifications/NotificationManager.h (modified)
	* code/trunk/src/modules/notifications/NotificationQueue.cc (modified)
	* code/trunk/src/modules/notifications/NotificationQueue.h (modified)
	* code/trunk/src/modules/notifications/NotificationQueueCEGUI.cc (modified)
	* code/trunk/src/modules/notifications/NotificationQueueCEGUI.h (modified)
	* code/trunk/src/modules/notifications/dispatchers/CommandNotification.cc (modified)
	* code/trunk/src/modules/notifications/dispatchers/CommandNotification.h (modified)
	* code/trunk/src/modules/notifications/dispatchers/SimpleNotification.cc (modified)
	* code/trunk/src/modules/notifications/dispatchers/SimpleNotification.h (modified)
	* code/trunk/src/modules/objects/Attacher.cc (modified)
	* code/trunk/src/modules/objects/Attacher.h (modified)
	* code/trunk/src/modules/objects/ForceField.cc (modified)
	* code/trunk/src/modules/objects/ForceField.h (modified)
	* code/trunk/src/modules/objects/Planet.cc (modified)
	* code/trunk/src/modules/objects/Planet.h (modified)
	* code/trunk/src/modules/objects/Script.cc (modified)
	* code/trunk/src/modules/objects/Script.h (modified)
	* code/trunk/src/modules/objects/SpaceBoundaries.cc (modified)
	* code/trunk/src/modules/objects/SpaceBoundaries.h (modified)
	* code/trunk/src/modules/objects/Turret.cc (modified)
	* code/trunk/src/modules/objects/Turret.h (modified)
	* code/trunk/src/modules/objects/collisionshapes/BoxCollisionShape.cc (modified)
	* code/trunk/src/modules/objects/collisionshapes/BoxCollisionShape.h (modified)
	* code/trunk/src/modules/objects/collisionshapes/ConeCollisionShape.cc (modified)
	* code/trunk/src/modules/objects/collisionshapes/ConeCollisionShape.h (modified)
	* code/trunk/src/modules/objects/collisionshapes/PlaneCollisionShape.cc (modified)
	* code/trunk/src/modules/objects/collisionshapes/PlaneCollisionShape.h (modified)
	* code/trunk/src/modules/objects/collisionshapes/SphereCollisionShape.cc (modified)
	* code/trunk/src/modules/objects/collisionshapes/SphereCollisionShape.h (modified)
	* code/trunk/src/modules/objects/eventsystem/EventDispatcher.cc (modified)
	* code/trunk/src/modules/objects/eventsystem/EventDispatcher.h (modified)
	* code/trunk/src/modules/objects/eventsystem/EventFilter.cc (modified)
	* code/trunk/src/modules/objects/eventsystem/EventFilter.h (modified)
	* code/trunk/src/modules/objects/eventsystem/EventListener.cc (modified)
	* code/trunk/src/modules/objects/eventsystem/EventListener.h (modified)
	* code/trunk/src/modules/objects/eventsystem/EventName.cc (modified)
	* code/trunk/src/modules/objects/eventsystem/EventName.h (modified)
	* code/trunk/src/modules/objects/eventsystem/EventTarget.cc (modified)
	* code/trunk/src/modules/objects/eventsystem/EventTarget.h (modified)
	* code/trunk/src/modules/objects/triggers/CheckPoint.cc (modified)
	* code/trunk/src/modules/objects/triggers/CheckPoint.h (modified)
	* code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.cc (modified)
	* code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.h (modified)
	* code/trunk/src/modules/objects/triggers/DistanceTrigger.cc (modified)
	* code/trunk/src/modules/objects/triggers/DistanceTrigger.h (modified)
	* code/trunk/src/modules/objects/triggers/DistanceTriggerBeacon.cc (modified)
	* code/trunk/src/modules/objects/triggers/DistanceTriggerBeacon.h (modified)
	* code/trunk/src/modules/objects/triggers/EventMultiTrigger.cc (modified)
	* code/trunk/src/modules/objects/triggers/EventMultiTrigger.h (modified)
	* code/trunk/src/modules/objects/triggers/EventTrigger.cc (modified)
	* code/trunk/src/modules/objects/triggers/EventTrigger.h (modified)
	* code/trunk/src/modules/objects/triggers/MultiTrigger.cc (modified)
	* code/trunk/src/modules/objects/triggers/MultiTrigger.h (modified)
	* code/trunk/src/modules/objects/triggers/MultiTriggerContainer.cc (modified)
	* code/trunk/src/modules/objects/triggers/MultiTriggerContainer.h (modified)
	* code/trunk/src/modules/objects/triggers/Trigger.cc (modified)
	* code/trunk/src/modules/objects/triggers/Trigger.h (modified)
	* code/trunk/src/modules/objects/triggers/TriggerBase.cc (modified)
	* code/trunk/src/modules/objects/triggers/TriggerBase.h (modified)
	* code/trunk/src/modules/overlays/FadeoutText.cc (modified)
	* code/trunk/src/modules/overlays/FadeoutText.h (modified)
	* code/trunk/src/modules/overlays/GUIOverlay.cc (modified)
	* code/trunk/src/modules/overlays/GUIOverlay.h (modified)
	* code/trunk/src/modules/overlays/OverlayText.cc (modified)
	* code/trunk/src/modules/overlays/OverlayText.h (modified)
	* code/trunk/src/modules/overlays/debugging/DebugFPSText.cc (modified)
	* code/trunk/src/modules/overlays/debugging/DebugFPSText.h (modified)
	* code/trunk/src/modules/overlays/debugging/DebugRTRText.cc (modified)
	* code/trunk/src/modules/overlays/debugging/DebugRTRText.h (modified)
	* code/trunk/src/modules/overlays/hud/AnnounceMessage.cc (modified)
	* code/trunk/src/modules/overlays/hud/AnnounceMessage.h (modified)
	* code/trunk/src/modules/overlays/hud/ChatOverlay.cc (modified)
	* code/trunk/src/modules/overlays/hud/ChatOverlay.h (modified)
	* code/trunk/src/modules/overlays/hud/DeathMessage.cc (modified)
	* code/trunk/src/modules/overlays/hud/DeathMessage.h (modified)
	* code/trunk/src/modules/overlays/hud/GametypeFadingMessage.cc (modified)
	* code/trunk/src/modules/overlays/hud/GametypeFadingMessage.h (modified)
	* code/trunk/src/modules/overlays/hud/GametypeStaticMessage.cc (modified)
	* code/trunk/src/modules/overlays/hud/GametypeStaticMessage.h (modified)
	* code/trunk/src/modules/overlays/hud/HUDBar.cc (modified)
	* code/trunk/src/modules/overlays/hud/HUDBar.h (modified)
	* code/trunk/src/modules/overlays/hud/HUDBoostBar.cc (modified)
	* code/trunk/src/modules/overlays/hud/HUDBoostBar.h (modified)
	* code/trunk/src/modules/overlays/hud/HUDEnemyHealthBar.cc (modified)
	* code/trunk/src/modules/overlays/hud/HUDEnemyHealthBar.h (modified)
	* code/trunk/src/modules/overlays/hud/HUDHealthBar.cc (modified)
	* code/trunk/src/modules/overlays/hud/HUDHealthBar.h (modified)
	* code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified)
	* code/trunk/src/modules/overlays/hud/HUDNavigation.h (modified)
	* code/trunk/src/modules/overlays/hud/HUDRadar.cc (modified)
	* code/trunk/src/modules/overlays/hud/HUDRadar.h (modified)
	* code/trunk/src/modules/overlays/hud/HUDSpeedBar.cc (modified)
	* code/trunk/src/modules/overlays/hud/HUDSpeedBar.h (modified)
	* code/trunk/src/modules/overlays/hud/HUDTimer.cc (modified)
	* code/trunk/src/modules/overlays/hud/HUDTimer.h (modified)
	* code/trunk/src/modules/overlays/hud/KillMessage.cc (modified)
	* code/trunk/src/modules/overlays/hud/KillMessage.h (modified)
	* code/trunk/src/modules/overlays/hud/LastManStandingInfos.cc (modified)
	* code/trunk/src/modules/overlays/hud/LastManStandingInfos.h (modified)
	* code/trunk/src/modules/overlays/hud/LastTeamStandingInfos.cc (modified)
	* code/trunk/src/modules/overlays/hud/LastTeamStandingInfos.h (modified)
	* code/trunk/src/modules/overlays/hud/PauseNotice.cc (modified)
	* code/trunk/src/modules/overlays/hud/PauseNotice.h (modified)
	* code/trunk/src/modules/overlays/hud/TeamBaseMatchScore.cc (modified)
	* code/trunk/src/modules/overlays/hud/TeamBaseMatchScore.h (modified)
	* code/trunk/src/modules/overlays/stats/Scoreboard.cc (modified)
	* code/trunk/src/modules/overlays/stats/Scoreboard.h (modified)
	* code/trunk/src/modules/overlays/stats/Stats.cc (modified)
	* code/trunk/src/modules/overlays/stats/Stats.h (modified)
	* code/trunk/src/modules/pickup/CollectiblePickup.cc (modified)
	* code/trunk/src/modules/pickup/Pickup.cc (modified)
	* code/trunk/src/modules/pickup/Pickup.h (modified)
	* code/trunk/src/modules/pickup/PickupCollection.cc (modified)
	* code/trunk/src/modules/pickup/PickupCollection.h (modified)
	* code/trunk/src/modules/pickup/PickupManager.cc (modified)
	* code/trunk/src/modules/pickup/PickupManager.h (modified)
	* code/trunk/src/modules/pickup/PickupRepresentation.cc (modified)
	* code/trunk/src/modules/pickup/PickupRepresentation.h (modified)
	* code/trunk/src/modules/pickup/PickupSpawner.cc (modified)
	* code/trunk/src/modules/pickup/PickupSpawner.h (modified)
	* code/trunk/src/modules/pickup/items/DamageBoostPickup.cc (modified)
	* code/trunk/src/modules/pickup/items/DamageBoostPickup.h (modified)
	* code/trunk/src/modules/pickup/items/DronePickup.cc (modified)
	* code/trunk/src/modules/pickup/items/DronePickup.h (modified)
	* code/trunk/src/modules/pickup/items/HealthPickup.cc (modified)
	* code/trunk/src/modules/pickup/items/HealthPickup.h (modified)
	* code/trunk/src/modules/pickup/items/InvisiblePickup.cc (modified)
	* code/trunk/src/modules/pickup/items/InvisiblePickup.h (modified)
	* code/trunk/src/modules/pickup/items/MetaPickup.cc (modified)
	* code/trunk/src/modules/pickup/items/MetaPickup.h (modified)
	* code/trunk/src/modules/pickup/items/ShieldPickup.cc (modified)
	* code/trunk/src/modules/pickup/items/ShieldPickup.h (modified)
	* code/trunk/src/modules/pickup/items/ShrinkPickup.cc (modified)
	* code/trunk/src/modules/pickup/items/ShrinkPickup.h (modified)
	* code/trunk/src/modules/pickup/items/SpeedPickup.cc (modified)
	* code/trunk/src/modules/pickup/items/SpeedPickup.h (modified)
	* code/trunk/src/modules/pong/Pong.cc (modified)
	* code/trunk/src/modules/pong/Pong.h (modified)
	* code/trunk/src/modules/pong/PongAI.cc (modified)
	* code/trunk/src/modules/pong/PongAI.h (modified)
	* code/trunk/src/modules/pong/PongBall.cc (modified)
	* code/trunk/src/modules/pong/PongBall.h (modified)
	* code/trunk/src/modules/pong/PongBat.cc (modified)
	* code/trunk/src/modules/pong/PongBat.h (modified)
	* code/trunk/src/modules/pong/PongBot.cc (modified)
	* code/trunk/src/modules/pong/PongBot.h (modified)
	* code/trunk/src/modules/pong/PongCenterpoint.cc (modified)
	* code/trunk/src/modules/pong/PongCenterpoint.h (modified)
	* code/trunk/src/modules/pong/PongScore.cc (modified)
	* code/trunk/src/modules/pong/PongScore.h (modified)
	* code/trunk/src/modules/portals/PortalEndPoint.cc (modified)
	* code/trunk/src/modules/portals/PortalEndPoint.h (modified)
	* code/trunk/src/modules/portals/PortalLink.cc (modified)
	* code/trunk/src/modules/portals/PortalLink.h (modified)
	* code/trunk/src/modules/questsystem/GlobalQuest.cc (modified)
	* code/trunk/src/modules/questsystem/GlobalQuest.h (modified)
	* code/trunk/src/modules/questsystem/LocalQuest.cc (modified)
	* code/trunk/src/modules/questsystem/LocalQuest.h (modified)
	* code/trunk/src/modules/questsystem/Quest.cc (modified)
	* code/trunk/src/modules/questsystem/Quest.h (modified)
	* code/trunk/src/modules/questsystem/QuestDescription.cc (modified)
	* code/trunk/src/modules/questsystem/QuestDescription.h (modified)
	* code/trunk/src/modules/questsystem/QuestEffect.cc (modified)
	* code/trunk/src/modules/questsystem/QuestEffect.h (modified)
	* code/trunk/src/modules/questsystem/QuestEffectBeacon.cc (modified)
	* code/trunk/src/modules/questsystem/QuestEffectBeacon.h (modified)
	* code/trunk/src/modules/questsystem/QuestHint.cc (modified)
	* code/trunk/src/modules/questsystem/QuestHint.h (modified)
	* code/trunk/src/modules/questsystem/QuestItem.cc (modified)
	* code/trunk/src/modules/questsystem/QuestItem.h (modified)
	* code/trunk/src/modules/questsystem/QuestListener.cc (modified)
	* code/trunk/src/modules/questsystem/QuestListener.h (modified)
	* code/trunk/src/modules/questsystem/QuestManager.cc (modified)
	* code/trunk/src/modules/questsystem/QuestManager.h (modified)
	* code/trunk/src/modules/questsystem/effects/AddQuest.cc (modified)
	* code/trunk/src/modules/questsystem/effects/AddQuest.h (modified)
	* code/trunk/src/modules/questsystem/effects/AddQuestHint.cc (modified)
	* code/trunk/src/modules/questsystem/effects/AddQuestHint.h (modified)
	* code/trunk/src/modules/questsystem/effects/AddReward.cc (modified)
	* code/trunk/src/modules/questsystem/effects/AddReward.h (modified)
	* code/trunk/src/modules/questsystem/effects/ChangeQuestStatus.cc (modified)
	* code/trunk/src/modules/questsystem/effects/ChangeQuestStatus.h (modified)
	* code/trunk/src/modules/questsystem/effects/CompleteQuest.cc (modified)
	* code/trunk/src/modules/questsystem/effects/CompleteQuest.h (modified)
	* code/trunk/src/modules/questsystem/effects/FailQuest.cc (modified)
	* code/trunk/src/modules/questsystem/effects/FailQuest.h (modified)
	* code/trunk/src/modules/tetris/Tetris.cc (modified)
	* code/trunk/src/modules/tetris/Tetris.h (modified)
	* code/trunk/src/modules/tetris/TetrisBrick.cc (modified)
	* code/trunk/src/modules/tetris/TetrisBrick.h (modified)
	* code/trunk/src/modules/tetris/TetrisCenterpoint.cc (modified)
	* code/trunk/src/modules/tetris/TetrisCenterpoint.h (modified)
	* code/trunk/src/modules/tetris/TetrisScore.cc (modified)
	* code/trunk/src/modules/tetris/TetrisScore.h (modified)
	* code/trunk/src/modules/tetris/TetrisStone.cc (modified)
	* code/trunk/src/modules/tetris/TetrisStone.h (modified)
	* code/trunk/src/modules/towerdefense/Tower.cc (modified)
	* code/trunk/src/modules/towerdefense/Tower.h (modified)
	* code/trunk/src/modules/towerdefense/TowerDefense.cc (modified)
	* code/trunk/src/modules/towerdefense/TowerDefense.h (modified)
	* code/trunk/src/modules/towerdefense/TowerDefenseCenterpoint.cc (modified)
	* code/trunk/src/modules/towerdefense/TowerDefenseCenterpoint.h (modified)
	* code/trunk/src/modules/towerdefense/TowerDefenseController.cc (modified)
	* code/trunk/src/modules/towerdefense/TowerDefenseController.h (modified)
	* code/trunk/src/modules/towerdefense/TowerDefenseHUDController.cc (modified)
	* code/trunk/src/modules/towerdefense/TowerDefenseHUDController.h (modified)
	* code/trunk/src/modules/weapons/MuzzleFlash.cc (modified)
	* code/trunk/src/modules/weapons/MuzzleFlash.h (modified)
	* code/trunk/src/modules/weapons/RocketController.cc (modified)
	* code/trunk/src/modules/weapons/RocketController.h (modified)
	* code/trunk/src/modules/weapons/munitions/FusionMunition.cc (modified)
	* code/trunk/src/modules/weapons/munitions/FusionMunition.h (modified)
	* code/trunk/src/modules/weapons/munitions/LaserMunition.cc (modified)
	* code/trunk/src/modules/weapons/munitions/LaserMunition.h (modified)
	* code/trunk/src/modules/weapons/munitions/ReplenishingMunition.cc (modified)
	* code/trunk/src/modules/weapons/munitions/ReplenishingMunition.h (modified)
	* code/trunk/src/modules/weapons/munitions/RocketMunition.cc (modified)
	* code/trunk/src/modules/weapons/munitions/RocketMunition.h (modified)
	* code/trunk/src/modules/weapons/projectiles/BasicProjectile.cc (modified)
	* code/trunk/src/modules/weapons/projectiles/BasicProjectile.h (modified)
	* code/trunk/src/modules/weapons/projectiles/BillboardProjectile.cc (modified)
	* code/trunk/src/modules/weapons/projectiles/BillboardProjectile.h (modified)
	* code/trunk/src/modules/weapons/projectiles/LightningGunProjectile.cc (modified)
	* code/trunk/src/modules/weapons/projectiles/LightningGunProjectile.h (modified)
	* code/trunk/src/modules/weapons/projectiles/ParticleProjectile.cc (modified)
	* code/trunk/src/modules/weapons/projectiles/ParticleProjectile.h (modified)
	* code/trunk/src/modules/weapons/projectiles/Projectile.cc (modified)
	* code/trunk/src/modules/weapons/projectiles/Projectile.h (modified)
	* code/trunk/src/modules/weapons/projectiles/Rocket.cc (modified)
	* code/trunk/src/modules/weapons/projectiles/Rocket.h (modified)
	* code/trunk/src/modules/weapons/projectiles/SimpleRocket.cc (modified)
	* code/trunk/src/modules/weapons/projectiles/SimpleRocket.h (modified)
	* code/trunk/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified)
	* code/trunk/src/modules/weapons/weaponmodes/EnergyDrink.h (modified)
	* code/trunk/src/modules/weapons/weaponmodes/FusionFire.cc (modified)
	* code/trunk/src/modules/weapons/weaponmodes/FusionFire.h (modified)
	* code/trunk/src/modules/weapons/weaponmodes/HsW01.cc (modified)
	* code/trunk/src/modules/weapons/weaponmodes/HsW01.h (modified)
	* code/trunk/src/modules/weapons/weaponmodes/LaserFire.cc (modified)
	* code/trunk/src/modules/weapons/weaponmodes/LaserFire.h (modified)
	* code/trunk/src/modules/weapons/weaponmodes/LightningGun.cc (modified)
	* code/trunk/src/modules/weapons/weaponmodes/LightningGun.h (modified)
	* code/trunk/src/modules/weapons/weaponmodes/RocketFire.cc (modified)
	* code/trunk/src/modules/weapons/weaponmodes/RocketFire.h (modified)
	* code/trunk/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified)
	* code/trunk/src/modules/weapons/weaponmodes/SimpleRocketFire.h (modified)
	* code/trunk/src/orxonox/CameraManager.cc (modified)
	* code/trunk/src/orxonox/CameraManager.h (modified)
	* code/trunk/src/orxonox/Level.cc (modified)
	* code/trunk/src/orxonox/Level.h (modified)
	* code/trunk/src/orxonox/LevelInfo.cc (modified)
	* code/trunk/src/orxonox/LevelInfo.h (modified)
	* code/trunk/src/orxonox/LevelManager.cc (modified)
	* code/trunk/src/orxonox/LevelManager.h (modified)
	* code/trunk/src/orxonox/Main.cc (modified)
	* code/trunk/src/orxonox/MoodManager.cc (modified)
	* code/trunk/src/orxonox/MoodManager.h (modified)
	* code/trunk/src/orxonox/PawnManager.cc (modified)
	* code/trunk/src/orxonox/PlayerManager.cc (modified)
	* code/trunk/src/orxonox/Radar.cc (modified)
	* code/trunk/src/orxonox/Radar.h (modified)
	* code/trunk/src/orxonox/Scene.cc (modified)
	* code/trunk/src/orxonox/Scene.h (modified)
	* code/trunk/src/orxonox/Test.cc (modified)
	* code/trunk/src/orxonox/Test.h (modified)
	* code/trunk/src/orxonox/chat/ChatHistory.cc (modified)
	* code/trunk/src/orxonox/chat/ChatListener.h (modified)
	* code/trunk/src/orxonox/chat/ChatManager.cc (modified)
	* code/trunk/src/orxonox/collisionshapes/CollisionShape.cc (modified)
	* code/trunk/src/orxonox/collisionshapes/CollisionShape.h (modified)
	* code/trunk/src/orxonox/collisionshapes/CompoundCollisionShape.cc (modified)
	* code/trunk/src/orxonox/collisionshapes/CompoundCollisionShape.h (modified)
	* code/trunk/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc (modified)
	* code/trunk/src/orxonox/collisionshapes/WorldEntityCollisionShape.h (modified)
	* code/trunk/src/orxonox/controllers/AIController.cc (modified)
	* code/trunk/src/orxonox/controllers/AIController.h (modified)
	* code/trunk/src/orxonox/controllers/ArtificialController.cc (modified)
	* code/trunk/src/orxonox/controllers/ArtificialController.h (modified)
	* code/trunk/src/orxonox/controllers/Controller.cc (modified)
	* code/trunk/src/orxonox/controllers/Controller.h (modified)
	* code/trunk/src/orxonox/controllers/DroneController.cc (modified)
	* code/trunk/src/orxonox/controllers/DroneController.h (modified)
	* code/trunk/src/orxonox/controllers/FormationController.cc (modified)
	* code/trunk/src/orxonox/controllers/FormationController.h (modified)
	* code/trunk/src/orxonox/controllers/HumanController.cc (modified)
	* code/trunk/src/orxonox/controllers/HumanController.h (modified)
	* code/trunk/src/orxonox/controllers/NewHumanController.cc (modified)
	* code/trunk/src/orxonox/controllers/NewHumanController.h (modified)
	* code/trunk/src/orxonox/controllers/ScriptController.cc (modified)
	* code/trunk/src/orxonox/controllers/ScriptController.h (modified)
	* code/trunk/src/orxonox/controllers/WaypointController.cc (modified)
	* code/trunk/src/orxonox/controllers/WaypointController.h (modified)
	* code/trunk/src/orxonox/controllers/WaypointPatrolController.cc (modified)
	* code/trunk/src/orxonox/controllers/WaypointPatrolController.h (modified)
	* code/trunk/src/orxonox/gamestates/GSClient.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSLevel.h (modified)
	* code/trunk/src/orxonox/gamestates/GSMainMenu.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSMainMenu.h (modified)
	* code/trunk/src/orxonox/gamestates/GSServer.cc (modified)
	* code/trunk/src/orxonox/gametypes/Asteroids.cc (modified)
	* code/trunk/src/orxonox/gametypes/Asteroids.h (modified)
	* code/trunk/src/orxonox/gametypes/Deathmatch.cc (modified)
	* code/trunk/src/orxonox/gametypes/Deathmatch.h (modified)
	* code/trunk/src/orxonox/gametypes/Dynamicmatch.cc (modified)
	* code/trunk/src/orxonox/gametypes/Dynamicmatch.h (modified)
	* code/trunk/src/orxonox/gametypes/Gametype.cc (modified)
	* code/trunk/src/orxonox/gametypes/Gametype.h (modified)
	* code/trunk/src/orxonox/gametypes/LastManStanding.cc (modified)
	* code/trunk/src/orxonox/gametypes/LastManStanding.h (modified)
	* code/trunk/src/orxonox/gametypes/LastTeamStanding.cc (modified)
	* code/trunk/src/orxonox/gametypes/LastTeamStanding.h (modified)
	* code/trunk/src/orxonox/gametypes/Mission.cc (modified)
	* code/trunk/src/orxonox/gametypes/Mission.h (modified)
	* code/trunk/src/orxonox/gametypes/TeamBaseMatch.cc (modified)
	* code/trunk/src/orxonox/gametypes/TeamBaseMatch.h (modified)
	* code/trunk/src/orxonox/gametypes/TeamDeathmatch.cc (modified)
	* code/trunk/src/orxonox/gametypes/TeamDeathmatch.h (modified)
	* code/trunk/src/orxonox/gametypes/TeamGametype.cc (modified)
	* code/trunk/src/orxonox/gametypes/TeamGametype.h (modified)
	* code/trunk/src/orxonox/gametypes/UnderAttack.cc (modified)
	* code/trunk/src/orxonox/gametypes/UnderAttack.h (modified)
	* code/trunk/src/orxonox/graphics/AnimatedModel.cc (modified)
	* code/trunk/src/orxonox/graphics/AnimatedModel.h (modified)
	* code/trunk/src/orxonox/graphics/Backlight.cc (modified)
	* code/trunk/src/orxonox/graphics/Backlight.h (modified)
	* code/trunk/src/orxonox/graphics/Billboard.cc (modified)
	* code/trunk/src/orxonox/graphics/Billboard.h (modified)
	* code/trunk/src/orxonox/graphics/BlinkingBillboard.cc (modified)
	* code/trunk/src/orxonox/graphics/BlinkingBillboard.h (modified)
	* code/trunk/src/orxonox/graphics/Camera.cc (modified)
	* code/trunk/src/orxonox/graphics/Camera.h (modified)
	* code/trunk/src/orxonox/graphics/FadingBillboard.cc (modified)
	* code/trunk/src/orxonox/graphics/FadingBillboard.h (modified)
	* code/trunk/src/orxonox/graphics/GlobalShader.cc (modified)
	* code/trunk/src/orxonox/graphics/GlobalShader.h (modified)
	* code/trunk/src/orxonox/graphics/Light.cc (modified)
	* code/trunk/src/orxonox/graphics/Light.h (modified)
	* code/trunk/src/orxonox/graphics/MeshLodInformation.cc (modified)
	* code/trunk/src/orxonox/graphics/MeshLodInformation.h (modified)
	* code/trunk/src/orxonox/graphics/Model.cc (modified)
	* code/trunk/src/orxonox/graphics/Model.h (modified)
	* code/trunk/src/orxonox/graphics/ParticleEmitter.cc (modified)
	* code/trunk/src/orxonox/graphics/ParticleEmitter.h (modified)
	* code/trunk/src/orxonox/graphics/ParticleSpawner.cc (modified)
	* code/trunk/src/orxonox/graphics/ParticleSpawner.h (modified)
	* code/trunk/src/orxonox/infos/Bot.cc (modified)
	* code/trunk/src/orxonox/infos/Bot.h (modified)
	* code/trunk/src/orxonox/infos/GametypeInfo.cc (modified)
	* code/trunk/src/orxonox/infos/GametypeInfo.h (modified)
	* code/trunk/src/orxonox/infos/HumanPlayer.cc (modified)
	* code/trunk/src/orxonox/infos/HumanPlayer.h (modified)
	* code/trunk/src/orxonox/infos/Info.cc (modified)
	* code/trunk/src/orxonox/infos/Info.h (modified)
	* code/trunk/src/orxonox/infos/PlayerInfo.cc (modified)
	* code/trunk/src/orxonox/infos/PlayerInfo.h (modified)
	* code/trunk/src/orxonox/interfaces/GametypeMessageListener.h (modified)
	* code/trunk/src/orxonox/interfaces/InterfaceCompilation.cc (modified)
	* code/trunk/src/orxonox/interfaces/NotificationListener.cc (modified)
	* code/trunk/src/orxonox/interfaces/NotificationListener.h (modified)
	* code/trunk/src/orxonox/interfaces/PickupCarrier.cc (modified)
	* code/trunk/src/orxonox/interfaces/PickupCarrier.h (modified)
	* code/trunk/src/orxonox/interfaces/PickupListener.cc (modified)
	* code/trunk/src/orxonox/interfaces/PickupListener.h (modified)
	* code/trunk/src/orxonox/interfaces/Pickupable.cc (modified)
	* code/trunk/src/orxonox/interfaces/Pickupable.h (modified)
	* code/trunk/src/orxonox/interfaces/PlayerTrigger.h (modified)
	* code/trunk/src/orxonox/interfaces/RadarListener.h (modified)
	* code/trunk/src/orxonox/interfaces/RadarViewable.cc (modified)
	* code/trunk/src/orxonox/interfaces/RadarViewable.h (modified)
	* code/trunk/src/orxonox/interfaces/Rewardable.h (modified)
	* code/trunk/src/orxonox/interfaces/TeamColourable.h (modified)
	* code/trunk/src/orxonox/items/Engine.cc (modified)
	* code/trunk/src/orxonox/items/Engine.h (modified)
	* code/trunk/src/orxonox/items/Item.cc (modified)
	* code/trunk/src/orxonox/items/Item.h (modified)
	* code/trunk/src/orxonox/items/MultiStateEngine.cc (modified)
	* code/trunk/src/orxonox/items/MultiStateEngine.h (modified)
	* code/trunk/src/orxonox/overlays/GUISheet.cc (modified)
	* code/trunk/src/orxonox/overlays/GUISheet.h (modified)
	* code/trunk/src/orxonox/overlays/InGameConsole.cc (modified)
	* code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc (modified)
	* code/trunk/src/orxonox/overlays/OrxonoxOverlay.h (modified)
	* code/trunk/src/orxonox/overlays/OverlayGroup.cc (modified)
	* code/trunk/src/orxonox/overlays/OverlayGroup.h (modified)
	* code/trunk/src/orxonox/sound/BaseSound.cc (modified)
	* code/trunk/src/orxonox/sound/BaseSound.h (modified)
	* code/trunk/src/orxonox/sound/SoundManager.cc (modified)
	* code/trunk/src/orxonox/sound/SoundManager.h (modified)
	* code/trunk/src/orxonox/sound/WorldAmbientSound.cc (modified)
	* code/trunk/src/orxonox/sound/WorldAmbientSound.h (modified)
	* code/trunk/src/orxonox/sound/WorldSound.cc (modified)
	* code/trunk/src/orxonox/sound/WorldSound.h (modified)
	* code/trunk/src/orxonox/weaponsystem/DefaultWeaponmodeLink.cc (modified)
	* code/trunk/src/orxonox/weaponsystem/DefaultWeaponmodeLink.h (modified)
	* code/trunk/src/orxonox/weaponsystem/Munition.cc (modified)
	* code/trunk/src/orxonox/weaponsystem/Munition.h (modified)
	* code/trunk/src/orxonox/weaponsystem/Weapon.cc (modified)
	* code/trunk/src/orxonox/weaponsystem/Weapon.h (modified)
	* code/trunk/src/orxonox/weaponsystem/WeaponMode.cc (modified)
	* code/trunk/src/orxonox/weaponsystem/WeaponMode.h (modified)
	* code/trunk/src/orxonox/weaponsystem/WeaponPack.cc (modified)
	* code/trunk/src/orxonox/weaponsystem/WeaponPack.h (modified)
	* code/trunk/src/orxonox/weaponsystem/WeaponSet.cc (modified)
	* code/trunk/src/orxonox/weaponsystem/WeaponSet.h (modified)
	* code/trunk/src/orxonox/weaponsystem/WeaponSlot.cc (modified)
	* code/trunk/src/orxonox/weaponsystem/WeaponSlot.h (modified)
	* code/trunk/src/orxonox/weaponsystem/WeaponSystem.cc (modified)
	* code/trunk/src/orxonox/weaponsystem/WeaponSystem.h (modified)
	* code/trunk/src/orxonox/worldentities/BigExplosion.cc (modified)
	* code/trunk/src/orxonox/worldentities/BigExplosion.h (modified)
	* code/trunk/src/orxonox/worldentities/CameraPosition.cc (modified)
	* code/trunk/src/orxonox/worldentities/CameraPosition.h (modified)
	* code/trunk/src/orxonox/worldentities/ControllableEntity.cc (modified)
	* code/trunk/src/orxonox/worldentities/ControllableEntity.h (modified)
	* code/trunk/src/orxonox/worldentities/Drone.cc (modified)
	* code/trunk/src/orxonox/worldentities/Drone.h (modified)
	* code/trunk/src/orxonox/worldentities/EffectContainer.cc (modified)
	* code/trunk/src/orxonox/worldentities/EffectContainer.h (modified)
	* code/trunk/src/orxonox/worldentities/ExplosionChunk.cc (modified)
	* code/trunk/src/orxonox/worldentities/ExplosionChunk.h (modified)
	* code/trunk/src/orxonox/worldentities/MobileEntity.cc (modified)
	* code/trunk/src/orxonox/worldentities/MobileEntity.h (modified)
	* code/trunk/src/orxonox/worldentities/MovableEntity.cc (modified)
	* code/trunk/src/orxonox/worldentities/MovableEntity.h (modified)
	* code/trunk/src/orxonox/worldentities/SpawnPoint.cc (modified)
	* code/trunk/src/orxonox/worldentities/SpawnPoint.h (modified)
	* code/trunk/src/orxonox/worldentities/StaticEntity.cc (modified)
	* code/trunk/src/orxonox/worldentities/StaticEntity.h (modified)
	* code/trunk/src/orxonox/worldentities/TeamSpawnPoint.cc (modified)
	* code/trunk/src/orxonox/worldentities/TeamSpawnPoint.h (modified)
	* code/trunk/src/orxonox/worldentities/WorldEntity.cc (modified)
	* code/trunk/src/orxonox/worldentities/WorldEntity.h (modified)
	* code/trunk/src/orxonox/worldentities/pawns/Destroyer.cc (modified)
	* code/trunk/src/orxonox/worldentities/pawns/Destroyer.h (modified)
	* code/trunk/src/orxonox/worldentities/pawns/FpsPlayer.cc (modified)
	* code/trunk/src/orxonox/worldentities/pawns/FpsPlayer.h (modified)
	* code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified)
	* code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc (modified)
	* code/trunk/src/orxonox/worldentities/pawns/SpaceShip.h (modified)
	* code/trunk/src/orxonox/worldentities/pawns/Spectator.cc (modified)
	* code/trunk/src/orxonox/worldentities/pawns/Spectator.h (modified)
	* code/trunk/src/orxonox/worldentities/pawns/TeamBaseMatchBase.cc (modified)
	* code/trunk/src/orxonox/worldentities/pawns/TeamBaseMatchBase.h (modified)
	* code/trunk/test/CMakeLists.txt (modified)
	* code/trunk/test/core (copied)

	merged core6 back to trunk


Tue, 12 Mar 2013 22:13:03 GMT landauf [9550]
	* code/trunk (modified)
	* code/trunk/CMakeLists.txt (modified)
	* code/trunk/cmake/tools/TargetUtilities.cmake (modified)
	* code/trunk/src/CMakeLists.txt (modified)
	* code/trunk/src/SourceConfig.cmake (copied)
	* code/trunk/src/external/CMakeLists.txt (modified)
	* code/trunk/src/external/gmock (copied)
	* code/trunk/src/external/gtest (copied)
	* code/trunk/src/libraries/core/CommandLineParser.cc (modified)
	* code/trunk/src/libraries/core/CommandLineParser.h (modified)
	* code/trunk/src/libraries/core/ConfigValueContainer.cc (modified)
	* code/trunk/src/libraries/core/Core.cc (modified)
	* code/trunk/src/libraries/core/PathConfig.cc (modified)
	* code/trunk/src/libraries/core/command/CommandEvaluation.cc (modified)
	* code/trunk/src/libraries/core/command/CommandExecutor.cc (modified)
	* code/trunk/src/libraries/core/command/ConsoleCommand.h (modified)
	* code/trunk/src/libraries/core/command/Executor.cc (modified)
	* code/trunk/src/libraries/core/command/Executor.h (modified)
	* code/trunk/src/libraries/core/command/Functor.h (modified)
	* code/trunk/src/libraries/core/command/IOConsolePOSIX.cc (modified)
	* code/trunk/src/libraries/core/command/IOConsoleWindows.cc (modified)
	* code/trunk/src/libraries/core/command/Shell.cc (modified)
	* code/trunk/src/libraries/core/command/TclBind.cc (modified)
	* code/trunk/src/libraries/core/input/InputManager.cc (modified)
	* code/trunk/src/libraries/network/Client.cc (modified)
	* code/trunk/src/libraries/tools/Shader.cc (modified)
	* code/trunk/src/libraries/tools/Shader.h (modified)
	* code/trunk/src/libraries/util/Math.h (modified)
	* code/trunk/src/libraries/util/MultiType.cc (modified)
	* code/trunk/src/libraries/util/MultiType.h (modified)
	* code/trunk/src/libraries/util/MultiTypeValue.h (modified)
	* code/trunk/src/libraries/util/SignalHandler.cc (modified)
	* code/trunk/src/libraries/util/SignalHandler.h (modified)
	* code/trunk/src/libraries/util/StringUtils.cc (modified)
	* code/trunk/src/libraries/util/StringUtils.h (modified)
	* code/trunk/src/libraries/util/SubString.cc (modified)
	* code/trunk/src/libraries/util/SubString.h (modified)
	* code/trunk/src/libraries/util/UtilPrereqs.h (modified)
	* code/trunk/src/libraries/util/VA_NARGS.h (modified)
	* code/trunk/src/libraries/util/output/AdditionalContextListener.h (copied)
	* code/trunk/src/libraries/util/output/ConsoleWriter.cc (modified)
	* code/trunk/src/libraries/util/output/ConsoleWriter.h (modified)
	* code/trunk/src/libraries/util/output/LogWriter.cc (modified)
	* code/trunk/src/libraries/util/output/LogWriter.h (modified)
	* code/trunk/src/libraries/util/output/MemoryWriter.cc (modified)
	* code/trunk/src/libraries/util/output/MemoryWriter.h (modified)
	* code/trunk/src/libraries/util/output/OutputDefinitions.h (modified)
	* code/trunk/src/libraries/util/output/OutputListener.cc (modified)
	* code/trunk/src/libraries/util/output/OutputListener.h (modified)
	* code/trunk/src/libraries/util/output/OutputManager.cc (modified)
	* code/trunk/src/libraries/util/output/OutputManager.h (modified)
	* code/trunk/src/libraries/util/output/OutputStream.h (modified)
	* code/trunk/src/libraries/util/output/SubcontextOutputListener.h (modified)
	* code/trunk/src/modules/notifications/dispatchers/CommandNotification.cc (modified)
	* code/trunk/src/orxonox-main.vcproj.user.in (deleted)
	* code/trunk/src/orxonox-main.vcxproj.user.in (deleted)
	* code/trunk/src/orxonox/LevelManager.cc (modified)
	* code/trunk/src/orxonox/Main.cc (modified)
	* code/trunk/src/orxonox/graphics/ParticleEmitter.cc (modified)
	* code/trunk/src/orxonox/overlays/InGameConsole.cc (modified)
	* code/trunk/src/template.vcproj.user.in (copied)
	* code/trunk/src/template.vcxproj.user.in (copied)
	* code/trunk/test (copied)

	merged testing branch back to trunk. unbelievable it took me 13 ...


Tue, 14 Jun 2011 18:53:28 GMT dafrick [8706]
	* code/trunk (modified)
	* code/trunk/data/defaultConfig/keybindings.ini (modified)
	* code/trunk/data/gui/layouts/DockingDialog.layout (copied)
	* code/trunk/data/gui/layouts/QuestGUI.layout (modified)
	* code/trunk/data/gui/scripts/DockingDialog.lua (copied)
	* code/trunk/data/gui/scripts/NotificationLayer.lua (modified)
	* code/trunk/data/gui/scripts/QuestGUI.lua (modified)
	* code/trunk/data/gui/scripts/SingleplayerMenu.lua (modified)
	* code/trunk/data/levels/FPSTest.oxw (modified)
	* code/trunk/data/levels/asteroids.oxw (modified)
	* code/trunk/data/levels/docking.oxw (copied)
	* code/trunk/data/levels/dynamicMatch.oxw (modified)
	* code/trunk/data/levels/earth.oxw (modified)
	* code/trunk/data/levels/emptyLevel.oxw (modified)
	* code/trunk/data/levels/events.oxw (modified)
	* code/trunk/data/levels/fightInOurBack.oxw (modified)
	* code/trunk/data/levels/includes/notifications.oxi (copied)
	* code/trunk/data/levels/includes/pickups.oxi (modified)
	* code/trunk/data/levels/includes/weaponSettingsAssff.oxi (modified)
	* code/trunk/data/levels/includes/weaponSettingsAssff2.oxi (copied)
	* code/trunk/data/levels/includes/weaponSettingsImmTest.oxi (copied)
	* code/trunk/data/levels/lastManStanding.oxw (modified)
	* code/trunk/data/levels/lastTeamStanding.oxw (modified)
	* code/trunk/data/levels/lastTeamStandingII.oxw (modified)
	* code/trunk/data/levels/myTestLevel.oxw (modified)
	* code/trunk/data/levels/notifications.oxw (modified)
	* code/trunk/data/levels/pickups.oxw (modified)
	* code/trunk/data/levels/pirateAttack.oxw (modified)
	* code/trunk/data/levels/planets.oxw (modified)
	* code/trunk/data/levels/pong.oxw (modified)
	* code/trunk/data/levels/portals.oxw (modified)
	* code/trunk/data/levels/presentation.oxw (modified)
	* code/trunk/data/levels/presentation09.oxw (modified)
	* code/trunk/data/levels/presentation09b.oxw (modified)
	* code/trunk/data/levels/presentationDM.oxw (modified)
	* code/trunk/data/levels/presentationFS10.oxw (modified)
	* code/trunk/data/levels/presentationFS102.oxw (modified)
	* code/trunk/data/levels/presentationFS10Ed.oxw (modified)
	* code/trunk/data/levels/presentationFS11.oxw (modified)
	* code/trunk/data/levels/presentationHS09.oxw (modified)
	* code/trunk/data/levels/presentationHS09b.oxw (modified)
	* code/trunk/data/levels/princessAeryn.oxw (modified)
	* code/trunk/data/levels/quests.oxw (copied)
	* code/trunk/data/levels/screenshot.oxw (modified)
	* code/trunk/data/levels/shieldTest.oxw (copied)
	* code/trunk/data/levels/sound.oxw (modified)
	* code/trunk/data/levels/spaceRace.oxw (copied)
	* code/trunk/data/levels/teamBaseMatch.oxw (modified)
	* code/trunk/data/levels/teamDeathMatch.oxw (modified)
	* code/trunk/data/levels/templates/lodInformation.oxt (modified)
	* code/trunk/data/levels/templates/pickupRepresentationTemplates.oxt (modified)
	* code/trunk/data/levels/templates/spaceshipAssff.oxt (modified)
	* code/trunk/data/levels/templates/spaceshipAssff2.oxt (copied)
	* code/trunk/data/levels/templates/spaceshipGhost.oxt (modified)
	* code/trunk/data/levels/templates/spaceshipH2.oxt (modified)
	* code/trunk/data/levels/templates/spaceshipHXY.oxt (modified)
	* code/trunk/data/levels/templates/spaceshipHXYSL.oxt (modified)
	* code/trunk/data/levels/templates/spaceshipImmTest.oxt (copied)
	* code/trunk/data/levels/templates/spaceshipPirate.oxt (modified)
	* code/trunk/data/levels/templates/spaceshipSwallow.oxt (modified)
	* code/trunk/data/levels/templates/spaceshipTransporter.oxt (modified)
	* code/trunk/data/levels/templates/spaceshipTransporterSL.oxt (modified)
	* code/trunk/data/levels/testStars.oxw (modified)
	* code/trunk/data/levels/testSwallow.oxw (modified)
	* code/trunk/data/levels/tetris.oxw (copied)
	* code/trunk/data/levels/theTimeMachine.oxw (modified)
	* code/trunk/data/levels/tutorial.oxw (modified)
	* code/trunk/data/levels/underAttack.oxw (modified)
	* code/trunk/data/levels/waypoints.oxw (modified)
	* code/trunk/data/overlays/HUDTemplates3.oxo (modified)
	* code/trunk/data/overlays/debug.oxo (modified)
	* code/trunk/data/particle/RingExp.particle (copied)
	* code/trunk/data/particle/RingExp2.particle (copied)
	* code/trunk/data/particle/RingExp3.particle (copied)
	* code/trunk/data/particle/Shield.particle (copied)
	* code/trunk/data/particle/weaponflare.particle (copied)
	* code/trunk/data/particle/weaponshoot.particle (copied)
	* code/trunk/doc/api/Groups.dox (modified)
	* code/trunk/doc/api/groups/Portals.dox (copied)
	* code/trunk/doc/api/groups/Triggers.dox (modified)
	* code/trunk/src/libraries/core/BaseObject.cc (modified)
	* code/trunk/src/libraries/core/ConfigValueContainer.h (modified)
	* code/trunk/src/libraries/core/CoreIncludes.h (modified)
	* code/trunk/src/libraries/core/GUIManager.cc (modified)
	* code/trunk/src/libraries/core/GUIManager.h (modified)
	* code/trunk/src/libraries/core/Game.cc (modified)
	* code/trunk/src/libraries/core/GraphicsManager.h (modified)
	* code/trunk/src/libraries/core/Identifier.h (modified)
	* code/trunk/src/libraries/core/Super.h (modified)
	* code/trunk/src/libraries/core/ThreadWin.cc (modified)
	* code/trunk/src/libraries/core/command/Functor.h (modified)
	* code/trunk/src/libraries/core/command/Shell.cc (modified)
	* code/trunk/src/libraries/network/LANDiscovery.cc (modified)
	* code/trunk/src/libraries/network/Server.cc (modified)
	* code/trunk/src/libraries/network/packet/Welcome.cc (modified)
	* code/trunk/src/libraries/network/packet/Welcome.h (modified)
	* code/trunk/src/libraries/network/synchronisable/Serialise.h (modified)
	* code/trunk/src/libraries/network/synchronisable/Synchronisable.cc (modified)
	* code/trunk/src/libraries/network/synchronisable/Synchronisable.h (modified)
	* code/trunk/src/libraries/util/Convert.h (modified)
	* code/trunk/src/libraries/util/Exception.h (modified)
	* code/trunk/src/libraries/util/Math.h (modified)
	* code/trunk/src/libraries/util/MultiTypeValue.h (modified)
	* code/trunk/src/libraries/util/ScopedSingletonManager.h (modified)
	* code/trunk/src/libraries/util/Serialise.h (modified)
	* code/trunk/src/libraries/util/SubString.h (modified)
	* code/trunk/src/modules/CMakeLists.txt (modified)
	* code/trunk/src/modules/docking (copied)
	* code/trunk/src/modules/docking/CMakeLists.txt (copied)
	* code/trunk/src/modules/docking/Dock.cc (copied)
	* code/trunk/src/modules/docking/Dock.h (copied)
	* code/trunk/src/modules/docking/DockToShip.cc (copied)
	* code/trunk/src/modules/docking/DockToShip.h (copied)
	* code/trunk/src/modules/docking/DockingAnimation.cc (copied)
	* code/trunk/src/modules/docking/DockingAnimation.h (copied)
	* code/trunk/src/modules/docking/DockingController.cc (copied)
	* code/trunk/src/modules/docking/DockingController.h (copied)
	* code/trunk/src/modules/docking/DockingEffect.cc (copied)
	* code/trunk/src/modules/docking/DockingEffect.h (copied)
	* code/trunk/src/modules/docking/DockingPrecompiledHeaders.h (copied)
	* code/trunk/src/modules/docking/DockingPrereqs.h (copied)
	* code/trunk/src/modules/docking/DockingTarget.cc (copied)
	* code/trunk/src/modules/docking/DockingTarget.h (copied)
	* code/trunk/src/modules/docking/MoveToDockingTarget.cc (copied)
	* code/trunk/src/modules/docking/MoveToDockingTarget.h (copied)
	* code/trunk/src/modules/gametypes (copied)
	* code/trunk/src/modules/gametypes/CMakeLists.txt (copied)
	* code/trunk/src/modules/gametypes/GametypesPrecompiledHeaders.h (copied)
	* code/trunk/src/modules/gametypes/GametypesPrereqs.h (copied)
	* code/trunk/src/modules/gametypes/RaceCheckPoint.cc (copied)
	* code/trunk/src/modules/gametypes/RaceCheckPoint.h (copied)
	* code/trunk/src/modules/gametypes/SpaceRace.cc (copied)
	* code/trunk/src/modules/gametypes/SpaceRace.h (copied)
	* code/trunk/src/modules/notifications/CMakeLists.txt (modified)
	* code/trunk/src/modules/notifications/Notification.cc (deleted)
	* code/trunk/src/modules/notifications/Notification.h (deleted)
	* code/trunk/src/modules/notifications/NotificationDispatcher.cc (modified)
	* code/trunk/src/modules/notifications/NotificationManager.cc (modified)
	* code/trunk/src/modules/notifications/NotificationManager.h (modified)
	* code/trunk/src/modules/notifications/NotificationQueue.cc (modified)
	* code/trunk/src/modules/notifications/NotificationQueue.h (modified)
	* code/trunk/src/modules/notifications/NotificationQueueCEGUI.cc (copied)
	* code/trunk/src/modules/notifications/NotificationQueueCEGUI.h (copied)
	* code/trunk/src/modules/notifications/dispatchers/SimpleNotification.cc (modified)
	* code/trunk/src/modules/objects/CMakeLists.txt (modified)
	* code/trunk/src/modules/objects/ObjectsPrereqs.h (modified)
	* code/trunk/src/modules/objects/Script.cc (modified)
	* code/trunk/src/modules/objects/SpaceBoundaries.cc (copied)
	* code/trunk/src/modules/objects/SpaceBoundaries.h (copied)
	* code/trunk/src/modules/objects/collisionshapes/BoxCollisionShape.cc (modified)
	* code/trunk/src/modules/objects/collisionshapes/BoxCollisionShape.h (modified)
	* code/trunk/src/modules/objects/collisionshapes/ConeCollisionShape.cc (modified)
	* code/trunk/src/modules/objects/collisionshapes/ConeCollisionShape.h (modified)
	* code/trunk/src/modules/objects/collisionshapes/PlaneCollisionShape.cc (modified)
	* code/trunk/src/modules/objects/collisionshapes/PlaneCollisionShape.h (modified)
	* code/trunk/src/modules/objects/collisionshapes/SphereCollisionShape.cc (modified)
	* code/trunk/src/modules/objects/collisionshapes/SphereCollisionShape.h (modified)
	* code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.cc (modified)
	* code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.h (modified)
	* code/trunk/src/modules/objects/triggers/DistanceTrigger.cc (modified)
	* code/trunk/src/modules/objects/triggers/DistanceTrigger.h (modified)
	* code/trunk/src/modules/objects/triggers/EventTrigger.h (modified)
	* code/trunk/src/modules/objects/triggers/MultiTrigger.cc (modified)
	* code/trunk/src/modules/objects/triggers/MultiTriggerContainer.cc (modified)
	* code/trunk/src/modules/objects/triggers/Trigger.cc (modified)
	* code/trunk/src/modules/objects/triggers/TriggerBase.cc (modified)
	* code/trunk/src/modules/objects/triggers/TriggerBase.h (modified)
	* code/trunk/src/modules/overlays/OverlaysPrereqs.h (modified)
	* code/trunk/src/modules/overlays/hud/CMakeLists.txt (modified)
	* code/trunk/src/modules/overlays/hud/GametypeStatus.cc (deleted)
	* code/trunk/src/modules/overlays/hud/GametypeStatus.h (deleted)
	* code/trunk/src/modules/overlays/hud/HUDBar.cc (modified)
	* code/trunk/src/modules/overlays/hud/HUDBar.h (modified)
	* code/trunk/src/modules/overlays/hud/HUDBoostBar.cc (copied)
	* code/trunk/src/modules/overlays/hud/HUDBoostBar.h (copied)
	* code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified)
	* code/trunk/src/modules/overlays/hud/HUDSpeedBar.cc (modified)
	* code/trunk/src/modules/pickup/PickupManager.h (modified)
	* code/trunk/src/modules/pickup/PickupPrereqs.h (modified)
	* code/trunk/src/modules/pickup/PickupRepresentation.cc (modified)
	* code/trunk/src/modules/pickup/items/CMakeLists.txt (modified)
	* code/trunk/src/modules/pickup/items/ShrinkPickup.cc (copied)
	* code/trunk/src/modules/pickup/items/ShrinkPickup.h (copied)
	* code/trunk/src/modules/pong/PongBat.h (modified)
	* code/trunk/src/modules/portals/CMakeLists.txt (modified)
	* code/trunk/src/modules/portals/PortalEndPoint.cc (modified)
	* code/trunk/src/modules/portals/PortalEndPoint.h (modified)
	* code/trunk/src/modules/portals/PortalLink.cc (modified)
	* code/trunk/src/modules/portals/PortalLink.h (modified)
	* code/trunk/src/modules/portals/PortalsPrecompiledHeaders.h (modified)
	* code/trunk/src/modules/portals/PortalsPrereqs.h (modified)
	* code/trunk/src/modules/questsystem/QuestDescription.cc (modified)
	* code/trunk/src/modules/questsystem/QuestEffectBeacon.cc (modified)
	* code/trunk/src/modules/questsystem/QuestManager.cc (modified)
	* code/trunk/src/modules/questsystem/QuestManager.h (modified)
	* code/trunk/src/modules/tetris (copied)
	* code/trunk/src/modules/tetris/CMakeLists.txt (copied)
	* code/trunk/src/modules/tetris/Tetris.cc (copied)
	* code/trunk/src/modules/tetris/Tetris.h (copied)
	* code/trunk/src/modules/tetris/TetrisCenterpoint.cc (copied)
	* code/trunk/src/modules/tetris/TetrisCenterpoint.h (copied)
	* code/trunk/src/modules/tetris/TetrisPrereqs.h (copied)
	* code/trunk/src/modules/tetris/TetrisStone.cc (copied)
	* code/trunk/src/modules/tetris/TetrisStone.h (copied)
	* code/trunk/src/modules/weapons/projectiles/BasicProjectile.cc (copied)
	* code/trunk/src/modules/weapons/projectiles/BasicProjectile.h (copied)
	* code/trunk/src/modules/weapons/projectiles/CMakeLists.txt (modified)
	* code/trunk/src/modules/weapons/projectiles/Projectile.cc (modified)
	* code/trunk/src/modules/weapons/projectiles/Projectile.h (modified)
	* code/trunk/src/modules/weapons/projectiles/Rocket.cc (modified)
	* code/trunk/src/modules/weapons/projectiles/Rocket.h (modified)
	* code/trunk/src/modules/weapons/projectiles/SimpleRocket.cc (modified)
	* code/trunk/src/modules/weapons/projectiles/SimpleRocket.h (modified)
	* code/trunk/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified)
	* code/trunk/src/modules/weapons/weaponmodes/FusionFire.cc (modified)
	* code/trunk/src/modules/weapons/weaponmodes/HsW01.cc (modified)
	* code/trunk/src/modules/weapons/weaponmodes/LaserFire.cc (modified)
	* code/trunk/src/modules/weapons/weaponmodes/LightningGun.cc (modified)
	* code/trunk/src/modules/weapons/weaponmodes/RocketFire.cc (modified)
	* code/trunk/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified)
	* code/trunk/src/orxonox/LevelManager.cc (modified)
	* code/trunk/src/orxonox/MoodManager.cc (modified)
	* code/trunk/src/orxonox/MoodManager.h (modified)
	* code/trunk/src/orxonox/collisionshapes/CollisionShape.cc (modified)
	* code/trunk/src/orxonox/collisionshapes/CollisionShape.h (modified)
	* code/trunk/src/orxonox/collisionshapes/CompoundCollisionShape.cc (modified)
	* code/trunk/src/orxonox/collisionshapes/CompoundCollisionShape.h (modified)
	* code/trunk/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc (modified)
	* code/trunk/src/orxonox/controllers/ArtificialController.cc (modified)
	* code/trunk/src/orxonox/controllers/ArtificialController.h (modified)
	* code/trunk/src/orxonox/controllers/Controller.h (modified)
	* code/trunk/src/orxonox/controllers/HumanController.cc (modified)
	* code/trunk/src/orxonox/controllers/HumanController.h (modified)
	* code/trunk/src/orxonox/gamestates/GSRoot.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSRoot.h (modified)
	* code/trunk/src/orxonox/gametypes/Dynamicmatch.cc (modified)
	* code/trunk/src/orxonox/gametypes/Dynamicmatch.h (modified)
	* code/trunk/src/orxonox/gametypes/Gametype.cc (modified)
	* code/trunk/src/orxonox/gametypes/Gametype.h (modified)
	* code/trunk/src/orxonox/gametypes/LastTeamStanding.cc (modified)
	* code/trunk/src/orxonox/graphics/Billboard.cc (modified)
	* code/trunk/src/orxonox/graphics/Billboard.h (modified)
	* code/trunk/src/orxonox/graphics/Camera.cc (modified)
	* code/trunk/src/orxonox/graphics/Camera.h (modified)
	* code/trunk/src/orxonox/infos/GametypeInfo.cc (modified)
	* code/trunk/src/orxonox/infos/GametypeInfo.h (modified)
	* code/trunk/src/orxonox/infos/PlayerInfo.cc (modified)
	* code/trunk/src/orxonox/infos/PlayerInfo.h (modified)
	* code/trunk/src/orxonox/interfaces/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/interfaces/InterfaceCompilation.cc (modified)
	* code/trunk/src/orxonox/interfaces/NotificationListener.cc (copied)
	* code/trunk/src/orxonox/interfaces/NotificationListener.h (modified)
	* code/trunk/src/orxonox/interfaces/PlayerTrigger.h (modified)
	* code/trunk/src/orxonox/items/Engine.cc (modified)
	* code/trunk/src/orxonox/items/Engine.h (modified)
	* code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc (modified)
	* code/trunk/src/orxonox/overlays/OrxonoxOverlay.h (modified)
	* code/trunk/src/orxonox/sound/AmbientSound.cc (modified)
	* code/trunk/src/orxonox/weaponsystem/Munition.cc (modified)
	* code/trunk/src/orxonox/weaponsystem/WeaponMode.cc (modified)
	* code/trunk/src/orxonox/weaponsystem/WeaponMode.h (modified)
	* code/trunk/src/orxonox/weaponsystem/WeaponSlot.cc (modified)
	* code/trunk/src/orxonox/worldentities/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/worldentities/CameraPosition.cc (modified)
	* code/trunk/src/orxonox/worldentities/ControllableEntity.cc (modified)
	* code/trunk/src/orxonox/worldentities/ControllableEntity.h (modified)
	* code/trunk/src/orxonox/worldentities/MobileEntity.cc (modified)
	* code/trunk/src/orxonox/worldentities/MobileEntity.h (modified)
	* code/trunk/src/orxonox/worldentities/SpaceBoundaries.cc (deleted)
	* code/trunk/src/orxonox/worldentities/SpaceBoundaries.h (deleted)
	* code/trunk/src/orxonox/worldentities/SpawnPoint.cc (modified)
	* code/trunk/src/orxonox/worldentities/WorldEntity.cc (modified)
	* code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified)
	* code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc (modified)
	* code/trunk/src/orxonox/worldentities/pawns/SpaceShip.h (modified)

	Merging presentation branch back into trunk.
	There are many new ...


Sun, 17 Oct 2010 20:50:43 GMT dafrick [7552]
	* code/trunk/doc/api/Groups.dox (modified)
	* code/trunk/src/modules/notifications/Notification.h (modified)
	* code/trunk/src/modules/notifications/NotificationDispatcher.cc (modified)
	* code/trunk/src/modules/notifications/NotificationDispatcher.h (modified)
	* code/trunk/src/modules/notifications/NotificationManager.cc (modified)
	* code/trunk/src/modules/notifications/NotificationManager.h (modified)
	* code/trunk/src/modules/notifications/NotificationQueue.h (modified)
	* code/trunk/src/modules/notifications/dispatchers/CommandNotification.h (modified)
	* code/trunk/src/modules/notifications/dispatchers/SimpleNotification.h (modified)
	* code/trunk/src/modules/questsystem/GlobalQuest.cc (modified)
	* code/trunk/src/modules/questsystem/GlobalQuest.h (modified)
	* code/trunk/src/modules/questsystem/LocalQuest.cc (modified)
	* code/trunk/src/modules/questsystem/LocalQuest.h (modified)
	* code/trunk/src/modules/questsystem/Quest.cc (modified)
	* code/trunk/src/modules/questsystem/Quest.h (modified)
	* code/trunk/src/modules/questsystem/QuestDescription.h (modified)
	* code/trunk/src/modules/questsystem/QuestEffect.h (modified)
	* code/trunk/src/modules/questsystem/QuestEffectBeacon.cc (modified)
	* code/trunk/src/modules/questsystem/QuestEffectBeacon.h (modified)
	* code/trunk/src/modules/questsystem/QuestHint.cc (modified)
	* code/trunk/src/modules/questsystem/QuestHint.h (modified)
	* code/trunk/src/modules/questsystem/QuestItem.h (modified)
	* code/trunk/src/modules/questsystem/QuestListener.h (modified)
	* code/trunk/src/modules/questsystem/QuestManager.cc (modified)
	* code/trunk/src/modules/questsystem/QuestManager.h (modified)
	* code/trunk/src/modules/questsystem/effects/AddQuest.cc (modified)
	* code/trunk/src/modules/questsystem/effects/AddQuest.h (modified)
	* code/trunk/src/modules/questsystem/effects/AddQuestHint.cc (modified)
	* code/trunk/src/modules/questsystem/effects/AddQuestHint.h (modified)
	* code/trunk/src/modules/questsystem/effects/AddReward.h (modified)
	* code/trunk/src/modules/questsystem/effects/ChangeQuestStatus.h (modified)
	* code/trunk/src/modules/questsystem/effects/CompleteQuest.cc (modified)
	* code/trunk/src/modules/questsystem/effects/CompleteQuest.h (modified)
	* code/trunk/src/modules/questsystem/effects/FailQuest.cc (modified)
	* code/trunk/src/modules/questsystem/effects/FailQuest.h (modified)
	* code/trunk/src/orxonox/interfaces/NotificationListener.h (modified)
	* code/trunk/src/orxonox/interfaces/PickupCarrier.h (modified)
	* code/trunk/src/orxonox/interfaces/Pickupable.h (modified)
	* code/trunk/src/orxonox/items/Engine.h (modified)

	Resolving some TODOs and doing some additional cleanup. Almost done ...


Fri, 24 Sep 2010 14:01:04 GMT dafrick [7489]
	* code/trunk/doc/api/Groups.dox (modified)
	* code/trunk/src/modules/notifications/Notification.cc (modified)
	* code/trunk/src/modules/notifications/Notification.h (modified)
	* code/trunk/src/modules/notifications/NotificationDispatcher.cc (modified)
	* code/trunk/src/modules/notifications/NotificationManager.cc (modified)
	* code/trunk/src/modules/notifications/NotificationManager.h (modified)
	* code/trunk/src/modules/notifications/NotificationQueue.cc (modified)
	* code/trunk/src/modules/notifications/NotificationQueue.h (modified)
	* code/trunk/src/modules/notifications/dispatchers/CommandNotification.cc (modified)
	* code/trunk/src/modules/notifications/dispatchers/CommandNotification.h (modified)
	* code/trunk/src/modules/questsystem/QuestEffectBeacon.h (modified)

	Mostly more documentation.


Fri, 24 Sep 2010 10:01:57 GMT dafrick [7488]
	* code/trunk/doc/api/Groups.dox (modified)
	* code/trunk/src/modules/notifications/Notification.cc (modified)
	* code/trunk/src/modules/notifications/Notification.h (modified)
	* code/trunk/src/modules/notifications/NotificationDispatcher.cc (modified)
	* code/trunk/src/modules/notifications/NotificationDispatcher.h (modified)
	* code/trunk/src/modules/notifications/NotificationManager.cc (modified)
	* code/trunk/src/modules/notifications/NotificationQueue.cc (modified)
	* code/trunk/src/modules/notifications/NotificationQueue.h (modified)
	* code/trunk/src/modules/notifications/dispatchers/CommandNotification.h (modified)
	* code/trunk/src/modules/notifications/dispatchers/SimpleNotification.h (modified)

	Some more documentation.
	Making NotificationManager Root scope, ...


Thu, 23 Sep 2010 11:00:42 GMT dafrick [7484]
	* code/trunk/doc/api/Groups.dox (modified)
	* code/trunk/src/modules/notifications/Notification.cc (modified)
	* code/trunk/src/modules/notifications/Notification.h (modified)
	* code/trunk/src/modules/notifications/NotificationDispatcher.cc (modified)
	* code/trunk/src/modules/notifications/NotificationDispatcher.h (modified)
	* code/trunk/src/modules/notifications/NotificationManager.cc (modified)
	* code/trunk/src/modules/notifications/NotificationManager.h (modified)
	* code/trunk/src/modules/notifications/NotificationQueue.cc (modified)
	* code/trunk/src/modules/notifications/NotificationQueue.h (modified)
	* code/trunk/src/modules/notifications/dispatchers/CommandNotification.cc (modified)
	* code/trunk/src/modules/notifications/dispatchers/CommandNotification.h (modified)
	* code/trunk/src/modules/notifications/dispatchers/SimpleNotification.h (modified)
	* code/trunk/src/modules/objects/Script.h (modified)
	* code/trunk/src/modules/questsystem/QuestEffectBeacon.cc (modified)
	* code/trunk/src/modules/questsystem/QuestManager.h (modified)
	* code/trunk/src/orxonox/interfaces/NotificationListener.h (modified)

	Doing some documentation.


Tue, 21 Sep 2010 21:15:44 GMT dafrick [7474]
	* code/trunk/data/levels/notifications.oxw (modified)
	* code/trunk/src/modules/notifications/Notification.cc (modified)
	* code/trunk/src/modules/notifications/Notification.h (modified)
	* code/trunk/src/modules/notifications/NotificationDispatcher.cc (modified)
	* code/trunk/src/modules/notifications/NotificationDispatcher.h (modified)
	* code/trunk/src/modules/notifications/NotificationManager.cc (modified)
	* code/trunk/src/modules/notifications/NotificationManager.h (modified)
	* code/trunk/src/modules/notifications/dispatchers/CommandNotification.cc (modified)
	* code/trunk/src/modules/notifications/dispatchers/CommandNotification.h (modified)
	* code/trunk/src/modules/notifications/dispatchers/SimpleNotification.cc (modified)
	* code/trunk/src/modules/objects/Script.cc (modified)
	* code/trunk/src/modules/objects/Script.h (modified)
	* code/trunk/src/modules/questsystem/CMakeLists.txt (modified)
	* code/trunk/src/modules/questsystem/QuestDescription.cc (modified)
	* code/trunk/src/modules/questsystem/QuestDescription.h (modified)
	* code/trunk/src/modules/questsystem/QuestNotification.cc (deleted)
	* code/trunk/src/modules/questsystem/QuestNotification.h (deleted)
	* code/trunk/src/modules/questsystem/QuestsystemPrereqs.h (modified)
	* code/trunk/src/orxonox/PlayerManager.cc (modified)

	Synchronizing Notifications.
	In the course of that, notifications ...


Wed, 15 Sep 2010 17:29:16 GMT dafrick [7456]
	* code/trunk/data/gui/scripts/QuestGUI.lua (modified)
	* code/trunk/doc/api/Groups.dox (modified)
	* code/trunk/doc/api/images/questsystem.png (added)
	* code/trunk/src/modules/notifications/Notification.cc (modified)
	* code/trunk/src/modules/notifications/Notification.h (modified)
	* code/trunk/src/modules/notifications/NotificationDispatcher.cc (modified)
	* code/trunk/src/modules/notifications/NotificationDispatcher.h (modified)
	* code/trunk/src/modules/notifications/NotificationManager.h (modified)
	* code/trunk/src/modules/notifications/NotificationQueue.h (modified)
	* code/trunk/src/modules/notifications/dispatchers/CommandNotification.cc (modified)
	* code/trunk/src/modules/notifications/dispatchers/CommandNotification.h (modified)
	* code/trunk/src/modules/notifications/dispatchers/SimpleNotification.cc (modified)
	* code/trunk/src/modules/notifications/dispatchers/SimpleNotification.h (modified)
	* code/trunk/src/modules/pickup/CollectiblePickup.h (modified)
	* code/trunk/src/modules/pickup/DroppedPickup.h (modified)
	* code/trunk/src/modules/pickup/Pickup.h (modified)
	* code/trunk/src/modules/pickup/PickupCollection.h (modified)
	* code/trunk/src/modules/pickup/PickupCollectionIdentifier.h (modified)
	* code/trunk/src/modules/pickup/PickupManager.h (modified)
	* code/trunk/src/modules/pickup/PickupRepresentation.h (modified)
	* code/trunk/src/modules/pickup/PickupSpawner.h (modified)
	* code/trunk/src/modules/pickup/items/DronePickup.h (modified)
	* code/trunk/src/modules/pickup/items/HealthPickup.h (modified)
	* code/trunk/src/modules/pickup/items/InvisiblePickup.h (modified)
	* code/trunk/src/modules/pickup/items/MetaPickup.h (modified)
	* code/trunk/src/modules/pickup/items/ShieldPickup.h (modified)
	* code/trunk/src/modules/pickup/items/SpeedPickup.h (modified)
	* code/trunk/src/modules/questsystem/GlobalQuest.cc (modified)
	* code/trunk/src/modules/questsystem/GlobalQuest.h (modified)
	* code/trunk/src/modules/questsystem/LocalQuest.cc (modified)
	* code/trunk/src/modules/questsystem/LocalQuest.h (modified)
	* code/trunk/src/modules/questsystem/Quest.cc (modified)
	* code/trunk/src/modules/questsystem/Quest.h (modified)
	* code/trunk/src/modules/questsystem/QuestDescription.cc (modified)
	* code/trunk/src/modules/questsystem/QuestDescription.h (modified)
	* code/trunk/src/modules/questsystem/QuestEffect.cc (modified)
	* code/trunk/src/modules/questsystem/QuestEffect.h (modified)
	* code/trunk/src/modules/questsystem/QuestEffectBeacon.cc (modified)
	* code/trunk/src/modules/questsystem/QuestEffectBeacon.h (modified)
	* code/trunk/src/modules/questsystem/QuestHint.cc (modified)
	* code/trunk/src/modules/questsystem/QuestHint.h (modified)
	* code/trunk/src/modules/questsystem/QuestItem.cc (modified)
	* code/trunk/src/modules/questsystem/QuestItem.h (modified)
	* code/trunk/src/modules/questsystem/QuestListener.cc (modified)
	* code/trunk/src/modules/questsystem/QuestListener.h (modified)
	* code/trunk/src/modules/questsystem/QuestManager.cc (modified)
	* code/trunk/src/modules/questsystem/QuestManager.h (modified)
	* code/trunk/src/modules/questsystem/QuestNotification.cc (modified)
	* code/trunk/src/modules/questsystem/QuestNotification.h (modified)
	* code/trunk/src/modules/questsystem/effects/AddQuest.cc (modified)
	* code/trunk/src/modules/questsystem/effects/AddQuest.h (modified)
	* code/trunk/src/modules/questsystem/effects/AddQuestHint.cc (modified)
	* code/trunk/src/modules/questsystem/effects/AddQuestHint.h (modified)
	* code/trunk/src/modules/questsystem/effects/AddReward.cc (modified)
	* code/trunk/src/modules/questsystem/effects/AddReward.h (modified)
	* code/trunk/src/modules/questsystem/effects/ChangeQuestStatus.cc (modified)
	* code/trunk/src/modules/questsystem/effects/ChangeQuestStatus.h (modified)
	* code/trunk/src/modules/questsystem/effects/CompleteQuest.cc (modified)
	* code/trunk/src/modules/questsystem/effects/CompleteQuest.h (modified)
	* code/trunk/src/modules/questsystem/effects/FailQuest.cc (modified)
	* code/trunk/src/modules/questsystem/effects/FailQuest.h (modified)
	* code/trunk/src/orxonox/interfaces/PickupCarrier.h (modified)
	* code/trunk/src/orxonox/interfaces/Pickupable.h (modified)
	* code/trunk/src/orxonox/pickup/PickupIdentifier.h (modified)

	Reviewing documentation fo Questsystem, moving documentation fully ...


Sat, 11 Sep 2010 08:20:44 GMT dafrick [7403]
	* code/trunk (modified)
	* code/trunk/data/gui/layouts/NotificationLayer.layout (copied)
	* code/trunk/data/gui/scripts/GUISheet.lua (modified)
	* code/trunk/data/gui/scripts/KeyBindMenu.lua (modified)
	* code/trunk/data/gui/scripts/MiscConfigMenu.lua (modified)
	* code/trunk/data/gui/scripts/NotificationLayer.lua (copied)
	* code/trunk/data/gui/scripts/SheetManager.lua (modified)
	* code/trunk/data/levels/Fight in our Back.oxw (modified)
	* code/trunk/data/levels/Quest_PirateAttack.oxw (modified)
	* code/trunk/data/levels/old/princessaeryn.oxw (modified)
	* code/trunk/data/levels/old/questsystem.oxw (modified)
	* code/trunk/data/levels/princessaeryn.oxw (modified)
	* code/trunk/data/levels/tutorial.oxw (modified)
	* code/trunk/src/libraries/core/GUIManager.cc (modified)
	* code/trunk/src/libraries/core/GUIManager.h (modified)
	* code/trunk/src/modules/notifications/CMakeLists.txt (modified)
	* code/trunk/src/modules/notifications/Notification.cc (modified)
	* code/trunk/src/modules/notifications/Notification.h (modified)
	* code/trunk/src/modules/notifications/NotificationDispatcher.cc (modified)
	* code/trunk/src/modules/notifications/NotificationDispatcher.h (modified)
	* code/trunk/src/modules/notifications/NotificationManager.cc (modified)
	* code/trunk/src/modules/notifications/NotificationManager.h (modified)
	* code/trunk/src/modules/notifications/NotificationOverlay.cc (deleted)
	* code/trunk/src/modules/notifications/NotificationOverlay.h (deleted)
	* code/trunk/src/modules/notifications/NotificationQueue.cc (modified)
	* code/trunk/src/modules/notifications/NotificationQueue.h (modified)
	* code/trunk/src/modules/notifications/NotificationsPrereqs.h (modified)
	* code/trunk/src/modules/notifications/dispatchers/CommandNotification.cc (modified)
	* code/trunk/src/modules/notifications/dispatchers/CommandNotification.h (modified)
	* code/trunk/src/modules/objects/triggers/MultiTriggerContainer.cc (modified)
	* code/trunk/src/modules/objects/triggers/MultiTriggerContainer.h (modified)
	* code/trunk/src/modules/questsystem/Quest.cc (modified)
	* code/trunk/src/modules/questsystem/QuestDescription.cc (modified)
	* code/trunk/src/modules/questsystem/QuestDescription.h (modified)
	* code/trunk/src/modules/questsystem/QuestHint.cc (modified)
	* code/trunk/src/modules/questsystem/QuestNotification.cc (modified)
	* code/trunk/src/modules/questsystem/QuestNotification.h (modified)
	* code/trunk/src/orxonox/interfaces/NotificationListener.h (modified)

	Merged notifications branch back to trunk.


Tue, 31 Aug 2010 01:51:37 GMT landauf [7285]
	* code/trunk/cmake/tools/FindPOCO.cmake (modified)
	* code/trunk/data/levels/includes/weaponsettings_swallow.oxi (modified)
	* code/trunk/data/levels/templates/spaceship_swallow.oxt (modified)
	* code/trunk/data/levels/test_swallow.oxw (modified)
	* code/trunk/src/modules/notifications/NotificationDispatcher.cc (modified)
	* code/trunk/src/modules/notifications/NotificationDispatcher.h (modified)
	* code/trunk/src/modules/notifications/NotificationsPrecompiledHeaders.h (modified)
	* code/trunk/src/modules/notifications/NotificationsPrereqs.h (modified)
	* code/trunk/src/modules/notifications/dispatchers/CMakeLists.txt (modified)
	* code/trunk/src/modules/notifications/dispatchers/CommandNotification.cc (modified)
	* code/trunk/src/modules/notifications/dispatchers/CommandNotification.h (modified)
	* code/trunk/src/modules/notifications/dispatchers/SimpleNotification.cc (modified)
	* code/trunk/src/modules/notifications/dispatchers/SimpleNotification.h (modified)
	* code/trunk/src/modules/pickup/CollectiblePickup.cc (modified)
	* code/trunk/src/modules/pickup/CollectiblePickup.h (modified)

	added eol-style native for some files.

	note: there are another 6 ...


Tue, 24 Aug 2010 12:26:39 GMT dafrick [7210]
	* code/trunk/data/levels/tutorial.oxw (modified)
	* code/trunk/src/modules/notifications/NotificationsPrereqs.h (modified)
	* code/trunk/src/modules/notifications/dispatchers/CMakeLists.txt (modified)
	* code/trunk/src/modules/notifications/dispatchers/CommandNotification.h (modified)
	* code/trunk/src/modules/notifications/dispatchers/SimpleNotification.cc (added)
	* code/trunk/src/modules/notifications/dispatchers/SimpleNotification.h (added)

	Created new NotificationDispatcher. It just displays, upon being ...


Fri, 20 Aug 2010 19:55:50 GMT dafrick [7193]
	* code/trunk/data/levels/tutorial.oxw (modified)
	* code/trunk/src/modules/notifications/CMakeLists.txt (modified)
	* code/trunk/src/modules/notifications/Notification.cc (modified)
	* code/trunk/src/modules/notifications/NotificationDispatcher.cc (added)
	* code/trunk/src/modules/notifications/NotificationDispatcher.h (added)
	* code/trunk/src/modules/notifications/NotificationsPrereqs.h (modified)
	* code/trunk/src/modules/notifications/dispatchers (added)
	* code/trunk/src/modules/notifications/dispatchers/CMakeLists.txt (added)
	* code/trunk/src/modules/notifications/dispatchers/CommandNotification.cc (added)
	* code/trunk/src/modules/notifications/dispatchers/CommandNotification.h (added)

	Added NotificationDispatcher, class that can, upon being triggered, ...