#
# ChangeLog for code
#
# Generated by Trac 1.0.9
# Nov 19, 2024, 12:03:07 AM

Mon, 19 Oct 2015 13:59:23 GMT meierman [10668]
	* code/branches/hoverHS15/data/levels/Hover.oxw (modified)

	update levelfile


Mon, 19 Oct 2015 13:47:08 GMT bhatiab [10667]
	* code/branches/campaignHS15/data/levels/Campaign1.oxw (modified)

	Added Waypoints for Transporter - Coordinates for A, B and the ...


Mon, 19 Oct 2015 13:26:21 GMT bhatiab [10666]
	* code/branches/campaignHS15/data/levels/Campaign1.oxw (modified)

	Added General Level-structure.


Mon, 19 Oct 2015 13:17:40 GMT bucyril [10665]
	* code/branches/hoverHS15/src/modules/hover/HoverShip.h (modified)




Mon, 19 Oct 2015 13:15:11 GMT meierman [10664]
	* code/branches/hoverHS15/data/levels/Hover.oxw (modified)
	* code/branches/hoverHS15/src/modules/hover/Hover.cc (modified)
	* code/branches/hoverHS15/src/modules/hover/Hover.h (modified)
	* code/branches/hoverHS15/src/modules/hover/HoverPrereqs.h (modified)
	* code/branches/hoverHS15/src/modules/hover/HoverShip.cc (modified)

	First (emptz) functioning version


Mon, 19 Oct 2015 13:08:34 GMT paulsc [10663]
	* code/branches/campaignHS15/data/levels/Campaign1.oxw (modified)

	Added quest structure, spawn trigger and comment sections


Mon, 19 Oct 2015 13:06:53 GMT bucyril [10662]
	* code/branches/hoverHS15/src/modules/hover/HoverShip.h (modified)

	M    src/modules/hover/HoverShip.h


Mon, 19 Oct 2015 12:53:51 GMT bucyril [10661]
	* code/branches/hoverHS15/src/modules/hover/HoverShip.cc (modified)
	* code/branches/hoverHS15/src/modules/hover/HoverShip.h (modified)

	Removed custom code

	M    hover/HoverShip.cc
	M    hover/HoverShip.h


Mon, 19 Oct 2015 12:51:49 GMT meierman [10660]
	* code/branches/hoverHS15/data/levels/Hover.oxw (added)
	* code/branches/hoverHS15/src/modules/hover/Hover.cc (modified)
	* code/branches/hoverHS15/src/modules/hover/Hover.h (modified)

	new level file


Mon, 19 Oct 2015 12:40:08 GMT bucyril [10659]
	* code/branches/hoverHS15/src/modules/hover/Hover.cc (modified)
	* code/branches/hoverHS15/src/modules/hover/Hover.h (modified)
	* code/branches/hoverHS15/src/modules/hover/HoverPrereqs.h (added)
	* code/branches/hoverHS15/src/modules/hover/HoverShip.cc (modified)
	* code/branches/hoverHS15/src/modules/hover/HoverShip.h (modified)

	1234

	M    hover/Hover.cc
	M    hover/Hover.h
	M    ...


Mon, 19 Oct 2015 12:32:32 GMT meierman [10658]
	* code/branches/hoverHS15/src/modules/hover/CMakeLists.txt (added)
	* code/branches/hoverHS15/src/modules/hover/Hover.cc (added)
	* code/branches/hoverHS15/src/modules/hover/Hover.h (added)

	new basic files added to Hover


Mon, 19 Oct 2015 12:22:28 GMT bucyril [10657]
	* code/branches/hoverHS15/src/modules/hover/HoverShip.cc (added)
	* code/branches/hoverHS15/src/modules/hover/HoverShip.h (added)

	Copied files from another module

	A    hover/HoverShip.cc
	A    ...


Mon, 19 Oct 2015 12:03:58 GMT meierman [10656]
	* code/branches/hoverHS15/src/modules/CMakeLists.txt (modified)
	* code/branches/hoverHS15/src/modules/hover (added)

	new folder for minigame hover


Sun, 18 Oct 2015 18:57:24 GMT gania [10655]
	* code/branches/AI_HS15/data/levels/AITest.oxw (added)




Sun, 18 Oct 2015 18:53:37 GMT gania [10654]
	* code/branches/AI_HS15/src/orxonox/controllers/AIController.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/AIController.h (modified)

	changed AIController -> collecting data about spaceships with each ...


Fri, 16 Oct 2015 13:25:17 GMT gania [10652]
	* code/branches/AI_HS15/src/orxonox/controllers/AIController.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/ArtificialController.h (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/FormationController.cc (modified)

	deleted old behaviour of AIController (partly), forced ships to form ...


Tue, 13 Oct 2015 16:11:01 GMT gania [10651]
	* code/branches/AI_HS15/src/orxonox/controllers/AIController.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/ArtificialController.h (modified)

	Old AIController default behaviour is commented out


Mon, 12 Oct 2015 20:57:00 GMT fvultier [10650]
	* code/trunk/data/levels/includes/weaponSettingsRing.oxi (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/WeaponSet.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/pawns/Pawn.cc (modified)

	There is now a spaceship that uses the gravity bomb. Minor ...


Mon, 12 Oct 2015 16:40:48 GMT paulsc [10649]
	* code/branches/campaignHS15/data/levels/Campaign1.oxw (modified)

	Added waypoint-transporter and music


Mon, 12 Oct 2015 16:28:15 GMT fvultier [10648]
	* code/trunk/data/levels/includes/weaponSettingsAssff.oxi (modified)
	* code/trunk/data/levels/includes/weaponSettingsAssff2.oxi (modified)
	* code/trunk/src/orxonox/weaponsystem/WeaponSlot.cc (modified)
	* code/trunk/src/orxonox/weaponsystem/WeaponSlot.h (modified)

	Removed EnergyDrink Weapon from SpaceshipASSFF. Improved ...


Mon, 12 Oct 2015 13:16:36 GMT hzuellig [10647]
	* code/branches/planetLevelHS15/test.txt (deleted)
	* code/branches/planetLevelHS15/text.txt (deleted)

	deleted


Mon, 12 Oct 2015 13:15:28 GMT hzuellig [10646]
	* code/branches/planetLevelHS15/test.txt (added)
	* code/branches/planetLevelHS15/text.txt (added)

	test&textfiles


Mon, 12 Oct 2015 13:14:46 GMT bhatiab [10645]
	* code/branches/campaignHS15/data/levels/Campaign1.oxw (modified)

	Added Transporter to level...


Mon, 12 Oct 2015 13:06:36 GMT fvultier [10644]
	* code/branches/particleEffectsHS15 (copied)

	New branch for PPS


Mon, 12 Oct 2015 12:31:56 GMT gstalder [10643]
	* code/branches/hoverHS15/README (modified)

	testphase


Mon, 12 Oct 2015 12:27:16 GMT paulsc [10642]
	* code/branches/campaignHS15/data/levels/Campaign1.oxw (added)

	First campaing level added


Mon, 12 Oct 2015 12:22:30 GMT fvultier [10641]
	* code/branches/explosionChunksHS15 (copied)

	New branch for PPS


Mon, 12 Oct 2015 12:22:02 GMT fvultier [10640]
	* code/branches/AI_HS15 (copied)

	New branch for PPS


Mon, 12 Oct 2015 12:20:29 GMT fvultier [10639]
	* code/branches/campaignHS15 (copied)

	New branch for PPS


Mon, 12 Oct 2015 12:20:15 GMT meierman [10638]
	* code/branches/hoverHS15/README (modified)

	fuck


Mon, 12 Oct 2015 12:19:33 GMT fvultier [10637]
	* code/branches/planetLevelHS15 (copied)

	New branch for PPS


Mon, 12 Oct 2015 12:09:59 GMT gstalder [10636]
	* code/branches/hoverHS15/README (modified)

	schwach


Mon, 12 Oct 2015 12:08:12 GMT meierman [10635]
	* code/branches/hoverHS15/README (modified)

	testerman


Mon, 12 Oct 2015 12:06:27 GMT gstalder [10634]
	* code/branches/hoverHS15/README (modified)

	blabla


Mon, 12 Oct 2015 11:53:57 GMT maxima [10633]
	* code/branches/hoverHS15 (copied)

	New branch for PPS.


Sat, 10 Oct 2015 17:55:21 GMT fvultier [10632]
	* code/trunk/src/modules/jump/JumpPlatform.cc (modified)
	* code/trunk/src/modules/jump/JumpPlatform.h (modified)

	Removed useless code (artifacts from copy-paste) in the Jump
	minigame.


Sat, 10 Oct 2015 16:38:44 GMT landauf [10631]
	* code/trunk/src/orxonox/controllers/ArtificialController.cc (modified)
	* code/trunk/src/orxonox/controllers/FormationController.cc (modified)
	* code/trunk/src/orxonox/controllers/FormationController.h (modified)
	* code/trunk/src/orxonox/controllers/NewHumanController.cc (modified)

	the AI sometimes selected its own ship as target while it was ...


Sat, 10 Oct 2015 16:36:49 GMT landauf [10630]
	* code/trunk/src/libraries/util/Math.cc (modified)

	avoid division by zero errors (happened e.g. if 'myposition' and ...


Sat, 10 Oct 2015 14:34:26 GMT fvultier [10629]
	* code/trunk/data/levels/emptyLevel.oxw (modified)
	* code/trunk/data/levels/includes/weaponSettingsRing.oxi (modified)
	* code/trunk/data/levels/includes/weaponSettingsSwallow.oxi (modified)
	* code/trunk/data/levels/jump.oxw (modified)
	* code/trunk/data/levels/templates/enemytowerdefense.oxt (deleted)
	* code/trunk/data/levels/towerDefense.oxw (modified)
	* code/trunk/src/modules/towerdefense/CMakeLists.txt (modified)
	* code/trunk/src/modules/towerdefense/TDCoordinate.cc (modified)
	* code/trunk/src/modules/towerdefense/TDCoordinate.h (modified)
	* code/trunk/src/modules/towerdefense/TDEnemy.h (deleted)
	* 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 (deleted)
	* code/trunk/src/modules/towerdefense/TowerDefenseController.h (deleted)
	* code/trunk/src/modules/towerdefense/TowerDefenseEnemy.cc (modified)
	* code/trunk/src/modules/towerdefense/TowerDefenseEnemy.h (modified)
	* code/trunk/src/modules/towerdefense/TowerDefenseField.cc (added)
	* code/trunk/src/modules/towerdefense/TowerDefenseField.h (added)
	* code/trunk/src/modules/towerdefense/TowerDefenseHUDController.cc (modified)
	* code/trunk/src/modules/towerdefense/TowerDefenseSelecter.cc (modified)
	* code/trunk/src/modules/towerdefense/TowerDefenseSelecter.h (modified)
	* code/trunk/src/modules/towerdefense/TowerDefenseTower.cc (modified)
	* code/trunk/src/modules/towerdefense/TowerDefenseTower.h (modified)
	* code/trunk/src/modules/weapons/CMakeLists.txt (modified)
	* code/trunk/src/modules/weapons/IceGunFreezer.cc (added)
	* code/trunk/src/modules/weapons/IceGunFreezer.h (added)
	* code/trunk/src/modules/weapons/munitions/CMakeLists.txt (modified)
	* code/trunk/src/modules/weapons/munitions/IceMunition.cc (added)
	* code/trunk/src/modules/weapons/munitions/IceMunition.h (added)
	* code/trunk/src/modules/weapons/munitions/SplitMunition.cc (added)
	* code/trunk/src/modules/weapons/munitions/SplitMunition.h (added)
	* code/trunk/src/modules/weapons/projectiles/BillboardProjectile.cc (modified)
	* code/trunk/src/modules/weapons/projectiles/BillboardProjectile.h (modified)
	* code/trunk/src/modules/weapons/projectiles/CMakeLists.txt (modified)
	* code/trunk/src/modules/weapons/projectiles/IceGunProjectile.cc (added)
	* code/trunk/src/modules/weapons/projectiles/IceGunProjectile.h (added)
	* code/trunk/src/modules/weapons/projectiles/Projectile.cc (modified)
	* code/trunk/src/modules/weapons/projectiles/Projectile.h (modified)
	* code/trunk/src/modules/weapons/projectiles/SplitGunProjectile.cc (added)
	* code/trunk/src/modules/weapons/projectiles/SplitGunProjectile.h (added)
	* code/trunk/src/modules/weapons/weaponmodes/CMakeLists.txt (modified)
	* code/trunk/src/modules/weapons/weaponmodes/IceGun.cc (added)
	* code/trunk/src/modules/weapons/weaponmodes/IceGun.h (added)
	* code/trunk/src/modules/weapons/weaponmodes/SplitGun.cc (added)
	* code/trunk/src/modules/weapons/weaponmodes/SplitGun.h (added)

	Merged towerdefenseFabien branch back to trunk. The towerdefense ...


Sat, 10 Oct 2015 09:40:59 GMT landauf [10628]
	* code/trunk/src/modules/invader/InvaderEnemyShooter.cc (modified)
	* code/trunk/src/modules/towerdefense/TowerDefenseEnemy.cc (modified)

	addendum to r10626 -> pass the collision shape to Pawn::damage


Tue, 06 Oct 2015 19:37:11 GMT fvultier [10627]
	* code/branches/towerdefenseFabien/data/levels/towerDefense.oxw (modified)
	* code/branches/towerdefenseFabien/src/modules/weapons/munitions/CMakeLists.txt (modified)
	* code/branches/towerdefenseFabien/src/modules/weapons/munitions/IceMunition.cc (added)
	* code/branches/towerdefenseFabien/src/modules/weapons/munitions/IceMunition.h (added)
	* code/branches/towerdefenseFabien/src/modules/weapons/munitions/SplitMunition.cc (added)
	* code/branches/towerdefenseFabien/src/modules/weapons/munitions/SplitMunition.h (added)
	* code/branches/towerdefenseFabien/src/modules/weapons/projectiles/SplitGunProjectile.cc (modified)
	* code/branches/towerdefenseFabien/src/modules/weapons/projectiles/SplitGunProjectile.h (modified)
	* code/branches/towerdefenseFabien/src/modules/weapons/weaponmodes/IceGun.cc (modified)
	* code/branches/towerdefenseFabien/src/modules/weapons/weaponmodes/SplitGun.cc (modified)
	* code/branches/towerdefenseFabien/src/modules/weapons/weaponmodes/SplitGun.h (modified)

	Minor improvements. Use of the Munition class.


Mon, 05 Oct 2015 13:34:47 GMT zifloria [10626]
	* code/trunk/src/modules/invader/InvaderEnemyShooter.cc (modified)
	* code/trunk/src/modules/invader/InvaderEnemyShooter.h (modified)
	* code/trunk/src/modules/towerdefense/TowerDefenseEnemy.cc (modified)
	* code/trunk/src/modules/towerdefense/TowerDefenseEnemy.h (modified)

	Fixed more of the same bug. Tower defense was also affected


Mon, 05 Oct 2015 13:28:39 GMT zifloria [10625]
	* code/trunk/src/modules/invader/InvaderEnemy.cc (modified)
	* code/trunk/src/modules/invader/InvaderEnemy.h (modified)

	Fixed OrxonoxArcade. Points are awarded again. The problem was that I ...


Sun, 04 Oct 2015 19:12:21 GMT landauf [10624]
	* code/trunk (modified)
	* code/trunk/CMakeLists.txt (modified)
	* code/trunk/cmake/InstallConfig.cmake (modified)
	* code/trunk/cmake/tools/FindVLD.cmake (modified)
	* code/trunk/cmake/tools/TargetUtilities.cmake (modified)
	* code/trunk/data/levels/4Dtest.oxw (modified)
	* code/trunk/data/levels/DodgeRace.oxw (modified)
	* code/trunk/data/levels/Invaders.oxw (modified)
	* code/trunk/data/levels/Spacerace2.oxw (modified)
	* code/trunk/data/levels/SurfaceRacePresentation.oxw (modified)
	* code/trunk/data/levels/jump.oxw (modified)
	* code/trunk/data/levels/pong.oxw (modified)
	* code/trunk/data/levels/presentationHS12.oxw (modified)
	* code/trunk/data/levels/spaceRace.oxw (modified)
	* code/trunk/data/levels/surfaceRace.oxw (modified)
	* code/trunk/data/levels/tetris.oxw (modified)
	* code/trunk/data/levels/towerDefense.oxw (modified)
	* code/trunk/src/CMakeLists.txt (modified)
	* code/trunk/src/SpecialConfig.h.in (modified)
	* code/trunk/src/libraries/core/ApplicationPaths.cc (copied)
	* code/trunk/src/libraries/core/ApplicationPaths.h (copied)
	* 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/ClassTreeMask.cc (modified)
	* code/trunk/src/libraries/core/ConfigurablePaths.cc (copied)
	* code/trunk/src/libraries/core/ConfigurablePaths.h (copied)
	* code/trunk/src/libraries/core/Core.cc (modified)
	* code/trunk/src/libraries/core/Core.h (modified)
	* code/trunk/src/libraries/core/CoreConfig.cc (copied)
	* code/trunk/src/libraries/core/CoreConfig.h (copied)
	* code/trunk/src/libraries/core/CoreIncludes.h (modified)
	* code/trunk/src/libraries/core/CorePrereqs.h (modified)
	* code/trunk/src/libraries/core/CoreStaticInitializationHandler.cc (copied)
	* code/trunk/src/libraries/core/CoreStaticInitializationHandler.h (copied)
	* code/trunk/src/libraries/core/DynLib.cc (deleted)
	* code/trunk/src/libraries/core/DynLib.h (deleted)
	* code/trunk/src/libraries/core/DynLibManager.cc (deleted)
	* code/trunk/src/libraries/core/DynLibManager.h (deleted)
	* code/trunk/src/libraries/core/GUIManager.cc (modified)
	* code/trunk/src/libraries/core/Game.cc (modified)
	* code/trunk/src/libraries/core/Game.h (modified)
	* code/trunk/src/libraries/core/GameConfig.cc (copied)
	* code/trunk/src/libraries/core/GameConfig.h (copied)
	* code/trunk/src/libraries/core/GraphicsManager.cc (modified)
	* code/trunk/src/libraries/core/GraphicsManager.h (modified)
	* code/trunk/src/libraries/core/Language.cc (modified)
	* code/trunk/src/libraries/core/Language.h (modified)
	* code/trunk/src/libraries/core/Loader.cc (modified)
	* code/trunk/src/libraries/core/Loader.h (modified)
	* code/trunk/src/libraries/core/Namespace.cc (modified)
	* code/trunk/src/libraries/core/PathConfig.cc (deleted)
	* code/trunk/src/libraries/core/PathConfig.h (deleted)
	* code/trunk/src/libraries/core/UpdateListener.cc (copied)
	* code/trunk/src/libraries/core/UpdateListener.h (copied)
	* code/trunk/src/libraries/core/ViewportEventListener.cc (modified)
	* code/trunk/src/libraries/core/WindowEventListener.cc (modified)
	* code/trunk/src/libraries/core/XMLNameListener.cc (modified)
	* code/trunk/src/libraries/core/XMLPort.cc (modified)
	* code/trunk/src/libraries/core/class/Identifiable.cc (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/OrxonoxInterface.cc (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/CMakeLists.txt (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.cc (modified)
	* code/trunk/src/libraries/core/command/ConsoleCommand.h (modified)
	* code/trunk/src/libraries/core/command/ConsoleCommandCompilation.cc (modified)
	* code/trunk/src/libraries/core/command/ConsoleCommandIncludes.cc (copied)
	* code/trunk/src/libraries/core/command/ConsoleCommandIncludes.h (copied)
	* code/trunk/src/libraries/core/command/ConsoleCommandManager.cc (copied)
	* code/trunk/src/libraries/core/command/ConsoleCommandManager.h (copied)
	* code/trunk/src/libraries/core/command/IRC.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/command/TclBind.cc (modified)
	* code/trunk/src/libraries/core/command/TclThreadManager.cc (modified)
	* code/trunk/src/libraries/core/commandline (copied)
	* code/trunk/src/libraries/core/config/CMakeLists.txt (modified)
	* code/trunk/src/libraries/core/config/CommandLineParser.cc (deleted)
	* code/trunk/src/libraries/core/config/CommandLineParser.h (deleted)
	* code/trunk/src/libraries/core/config/ConfigFile.cc (modified)
	* code/trunk/src/libraries/core/config/Configurable.cc (modified)
	* code/trunk/src/libraries/core/config/SettingsConfigFile.cc (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/JoyStickQuantityListener.cc (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/KeyDetector.cc (modified)
	* code/trunk/src/libraries/core/input/Mouse.cc (modified)
	* code/trunk/src/libraries/core/module (copied)
	* code/trunk/src/libraries/core/object/CMakeLists.txt (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/DestroyLaterManager.cc (copied)
	* code/trunk/src/libraries/core/object/DestroyLaterManager.h (copied)
	* code/trunk/src/libraries/core/object/Destroyable.cc (modified)
	* code/trunk/src/libraries/core/object/Destroyable.h (modified)
	* code/trunk/src/libraries/core/object/Iterator.h (modified)
	* code/trunk/src/libraries/core/object/IteratorBase.h (modified)
	* code/trunk/src/libraries/core/object/Listable.cc (modified)
	* code/trunk/src/libraries/core/object/ObjectList.h (modified)
	* code/trunk/src/libraries/core/object/ObjectListIterator.h (modified)
	* code/trunk/src/libraries/core/object/SmartPtr.h (deleted)
	* code/trunk/src/libraries/core/object/StrongPtr.h (copied)
	* code/trunk/src/libraries/core/object/WeakPtr.h (modified)
	* code/trunk/src/libraries/core/singleton (copied)
	* code/trunk/src/libraries/network/CMakeLists.txt (modified)
	* code/trunk/src/libraries/network/Client.cc (modified)
	* code/trunk/src/libraries/network/ClientConnectionListener.cc (modified)
	* code/trunk/src/libraries/network/FunctionCall.cc (modified)
	* code/trunk/src/libraries/network/FunctionCall.h (modified)
	* code/trunk/src/libraries/network/FunctionCallManager.cc (modified)
	* code/trunk/src/libraries/network/FunctionCallManager.h (modified)
	* code/trunk/src/libraries/network/Host.cc (modified)
	* code/trunk/src/libraries/network/LANDiscovery.cc (modified)
	* code/trunk/src/libraries/network/MasterServer.cc (modified)
	* code/trunk/src/libraries/network/NetworkFunction.cc (modified)
	* code/trunk/src/libraries/network/NetworkFunction.h (modified)
	* code/trunk/src/libraries/network/NetworkFunctionIncludes.cc (copied)
	* code/trunk/src/libraries/network/NetworkFunctionIncludes.h (copied)
	* code/trunk/src/libraries/network/NetworkFunctionManager.cc (copied)
	* code/trunk/src/libraries/network/NetworkFunctionManager.h (copied)
	* code/trunk/src/libraries/network/NetworkPrereqs.h (modified)
	* code/trunk/src/libraries/network/NetworkStaticInitializationHandler.cc (copied)
	* code/trunk/src/libraries/network/NetworkStaticInitializationHandler.h (copied)
	* code/trunk/src/libraries/network/WANDiscoverable.cc (modified)
	* code/trunk/src/libraries/network/WANDiscovery.cc (modified)
	* code/trunk/src/libraries/network/packet/FunctionCalls.cc (modified)
	* code/trunk/src/libraries/network/packet/FunctionCalls.h (modified)
	* code/trunk/src/libraries/network/packet/FunctionIDs.cc (modified)
	* code/trunk/src/libraries/network/synchronisable/CMakeLists.txt (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/SynchronisableVariable.cc (deleted)
	* code/trunk/src/libraries/network/synchronisable/SynchronisableVariable.h (modified)
	* code/trunk/src/libraries/tools/ParticleInterface.cc (modified)
	* code/trunk/src/libraries/tools/ParticleInterface.h (modified)
	* code/trunk/src/libraries/tools/ResourceLocation.cc (modified)
	* code/trunk/src/libraries/tools/Timer.cc (modified)
	* code/trunk/src/libraries/tools/interfaces/ToolsInterfaceCompilation.cc (modified)
	* code/trunk/src/libraries/util/CMakeLists.txt (modified)
	* code/trunk/src/libraries/util/Scope.cc (deleted)
	* code/trunk/src/libraries/util/Scope.h (deleted)
	* code/trunk/src/libraries/util/ScopedSingletonManager.cc (deleted)
	* code/trunk/src/libraries/util/ScopedSingletonManager.h (deleted)
	* code/trunk/src/libraries/util/SharedPtr.h (modified)
	* code/trunk/src/libraries/util/Singleton.h (modified)
	* code/trunk/src/libraries/util/UtilPrereqs.h (modified)
	* code/trunk/src/libraries/util/output/OutputDefinitions.h (modified)
	* code/trunk/src/modules/designtools/ScreenshotManager.cc (modified)
	* code/trunk/src/modules/designtools/SkyboxGenerator.cc (modified)
	* code/trunk/src/modules/docking/Dock.cc (modified)
	* code/trunk/src/modules/docking/DockingAnimation.cc (modified)
	* code/trunk/src/modules/docking/DockingEffect.cc (modified)
	* code/trunk/src/modules/dodgerace/CMakeLists.txt (modified)
	* code/trunk/src/modules/dodgerace/DodgeRace.cc (modified)
	* code/trunk/src/modules/dodgerace/DodgeRace.h (modified)
	* code/trunk/src/modules/dodgerace/DodgeRaceCenterPoint.cc (modified)
	* code/trunk/src/modules/dodgerace/DodgeRaceCenterPoint.h (modified)
	* code/trunk/src/modules/dodgerace/DodgeRaceCube.cc (modified)
	* code/trunk/src/modules/dodgerace/DodgeRaceHUDinfo.cc (modified)
	* code/trunk/src/modules/dodgerace/DodgeRaceShip.cc (modified)
	* code/trunk/src/modules/dodgerace/DodgeRaceShip.h (modified)
	* code/trunk/src/modules/gametypes/CMakeLists.txt (modified)
	* code/trunk/src/modules/gametypes/OldRaceCheckPoint.cc (modified)
	* code/trunk/src/modules/gametypes/SpaceRaceManager.cc (modified)
	* code/trunk/src/modules/invader/CMakeLists.txt (modified)
	* code/trunk/src/modules/invader/Invader.cc (modified)
	* code/trunk/src/modules/invader/Invader.h (modified)
	* code/trunk/src/modules/invader/InvaderCenterPoint.cc (modified)
	* code/trunk/src/modules/invader/InvaderCenterPoint.h (modified)
	* code/trunk/src/modules/invader/InvaderEnemy.cc (modified)
	* code/trunk/src/modules/invader/InvaderEnemy.h (modified)
	* code/trunk/src/modules/invader/InvaderHUDinfo.cc (modified)
	* code/trunk/src/modules/invader/InvaderShip.cc (modified)
	* code/trunk/src/modules/invader/InvaderShip.h (modified)
	* code/trunk/src/modules/invader/InvaderWeapon.cc (modified)
	* code/trunk/src/modules/jump/CMakeLists.txt (modified)
	* code/trunk/src/modules/jump/JumpCenterpoint.cc (modified)
	* code/trunk/src/modules/jump/JumpCenterpoint.h (modified)
	* code/trunk/src/modules/jump/JumpEnemy.cc (modified)
	* code/trunk/src/modules/jump/JumpEnemy.h (modified)
	* code/trunk/src/modules/jump/JumpItem.cc (modified)
	* code/trunk/src/modules/jump/JumpItem.h (modified)
	* code/trunk/src/modules/jump/JumpPlatform.cc (modified)
	* code/trunk/src/modules/jump/JumpPlatform.h (modified)
	* code/trunk/src/modules/jump/JumpProjectile.cc (modified)
	* code/trunk/src/modules/jump/JumpProjectile.h (modified)
	* code/trunk/src/modules/jump/JumpScore.cc (modified)
	* code/trunk/src/modules/mini4dgame/CMakeLists.txt (modified)
	* code/trunk/src/modules/mini4dgame/Mini4Dgame.cc (modified)
	* code/trunk/src/modules/mini4dgame/Mini4DgameBoard.cc (modified)
	* code/trunk/src/modules/mini4dgame/Mini4DgameBoard.h (modified)
	* code/trunk/src/modules/notifications/NotificationDispatcher.cc (modified)
	* code/trunk/src/modules/notifications/NotificationManager.cc (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/SpaceBoundaries.cc (modified)
	* code/trunk/src/modules/objects/collisionshapes/AbstractRadiusHeightCollisionShape.cc (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/CylinderCollisionShape.cc (modified)
	* code/trunk/src/modules/objects/collisionshapes/CylinderCollisionShape.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/CheckPoint.cc (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/Trigger.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/LastManStandingInfos.cc (modified)
	* code/trunk/src/modules/overlays/hud/LastTeamStandingInfos.cc (modified)
	* code/trunk/src/modules/overlays/hud/TeamBaseMatchScore.cc (modified)
	* code/trunk/src/modules/pickup/CollectiblePickup.cc (modified)
	* code/trunk/src/modules/pickup/PickupManager.cc (modified)
	* code/trunk/src/modules/pickup/PickupManager.h (modified)
	* code/trunk/src/modules/pickup/PickupSpawner.cc (modified)
	* code/trunk/src/modules/pickup/items/ShrinkPickup.cc (modified)
	* code/trunk/src/modules/pong/CMakeLists.txt (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/questsystem/Quest.cc (modified)
	* code/trunk/src/modules/questsystem/QuestEffect.cc (modified)
	* code/trunk/src/modules/questsystem/QuestManager.cc (modified)
	* code/trunk/src/modules/questsystem/effects/ChangeQuestStatus.cc (modified)
	* code/trunk/src/modules/tetris/CMakeLists.txt (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/TetrisCenterpoint.cc (modified)
	* code/trunk/src/modules/tetris/TetrisCenterpoint.h (modified)
	* code/trunk/src/modules/tetris/TetrisScore.cc (modified)
	* code/trunk/src/modules/towerdefense/CMakeLists.txt (modified)
	* code/trunk/src/modules/towerdefense/TDCoordinate.h (modified)
	* code/trunk/src/modules/towerdefense/TowerDefense.cc (modified)
	* code/trunk/src/modules/towerdefense/TowerDefenseCenterpoint.cc (modified)
	* code/trunk/src/modules/towerdefense/TowerDefenseCenterpoint.h (modified)
	* code/trunk/src/modules/towerdefense/TowerDefenseEnemy.cc (modified)
	* code/trunk/src/modules/towerdefense/TowerDefenseEnemy.h (modified)
	* code/trunk/src/modules/towerdefense/TowerDefenseHUDController.cc (modified)
	* code/trunk/src/modules/weapons/projectiles/ParticleProjectile.cc (modified)
	* code/trunk/src/orxonox/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/CameraManager.cc (modified)
	* code/trunk/src/orxonox/Level.cc (modified)
	* code/trunk/src/orxonox/Level.h (modified)
	* code/trunk/src/orxonox/LevelManager.cc (modified)
	* code/trunk/src/orxonox/Main.cc (modified)
	* code/trunk/src/orxonox/MoodManager.cc (modified)
	* code/trunk/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/trunk/src/orxonox/PawnManager.cc (deleted)
	* code/trunk/src/orxonox/PawnManager.h (deleted)
	* code/trunk/src/orxonox/PlayerManager.cc (modified)
	* code/trunk/src/orxonox/Radar.cc (modified)
	* code/trunk/src/orxonox/Scene.cc (modified)
	* code/trunk/src/orxonox/Scene.h (modified)
	* code/trunk/src/orxonox/ShipPartManager.cc (deleted)
	* code/trunk/src/orxonox/ShipPartManager.h (deleted)
	* code/trunk/src/orxonox/Test.cc (modified)
	* code/trunk/src/orxonox/chat/ChatHistory.cc (modified)
	* code/trunk/src/orxonox/chat/ChatHistory.h (modified)
	* code/trunk/src/orxonox/chat/ChatInputHandler.cc (modified)
	* code/trunk/src/orxonox/chat/ChatManager.cc (modified)
	* code/trunk/src/orxonox/collisionshapes/CollisionShape.cc (modified)
	* code/trunk/src/orxonox/collisionshapes/CompoundCollisionShape.cc (modified)
	* code/trunk/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc (modified)
	* code/trunk/src/orxonox/collisionshapes/WorldEntityCollisionShape.h (modified)
	* code/trunk/src/orxonox/controllers/ArtificialController.cc (modified)
	* code/trunk/src/orxonox/controllers/FormationController.cc (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/gamestates/GSClient.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSLevel.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSLevel.h (modified)
	* code/trunk/src/orxonox/gamestates/GSMainMenu.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSRoot.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSServer.cc (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/Mission.cc (modified)
	* code/trunk/src/orxonox/infos/GametypeInfo.cc (modified)
	* code/trunk/src/orxonox/infos/HumanPlayer.cc (modified)
	* code/trunk/src/orxonox/infos/HumanPlayer.h (modified)
	* code/trunk/src/orxonox/infos/PlayerInfo.cc (modified)
	* code/trunk/src/orxonox/infos/PlayerInfo.h (modified)
	* code/trunk/src/orxonox/interfaces/InterfaceCompilation.cc (modified)
	* code/trunk/src/orxonox/interfaces/NotificationListener.cc (modified)
	* code/trunk/src/orxonox/interfaces/PickupCarrier.cc (modified)
	* code/trunk/src/orxonox/interfaces/PickupListener.cc (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/RadarViewable.cc (modified)
	* code/trunk/src/orxonox/interfaces/RadarViewable.h (modified)
	* code/trunk/src/orxonox/items/ShipPart.cc (modified)
	* code/trunk/src/orxonox/items/ShipPart.h (modified)
	* code/trunk/src/orxonox/overlays/InGameConsole.cc (modified)
	* code/trunk/src/orxonox/overlays/InGameConsole.h (modified)
	* code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc (modified)
	* code/trunk/src/orxonox/overlays/OverlayGroup.cc (modified)
	* code/trunk/src/orxonox/overlays/OverlayGroup.h (modified)
	* code/trunk/src/orxonox/sound/AmbientSound.cc (modified)
	* code/trunk/src/orxonox/sound/BaseSound.cc (modified)
	* code/trunk/src/orxonox/sound/SoundBuffer.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/weaponsystem/WeaponMode.cc (modified)
	* code/trunk/src/orxonox/worldentities/ControllableEntity.cc (modified)
	* code/trunk/src/orxonox/worldentities/ControllableEntity.h (modified)
	* code/trunk/src/orxonox/worldentities/WorldEntity.cc (modified)
	* code/trunk/src/orxonox/worldentities/pawns/Destroyer.cc (modified)
	* code/trunk/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified)
	* code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/trunk/src/orxonox/worldentities/pawns/Spectator.cc (modified)
	* code/trunk/src/orxonox/worldentities/pawns/TeamBaseMatchBase.cc (modified)
	* code/trunk/test/core/CMakeLists.txt (modified)
	* code/trunk/test/core/class/IdentifiableTest.cc (modified)
	* code/trunk/test/core/class/IdentifierClassHierarchyTest.cc (modified)
	* code/trunk/test/core/class/IdentifierExternalClassHierarchyTest.cc (modified)
	* code/trunk/test/core/class/IdentifierNestedClassHierarchyTest.cc (copied)
	* code/trunk/test/core/class/IdentifierSimpleClassHierarchyTest.cc (modified)
	* code/trunk/test/core/class/IdentifierTest.cc (modified)
	* code/trunk/test/core/class/OrxonoxClassTest.cc (modified)
	* code/trunk/test/core/class/OrxonoxInterfaceTest.cc (modified)
	* code/trunk/test/core/class/SubclassIdentifierTest.cc (modified)
	* code/trunk/test/core/class/SuperTest.cc (modified)
	* code/trunk/test/core/command/CommandTest.cc (modified)
	* code/trunk/test/core/object/ClassFactoryTest.cc (modified)
	* code/trunk/test/core/object/ContextTest.cc (modified)
	* code/trunk/test/core/object/IteratorTest.cc (modified)
	* code/trunk/test/core/object/ListableTest.cc (modified)
	* code/trunk/test/core/object/ObjectListIteratorTest.cc (modified)
	* code/trunk/test/core/object/SmartPtrTest.cc (deleted)
	* code/trunk/test/core/object/StrongPtrTest.cc (copied)
	* code/trunk/test/core/object/WeakPtrTest.cc (modified)
	* code/trunk/test/core/singleton (copied)
	* code/trunk/test/util/CMakeLists.txt (modified)
	* code/trunk/test/util/ScopeTest.cc (deleted)
	* code/trunk/test/util/output/ConsoleWriterTest.cc (modified)
	* code/trunk/test/util/output/LogWriterTest.cc (modified)
	* code/trunk/test/util/output/MemoryWriterTest.cc (modified)
	* code/trunk/test/util/output/OutputManagerTest.cc (modified)

	merged branch core7 back to trunk


Sun, 04 Oct 2015 18:37:12 GMT landauf [10623]
	* code/branches/ParticleEffectsFS15 (deleted)
	* code/branches/SciptableControllerFS15 (deleted)
	* code/branches/clangenb (deleted)
	* code/branches/formationFS15 (deleted)
	* code/branches/multiplayerFS15 (deleted)
	* code/branches/presentationFS15 (deleted)
	* code/branches/presentationFS15merge (deleted)
	* code/branches/towerdefenseFS15 (deleted)
	* code/branches/weaponFS15 (deleted)

	removed branches from FS15


Sun, 04 Oct 2015 13:45:56 GMT landauf [10622]
	* code/trunk (modified)
	* code/trunk/data/defaultConfig/keybindings.ini (modified)
	* code/trunk/data/gui/scripts/MultiplayerMenu.lua (modified)
	* code/trunk/data/gui/scripts/presentation.lua (copied)
	* code/trunk/data/gui/scripts/testscript.lua (modified)
	* code/trunk/data/levels/clangenb.oxw (copied)
	* code/trunk/data/levels/includes/weaponSettingsAssff.oxi (modified)
	* code/trunk/data/levels/includes/weaponSettingsFS15.oxi (copied)
	* code/trunk/data/levels/includes/weaponSettingsHeartAttack.oxi (copied)
	* code/trunk/data/levels/includes/weaponSettingsRing.oxi (copied)
	* code/trunk/data/levels/presentationFS15.oxw (copied)
	* code/trunk/data/levels/scriptController.oxw (modified)
	* code/trunk/data/levels/simone.oxw (copied)
	* code/trunk/data/levels/templates/enemytowerdefense.oxt (modified)
	* code/trunk/data/levels/templates/orbStation.oxt (copied)
	* code/trunk/data/levels/templates/spaceshipFS15.oxt (copied)
	* code/trunk/data/levels/templates/spaceshipHeartAttack.oxt (copied)
	* code/trunk/data/levels/templates/spaceshipRing.oxt (copied)
	* code/trunk/data/levels/templates/tower.oxt (deleted)
	* code/trunk/data/levels/templates/towerdefensetower.oxt (copied)
	* code/trunk/data/levels/towerDefense.oxw (modified)
	* code/trunk/data/particle/FieldExplosion.particle (copied)
	* code/trunk/data/particle/GravityBombField.particle (copied)
	* code/trunk/data/particle/orxonox_explosionAfterglow.particle (copied)
	* code/trunk/data/particle/orxonox_explosionFlame.particle (copied)
	* code/trunk/data/particle/orxonox_explosionFlame2.particle (copied)
	* code/trunk/data/particle/orxonox_explosionFlash.particle (copied)
	* code/trunk/data/particle/orxonox_explosionFlash2.particle (copied)
	* code/trunk/data/particle/orxonox_explosionShockwave.particle (copied)
	* code/trunk/data/particle/orxonox_explosionShockwave2.particle (copied)
	* code/trunk/data/particle/orxonox_explosionSparks.particle (copied)
	* code/trunk/data/particle/orxonox_explosionSparks2.particle (copied)
	* code/trunk/data/particle/orxonox_explosionStreak1.particle (copied)
	* code/trunk/data/particle/orxonox_explosionStreak2.particle (copied)
	* code/trunk/src/libraries/network/GamestateManager.h (modified)
	* code/trunk/src/libraries/network/LANDiscoverable.cc (modified)
	* code/trunk/src/libraries/network/LANDiscoverable.h (modified)
	* code/trunk/src/libraries/network/LANDiscovery.cc (modified)
	* code/trunk/src/libraries/network/LANDiscovery.h (modified)
	* code/trunk/src/libraries/network/MasterServer.cc (modified)
	* code/trunk/src/libraries/network/MasterServer.h (modified)
	* code/trunk/src/libraries/network/MasterServerProtocol.h (modified)
	* code/trunk/src/libraries/network/PeerList.cc (modified)
	* code/trunk/src/libraries/network/PeerList.h (modified)
	* code/trunk/src/libraries/network/Server.cc (modified)
	* code/trunk/src/libraries/network/Server.h (modified)
	* code/trunk/src/libraries/network/ServerList.cc (modified)
	* code/trunk/src/libraries/network/ServerList.h (modified)
	* code/trunk/src/libraries/network/WANDiscoverable.cc (modified)
	* code/trunk/src/libraries/network/WANDiscoverable.h (modified)
	* code/trunk/src/libraries/network/WANDiscovery.cc (modified)
	* code/trunk/src/libraries/network/WANDiscovery.h (modified)
	* code/trunk/src/libraries/network/packet/ServerInformation.cc (modified)
	* code/trunk/src/libraries/network/packet/ServerInformation.h (modified)
	* code/trunk/src/modules/objects/ForceField.h (modified)
	* code/trunk/src/modules/objects/Turret.cc (modified)
	* code/trunk/src/modules/objects/Turret.h (modified)
	* code/trunk/src/modules/objects/controllers/TurretController.cc (modified)
	* code/trunk/src/modules/tetris/Tetris.h (modified)
	* code/trunk/src/modules/towerdefense/CMakeLists.txt (modified)
	* code/trunk/src/modules/towerdefense/TDCoordinate.cc (modified)
	* code/trunk/src/modules/towerdefense/TDCoordinate.h (modified)
	* code/trunk/src/modules/towerdefense/Tower.cc (deleted)
	* code/trunk/src/modules/towerdefense/Tower.h (deleted)
	* 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/TowerDefenseEnemy.cc (modified)
	* code/trunk/src/modules/towerdefense/TowerDefenseSelecter.cc (copied)
	* code/trunk/src/modules/towerdefense/TowerDefenseSelecter.h (copied)
	* code/trunk/src/modules/towerdefense/TowerDefenseTower.cc (modified)
	* code/trunk/src/modules/towerdefense/TowerDefenseTower.h (modified)
	* code/trunk/src/modules/towerdefense/TowerTurret.cc (deleted)
	* code/trunk/src/modules/towerdefense/TowerTurret.h (deleted)
	* code/trunk/src/modules/weapons/WeaponsPrereqs.h (modified)
	* code/trunk/src/modules/weapons/munitions/CMakeLists.txt (modified)
	* code/trunk/src/modules/weapons/munitions/GravityBombMunition.cc (copied)
	* code/trunk/src/modules/weapons/munitions/GravityBombMunition.h (copied)
	* code/trunk/src/modules/weapons/projectiles/CMakeLists.txt (modified)
	* code/trunk/src/modules/weapons/projectiles/GravityBomb.cc (copied)
	* code/trunk/src/modules/weapons/projectiles/GravityBomb.h (copied)
	* code/trunk/src/modules/weapons/projectiles/GravityBombField.cc (copied)
	* code/trunk/src/modules/weapons/projectiles/GravityBombField.h (copied)
	* code/trunk/src/modules/weapons/projectiles/LightningGunProjectile.cc (modified)
	* code/trunk/src/modules/weapons/projectiles/Rocket.cc (modified)
	* code/trunk/src/modules/weapons/projectiles/RocketOld.cc (copied)
	* code/trunk/src/modules/weapons/projectiles/RocketOld.h (copied)
	* 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 (copied)
	* code/trunk/src/modules/weapons/weaponmodes/GravityBombFire.h (copied)
	* code/trunk/src/modules/weapons/weaponmodes/LaserFire.cc (modified)
	* code/trunk/src/modules/weapons/weaponmodes/RocketFireOld.cc (copied)
	* code/trunk/src/modules/weapons/weaponmodes/RocketFireOld.h (copied)
	* code/trunk/src/orxonox/controllers/ControllerDirector.cc (modified)
	* code/trunk/src/orxonox/controllers/ControllerDirector.h (modified)
	* code/trunk/src/orxonox/controllers/FormationController.cc (modified)
	* code/trunk/src/orxonox/controllers/ScriptController.cc (modified)
	* code/trunk/src/orxonox/controllers/ScriptController.h (modified)
	* code/trunk/src/orxonox/controllers/testscript.lua (modified)
	* code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified)

	merged branch presentationFS15merge back to trunk


Sun, 04 Oct 2015 13:30:38 GMT landauf [10621]
	* code/branches/presentationFS15merge/src/modules/towerdefense/TowerDefense.cc (modified)
	* code/branches/presentationFS15merge/src/modules/towerdefense/TowerDefenseTower.cc (modified)
	* code/branches/presentationFS15merge/src/modules/weapons/projectiles/GravityBombField.cc (modified)

	don't call srand()! this is already done by Core. also fixed some ...


Sun, 04 Oct 2015 13:18:10 GMT landauf [10620]
	* code/branches/presentationFS15merge/src/orxonox/controllers/ScriptController.cc (modified)

	use our internal definition of pi


Sun, 04 Oct 2015 12:30:26 GMT landauf [10619]
	* code/branches/presentationFS15merge/data/gui/scripts/presentation.lua (modified)
	* code/branches/presentationFS15merge/data/levels/clangenb.oxw (modified)
	* code/branches/presentationFS15merge/data/levels/includes/weaponSettingsFS15.oxi (modified)
	* code/branches/presentationFS15merge/data/levels/includes/weaponSettingsHeartAttack.oxi (modified)
	* code/branches/presentationFS15merge/data/levels/includes/weaponSettingsRing.oxi (modified)
	* code/branches/presentationFS15merge/data/levels/presentationFS15.oxw (modified)
	* code/branches/presentationFS15merge/data/levels/simone.oxw (modified)
	* code/branches/presentationFS15merge/data/levels/templates/orbStation.oxt (modified)
	* code/branches/presentationFS15merge/data/levels/templates/spaceshipFS15.oxt (modified)
	* code/branches/presentationFS15merge/data/levels/templates/spaceshipHeartAttack.oxt (modified)
	* code/branches/presentationFS15merge/data/levels/templates/spaceshipRing.oxt (modified)
	* code/branches/presentationFS15merge/data/levels/templates/towerdefensetower.oxt (modified)
	* code/branches/presentationFS15merge/data/particle/FieldExplosion.particle (modified)
	* code/branches/presentationFS15merge/data/particle/GravityBombField.particle (modified)
	* code/branches/presentationFS15merge/data/particle/orxonox_explosionAfterglow.particle (modified)
	* code/branches/presentationFS15merge/data/particle/orxonox_explosionFlame.particle (modified)
	* code/branches/presentationFS15merge/data/particle/orxonox_explosionFlame2.particle (modified)
	* code/branches/presentationFS15merge/data/particle/orxonox_explosionFlash.particle (modified)
	* code/branches/presentationFS15merge/data/particle/orxonox_explosionFlash2.particle (modified)
	* code/branches/presentationFS15merge/data/particle/orxonox_explosionShockwave.particle (modified)
	* code/branches/presentationFS15merge/data/particle/orxonox_explosionShockwave2.particle (modified)
	* code/branches/presentationFS15merge/data/particle/orxonox_explosionSparks.particle (modified)
	* code/branches/presentationFS15merge/data/particle/orxonox_explosionSparks2.particle (modified)
	* code/branches/presentationFS15merge/data/particle/orxonox_explosionStreak1.particle (modified)
	* code/branches/presentationFS15merge/data/particle/orxonox_explosionStreak2.particle (modified)
	* code/branches/presentationFS15merge/src/modules/towerdefense/TowerDefenseSelecter.cc (modified)
	* code/branches/presentationFS15merge/src/modules/towerdefense/TowerDefenseSelecter.h (modified)
	* code/branches/presentationFS15merge/src/modules/weapons/munitions/GravityBombMunition.cc (modified)
	* code/branches/presentationFS15merge/src/modules/weapons/munitions/GravityBombMunition.h (modified)
	* code/branches/presentationFS15merge/src/modules/weapons/projectiles/GravityBomb.cc (modified)
	* code/branches/presentationFS15merge/src/modules/weapons/projectiles/GravityBomb.h (modified)
	* code/branches/presentationFS15merge/src/modules/weapons/projectiles/GravityBombField.cc (modified)
	* code/branches/presentationFS15merge/src/modules/weapons/projectiles/GravityBombField.h (modified)
	* code/branches/presentationFS15merge/src/modules/weapons/projectiles/RocketOld.cc (modified)
	* code/branches/presentationFS15merge/src/modules/weapons/projectiles/RocketOld.h (modified)
	* code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/GravityBombFire.cc (modified)
	* code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/GravityBombFire.h (modified)
	* code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/RocketFireOld.cc (modified)
	* code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/RocketFireOld.h (modified)

	eol-style native


Sun, 04 Oct 2015 12:23:33 GMT landauf [10618]
	* code/branches/presentationFS15merge/src/libraries/network/WANDiscovery.cc (modified)
	* code/branches/presentationFS15merge/src/modules/weapons/projectiles/RocketOld.cc (modified)
	* code/branches/presentationFS15merge/src/orxonox/controllers/testscript.lua (modified)

	tabs -> spaces


Sun, 04 Oct 2015 12:18:02 GMT landauf [10617]
	* code/branches/presentationFS15merge/data/defaultConfig/keybindings.ini (modified)
	* code/branches/presentationFS15merge/data/gui/scripts/presentation.lua (modified)
	* code/branches/presentationFS15merge/data/gui/scripts/testscript.lua (modified)
	* code/branches/presentationFS15merge/data/levels/clangenb.oxw (modified)
	* code/branches/presentationFS15merge/data/levels/includes/weaponSettingsFS15.oxi (copied)
	* code/branches/presentationFS15merge/data/levels/includes/weaponSettingsHeartAttack.oxi (modified)
	* code/branches/presentationFS15merge/data/levels/includes/weaponSettingsRing.oxi (copied)
	* code/branches/presentationFS15merge/data/levels/presentationFS15.oxw (copied)
	* code/branches/presentationFS15merge/data/levels/simone.oxw (copied)
	* code/branches/presentationFS15merge/data/levels/templates/spaceshipFS15.oxt (copied)
	* code/branches/presentationFS15merge/data/levels/templates/spaceshipHeartAttack.oxt (modified)
	* code/branches/presentationFS15merge/data/levels/templates/spaceshipRing.oxt (copied)

	added new levels and modified ship definitions from branch ...


Sun, 04 Oct 2015 10:20:35 GMT landauf [10616]
	* code/branches/presentationFS15merge (modified)
	* code/branches/presentationFS15merge/data/particle/FieldExplosion.particle (copied)
	* code/branches/presentationFS15merge/data/particle/GravityBombField.particle (copied)
	* code/branches/presentationFS15merge/src/modules/objects/ForceField.h (modified)
	* code/branches/presentationFS15merge/src/modules/weapons/WeaponsPrereqs.h (modified)
	* code/branches/presentationFS15merge/src/modules/weapons/munitions/CMakeLists.txt (modified)
	* code/branches/presentationFS15merge/src/modules/weapons/munitions/GravityBombMunition.cc (copied)
	* code/branches/presentationFS15merge/src/modules/weapons/munitions/GravityBombMunition.h (copied)
	* code/branches/presentationFS15merge/src/modules/weapons/projectiles/CMakeLists.txt (modified)
	* code/branches/presentationFS15merge/src/modules/weapons/projectiles/GravityBomb.cc (copied)
	* code/branches/presentationFS15merge/src/modules/weapons/projectiles/GravityBomb.h (copied)
	* code/branches/presentationFS15merge/src/modules/weapons/projectiles/GravityBombField.cc (copied)
	* code/branches/presentationFS15merge/src/modules/weapons/projectiles/GravityBombField.h (copied)
	* code/branches/presentationFS15merge/src/modules/weapons/projectiles/LightningGunProjectile.cc (modified)
	* code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/CMakeLists.txt (modified)
	* code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/GravityBombFire.cc (copied)
	* code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/GravityBombFire.h (copied)

	merged branch weaponFS15 (but without changes in
	weaponSettingsAssff.oxi)


Sun, 04 Oct 2015 10:18:01 GMT landauf [10615]
	* code/branches/presentationFS15merge (modified)
	* code/branches/presentationFS15merge/data/levels/templates/enemytowerdefense.oxt (modified)
	* code/branches/presentationFS15merge/data/levels/templates/tower.oxt (deleted)
	* code/branches/presentationFS15merge/data/levels/templates/towerdefensetower.oxt (copied)
	* code/branches/presentationFS15merge/data/levels/towerDefense.oxw (modified)
	* code/branches/presentationFS15merge/src/modules/objects/Turret.cc (modified)
	* code/branches/presentationFS15merge/src/modules/objects/Turret.h (modified)
	* code/branches/presentationFS15merge/src/modules/objects/controllers/TurretController.cc (modified)
	* code/branches/presentationFS15merge/src/modules/tetris/Tetris.h (modified)
	* code/branches/presentationFS15merge/src/modules/towerdefense/CMakeLists.txt (modified)
	* code/branches/presentationFS15merge/src/modules/towerdefense/TDCoordinate.cc (modified)
	* code/branches/presentationFS15merge/src/modules/towerdefense/TDCoordinate.h (modified)
	* code/branches/presentationFS15merge/src/modules/towerdefense/Tower.cc (deleted)
	* code/branches/presentationFS15merge/src/modules/towerdefense/Tower.h (deleted)
	* code/branches/presentationFS15merge/src/modules/towerdefense/TowerDefense.cc (modified)
	* code/branches/presentationFS15merge/src/modules/towerdefense/TowerDefense.h (modified)
	* code/branches/presentationFS15merge/src/modules/towerdefense/TowerDefenseCenterpoint.cc (modified)
	* code/branches/presentationFS15merge/src/modules/towerdefense/TowerDefenseCenterpoint.h (modified)
	* code/branches/presentationFS15merge/src/modules/towerdefense/TowerDefenseEnemy.cc (modified)
	* code/branches/presentationFS15merge/src/modules/towerdefense/TowerDefenseSelecter.cc (copied)
	* code/branches/presentationFS15merge/src/modules/towerdefense/TowerDefenseSelecter.h (copied)
	* code/branches/presentationFS15merge/src/modules/towerdefense/TowerDefenseTower.cc (modified)
	* code/branches/presentationFS15merge/src/modules/towerdefense/TowerDefenseTower.h (modified)
	* code/branches/presentationFS15merge/src/modules/towerdefense/TowerTurret.cc (deleted)
	* code/branches/presentationFS15merge/src/modules/towerdefense/TowerTurret.h (deleted)
	* code/branches/presentationFS15merge/src/orxonox/controllers/FormationController.cc (modified)

	merged branch towerdefenseFS15


Sun, 04 Oct 2015 10:16:42 GMT landauf [10614]
	* code/branches/presentationFS15merge (modified)
	* code/branches/presentationFS15merge/data/gui/scripts/presentation.lua (copied)
	* code/branches/presentationFS15merge/data/gui/scripts/testscript.lua (modified)
	* code/branches/presentationFS15merge/data/levels/scriptController.oxw (modified)
	* code/branches/presentationFS15merge/src/orxonox/controllers/ControllerDirector.cc (modified)
	* code/branches/presentationFS15merge/src/orxonox/controllers/ControllerDirector.h (modified)
	* code/branches/presentationFS15merge/src/orxonox/controllers/ScriptController.cc (modified)
	* code/branches/presentationFS15merge/src/orxonox/controllers/ScriptController.h (modified)

	merged branch SciptableControllerFS15


Sun, 04 Oct 2015 10:15:43 GMT landauf [10613]
	* code/branches/presentationFS15merge (modified)
	* code/branches/presentationFS15merge/data/levels/includes/weaponSettingsAssff.oxi (modified)
	* code/branches/presentationFS15merge/data/particle/orxonox_explosionAfterglow.particle (copied)
	* code/branches/presentationFS15merge/data/particle/orxonox_explosionFlame.particle (copied)
	* code/branches/presentationFS15merge/data/particle/orxonox_explosionFlame2.particle (copied)
	* code/branches/presentationFS15merge/data/particle/orxonox_explosionFlash.particle (copied)
	* code/branches/presentationFS15merge/data/particle/orxonox_explosionFlash2.particle (copied)
	* code/branches/presentationFS15merge/data/particle/orxonox_explosionShockwave.particle (copied)
	* code/branches/presentationFS15merge/data/particle/orxonox_explosionShockwave2.particle (copied)
	* code/branches/presentationFS15merge/data/particle/orxonox_explosionSparks.particle (copied)
	* code/branches/presentationFS15merge/data/particle/orxonox_explosionSparks2.particle (copied)
	* code/branches/presentationFS15merge/data/particle/orxonox_explosionStreak1.particle (copied)
	* code/branches/presentationFS15merge/data/particle/orxonox_explosionStreak2.particle (copied)
	* code/branches/presentationFS15merge/src/modules/weapons/WeaponsPrereqs.h (modified)
	* code/branches/presentationFS15merge/src/modules/weapons/projectiles/CMakeLists.txt (modified)
	* code/branches/presentationFS15merge/src/modules/weapons/projectiles/Rocket.cc (modified)
	* code/branches/presentationFS15merge/src/modules/weapons/projectiles/RocketOld.cc (copied)
	* code/branches/presentationFS15merge/src/modules/weapons/projectiles/RocketOld.h (copied)
	* code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/CMakeLists.txt (modified)
	* code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/RocketFireOld.cc (copied)
	* code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/RocketFireOld.h (copied)
	* code/branches/presentationFS15merge/src/orxonox/worldentities/pawns/Pawn.cc (modified)

	merged branch ParticleEffectsFS15 (but without changes in ...


Sun, 04 Oct 2015 10:13:42 GMT landauf [10612]
	* code/branches/presentationFS15merge (modified)
	* code/branches/presentationFS15merge/data/gui/scripts/MultiplayerMenu.lua (modified)
	* code/branches/presentationFS15merge/src/libraries/network/GamestateManager.h (modified)
	* code/branches/presentationFS15merge/src/libraries/network/LANDiscoverable.cc (modified)
	* code/branches/presentationFS15merge/src/libraries/network/LANDiscoverable.h (modified)
	* code/branches/presentationFS15merge/src/libraries/network/LANDiscovery.cc (modified)
	* code/branches/presentationFS15merge/src/libraries/network/LANDiscovery.h (modified)
	* code/branches/presentationFS15merge/src/libraries/network/MasterServer.cc (modified)
	* code/branches/presentationFS15merge/src/libraries/network/MasterServer.h (modified)
	* code/branches/presentationFS15merge/src/libraries/network/MasterServerProtocol.h (modified)
	* code/branches/presentationFS15merge/src/libraries/network/PeerList.cc (modified)
	* code/branches/presentationFS15merge/src/libraries/network/PeerList.h (modified)
	* code/branches/presentationFS15merge/src/libraries/network/Server.cc (modified)
	* code/branches/presentationFS15merge/src/libraries/network/Server.h (modified)
	* code/branches/presentationFS15merge/src/libraries/network/ServerList.cc (modified)
	* code/branches/presentationFS15merge/src/libraries/network/ServerList.h (modified)
	* code/branches/presentationFS15merge/src/libraries/network/WANDiscoverable.cc (modified)
	* code/branches/presentationFS15merge/src/libraries/network/WANDiscoverable.h (modified)
	* code/branches/presentationFS15merge/src/libraries/network/WANDiscovery.cc (modified)
	* code/branches/presentationFS15merge/src/libraries/network/WANDiscovery.h (modified)
	* code/branches/presentationFS15merge/src/libraries/network/packet/ServerInformation.cc (modified)
	* code/branches/presentationFS15merge/src/libraries/network/packet/ServerInformation.h (modified)

	merged branch multiplayerFS15


Sun, 04 Oct 2015 10:12:42 GMT landauf [10611]
	* code/branches/presentationFS15merge (modified)
	* code/branches/presentationFS15merge/data/levels/templates/orbStation.oxt (copied)

	merged branch formationFS15


Sun, 04 Oct 2015 10:11:03 GMT landauf [10610]
	* code/branches/presentationFS15merge (modified)
	* code/branches/presentationFS15merge/data/levels/clangenb.oxw (copied)
	* code/branches/presentationFS15merge/data/levels/includes/weaponSettingsAssff.oxi (modified)
	* code/branches/presentationFS15merge/data/levels/includes/weaponSettingsHeartAttack.oxi (copied)
	* code/branches/presentationFS15merge/data/levels/templates/spaceshipHeartAttack.oxt (copied)
	* code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified)
	* code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/FusionFire.cc (modified)
	* code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/LaserFire.cc (modified)

	merged branch clangenb


Sun, 04 Oct 2015 09:51:01 GMT landauf [10609]
	* code/branches/SciptableControllerFS15 (modified)
	* code/branches/SciptableControllerFS15/data/gui/scripts/presentation.lua (copied)
	* code/branches/SciptableControllerFS15/data/gui/scripts/testscript.lua (modified)
	* code/branches/SciptableControllerFS15/data/levels/scriptController.oxw (modified)
	* code/branches/SciptableControllerFS15/src/orxonox/controllers/ControllerDirector.cc (modified)
	* code/branches/SciptableControllerFS15/src/orxonox/controllers/ControllerDirector.h (modified)

	merged r10499 from presentationFS15 into this branch


Fri, 02 Oct 2015 21:03:31 GMT fvultier [10608]
	* code/branches/towerdefenseFabien/src/modules/weapons/IceGunFreezer.cc (modified)
	* code/branches/towerdefenseFabien/src/modules/weapons/IceGunFreezer.h (modified)
	* code/branches/towerdefenseFabien/src/modules/weapons/projectiles/IceGunProjectile.cc (modified)
	* code/branches/towerdefenseFabien/src/modules/weapons/projectiles/IceGunProjectile.h (modified)
	* code/branches/towerdefenseFabien/src/modules/weapons/weaponmodes/IceGun.cc (modified)
	* code/branches/towerdefenseFabien/src/modules/weapons/weaponmodes/IceGun.h (modified)

	Improved documentation


Fri, 02 Oct 2015 20:46:40 GMT fvultier [10606]
	* code/branches/towerdefenseFabien/data/levels/towerDefense.oxw (modified)
	* code/branches/towerdefenseFabien/src/modules/towerdefense/TowerDefenseEnemy.h (modified)
	* code/branches/towerdefenseFabien/src/modules/weapons/CMakeLists.txt (modified)
	* code/branches/towerdefenseFabien/src/modules/weapons/IceGunFreezer.cc (added)
	* code/branches/towerdefenseFabien/src/modules/weapons/IceGunFreezer.h (added)
	* code/branches/towerdefenseFabien/src/modules/weapons/projectiles/CMakeLists.txt (modified)
	* code/branches/towerdefenseFabien/src/modules/weapons/projectiles/IceGunProjectile.cc (added)
	* code/branches/towerdefenseFabien/src/modules/weapons/projectiles/IceGunProjectile.h (added)
	* code/branches/towerdefenseFabien/src/modules/weapons/projectiles/Projectile.cc (modified)
	* code/branches/towerdefenseFabien/src/modules/weapons/projectiles/Projectile.h (modified)
	* code/branches/towerdefenseFabien/src/modules/weapons/projectiles/SplitGunProjectile.cc (modified)
	* code/branches/towerdefenseFabien/src/modules/weapons/projectiles/SplitGunProjectile.h (modified)
	* code/branches/towerdefenseFabien/src/modules/weapons/weaponmodes/CMakeLists.txt (modified)
	* code/branches/towerdefenseFabien/src/modules/weapons/weaponmodes/IceGun.cc (added)
	* code/branches/towerdefenseFabien/src/modules/weapons/weaponmodes/IceGun.h (added)
	* code/branches/towerdefenseFabien/src/modules/weapons/weaponmodes/SplitGun.cc (modified)
	* code/branches/towerdefenseFabien/src/modules/weapons/weaponmodes/SplitGun.h (modified)

	The most expensive tower fires now a new weapon: The Ice gun; a ...


Sun, 27 Sep 2015 20:39:57 GMT landauf [10605]
	* code/branches/SciptableControllerFS15/src/orxonox/controllers/ScriptController.cc (modified)

	added changes from presentationFS15 branch


Sun, 27 Sep 2015 20:35:32 GMT landauf [10604]
	* code/branches/weaponFS15/src/modules/weapons/projectiles/GravityBomb.h (modified)
	* code/branches/weaponFS15/src/modules/weapons/projectiles/GravityBombField.h (modified)

	corrected include paths


Sun, 27 Sep 2015 20:29:59 GMT landauf [10603]
	* code/branches/ParticleEffectsFS15/data/DefaultResources.oxr (modified)
	* code/branches/ParticleEffectsFS15/data/levels/emptyLevel.oxw (modified)
	* code/branches/ParticleEffectsFS15/src/external/CMakeLists.txt (modified)
	* code/branches/ParticleEffectsFS15/src/modules/weapons/projectiles/Rocket.cc (modified)
	* code/branches/ParticleEffectsFS15/src/orxonox/worldentities/CMakeLists.txt (modified)

	cleanup: empty level is empty again & tabs->spaces.


Sun, 27 Sep 2015 20:15:01 GMT landauf [10602]
	* code/branches/weaponFS15/data/levels/includes/weaponSettingsAssff.oxi (modified)
	* code/branches/weaponFS15/data/particle/FieldExplosion.particle (modified)
	* code/branches/weaponFS15/src/modules/objects/ForceField.h (modified)

	more cleanup


Sun, 27 Sep 2015 20:03:53 GMT landauf [10601]
	* code/branches/weaponFS15/data/levels/emptyLevel.oxw (modified)
	* code/branches/weaponFS15/data/levels/includes/weaponSettingsAssff.oxi (modified)
	* code/branches/weaponFS15/src/modules/objects/ForceField.h (modified)
	* code/branches/weaponFS15/src/modules/weapons/munitions/GravityBombMunition.cc (modified)
	* code/branches/weaponFS15/src/modules/weapons/munitions/GravityBombMunition.h (modified)
	* code/branches/weaponFS15/src/modules/weapons/projectiles/GravityBomb.cc (modified)
	* code/branches/weaponFS15/src/modules/weapons/projectiles/GravityBomb.h (modified)
	* code/branches/weaponFS15/src/modules/weapons/projectiles/GravityBombField.cc (modified)
	* code/branches/weaponFS15/src/modules/weapons/projectiles/GravityBombField.h (modified)
	* code/branches/weaponFS15/src/modules/weapons/weaponmodes/GravityBombFire.cc (modified)

	cleanup: empty level is empty again & tabs->spaces.


Sun, 27 Sep 2015 19:11:20 GMT landauf [10600]
	* code/branches/SciptableControllerFS15/src/orxonox/controllers/ScriptController.cc (modified)
	* code/branches/SciptableControllerFS15/src/orxonox/controllers/ScriptController.h (modified)

	fixed warnings


Sun, 27 Sep 2015 12:02:00 GMT landauf [10599]
	* code/branches/tuandreFS15 (deleted)

	removed unused branch


Sun, 27 Sep 2015 12:01:06 GMT landauf [10598]
	* code/branches/formationFS15/data/levels/emptyLevel.oxw (modified)
	* code/branches/formationFS15/data/levels/templates/orbStation.oxt (modified)

	cleanup: empty level is empty again & tabs->spaces.


Sun, 27 Sep 2015 11:56:58 GMT landauf [10597]
	* code/branches/clangenb/data/levels/includes/weaponSettingsHeartAttack.oxi (modified)
	* code/branches/clangenb/data/levels/templates/spaceshipHeartAttack.oxt (modified)

	cleanup: tabs->spaces


Sun, 27 Sep 2015 10:32:52 GMT landauf [10596]
	* code/branches/clangenb/data/levels/emptyLevel.oxw (modified)
	* code/branches/clangenb/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified)
	* code/branches/clangenb/src/modules/weapons/weaponmodes/FusionFire.cc (modified)
	* code/branches/clangenb/src/modules/weapons/weaponmodes/LaserFire.cc (modified)

	cleanup: empty level is empty again & tabs->spaces.


Sun, 27 Sep 2015 10:11:43 GMT landauf [10595]
	* code/branches/presentationFS15merge (copied)

	created new branch to merge all branches from FS15 in a clean way


Fri, 25 Sep 2015 11:56:51 GMT fvultier [10594]
	* code/branches/towerdefenseFabien/data/levels/towerDefense.oxw (modified)
	* code/branches/towerdefenseFabien/src/modules/weapons/projectiles/CMakeLists.txt (modified)
	* code/branches/towerdefenseFabien/src/modules/weapons/projectiles/SplitGunProjectile.cc (modified)
	* code/branches/towerdefenseFabien/src/modules/weapons/projectiles/SplitGunProjectile.h (modified)
	* code/branches/towerdefenseFabien/src/modules/weapons/weaponmodes/SplitGun.cc (modified)
	* code/branches/towerdefenseFabien/src/modules/weapons/weaponmodes/SplitGun.h (modified)

	improved documentation


Thu, 24 Sep 2015 11:23:47 GMT fvultier [10592]
	* code/branches/towerdefenseFabien/data/levels/jump.oxw (modified)
	* code/branches/towerdefenseFabien/data/levels/towerDefense.oxw (modified)
	* code/branches/towerdefenseFabien/src/modules/towerdefense/TowerDefense.cc (modified)
	* code/branches/towerdefenseFabien/src/modules/weapons/WeaponsPrereqs.h (modified)
	* code/branches/towerdefenseFabien/src/modules/weapons/projectiles/BillboardProjectile.cc (modified)
	* code/branches/towerdefenseFabien/src/modules/weapons/projectiles/BillboardProjectile.h (modified)
	* code/branches/towerdefenseFabien/src/modules/weapons/projectiles/CMakeLists.txt (modified)
	* code/branches/towerdefenseFabien/src/modules/weapons/projectiles/SplitGunProjectile.cc (added)
	* code/branches/towerdefenseFabien/src/modules/weapons/projectiles/SplitGunProjectile.h (added)
	* code/branches/towerdefenseFabien/src/modules/weapons/weaponmodes/CMakeLists.txt (modified)
	* code/branches/towerdefenseFabien/src/modules/weapons/weaponmodes/SplitGun.cc (added)
	* code/branches/towerdefenseFabien/src/modules/weapons/weaponmodes/SplitGun.h (added)

	New Weapon for the towerDefense minigame: The SplitGun, a weapon that ...


Thu, 17 Sep 2015 13:32:50 GMT fvultier [10591]
	* code/branches/towerdefenseFabien/data/levels/towerDefense.oxw (modified)
	* code/branches/towerdefenseFabien/data/overlays/towerdefenseHUD.oxo (modified)
	* code/branches/towerdefenseFabien/src/modules/towerdefense/TowerDefense.cc (modified)
	* code/branches/towerdefenseFabien/src/modules/towerdefense/TowerDefense.h (modified)
	* code/branches/towerdefenseFabien/src/modules/towerdefense/TowerDefenseEnemy.cc (modified)
	* code/branches/towerdefenseFabien/src/modules/towerdefense/TowerDefenseField.cc (modified)
	* code/branches/towerdefenseFabien/src/modules/towerdefense/TowerDefenseField.h (modified)
	* code/branches/towerdefenseFabien/src/modules/towerdefense/TowerDefenseHUDController.cc (modified)

	Different wave types with different enemies. New field type: ...


Tue, 15 Sep 2015 14:48:24 GMT landauf [10589]
	* code/branches/towerdefenseFabien/src/modules/towerdefense/TowerDefense.cc (modified)

	enemies can be killed by towers -> the WeakPtr returns NULL -> remove ...


Tue, 15 Sep 2015 14:44:28 GMT landauf [10588]
	* code/branches/towerdefenseFabien/src/modules/towerdefense/TowerDefense.cc (modified)

	use the new entity as waypoint (each WaypointController will destroy ...


Tue, 15 Sep 2015 14:43:03 GMT landauf [10587]
	* code/branches/towerdefenseFabien/src/modules/towerdefense/TowerDefense.cc (modified)
	* code/branches/towerdefenseFabien/src/modules/towerdefense/TowerDefense.h (modified)

	use list instead of vector - list is better suited for removing
	elements


Tue, 15 Sep 2015 12:20:34 GMT fvultier [10586]
	* code/branches/towerdefenseFabien/data/levels/templates/enemytowerdefense.oxt (deleted)
	* code/branches/towerdefenseFabien/data/levels/templates/tower.oxt (deleted)
	* code/branches/towerdefenseFabien/data/levels/towerDefense.oxw (modified)
	* code/branches/towerdefenseFabien/src/modules/towerdefense/CMakeLists.txt (modified)
	* code/branches/towerdefenseFabien/src/modules/towerdefense/TDCoordinate.cc (modified)
	* code/branches/towerdefenseFabien/src/modules/towerdefense/TDCoordinate.h (modified)
	* code/branches/towerdefenseFabien/src/modules/towerdefense/TDEnemy.h (deleted)
	* code/branches/towerdefenseFabien/src/modules/towerdefense/Tower.cc (deleted)
	* code/branches/towerdefenseFabien/src/modules/towerdefense/Tower.h (deleted)
	* code/branches/towerdefenseFabien/src/modules/towerdefense/TowerDefense.cc (modified)
	* code/branches/towerdefenseFabien/src/modules/towerdefense/TowerDefense.h (modified)
	* code/branches/towerdefenseFabien/src/modules/towerdefense/TowerDefenseCenterpoint.cc (modified)
	* code/branches/towerdefenseFabien/src/modules/towerdefense/TowerDefenseCenterpoint.h (modified)
	* code/branches/towerdefenseFabien/src/modules/towerdefense/TowerDefenseController.cc (deleted)
	* code/branches/towerdefenseFabien/src/modules/towerdefense/TowerDefenseController.h (deleted)
	* code/branches/towerdefenseFabien/src/modules/towerdefense/TowerDefenseEnemy.cc (modified)
	* code/branches/towerdefenseFabien/src/modules/towerdefense/TowerDefenseEnemy.h (modified)
	* code/branches/towerdefenseFabien/src/modules/towerdefense/TowerDefenseField.cc (added)
	* code/branches/towerdefenseFabien/src/modules/towerdefense/TowerDefenseField.h (added)
	* code/branches/towerdefenseFabien/src/modules/towerdefense/TowerDefenseSelecter.cc (added)
	* code/branches/towerdefenseFabien/src/modules/towerdefense/TowerDefenseSelecter.h (added)
	* code/branches/towerdefenseFabien/src/modules/towerdefense/TowerDefenseTower.cc (modified)
	* code/branches/towerdefenseFabien/src/modules/towerdefense/TowerDefenseTower.h (modified)
	* code/branches/towerdefenseFabien/src/modules/towerdefense/TowerTurret.cc (deleted)
	* code/branches/towerdefenseFabien/src/modules/towerdefense/TowerTurret.h (deleted)

	Removed unuses classes and templates. The enemies move now along a ...


Sun, 13 Sep 2015 16:13:02 GMT fvultier [10585]
	* code/branches/towerdefenseFabien (copied)

	Create new branch for the tower defense minigame with new features.


Sat, 12 Sep 2015 19:12:22 GMT landauf [10583]
	* code/branches/core7/src/modules/towerdefense/TDCoordinate.h (modified)

	TDCoordinate doesn't call RegisterObject, thus shouldn't inherit from ...


Sat, 12 Sep 2015 17:28:17 GMT landauf [10582]
	* code/branches/core7/CMakeLists.txt (modified)

	delete helper files before building. this avoids that old helper ...


Sat, 12 Sep 2015 16:46:55 GMT landauf [10581]
	* code/branches/core7/data/levels/4Dtest.oxw (modified)
	* code/branches/core7/data/levels/DodgeRace.oxw (modified)
	* code/branches/core7/data/levels/Invaders.oxw (modified)
	* code/branches/core7/data/levels/Spacerace2.oxw (modified)
	* code/branches/core7/data/levels/SurfaceRacePresentation.oxw (modified)
	* code/branches/core7/data/levels/jump.oxw (modified)
	* code/branches/core7/data/levels/pong.oxw (modified)
	* code/branches/core7/data/levels/presentationHS12.oxw (modified)
	* code/branches/core7/data/levels/spaceRace.oxw (modified)
	* code/branches/core7/data/levels/surfaceRace.oxw (modified)
	* code/branches/core7/data/levels/tetris.oxw (modified)
	* code/branches/core7/data/levels/towerDefense.oxw (modified)
	* code/branches/core7/src/modules/dodgerace/CMakeLists.txt (modified)
	* code/branches/core7/src/modules/gametypes/CMakeLists.txt (modified)
	* code/branches/core7/src/modules/invader/CMakeLists.txt (modified)
	* code/branches/core7/src/modules/jump/CMakeLists.txt (modified)
	* code/branches/core7/src/modules/mini4dgame/CMakeLists.txt (modified)
	* code/branches/core7/src/modules/pong/CMakeLists.txt (modified)
	* code/branches/core7/src/modules/tetris/CMakeLists.txt (modified)
	* code/branches/core7/src/modules/towerdefense/CMakeLists.txt (modified)

	8 modules are now marked as plugins (which means they are only loaded ...


Sat, 12 Sep 2015 14:10:02 GMT landauf [10580]
	* code/branches/core7/src/libraries/core/CorePrereqs.h (modified)
	* code/branches/core7/src/libraries/core/module/CMakeLists.txt (modified)
	* code/branches/core7/src/libraries/core/module/PluginManager.cc (modified)
	* code/branches/core7/src/libraries/core/module/PluginManager.h (modified)
	* code/branches/core7/src/libraries/core/module/PluginReference.cc (added)
	* code/branches/core7/src/libraries/core/module/PluginReference.h (added)
	* code/branches/core7/src/orxonox/Level.cc (modified)
	* code/branches/core7/src/orxonox/Level.h (modified)

	it's now possible to define required plugins in the level definition ...


Wed, 09 Sep 2015 14:14:14 GMT landauf [10579]
	* code/branches/core7/src/orxonox/Level.cc (modified)

	inverted dependency between level and gametype: gametype now ...


Wed, 09 Sep 2015 14:10:21 GMT landauf [10578]
	* code/branches/core7/src/libraries/core/BaseObject.cc (modified)
	* code/branches/core7/src/libraries/core/BaseObject.h (modified)
	* code/branches/core7/src/libraries/core/Namespace.cc (modified)
	* code/branches/core7/src/libraries/core/object/StrongPtr.h (modified)
	* code/branches/core7/src/orxonox/Level.cc (modified)
	* code/branches/core7/src/orxonox/Scene.cc (modified)
	* code/branches/core7/src/orxonox/gametypes/Gametype.cc (modified)
	* code/branches/core7/src/orxonox/infos/PlayerInfo.cc (modified)

	removed the 'bAddRef' argument from StrongPtr's constructor. it was a ...


Wed, 09 Sep 2015 13:55:26 GMT landauf [10577]
	* code/branches/core7/src/libraries/core/Loader.cc (modified)

	no need to store the namespace again, this is already done in the ...


Wed, 09 Sep 2015 12:15:46 GMT landauf [10576]
	* code/branches/core7/src/libraries/core/BaseObject.cc (modified)
	* code/branches/core7/src/libraries/core/BaseObject.h (modified)
	* code/branches/core7/src/libraries/core/class/Super.h (modified)
	* code/branches/core7/src/orxonox/Level.cc (modified)
	* code/branches/core7/src/orxonox/infos/HumanPlayer.cc (modified)
	* code/branches/core7/src/orxonox/infos/HumanPlayer.h (modified)
	* code/branches/core7/src/orxonox/infos/PlayerInfo.cc (modified)
	* code/branches/core7/src/orxonox/infos/PlayerInfo.h (modified)
	* code/branches/core7/src/orxonox/interfaces/Pickupable.h (modified)

	removed changedGametype and getOldGametype from BaseObject. the ...


Wed, 09 Sep 2015 12:02:01 GMT landauf [10575]
	* code/branches/core7/src/orxonox/Level.cc (modified)
	* code/branches/core7/src/orxonox/gametypes/Gametype.cc (modified)
	* code/branches/core7/src/orxonox/gametypes/Gametype.h (modified)
	* code/branches/core7/src/orxonox/overlays/OverlayGroup.cc (modified)
	* code/branches/core7/src/orxonox/overlays/OverlayGroup.h (modified)

	create the scoreboard directly with the correct gametype. this ...


Wed, 09 Sep 2015 11:49:55 GMT landauf [10574]
	* code/branches/core7/src/modules/dodgerace/DodgeRace.cc (modified)
	* code/branches/core7/src/modules/dodgerace/DodgeRace.h (modified)
	* code/branches/core7/src/modules/invader/Invader.cc (modified)
	* code/branches/core7/src/modules/invader/Invader.h (modified)
	* code/branches/core7/src/modules/objects/Planet.cc (modified)
	* code/branches/core7/src/modules/objects/Planet.h (modified)

	removed some init() functions, integrated them directly into the ...


Wed, 09 Sep 2015 11:36:00 GMT landauf [10573]
	* code/branches/core7/src/orxonox/Level.cc (modified)

	there are no objects_ at this point, so it's not necessary to set the ...


Wed, 09 Sep 2015 11:31:11 GMT landauf [10572]
	* code/branches/core7/src/modules/dodgerace/DodgeRaceCenterPoint.cc (modified)
	* code/branches/core7/src/modules/dodgerace/DodgeRaceCenterPoint.h (modified)
	* code/branches/core7/src/modules/invader/InvaderCenterPoint.cc (modified)
	* code/branches/core7/src/modules/invader/InvaderCenterPoint.h (modified)
	* code/branches/core7/src/modules/jump/JumpCenterpoint.cc (modified)
	* code/branches/core7/src/modules/jump/JumpCenterpoint.h (modified)
	* code/branches/core7/src/modules/mini4dgame/Mini4DgameBoard.cc (modified)
	* code/branches/core7/src/modules/mini4dgame/Mini4DgameBoard.h (modified)
	* code/branches/core7/src/modules/pong/PongCenterpoint.cc (modified)
	* code/branches/core7/src/modules/pong/PongCenterpoint.h (modified)
	* code/branches/core7/src/modules/tetris/TetrisCenterpoint.cc (modified)
	* code/branches/core7/src/modules/tetris/TetrisCenterpoint.h (modified)
	* code/branches/core7/src/modules/towerdefense/TowerDefenseCenterpoint.cc (modified)
	* code/branches/core7/src/modules/towerdefense/TowerDefenseCenterpoint.h (modified)

	removed unnecessary code - setGametype or changedGametype is never ...


Wed, 09 Sep 2015 11:11:13 GMT landauf [10571]
	* code/branches/core7/src/libraries/core/BaseObject.cc (modified)
	* code/branches/core7/src/libraries/core/BaseObject.h (modified)
	* code/branches/core7/src/modules/dodgerace/DodgeRaceCenterPoint.cc (modified)
	* code/branches/core7/src/modules/dodgerace/DodgeRaceHUDinfo.cc (modified)
	* code/branches/core7/src/modules/gametypes/OldRaceCheckPoint.cc (modified)
	* code/branches/core7/src/modules/gametypes/SpaceRaceManager.cc (modified)
	* code/branches/core7/src/modules/invader/InvaderCenterPoint.cc (modified)
	* code/branches/core7/src/modules/invader/InvaderHUDinfo.cc (modified)
	* code/branches/core7/src/modules/jump/JumpCenterpoint.cc (modified)
	* code/branches/core7/src/modules/jump/JumpScore.cc (modified)
	* code/branches/core7/src/modules/mini4dgame/Mini4DgameBoard.cc (modified)
	* code/branches/core7/src/modules/objects/triggers/CheckPoint.cc (modified)
	* code/branches/core7/src/modules/overlays/hud/LastManStandingInfos.cc (modified)
	* code/branches/core7/src/modules/overlays/hud/LastTeamStandingInfos.cc (modified)
	* code/branches/core7/src/modules/overlays/hud/TeamBaseMatchScore.cc (modified)
	* code/branches/core7/src/modules/pong/PongCenterpoint.cc (modified)
	* code/branches/core7/src/modules/pong/PongScore.cc (modified)
	* code/branches/core7/src/modules/tetris/TetrisBrick.cc (modified)
	* code/branches/core7/src/modules/tetris/TetrisCenterpoint.cc (modified)
	* code/branches/core7/src/modules/tetris/TetrisScore.cc (modified)
	* code/branches/core7/src/modules/towerdefense/TowerDefenseCenterpoint.cc (modified)
	* code/branches/core7/src/modules/towerdefense/TowerDefenseEnemy.cc (modified)
	* code/branches/core7/src/modules/towerdefense/TowerDefenseHUDController.cc (modified)
	* code/branches/core7/src/orxonox/Scene.cc (modified)
	* code/branches/core7/src/orxonox/overlays/OverlayGroup.cc (modified)
	* code/branches/core7/src/orxonox/worldentities/pawns/Destroyer.cc (modified)
	* code/branches/core7/src/orxonox/worldentities/pawns/TeamBaseMatchBase.cc (modified)

	BaseObject returns plain pointers instead of StrongPtrs for ...


Tue, 08 Sep 2015 20:47:36 GMT landauf [10570]
	* code/branches/core7/src/libraries/core/BaseObject.h (modified)
	* code/branches/core7/src/orxonox/Scene.cc (modified)

	not sure why Level was synchronized in Scene, but it doesn't seem to ...


Tue, 08 Sep 2015 20:18:05 GMT landauf [10569]
	* code/branches/core7/src/orxonox/gamestates/GSLevel.cc (modified)

	fixed bug which was introduced in r10563: when unloading in client ...


Tue, 08 Sep 2015 20:02:46 GMT landauf [10568]
	* code/branches/core7/src/libraries/core/object/Iterator.h (modified)
	* code/branches/core7/src/libraries/core/object/IteratorBase.h (modified)
	* code/branches/core7/src/libraries/core/object/ObjectListIterator.h (modified)

	Enforce type-safety of ObjectListIterator.
	Previously it was ...


Tue, 08 Sep 2015 14:16:28 GMT landauf [10567]
	* code/branches/core7/src/libraries/core/object/ObjectList.h (modified)

	added functions to use ObjectList<T> for any context


Tue, 08 Sep 2015 13:42:30 GMT landauf [10566]
	* code/branches/core7/src/libraries/network/Client.cc (modified)
	* code/branches/core7/src/orxonox/gamestates/GSLevel.cc (modified)
	* code/branches/core7/src/orxonox/gamestates/GSLevel.h (modified)

	moved destruction of all level objects from Client to GSLevel. ...


Sun, 30 Aug 2015 12:36:27 GMT landauf [10565]
	* code/branches/core7/src/libraries/network/FunctionCall.cc (modified)
	* code/branches/core7/src/libraries/network/NetworkFunction.cc (modified)
	* code/branches/core7/src/libraries/network/NetworkFunctionManager.cc (modified)
	* code/branches/core7/src/libraries/network/NetworkFunctionManager.h (modified)
	* code/branches/core7/src/libraries/network/packet/FunctionIDs.cc (modified)

	fixed mapping of FunctionIDs - same reason like for ClassIDs in
	r10564


Sun, 30 Aug 2015 11:36:54 GMT landauf [10564]
	* code/branches/core7/src/libraries/core/class/Identifier.cc (modified)
	* code/branches/core7/src/libraries/network/synchronisable/Synchronisable.cc (modified)

	bugfix: after receiving a ClassID packet, the client erases the list ...