#
# ChangeLog for /
#
# Generated by Trac 1.0.9
# Apr 14, 2025, 9:02:12 PM

Sat, 06 Jun 2015 08:43:12 GMT landauf [10527]
	* code/branches/core7/src/libraries/core/Core.cc (modified)
	* code/branches/core7/src/libraries/core/DynLib.cc (modified)
	* code/branches/core7/src/libraries/core/Game.cc (modified)

	unload modules, unload and destroy all statically initialized
	instances


Sat, 06 Jun 2015 08:37:40 GMT landauf [10526]
	* code/branches/core7/src/libraries/core/class/Identifier.cc (modified)

	identifier removes itself from all related identifiers when being ...


Thu, 04 Jun 2015 21:09:40 GMT landauf [10525]
	* code/branches/core7/src/libraries/core/Core.cc (modified)
	* code/branches/core7/src/libraries/core/GraphicsManager.cc (modified)
	* code/branches/core7/src/libraries/core/GraphicsManager.h (modified)

	unload debug overly while unloading graphics


Thu, 04 Jun 2015 20:32:52 GMT landauf [10524]
	* code/branches/core7/src/libraries/core/Core.cc (modified)
	* code/branches/core7/src/libraries/core/Core.h (modified)
	* code/branches/core7/src/libraries/core/Game.cc (modified)
	* code/branches/core7/src/libraries/core/Game.h (modified)

	unload graphics when the game exits


Sun, 31 May 2015 12:46:32 GMT landauf [10523]
	* code/branches/core7/src/libraries/core/DynLib.cc (modified)

	bugfix: DynLib::mName must be equal to the string in the ...


Sun, 31 May 2015 12:24:07 GMT landauf [10522]
	* code/branches/core7/src/libraries/core/module/StaticallyInitializedInstance.cc (modified)
	* code/branches/core7/src/libraries/core/module/StaticallyInitializedInstance.h (modified)

	remove StaticallyInitializedInstance from the same module where it ...


Sun, 31 May 2015 11:41:55 GMT landauf [10521]
	* code/branches/core7/src/libraries/core/module/ModuleInstance.cc (modified)

	bugfix: the wrong set was used


Sun, 31 May 2015 09:54:06 GMT landauf [10520]
	* code/branches/core7/src/libraries/core/Core.cc (modified)
	* code/branches/core7/src/libraries/core/CoreIncludes.h (modified)
	* code/branches/core7/src/libraries/core/class/IdentifierManager.cc (modified)
	* code/branches/core7/src/libraries/core/class/IdentifierManager.h (modified)
	* code/branches/core7/src/libraries/core/command/ConsoleCommand.cc (modified)
	* code/branches/core7/src/libraries/core/command/ConsoleCommandIncludes.h (modified)
	* code/branches/core7/src/libraries/core/command/ConsoleCommandManager.cc (modified)
	* code/branches/core7/src/libraries/core/command/ConsoleCommandManager.h (modified)
	* code/branches/core7/src/libraries/core/commandline/CommandLineIncludes.h (modified)
	* code/branches/core7/src/libraries/core/commandline/CommandLineParser.cc (modified)
	* code/branches/core7/src/libraries/core/commandline/CommandLineParser.h (modified)
	* code/branches/core7/src/libraries/core/singleton/ScopedSingletonIncludes.h (modified)
	* code/branches/core7/src/libraries/network/NetworkFunctionIncludes.h (modified)
	* code/branches/core7/src/libraries/network/NetworkFunctionManager.cc (modified)
	* code/branches/core7/src/libraries/network/NetworkFunctionManager.h (modified)
	* code/branches/core7/src/orxonox/gamestates/GSRoot.cc (modified)

	StaticallyInitializedInstances are now responsible to delete the ...


Sun, 31 May 2015 09:26:33 GMT landauf [10519]
	* code/branches/core7/src/libraries/core/class/IdentifierManager.cc (modified)
	* code/branches/core7/src/libraries/core/class/IdentifierManager.h (modified)

	only verify freshly initialized identifiers


Sun, 31 May 2015 08:56:32 GMT landauf [10518]
	* code/branches/core7/src/libraries/core/Core.cc (modified)
	* code/branches/core7/src/libraries/core/Core.h (modified)
	* code/branches/core7/src/libraries/core/Game.cc (modified)
	* code/branches/core7/src/libraries/core/class/IdentifierManager.cc (modified)
	* code/branches/core7/src/libraries/core/module/ModuleInstance.cc (modified)
	* code/branches/core7/src/libraries/core/module/ModuleInstance.h (modified)

	load modules AFTER core was initialized. load each module with a ...


Sun, 31 May 2015 08:54:39 GMT landauf [10517]
	* code/branches/core7/src/libraries/core/singleton/ScopeManager.cc (modified)
	* code/branches/core7/src/libraries/core/singleton/ScopeManager.h (modified)

	activating a scopelistener right after registering may not be the ...


Sun, 31 May 2015 08:38:09 GMT landauf [10516]
	* code/branches/core7/src/libraries/core/singleton/ScopeManager.cc (modified)

	fixed compilation error on buildserver


Sun, 31 May 2015 08:26:39 GMT landauf [10515]
	* code/branches/core7/src/libraries/core/singleton/ScopeManager.cc (modified)
	* code/branches/core7/src/libraries/core/singleton/ScopeManager.h (modified)

	if the scope is already active when a scopelistener is registered, ...


Sun, 31 May 2015 08:22:59 GMT landauf [10514]
	* code/branches/core7/src/libraries/core/singleton/Scope.h (modified)
	* code/branches/core7/src/libraries/core/singleton/ScopeManager.cc (modified)
	* code/branches/core7/src/libraries/core/singleton/ScopeManager.h (modified)
	* code/branches/core7/src/libraries/core/singleton/ScopedSingletonIncludes.cc (modified)
	* code/branches/core7/src/libraries/core/singleton/ScopedSingletonIncludes.h (modified)
	* code/branches/core7/src/libraries/core/singleton/ScopedSingletonWrapper.h (modified)

	don't store scope in ScopeListener - instead register the listener in ...


Sun, 31 May 2015 08:14:12 GMT landauf [10513]
	* code/branches/core7/src/libraries/core/singleton/Scope.h (modified)
	* code/branches/core7/src/libraries/core/singleton/ScopeManager.cc (modified)
	* code/branches/core7/src/libraries/core/singleton/ScopeManager.h (modified)

	refactoring: moved code from Scope.h into ScopeManager


Sat, 30 May 2015 20:59:13 GMT landauf [10512]
	* code/branches/core7/src/libraries/core/CoreIncludes.h (modified)
	* code/branches/core7/src/libraries/core/class/Identifier.cc (modified)
	* code/branches/core7/src/libraries/core/class/Identifier.h (modified)

	fixed issue: Class(T) may not be allowed in ...


Sat, 30 May 2015 19:59:31 GMT landauf [10511]
	* code/branches/core7/src/libraries/network/NetworkFunction.h (modified)

	bugfix: comparison function was not symmetric.
	e.g. two ...


Sat, 30 May 2015 11:13:23 GMT landauf [10510]
	* code/branches/core7/src/libraries/core/CMakeLists.txt (modified)

	fixed CMakeLists.txt


Sat, 30 May 2015 10:22:27 GMT landauf [10509]
	* code/branches/core7/src/libraries/core/ApplicationPaths.cc (copied)
	* code/branches/core7/src/libraries/core/ApplicationPaths.h (copied)
	* code/branches/core7/src/libraries/core/CMakeLists.txt (modified)
	* code/branches/core7/src/libraries/core/ConfigurablePaths.cc (moved)
	* code/branches/core7/src/libraries/core/ConfigurablePaths.h (moved)
	* code/branches/core7/src/libraries/core/Core.cc (modified)
	* code/branches/core7/src/libraries/core/Core.h (modified)
	* code/branches/core7/src/libraries/core/CoreConfig.cc (modified)
	* code/branches/core7/src/libraries/core/CorePrereqs.h (modified)
	* code/branches/core7/src/libraries/core/GUIManager.cc (modified)
	* code/branches/core7/src/libraries/core/GraphicsManager.cc (modified)
	* code/branches/core7/src/libraries/core/Language.cc (modified)
	* code/branches/core7/src/libraries/core/command/Shell.cc (modified)
	* code/branches/core7/src/libraries/core/command/TclBind.cc (modified)
	* code/branches/core7/src/libraries/core/commandline/CommandLineParser.cc (modified)
	* code/branches/core7/src/libraries/core/config/ConfigFile.cc (modified)
	* code/branches/core7/src/libraries/core/input/KeyBinder.cc (modified)
	* code/branches/core7/src/libraries/tools/ResourceLocation.cc (modified)
	* code/branches/core7/src/modules/designtools/ScreenshotManager.cc (modified)
	* code/branches/core7/src/modules/designtools/SkyboxGenerator.cc (modified)
	* code/branches/core7/src/orxonox/chat/ChatHistory.cc (modified)
	* code/branches/core7/src/orxonox/chat/ChatHistory.h (modified)

	moved static application paths (root, executable, modules) into new ...


Sat, 30 May 2015 08:18:07 GMT landauf [10508]
	* code/branches/core7/src/libraries/core/GraphicsManager.cc (modified)
	* code/branches/core7/src/libraries/core/Loader.cc (modified)
	* code/branches/core7/src/libraries/core/Loader.h (modified)
	* code/branches/core7/src/orxonox/Level.cc (modified)
	* code/branches/core7/src/orxonox/gamestates/GSLevel.cc (modified)

	removed unused code from Loader


Thu, 28 May 2015 09:39:26 GMT maxima [10507]
	* code/branches/presentationFS15/data/levels/presentationFS15.oxw (modified)

	Presentation level changed


Thu, 28 May 2015 09:38:42 GMT maxima [10506]
	* data/trunk/images/textures/Alien.png (added)
	* data/trunk/materials/Alien.material (added)

	Alien by liepatri


Thu, 28 May 2015 09:26:38 GMT maxima [10505]
	* code/branches/presentationFS15/data/gui/scripts/presentation.lua (modified)
	* code/branches/presentationFS15/data/gui/scripts/testscript.lua (modified)
	* code/branches/presentationFS15/data/levels/presentationFS15.oxw (modified)
	* code/branches/presentationFS15/src/orxonox/controllers/ScriptController.cc (modified)

	changed the presentation level and script


Thu, 28 May 2015 08:41:23 GMT maxima [10504]
	* code/branches/presentationFS15/data/levels/presentationFS15.oxw (modified)
	* code/branches/presentationFS15/data/levels/templates/orbStation.oxt (copied)
	* code/branches/presentationFS15/src/modules/weapons/projectiles/GravityBomb.cc (modified)
	* code/branches/presentationFS15/src/modules/weapons/projectiles/GravityBomb.h (modified)
	* code/branches/presentationFS15/src/modules/weapons/projectiles/GravityBombField.cc (modified)
	* code/branches/presentationFS15/src/modules/weapons/weaponmodes/GravityBombFire.cc (modified)

	Bugfix: See Commit 10502. New orbStation Template.


Wed, 27 May 2015 14:26:20 GMT meggiman [10503]
	* code/branches/weaponFS15/src/modules/weapons/weaponmodes/GravityBombFire.cc (modified)

	Changed Speed of Bomb to 600 and reduced flying time to 2.5 seconds.


Wed, 27 May 2015 14:23:44 GMT meggiman [10502]
	* 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)

	Bugfix: Game crashed if a pawn was directly hit by the bomb. Changed ...


Wed, 27 May 2015 13:08:53 GMT maxima [10501]
	* data/trunk/images/textures/OrbStation_Antenna.png (added)
	* data/trunk/images/textures/OrbStation_OpenPlat.png (added)
	* data/trunk/images/textures/OrbStation_Parabola.png (added)
	* data/trunk/images/textures/OrbStation_Platform.png (added)
	* data/trunk/images/textures/OrbStation_Ring_1.png (added)
	* data/trunk/images/textures/OrbStation_Ring_2.png (added)
	* data/trunk/images/textures/OrbStation_Ring_3.png (added)
	* data/trunk/images/textures/OrbStation_Ring_4.png (added)
	* data/trunk/images/textures/OrbStation_Ring_5.png (added)
	* data/trunk/images/textures/OrbStation_Sphere.png (added)
	* data/trunk/materials/OrbStation_Antenna.material (added)
	* data/trunk/materials/OrbStation_OpenPlat.material (added)
	* data/trunk/materials/OrbStation_Parabola.material (added)
	* data/trunk/materials/OrbStation_Platform.material (added)
	* data/trunk/materials/OrbStation_Ring_1.material (added)
	* data/trunk/materials/OrbStation_Ring_2.material (added)
	* data/trunk/materials/OrbStation_Ring_3.material (added)
	* data/trunk/materials/OrbStation_Ring_4.material (added)
	* data/trunk/materials/OrbStation_Ring_5.material (added)
	* data/trunk/materials/OrbStation_Sphere.material (added)
	* data/trunk/models/OrbStation_Antenna.mesh (added)
	* data/trunk/models/OrbStation_OpenPlat.mesh (added)
	* data/trunk/models/OrbStation_Parabola.mesh (added)
	* data/trunk/models/OrbStation_Platform.mesh (added)
	* data/trunk/models/OrbStation_Ring_1.mesh (added)
	* data/trunk/models/OrbStation_Ring_2.mesh (added)
	* data/trunk/models/OrbStation_Ring_3.mesh (added)
	* data/trunk/models/OrbStation_Ring_4.mesh (added)
	* data/trunk/models/OrbStation_Ring_5.mesh (added)
	* data/trunk/models/OrbStation_Sphere.mesh (added)

	files for orbstation


Wed, 27 May 2015 12:56:19 GMT sborghi [10500]
	* code/branches/formationFS15/data/levels/templates/orbStation.oxt (modified)

	Final template with all new models and rotation parabola.


Wed, 27 May 2015 12:36:07 GMT maxima [10499]
	* code/branches/presentationFS15/data/gui/scripts/presentation.lua (added)
	* code/branches/presentationFS15/data/gui/scripts/testscript.lua (modified)
	* code/branches/presentationFS15/data/levels/scriptController.oxw (modified)
	* code/branches/presentationFS15/data/levels/templates/spaceshipRing.oxt (modified)
	* code/branches/presentationFS15/src/orxonox/controllers/ControllerDirector.cc (modified)
	* code/branches/presentationFS15/src/orxonox/controllers/ControllerDirector.h (modified)

	New XMLPort for ControllerDirector. The name of the script can now be ...


Wed, 27 May 2015 11:11:01 GMT maxima [10498]
	* code/branches/presentationFS15/data/levels/includes/weaponSettingsFS15.oxi (modified)
	* code/branches/presentationFS15/data/levels/includes/weaponSettingsRing.oxi (modified)
	* code/branches/presentationFS15/data/levels/presentationFS15.oxw (modified)
	* code/branches/presentationFS15/data/levels/templates/spaceshipFS15.oxt (modified)
	* code/branches/presentationFS15/data/levels/templates/spaceshipHeartAttack.oxt (modified)
	* code/branches/presentationFS15/data/levels/templates/spaceshipRing.oxt (modified)

	Pres level modified


Wed, 27 May 2015 08:45:56 GMT maxima [10497]
	* code/branches/presentationFS15/data/gui/scripts/MultiplayerMenu.lua (modified)
	* code/branches/presentationFS15/data/levels/includes/weaponSettingsHeartAttack.oxi (modified)
	* code/branches/presentationFS15/src/libraries/network/GamestateManager.h (modified)
	* code/branches/presentationFS15/src/libraries/network/LANDiscoverable.cc (modified)
	* code/branches/presentationFS15/src/libraries/network/LANDiscoverable.h (modified)
	* code/branches/presentationFS15/src/libraries/network/LANDiscovery.cc (modified)
	* code/branches/presentationFS15/src/libraries/network/LANDiscovery.h (modified)
	* code/branches/presentationFS15/src/libraries/network/MasterServer.cc (modified)
	* code/branches/presentationFS15/src/libraries/network/MasterServer.h (modified)
	* code/branches/presentationFS15/src/libraries/network/MasterServerProtocol.h (modified)
	* code/branches/presentationFS15/src/libraries/network/PeerList.cc (modified)
	* code/branches/presentationFS15/src/libraries/network/PeerList.h (modified)
	* code/branches/presentationFS15/src/libraries/network/Server.cc (modified)
	* code/branches/presentationFS15/src/libraries/network/Server.h (modified)
	* code/branches/presentationFS15/src/libraries/network/ServerList.cc (modified)
	* code/branches/presentationFS15/src/libraries/network/ServerList.h (modified)
	* code/branches/presentationFS15/src/libraries/network/WANDiscoverable.cc (modified)
	* code/branches/presentationFS15/src/libraries/network/WANDiscoverable.h (modified)
	* code/branches/presentationFS15/src/libraries/network/WANDiscovery.cc (modified)
	* code/branches/presentationFS15/src/libraries/network/WANDiscovery.h (modified)
	* code/branches/presentationFS15/src/libraries/network/packet/ServerInformation.cc (modified)
	* code/branches/presentationFS15/src/libraries/network/packet/ServerInformation.h (modified)

	multiplayer branch merged to presentation


Wed, 27 May 2015 08:21:55 GMT maxima [10496]
	* code/branches/presentationFS15/data/levels/clangenb.oxw (copied)
	* code/branches/presentationFS15/data/levels/emptyLevel.oxw (modified)
	* code/branches/presentationFS15/data/levels/includes/weaponSettingsAssff.oxi (modified)
	* code/branches/presentationFS15/data/levels/includes/weaponSettingsHeartAttack.oxi (copied)
	* code/branches/presentationFS15/data/levels/templates/spaceshipHeartAttack.oxt (copied)
	* code/branches/presentationFS15/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified)
	* code/branches/presentationFS15/src/modules/weapons/weaponmodes/FusionFire.cc (modified)
	* code/branches/presentationFS15/src/modules/weapons/weaponmodes/LaserFire.cc (modified)

	clangenb: new spaceship heartattack merged to presentation


Wed, 27 May 2015 08:07:27 GMT maxima [10495]
	* code/branches/clangenb/data/levels/clangenb.oxw (added)
	* code/branches/clangenb/data/levels/includes/weaponSettingsAssff.oxi (modified)
	* code/branches/clangenb/src/modules/weapons/projectiles/Rocket.cc (modified)

	small changes


Wed, 27 May 2015 07:18:06 GMT clangenb [10494]
	* code/branches/clangenb/data/levels/emptyLevel.oxw (modified)
	* code/branches/clangenb/data/levels/includes/weaponSettingsAssff.oxi (modified)
	* code/branches/clangenb/data/levels/includes/weaponSettingsHeartAttack.oxi (added)
	* code/branches/clangenb/data/levels/templates/spaceshipHeartAttack.oxt (added)
	* code/branches/clangenb/src/modules/weapons/projectiles/Rocket.cc (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)

	branch added


Tue, 26 May 2015 15:10:25 GMT fvultier [10493]
	* data/trunk/materials/Phoenix.material (deleted)
	* data/trunk/models/HeartAttack.mesh (added)

	New spaceship by Christian Langenbacher


Tue, 26 May 2015 15:07:29 GMT fvultier [10492]
	* data/trunk/images/textures/HeartAttack.jpg (added)
	* data/trunk/materials/HeartAttack.material (added)
	* data/trunk/materials/Phoenix.material (added)

	New spaceship by Christian Langenbacher


Tue, 26 May 2015 12:33:47 GMT maxima [10491]
	* code/branches/presentationFS15/data/levels/includes/weaponSettingsRing.oxi (added)
	* code/branches/presentationFS15/data/levels/simone.oxw (added)
	* code/branches/presentationFS15/data/levels/templates/spaceshipRing.oxt (added)

	new spaceship by ssimone


Tue, 26 May 2015 12:30:04 GMT maxima [10490]
	* data/trunk/images/textures/ringWeapon.jpg (added)
	* data/trunk/images/textures/ship.jpg (added)
	* data/trunk/materials/ringWeapon.material (added)
	* data/trunk/materials/ship.material (added)
	* data/trunk/models/ringWeapon.mesh (added)
	* data/trunk/models/ship.mesh (added)

	files for new ship


Tue, 26 May 2015 12:23:26 GMT maxima [10489]
	* code/branches/presentationFS15/data/gui/scripts/testscript.lua (modified)
	* code/branches/presentationFS15/data/levels/levelTry.oxw (modified)
	* code/branches/presentationFS15/src/orxonox/controllers/ScriptController.cc (modified)
	* code/branches/presentationFS15/src/orxonox/controllers/ScriptController.h (modified)

	scriptable controller branch merged to presentation.


Tue, 26 May 2015 11:11:30 GMT meggiman [10488]
	* data/trunk/audio/sounds/GravityBombFlight.ogg (added)
	* data/trunk/audio/sounds/GravityField.ogg (added)
	* data/trunk/audio/sounds/GravityFieldExplosion.ogg (added)

	Added missing Sound files GravityBombFlight.ogg, GravityField.ogg and ...


Tue, 26 May 2015 11:08:43 GMT maxima [10487]
	* code/branches/presentationFS15/src/modules/weapons/projectiles/GravityBomb.h (modified)
	* code/branches/presentationFS15/src/modules/weapons/projectiles/GravityBombField.h (modified)

	Bug fixed


Tue, 26 May 2015 10:53:08 GMT maxima [10486]
	* code/branches/presentationFS15 (modified)
	* code/branches/presentationFS15/data/levels/includes/weaponSettingsFS15.oxi (modified)
	* code/branches/presentationFS15/data/particle/FieldExplosion.particle (copied)
	* code/branches/presentationFS15/data/particle/GravityBombField.particle (copied)
	* code/branches/presentationFS15/src/modules/objects/ForceField.h (modified)
	* code/branches/presentationFS15/src/modules/weapons/WeaponsPrereqs.h (modified)
	* code/branches/presentationFS15/src/modules/weapons/munitions/CMakeLists.txt (modified)
	* code/branches/presentationFS15/src/modules/weapons/munitions/GravityBombMunition.cc (copied)
	* code/branches/presentationFS15/src/modules/weapons/munitions/GravityBombMunition.h (copied)
	* code/branches/presentationFS15/src/modules/weapons/projectiles/CMakeLists.txt (modified)
	* code/branches/presentationFS15/src/modules/weapons/projectiles/GravityBomb.cc (copied)
	* code/branches/presentationFS15/src/modules/weapons/projectiles/GravityBomb.h (copied)
	* code/branches/presentationFS15/src/modules/weapons/projectiles/GravityBombField.cc (copied)
	* code/branches/presentationFS15/src/modules/weapons/projectiles/GravityBombField.h (copied)
	* code/branches/presentationFS15/src/modules/weapons/projectiles/LightningGunProjectile.cc (modified)
	* code/branches/presentationFS15/src/modules/weapons/weaponmodes/CMakeLists.txt (modified)
	* code/branches/presentationFS15/src/modules/weapons/weaponmodes/GravityBombFire.cc (copied)
	* code/branches/presentationFS15/src/modules/weapons/weaponmodes/GravityBombFire.h (copied)

	weaponFS15 branch merged to presentation. spaceshipFS15 has ...


Tue, 26 May 2015 10:40:33 GMT maxima [10485]
	* code/branches/presentationFS15 (modified)
	* code/branches/presentationFS15/data/defaultConfig/keybindings.ini (modified)
	* code/branches/presentationFS15/data/levels/emptyLevel.oxw (modified)
	* code/branches/presentationFS15/data/levels/includes/weaponSettingsAssff.oxi (modified)
	* code/branches/presentationFS15/data/levels/includes/weaponSettingsFS15.oxi (added)
	* code/branches/presentationFS15/data/levels/presentationFS15.oxw (added)
	* code/branches/presentationFS15/data/levels/templates/spaceshipFS15.oxt (added)
	* code/branches/presentationFS15/data/particle/orxonox_explosionAfterglow.particle (copied)
	* code/branches/presentationFS15/data/particle/orxonox_explosionFlame.particle (copied)
	* code/branches/presentationFS15/data/particle/orxonox_explosionFlame2.particle (copied)
	* code/branches/presentationFS15/data/particle/orxonox_explosionFlash.particle (copied)
	* code/branches/presentationFS15/data/particle/orxonox_explosionFlash2.particle (copied)
	* code/branches/presentationFS15/data/particle/orxonox_explosionShockwave.particle (copied)
	* code/branches/presentationFS15/data/particle/orxonox_explosionShockwave2.particle (copied)
	* code/branches/presentationFS15/data/particle/orxonox_explosionSparks.particle (copied)
	* code/branches/presentationFS15/data/particle/orxonox_explosionSparks2.particle (copied)
	* code/branches/presentationFS15/data/particle/orxonox_explosionStreak1.particle (copied)
	* code/branches/presentationFS15/data/particle/orxonox_explosionStreak2.particle (copied)
	* code/branches/presentationFS15/src/external/ogreceguirenderer/CMakeLists.txt (modified)
	* code/branches/presentationFS15/src/modules/weapons/CMakeLists.txt (modified)
	* code/branches/presentationFS15/src/modules/weapons/WeaponsPrereqs.h (modified)
	* code/branches/presentationFS15/src/modules/weapons/projectiles/CMakeLists.txt (modified)
	* code/branches/presentationFS15/src/modules/weapons/projectiles/Rocket.cc (modified)
	* code/branches/presentationFS15/src/modules/weapons/projectiles/RocketOld.cc (copied)
	* code/branches/presentationFS15/src/modules/weapons/projectiles/RocketOld.h (copied)
	* code/branches/presentationFS15/src/modules/weapons/weaponmodes/CMakeLists.txt (modified)
	* code/branches/presentationFS15/src/modules/weapons/weaponmodes/RocketFireOld.cc (copied)
	* code/branches/presentationFS15/src/modules/weapons/weaponmodes/RocketFireOld.h (copied)
	* code/branches/presentationFS15/src/orxonox/worldentities/pawns/Pawn.cc (modified)

	ParticleEffects branch merged to presentation. New level ...


Mon, 25 May 2015 20:56:26 GMT landauf [10484]
	* code/branches/core7/src/libraries/core/Core.cc (modified)
	* code/branches/core7/src/libraries/core/command/ArgumentCompletionFunctions.cc (modified)
	* code/branches/core7/src/libraries/core/command/CommandEvaluation.cc (modified)
	* code/branches/core7/src/libraries/core/command/CommandExecutor.cc (modified)
	* code/branches/core7/src/libraries/core/command/ConsoleCommand.cc (modified)
	* code/branches/core7/src/libraries/core/command/ConsoleCommandIncludes.cc (modified)
	* code/branches/core7/src/libraries/core/command/ConsoleCommandIncludes.h (modified)
	* code/branches/core7/src/libraries/core/command/ConsoleCommandManager.cc (modified)
	* code/branches/core7/src/libraries/core/command/ConsoleCommandManager.h (modified)

	made ConsoleCommandManager a singleton.


Mon, 25 May 2015 20:36:28 GMT landauf [10483]
	* code/branches/core7/src/libraries/core/Core.cc (modified)
	* code/branches/core7/src/libraries/core/class/Identifier.cc (modified)
	* code/branches/core7/src/libraries/core/class/Identifier.h (modified)
	* code/branches/core7/src/libraries/core/class/IdentifierManager.cc (modified)
	* code/branches/core7/src/libraries/core/class/IdentifierManager.h (modified)

	avoid dependency on IdentifierManager for as long as possible


Mon, 25 May 2015 20:34:42 GMT landauf [10482]
	* code/branches/core7/src/libraries/core/class/Identifier.cc (modified)

	detail


Mon, 25 May 2015 19:40:11 GMT landauf [10481]
	* code/branches/core7/src/libraries/core/CoreIncludes.h (modified)
	* code/branches/core7/src/libraries/core/class/IdentifierManager.cc (modified)
	* code/branches/core7/src/libraries/core/class/IdentifierManager.h (modified)
	* code/branches/core7/src/libraries/core/singleton/ScopedSingletonIncludes.h (modified)
	* code/branches/core7/test/core/object/ClassFactoryTest.cc (modified)
	* code/branches/core7/test/core/object/ContextTest.cc (modified)
	* code/branches/core7/test/core/object/IteratorTest.cc (modified)
	* code/branches/core7/test/core/object/ListableTest.cc (modified)
	* code/branches/core7/test/core/object/ObjectListIteratorTest.cc (modified)

	StaticallyInitializedIdentifier is now responsible to register and ...


Mon, 25 May 2015 19:01:33 GMT landauf [10480]
	* code/branches/core7/src/libraries/core/Core.cc (modified)
	* code/branches/core7/src/libraries/core/CoreConfig.cc (modified)
	* code/branches/core7/src/libraries/core/CoreConfig.h (modified)
	* code/branches/core7/src/libraries/core/Language.cc (modified)
	* code/branches/core7/src/libraries/core/Language.h (modified)

	removed dependency of Language on CoreConfig.


Mon, 25 May 2015 17:20:21 GMT landauf [10479]
	* code/branches/core7/src/libraries/core/CMakeLists.txt (modified)
	* code/branches/core7/src/libraries/core/Core.cc (modified)
	* code/branches/core7/src/libraries/core/Core.h (modified)
	* code/branches/core7/src/libraries/core/CoreConfig.cc (added)
	* code/branches/core7/src/libraries/core/CoreConfig.h (added)
	* code/branches/core7/src/libraries/core/CorePrereqs.h (modified)
	* code/branches/core7/src/libraries/core/GUIManager.cc (modified)
	* code/branches/core7/src/libraries/core/Game.cc (modified)
	* code/branches/core7/src/libraries/core/Game.h (modified)
	* code/branches/core7/src/libraries/core/GameConfig.cc (added)
	* code/branches/core7/src/libraries/core/GameConfig.h (added)
	* code/branches/core7/src/libraries/core/GraphicsManager.cc (modified)
	* code/branches/core7/src/libraries/core/Language.cc (modified)
	* code/branches/core7/src/libraries/core/Language.h (modified)
	* code/branches/core7/src/libraries/core/class/IdentifierManager.cc (modified)
	* code/branches/core7/src/libraries/core/command/Shell.h (modified)
	* code/branches/core7/src/orxonox/gamestates/GSLevel.cc (modified)
	* code/branches/core7/src/orxonox/gametypes/Gametype.cc (modified)

	moved config values and all related functions from Game and Core to ...


Mon, 25 May 2015 15:37:15 GMT landauf [10478]
	* code/branches/core7/src/libraries/network/CMakeLists.txt (modified)
	* code/branches/core7/src/libraries/network/FunctionCall.cc (modified)
	* code/branches/core7/src/libraries/network/FunctionCall.h (modified)
	* code/branches/core7/src/libraries/network/FunctionCallManager.cc (modified)
	* code/branches/core7/src/libraries/network/FunctionCallManager.h (modified)
	* code/branches/core7/src/libraries/network/NetworkFunction.h (modified)
	* code/branches/core7/src/libraries/network/NetworkFunctionIncludes.cc (added)
	* code/branches/core7/src/libraries/network/NetworkFunctionIncludes.h (modified)
	* code/branches/core7/src/libraries/network/packet/FunctionCalls.cc (modified)
	* code/branches/core7/src/libraries/network/packet/FunctionCalls.h (modified)
	* code/branches/core7/src/modules/docking/Dock.cc (modified)
	* code/branches/core7/src/modules/notifications/NotificationDispatcher.cc (modified)
	* code/branches/core7/src/modules/objects/Script.cc (modified)
	* code/branches/core7/src/modules/pickup/PickupManager.cc (modified)
	* code/branches/core7/src/orxonox/Test.cc (modified)
	* code/branches/core7/src/orxonox/infos/GametypeInfo.cc (modified)
	* code/branches/core7/src/orxonox/interfaces/NotificationListener.cc (modified)
	* code/branches/core7/src/orxonox/worldentities/ControllableEntity.cc (modified)

	callStaticNetworkFunction() and callMemberNetworkFunction() are now ...


Mon, 25 May 2015 14:51:04 GMT landauf [10477]
	* code/branches/core7/src/libraries/network/CMakeLists.txt (modified)

	simplified CMakeLists.txt


Mon, 25 May 2015 13:23:55 GMT landauf [10476]
	* code/branches/core7/src/libraries/network/NetworkFunction.cc (modified)
	* code/branches/core7/src/libraries/network/NetworkFunctionIncludes.h (modified)

	wrap NetworkFunction in a StaticallyInitializedInstance


Mon, 25 May 2015 12:41:57 GMT landauf [10475]
	* code/branches/core7/src/libraries/network/FunctionCall.cc (modified)
	* code/branches/core7/src/libraries/network/NetworkFunction.cc (modified)
	* code/branches/core7/src/libraries/network/NetworkFunction.h (modified)
	* code/branches/core7/src/libraries/network/NetworkFunctionIncludes.h (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)

	refactored the interface of NetworkFunctionManager: maps are better ...


Mon, 25 May 2015 12:14:16 GMT landauf [10474]
	* code/branches/core7/src/libraries/network/FunctionCall.cc (modified)
	* code/branches/core7/src/libraries/network/NetworkFunction.cc (modified)
	* code/branches/core7/src/libraries/network/NetworkFunctionIncludes.h (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)
	* code/branches/core7/src/orxonox/gamestates/GSRoot.cc (modified)

	made NetworkFunctionManager a singleton, no static functions anymore ...


Mon, 25 May 2015 12:04:43 GMT landauf [10473]
	* code/branches/core7/src/libraries/network/FunctionCall.cc (modified)
	* code/branches/core7/src/libraries/network/FunctionCall.h (modified)
	* code/branches/core7/src/libraries/network/FunctionCallManager.cc (modified)
	* code/branches/core7/src/libraries/network/FunctionCallManager.h (modified)
	* code/branches/core7/src/libraries/network/NetworkFunctionIncludes.h (modified)
	* code/branches/core7/src/libraries/network/packet/FunctionCalls.cc (modified)
	* code/branches/core7/src/libraries/network/packet/FunctionCalls.h (modified)

	bugfix and continuation of the last commit:
	 - ...


Mon, 25 May 2015 11:51:40 GMT landauf [10472]
	* code/branches/core7/src/libraries/network/FunctionCall.cc (modified)
	* code/branches/core7/src/libraries/network/FunctionCall.h (modified)
	* code/branches/core7/src/libraries/network/NetworkFunction.h (modified)

	use the same interface for static an member functions


Mon, 25 May 2015 11:37:50 GMT landauf [10471]
	* code/branches/core7/src/libraries/network/FunctionCall.cc (modified)
	* code/branches/core7/src/libraries/network/NetworkFunction.cc (modified)
	* code/branches/core7/src/libraries/network/NetworkFunction.h (modified)
	* code/branches/core7/src/libraries/network/NetworkFunctionIncludes.h (modified)
	* code/branches/core7/src/libraries/network/NetworkFunctionManager.cc (modified)
	* code/branches/core7/src/libraries/network/NetworkFunctionManager.h (modified)

	moved static maps from NetworkFunctionStatic and ...


Mon, 25 May 2015 10:25:29 GMT landauf [10470]
	* code/branches/core7/src/libraries/network/NetworkFunction.cc (modified)
	* code/branches/core7/src/libraries/network/NetworkFunction.h (modified)
	* code/branches/core7/src/libraries/network/packet/FunctionIDs.cc (modified)

	NetworkFunctionBase doesn't have to inherit from Listable: there's a ...


Mon, 25 May 2015 10:16:43 GMT landauf [10469]
	* code/branches/core7/src/libraries/network/NetworkFunction.h (modified)
	* code/branches/core7/src/libraries/network/NetworkFunctionManager.cc (modified)
	* code/branches/core7/src/libraries/network/NetworkFunctionManager.h (modified)

	removed unused code


Mon, 25 May 2015 10:13:27 GMT landauf [10468]
	* code/branches/core7/src/libraries/network/CMakeLists.txt (modified)
	* code/branches/core7/src/libraries/network/NetworkFunction.cc (modified)
	* code/branches/core7/src/libraries/network/NetworkFunction.h (modified)
	* code/branches/core7/src/libraries/network/NetworkFunctionManager.cc (added)
	* code/branches/core7/src/libraries/network/NetworkFunctionManager.h (added)
	* code/branches/core7/src/libraries/network/packet/FunctionIDs.cc (modified)
	* code/branches/core7/src/orxonox/gamestates/GSRoot.cc (modified)

	moved static content of NetworkFunctionBase to NetworkFunctionManager


Mon, 25 May 2015 09:50:15 GMT landauf [10467]
	* code/branches/core7/src/libraries/core/class/Identifier.h (modified)
	* code/branches/core7/src/libraries/core/object/IteratorBase.h (modified)
	* code/branches/core7/src/libraries/core/object/ObjectList.h (modified)

	trying to fix compiler error on buildserver


Mon, 25 May 2015 09:33:05 GMT landauf [10466]
	* code/branches/core7/src/libraries/core/class/Identifier.h (modified)
	* code/branches/core7/src/libraries/core/object/IteratorBase.h (modified)
	* code/branches/core7/src/libraries/core/object/ObjectList.h (modified)

	added static assertions to validate the type of certain templates


Mon, 25 May 2015 08:24:56 GMT landauf [10465]
	* code/branches/core7/src/libraries/network/NetworkFunction.h (modified)
	* code/branches/core7/src/libraries/network/NetworkFunctionIncludes.h (added)
	* code/branches/core7/src/modules/docking/Dock.cc (modified)
	* code/branches/core7/src/modules/notifications/NotificationDispatcher.cc (modified)
	* code/branches/core7/src/modules/objects/Script.cc (modified)
	* code/branches/core7/src/modules/pickup/PickupManager.cc (modified)
	* code/branches/core7/src/orxonox/Test.cc (modified)
	* code/branches/core7/src/orxonox/gamestates/GSRoot.cc (modified)
	* code/branches/core7/src/orxonox/infos/GametypeInfo.cc (modified)
	* code/branches/core7/src/orxonox/interfaces/NotificationListener.cc (modified)
	* code/branches/core7/src/orxonox/worldentities/ControllableEntity.cc (modified)

	moved macro ans helperfunction from NetworkFunction.h to ...


Sun, 24 May 2015 22:13:34 GMT landauf [10464]
	* code/branches/core7/src/libraries/core/Core.cc (modified)
	* code/branches/core7/src/libraries/core/Core.h (modified)
	* code/branches/core7/src/libraries/core/CorePrereqs.h (modified)
	* code/branches/core7/src/libraries/core/input/KeyBinderManager.cc (modified)
	* code/branches/core7/src/libraries/core/input/KeyDetector.cc (modified)
	* code/branches/core7/src/libraries/core/object/DestroyLaterManager.cc (modified)
	* code/branches/core7/src/libraries/network/Client.cc (modified)
	* code/branches/core7/src/libraries/network/LANDiscovery.cc (modified)
	* code/branches/core7/src/modules/designtools/ScreenshotManager.cc (modified)
	* code/branches/core7/src/modules/designtools/SkyboxGenerator.cc (modified)
	* code/branches/core7/src/modules/notifications/NotificationManager.cc (modified)
	* code/branches/core7/src/modules/pickup/PickupManager.cc (modified)
	* code/branches/core7/src/modules/questsystem/QuestManager.cc (modified)
	* code/branches/core7/src/orxonox/CameraManager.cc (modified)
	* code/branches/core7/src/orxonox/LevelManager.cc (modified)
	* code/branches/core7/src/orxonox/MoodManager.cc (modified)
	* code/branches/core7/src/orxonox/PlayerManager.cc (modified)
	* code/branches/core7/src/orxonox/chat/ChatHistory.cc (modified)
	* code/branches/core7/src/orxonox/chat/ChatInputHandler.cc (modified)
	* code/branches/core7/src/orxonox/chat/ChatManager.cc (modified)
	* code/branches/core7/src/orxonox/overlays/InGameConsole.cc (modified)
	* code/branches/core7/src/orxonox/sound/SoundManager.cc (modified)
	* code/branches/core7/test/core/singleton/ScopeTest.cc (modified)

	define ScopeID as integer constants instead of an enum. this allows ...


Sun, 24 May 2015 22:00:14 GMT landauf [10463]
	* code/branches/core7/src/libraries/core/singleton/Scope.h (modified)
	* code/branches/core7/src/libraries/core/singleton/ScopeManager.cc (modified)
	* code/branches/core7/src/libraries/core/singleton/ScopeManager.h (modified)

	removed unnecessary instance counts. creation of scopes is strictly ...


Sun, 24 May 2015 21:42:16 GMT landauf [10462]
	* code/branches/core7/src/libraries/core/Core.cc (modified)
	* code/branches/core7/src/libraries/core/singleton/Scope.h (modified)
	* code/branches/core7/src/libraries/core/singleton/ScopeManager.cc (modified)
	* code/branches/core7/src/libraries/core/singleton/ScopeManager.h (modified)
	* code/branches/core7/src/libraries/core/singleton/ScopedSingletonIncludes.cc (modified)

	some refactoring in ScopeManager. made it a singleton and added ...


Sun, 24 May 2015 21:29:21 GMT landauf [10461]
	* code/branches/core7/src/libraries/core/singleton/CMakeLists.txt (modified)
	* code/branches/core7/src/libraries/core/singleton/Scope.h (modified)
	* code/branches/core7/src/libraries/core/singleton/ScopeManager.cc (moved)
	* code/branches/core7/src/libraries/core/singleton/ScopeManager.h (copied)

	moved ScopeManager into separate class


Sun, 24 May 2015 21:19:15 GMT landauf [10460]
	* code/branches/core7/src/libraries/core/singleton/CMakeLists.txt (modified)
	* code/branches/core7/src/libraries/core/singleton/Scope.h (modified)
	* code/branches/core7/src/libraries/core/singleton/ScopedSingletonIncludes.cc (added)
	* code/branches/core7/src/libraries/core/singleton/ScopedSingletonIncludes.h (modified)
	* code/branches/core7/src/libraries/core/singleton/ScopedSingletonWrapper.h (modified)
	* code/branches/core7/test/core/singleton/ScopeTest.cc (modified)

	StaticallyInitializedScopedSingletonWrapper registers ...


Sun, 24 May 2015 11:48:18 GMT landauf [10459]
	* code/branches/core7/src/libraries/core/Core.cc (modified)
	* code/branches/core7/src/libraries/core/input/KeyBinderManager.cc (modified)
	* code/branches/core7/src/libraries/core/input/KeyDetector.cc (modified)
	* code/branches/core7/src/libraries/core/object/DestroyLaterManager.cc (modified)
	* code/branches/core7/src/libraries/core/singleton/ScopedSingletonIncludes.h (added)
	* code/branches/core7/src/libraries/core/singleton/ScopedSingletonWrapper.h (modified)
	* code/branches/core7/src/libraries/network/Client.cc (modified)
	* code/branches/core7/src/libraries/network/LANDiscovery.cc (modified)
	* code/branches/core7/src/libraries/network/MasterServer.cc (modified)
	* code/branches/core7/src/modules/designtools/ScreenshotManager.cc (modified)
	* code/branches/core7/src/modules/designtools/SkyboxGenerator.cc (modified)
	* code/branches/core7/src/modules/notifications/NotificationManager.cc (modified)
	* code/branches/core7/src/modules/pickup/PickupManager.cc (modified)
	* code/branches/core7/src/modules/questsystem/QuestManager.cc (modified)
	* code/branches/core7/src/orxonox/CameraManager.cc (modified)
	* code/branches/core7/src/orxonox/LevelManager.cc (modified)
	* code/branches/core7/src/orxonox/MoodManager.cc (modified)
	* code/branches/core7/src/orxonox/PlayerManager.cc (modified)
	* code/branches/core7/src/orxonox/chat/ChatHistory.cc (modified)
	* code/branches/core7/src/orxonox/chat/ChatInputHandler.cc (modified)
	* code/branches/core7/src/orxonox/chat/ChatManager.cc (modified)
	* code/branches/core7/src/orxonox/overlays/InGameConsole.cc (modified)
	* code/branches/core7/src/orxonox/sound/SoundManager.cc (modified)
	* code/branches/core7/test/core/singleton/ScopeTest.cc (modified)

	wrap ScopedSingletonWrapper in a ...


Sun, 24 May 2015 09:51:05 GMT landauf [10458]
	* code/branches/core7/src/libraries/core/Core.cc (modified)
	* code/branches/core7/src/libraries/core/CorePrereqs.h (modified)
	* code/branches/core7/src/libraries/core/input/KeyBinderManager.cc (modified)
	* code/branches/core7/src/libraries/core/input/KeyDetector.cc (modified)
	* code/branches/core7/src/libraries/core/object/DestroyLaterManager.cc (modified)
	* code/branches/core7/src/libraries/core/singleton/CMakeLists.txt (modified)
	* code/branches/core7/src/libraries/core/singleton/Scope.h (modified)
	* code/branches/core7/src/libraries/core/singleton/ScopedSingletonManager.cc (deleted)
	* code/branches/core7/src/libraries/core/singleton/ScopedSingletonWrapper.h (moved)
	* code/branches/core7/src/libraries/network/Client.cc (modified)
	* code/branches/core7/src/libraries/network/LANDiscovery.cc (modified)
	* code/branches/core7/src/libraries/network/MasterServer.cc (modified)
	* code/branches/core7/src/libraries/util/Singleton.h (modified)
	* code/branches/core7/src/modules/designtools/ScreenshotManager.cc (modified)
	* code/branches/core7/src/modules/designtools/SkyboxGenerator.cc (modified)
	* code/branches/core7/src/modules/notifications/NotificationManager.cc (modified)
	* code/branches/core7/src/modules/pickup/PickupManager.cc (modified)
	* code/branches/core7/src/modules/questsystem/QuestManager.cc (modified)
	* code/branches/core7/src/orxonox/CameraManager.cc (modified)
	* code/branches/core7/src/orxonox/LevelManager.cc (modified)
	* code/branches/core7/src/orxonox/MoodManager.cc (modified)
	* code/branches/core7/src/orxonox/PlayerManager.cc (modified)
	* code/branches/core7/src/orxonox/chat/ChatHistory.cc (modified)
	* code/branches/core7/src/orxonox/chat/ChatInputHandler.cc (modified)
	* code/branches/core7/src/orxonox/chat/ChatManager.cc (modified)
	* code/branches/core7/src/orxonox/overlays/InGameConsole.cc (modified)
	* code/branches/core7/src/orxonox/sound/SoundManager.cc (modified)
	* code/branches/core7/test/core/singleton/ScopeTest.cc (modified)

	renamed ScopedSingletonManager to ScopedSingletonWrapper. removed ...


Sat, 23 May 2015 19:50:13 GMT frovelli [10457]
	* code/branches/multiplayerFS15/src/libraries/network/LANDiscoverable.cc (modified)
	* code/branches/multiplayerFS15/src/libraries/network/LANDiscoverable.h (modified)

	Remove training wheels


Sat, 23 May 2015 19:47:30 GMT frovelli [10456]
	* code/branches/multiplayerFS15/src/libraries/network/LANDiscoverable.cc (modified)
	* code/branches/multiplayerFS15/src/libraries/network/LANDiscovery.cc (modified)
	* code/branches/multiplayerFS15/src/libraries/network/packet/ServerInformation.cc (modified)
	* code/branches/multiplayerFS15/src/libraries/network/packet/ServerInformation.h (modified)

	Transmit client count in LAN by evil hack


Sat, 23 May 2015 17:33:37 GMT meggiman [10455]
	* 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)
	* code/branches/weaponFS15/src/modules/weapons/weaponmodes/GravityBombFire.h (modified)




Fri, 22 May 2015 09:06:11 GMT clangenb [10454]
	* data/contentcreation/pps/clangenb/Blenderfiles/HeartAttack (deleted)
	* data/contentcreation/pps/clangenb/Blenderfiles/HeartAttack1 (added)
	* data/contentcreation/pps/clangenb/Blenderfiles/HeartAttack1/HeartAttack.blend (added)
	* data/contentcreation/pps/clangenb/Blenderfiles/HeartAttack1/HeartAttack.jpg (added)
	* data/contentcreation/pps/clangenb/Blenderfiles/HeartAttack1/HeartAttack.material (added)
	* data/contentcreation/pps/clangenb/Blenderfiles/HeartAttack1/HeartAttack.mesh (added)
	* data/contentcreation/pps/clangenb/Blenderfiles/HeartAttack2 (deleted)
	* data/contentcreation/pps/clangenb/Blenderfiles/Spaceship.blend (deleted)
	* data/contentcreation/pps/clangenb/Blenderfiles/Spaceship.blend1 (deleted)
	* data/contentcreation/pps/clangenb/Blenderfiles/Spaceship.blend2 (deleted)
	* data/contentcreation/pps/clangenb/Blenderfiles/SpaceshipALT.blend1 (deleted)
	* data/contentcreation/pps/clangenb/Blenderfiles/SpaceshipALT.blend2 (deleted)
	* data/contentcreation/pps/clangenb/Blenderfiles/SpaceshipFun.blend (deleted)
	* data/contentcreation/pps/clangenb/Blenderfiles/SpaceshipMetal.blend (deleted)
	* data/contentcreation/pps/clangenb/Blenderfiles/SpaceshipMetal.blend1 (deleted)
	* data/contentcreation/pps/clangenb/Blenderfiles/SpaceshipMetal.blend2 (deleted)
	* data/contentcreation/pps/clangenb/Blenderfiles/SpaceshipMetal.jpg (deleted)
	* data/contentcreation/pps/clangenb/Blenderfiles/SpaceshipMetal1.blend (deleted)
	* data/contentcreation/pps/clangenb/Blenderfiles/SpaceshipMetal2.blend (deleted)
	* data/contentcreation/pps/clangenb/Blenderfiles/SpaceshipMetal3.blend (deleted)
	* data/contentcreation/pps/clangenb/Blenderfiles/SpaceshipText (deleted)

	Final Spaceship Files


Thu, 21 May 2015 16:48:06 GMT clangenb [10453]
	* data/contentcreation/pps/clangenb/Blenderfiles/HeartAttack2/HeartAttack.mesh (modified)

	converted mesh


Thu, 21 May 2015 14:26:39 GMT maxima [10452]
	* code/branches/presentationFS15 (modified)
	* code/branches/presentationFS15/data/levels/templates/enemytowerdefense.oxt (modified)
	* code/branches/presentationFS15/data/levels/templates/tower.oxt (deleted)
	* code/branches/presentationFS15/data/levels/templates/towerdefensetower.oxt (copied)
	* code/branches/presentationFS15/data/levels/towerDefense.oxw (modified)
	* code/branches/presentationFS15/src/modules/objects/Turret.cc (modified)
	* code/branches/presentationFS15/src/modules/objects/Turret.h (modified)
	* code/branches/presentationFS15/src/modules/objects/controllers/TurretController.cc (modified)
	* code/branches/presentationFS15/src/modules/tetris/Tetris.h (modified)
	* code/branches/presentationFS15/src/modules/towerdefense/CMakeLists.txt (modified)
	* code/branches/presentationFS15/src/modules/towerdefense/TDCoordinate.cc (modified)
	* code/branches/presentationFS15/src/modules/towerdefense/TDCoordinate.h (modified)
	* code/branches/presentationFS15/src/modules/towerdefense/Tower.cc (deleted)
	* code/branches/presentationFS15/src/modules/towerdefense/Tower.h (deleted)
	* code/branches/presentationFS15/src/modules/towerdefense/TowerDefense.cc (modified)
	* code/branches/presentationFS15/src/modules/towerdefense/TowerDefense.h (modified)
	* code/branches/presentationFS15/src/modules/towerdefense/TowerDefenseCenterpoint.cc (modified)
	* code/branches/presentationFS15/src/modules/towerdefense/TowerDefenseCenterpoint.h (modified)
	* code/branches/presentationFS15/src/modules/towerdefense/TowerDefenseEnemy.cc (modified)
	* code/branches/presentationFS15/src/modules/towerdefense/TowerDefenseSelecter.cc (copied)
	* code/branches/presentationFS15/src/modules/towerdefense/TowerDefenseSelecter.h (copied)
	* code/branches/presentationFS15/src/modules/towerdefense/TowerDefenseTower.cc (modified)
	* code/branches/presentationFS15/src/modules/towerdefense/TowerDefenseTower.h (modified)
	* code/branches/presentationFS15/src/modules/towerdefense/TowerTurret.cc (deleted)
	* code/branches/presentationFS15/src/modules/towerdefense/TowerTurret.h (deleted)
	* code/branches/presentationFS15/src/orxonox/controllers/FormationController.cc (modified)

	Towerdefense merged to Presentation


Thu, 21 May 2015 14:10:10 GMT erbj [10451]
	* code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefense.cc (modified)
	* code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefense.h (modified)
	* code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseSelecter.cc (modified)

	final version


Thu, 21 May 2015 13:58:46 GMT clangenb [10450]
	* data/contentcreation/pps/clangenb/Blenderfiles/HeartAttack/HeartAttack.blend (modified)
	* data/contentcreation/pps/clangenb/Blenderfiles/HeartAttack/HeartAttack.blend1 (modified)
	* data/contentcreation/pps/clangenb/Blenderfiles/HeartAttack2/HeartAttack.blend (modified)

	new mesh


Thu, 21 May 2015 13:58:12 GMT liepatri [10449]
	* data/contentcreation/pps/liepatri/Alien v1.0 Final.blend (added)
	* data/contentcreation/pps/liepatri/Alien v1.0 rendered (1).png (added)
	* data/contentcreation/pps/liepatri/Alien v1.0 rendered (2).png (added)
	* data/contentcreation/pps/liepatri/Alien v1.0 rendered (3).png (added)
	* data/contentcreation/pps/liepatri/Animation 1.avi (added)
	* data/contentcreation/pps/liepatri/Animation 2.avi (added)
	* data/contentcreation/pps/liepatri/mannsgöggeli v1.0 rendered.png (deleted)
	* data/contentcreation/pps/liepatri/mannsgöggeli v1.0.blend (deleted)

	fertige Version des Aliens, das Alien ist in Blender animiert (kann ...


Thu, 21 May 2015 12:55:51 GMT rgraczyk [10448]
	* code/branches/SciptableControllerFS15/data/gui/scripts/testscript.lua (modified)
	* code/branches/SciptableControllerFS15/src/orxonox/controllers/ScriptController.cc (modified)
	* code/branches/SciptableControllerFS15/src/orxonox/controllers/ScriptController.h (modified)

	Various changes, see comments in cpp file


Thu, 21 May 2015 12:39:05 GMT frovelli [10447]
	* code/branches/multiplayerFS15/src/libraries/network/LANDiscoverable.cc (modified)
	* code/branches/multiplayerFS15/src/libraries/network/MasterServer.cc (modified)
	* code/branches/multiplayerFS15/src/libraries/network/MasterServerProtocol.h (modified)
	* code/branches/multiplayerFS15/src/libraries/network/WANDiscoverable.cc (modified)
	* code/branches/multiplayerFS15/src/libraries/network/WANDiscoverable.h (modified)

	cleanup


Thu, 21 May 2015 11:19:28 GMT frovelli [10446]
	* code/branches/multiplayerFS15/data/gui/scripts/MultiplayerMenu.lua (modified)

	Display bugfix


Thu, 21 May 2015 10:57:18 GMT maxima [10445]
	* data/contentcreation/pps/sborghi (added)




Thu, 21 May 2015 10:44:57 GMT maxima [10444]
	* code/branches/presentationFS15 (copied)

	New branch for the presentation.


Sun, 17 May 2015 19:45:02 GMT landauf [10443]
	* code/branches/cpp11/src/libraries/tools/BulletDebugDrawer.h (modified)
	* code/branches/cpp11/src/libraries/tools/OgreBulletUtils.h (modified)
	* code/branches/cpp11/src/libraries/util/SmallObjectAllocator.h (modified)
	* code/branches/cpp11/src/modules/invader/Invader.cc (modified)
	* code/branches/cpp11/src/modules/invader/Invader.h (modified)
	* code/branches/cpp11/src/modules/invader/InvaderEnemy.cc (modified)
	* code/branches/cpp11/src/modules/invader/InvaderEnemy.h (modified)
	* code/branches/cpp11/src/modules/invader/InvaderEnemyShooter.cc (modified)
	* code/branches/cpp11/src/modules/invader/InvaderHUDinfo.cc (modified)
	* code/branches/cpp11/src/modules/invader/InvaderShip.cc (modified)
	* code/branches/cpp11/src/modules/invader/InvaderShip.h (modified)
	* code/branches/cpp11/src/modules/invader/InvaderWeapon.h (modified)
	* code/branches/cpp11/src/modules/invader/InvaderWeaponEnemy.cc (modified)
	* code/branches/cpp11/src/modules/invader/InvaderWeaponEnemy.h (modified)
	* code/branches/cpp11/src/modules/jump/Jump.cc (modified)
	* code/branches/cpp11/src/modules/jump/Jump.h (modified)
	* code/branches/cpp11/src/modules/jump/JumpBoots.cc (modified)
	* code/branches/cpp11/src/modules/jump/JumpBoots.h (modified)
	* code/branches/cpp11/src/modules/jump/JumpCenterpoint.cc (modified)
	* code/branches/cpp11/src/modules/jump/JumpCenterpoint.h (modified)
	* code/branches/cpp11/src/modules/jump/JumpEnemy.cc (modified)
	* code/branches/cpp11/src/modules/jump/JumpEnemy.h (modified)
	* code/branches/cpp11/src/modules/jump/JumpFigure.cc (modified)
	* code/branches/cpp11/src/modules/jump/JumpItem.cc (modified)
	* code/branches/cpp11/src/modules/jump/JumpItem.h (modified)
	* code/branches/cpp11/src/modules/jump/JumpPlatform.cc (modified)
	* code/branches/cpp11/src/modules/jump/JumpPlatform.h (modified)
	* code/branches/cpp11/src/modules/jump/JumpPlatformDisappear.cc (modified)
	* code/branches/cpp11/src/modules/jump/JumpPlatformDisappear.h (modified)
	* code/branches/cpp11/src/modules/jump/JumpPlatformFake.cc (modified)
	* code/branches/cpp11/src/modules/jump/JumpPlatformFake.h (modified)
	* code/branches/cpp11/src/modules/jump/JumpPlatformHMove.cc (modified)
	* code/branches/cpp11/src/modules/jump/JumpPlatformHMove.h (modified)
	* code/branches/cpp11/src/modules/jump/JumpPlatformStatic.cc (modified)
	* code/branches/cpp11/src/modules/jump/JumpPlatformStatic.h (modified)
	* code/branches/cpp11/src/modules/jump/JumpPlatformTimer.cc (modified)
	* code/branches/cpp11/src/modules/jump/JumpPlatformTimer.h (modified)
	* code/branches/cpp11/src/modules/jump/JumpPlatformVMove.cc (modified)
	* code/branches/cpp11/src/modules/jump/JumpPlatformVMove.h (modified)
	* code/branches/cpp11/src/modules/jump/JumpProjectile.cc (modified)
	* code/branches/cpp11/src/modules/jump/JumpPropeller.cc (modified)
	* code/branches/cpp11/src/modules/jump/JumpPropeller.h (modified)
	* code/branches/cpp11/src/modules/jump/JumpRocket.cc (modified)
	* code/branches/cpp11/src/modules/jump/JumpRocket.h (modified)
	* code/branches/cpp11/src/modules/jump/JumpScore.cc (modified)
	* code/branches/cpp11/src/modules/jump/JumpShield.cc (modified)
	* code/branches/cpp11/src/modules/jump/JumpShield.h (modified)
	* code/branches/cpp11/src/modules/jump/JumpSpring.cc (modified)
	* code/branches/cpp11/src/modules/jump/JumpSpring.h (modified)

	fixed includes to make it compile without build units


Thu, 14 May 2015 07:49:10 GMT clangenb [10442]
	* data/contentcreation/pps/clangenb/Blenderfiles/HeartAttack2/HeartAttack.material (modified)
	* data/contentcreation/pps/clangenb/Blenderfiles/HeartAttack2/HeartAttack.mesh (modified)




Sun, 10 May 2015 21:00:01 GMT bknecht [10441]
	* code/branches/cpp11/cmake/CompilerConfigGCC.cmake (modified)
	* code/branches/cpp11/src/libraries/core/config/ConfigFile.cc (modified)

	Turned on c++11 flag in compiler and fixed a bug where boost couldn't ...


Sun, 10 May 2015 16:49:49 GMT bknecht [10440]
	* code/branches/cpp11/src/external/ois/linux/LinuxJoyStickEvents.cpp (modified)

	Added include to make ois code compile under linux without build
	units


Sun, 10 May 2015 14:35:50 GMT bknecht [10439]
	* code/branches/cpp11 (copied)

	Creating C++11 branch


Sat, 09 May 2015 00:34:38 GMT meggiman [10438]
	* code/branches/weaponFS15/src/modules/weapons/weaponmodes/GravityBombFire.cc (modified)

	Added sound-effects to bomb.


Thu, 07 May 2015 22:17:03 GMT fvultier [10437]
	* code/trunk/src/modules/jump/JumpScore.cc (modified)
	* code/trunk/src/orxonox/worldentities/ControllableEntity.h (modified)
	* code/trunk/src/orxonox/worldentities/MobileEntity.h (modified)
	* code/trunk/src/orxonox/worldentities/StaticEntity.h (modified)
	* code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified)
	* code/trunk/src/orxonox/worldentities/pawns/SpaceShip.h (modified)

	Removed unnecessary output to console in kump minigame. Added a small ...


Thu, 07 May 2015 20:45:20 GMT meggiman [10436]
	* code/branches/weaponFS15/src/modules/weapons/projectiles/GravityBomb.cc (modified)

	Fixed dangling pointer bug when GravityBomb was destroyed by tick of ...


Thu, 07 May 2015 15:43:36 GMT meggiman [10435]
	* code/branches/weaponFS15/data/particle/FieldExplosion.particle (added)
	* code/branches/weaponFS15/data/particle/GravityBombField.particle (added)
	* 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)
	* code/branches/weaponFS15/src/modules/weapons/weaponmodes/GravityBombFire.h (modified)

	Added new models and fixed dammage bug. Bomb now fully working.


Thu, 07 May 2015 15:21:45 GMT frovelli [10434]
	* code/branches/multiplayerFS15/src/libraries/network/LANDiscoverable.cc (modified)
	* code/branches/multiplayerFS15/src/libraries/network/LANDiscoverable.h (modified)
	* code/branches/multiplayerFS15/src/libraries/network/LANDiscovery.cc (modified)
	* code/branches/multiplayerFS15/src/libraries/network/LANDiscovery.h (modified)
	* code/branches/multiplayerFS15/src/libraries/network/MasterServer.cc (modified)
	* code/branches/multiplayerFS15/src/libraries/network/MasterServer.h (modified)
	* code/branches/multiplayerFS15/src/libraries/network/Server.cc (modified)
	* code/branches/multiplayerFS15/src/libraries/network/ServerList.cc (modified)
	* code/branches/multiplayerFS15/src/libraries/network/ServerList.h (modified)
	* code/branches/multiplayerFS15/src/libraries/network/WANDiscoverable.cc (modified)
	* code/branches/multiplayerFS15/src/libraries/network/WANDiscoverable.h (modified)
	* code/branches/multiplayerFS15/src/libraries/network/WANDiscovery.cc (modified)
	* code/branches/multiplayerFS15/src/libraries/network/WANDiscovery.h (modified)
	* code/branches/multiplayerFS15/src/libraries/network/packet/ServerInformation.cc (modified)
	* code/branches/multiplayerFS15/src/libraries/network/packet/ServerInformation.h (modified)

	Implemented playercount in multiplayer lobby


Thu, 07 May 2015 15:01:38 GMT gpregger [10433]
	* code/branches/ParticleEffectsFS15/data/levels/emptyLevel.oxw (modified)
	* code/branches/ParticleEffectsFS15/data/particle/orxonox_explosionAfterglow.particle (added)
	* code/branches/ParticleEffectsFS15/data/particle/orxonox_explosionFlame2.particle (added)
	* code/branches/ParticleEffectsFS15/data/particle/orxonox_explosionFlash2.particle (added)
	* code/branches/ParticleEffectsFS15/data/particle/orxonox_explosionShockwave2.particle (added)
	* code/branches/ParticleEffectsFS15/data/particle/orxonox_explosionSparks2.particle (added)
	* code/branches/ParticleEffectsFS15/data/particle/orxonox_explosionStreak2.particle (added)
	* code/branches/ParticleEffectsFS15/src/orxonox/worldentities/pawns/Pawn.cc (modified)

	New explosion effect for pawn.cc (still WIP)


Thu, 07 May 2015 15:00:11 GMT clangenb [10432]
	* data/contentcreation/pps/clangenb/Blenderfiles/HeartAttack2 (added)
	* data/contentcreation/pps/clangenb/Blenderfiles/HeartAttack2/HeartAttack.blend (added)
	* data/contentcreation/pps/clangenb/Blenderfiles/HeartAttack2/HeartAttack.jpg (added)
	* data/contentcreation/pps/clangenb/Blenderfiles/HeartAttack2/HeartAttack.material (added)
	* data/contentcreation/pps/clangenb/Blenderfiles/HeartAttack2/HeartAttack.mesh (added)
	* data/contentcreation/pps/clangenb/Blenderfiles/HeartAttack2/HeartAttack.mesh.xml (added)
	* data/contentcreation/pps/clangenb/Blenderfiles/HeartAttack2/SpaceshipALT.blend2 (added)
	* data/contentcreation/pps/clangenb/Blenderfiles/SpaceshipALT.blend1 (added)
	* data/contentcreation/pps/clangenb/Blenderfiles/SpaceshipALT.blend2 (added)
	* data/contentcreation/pps/clangenb/Blenderfiles/SpaceshipMetal2.blend (modified)

	new mesh


Thu, 07 May 2015 14:58:54 GMT fvultier [10431]
	* data/trunk/images/effects/BrightStar.000.png (added)
	* data/trunk/materials/PE_materials.material (modified)

	new particle effect for the gravity bomb


Thu, 07 May 2015 14:35:21 GMT erbj [10430]
	* code/branches/towerdefenseFS15/data/levels/towerDefense.oxw (modified)
	* code/branches/towerdefenseFS15/src/modules/objects/controllers/TurretController.cc (modified)
	* code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefense.cc (modified)
	* code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefense.h (modified)
	* code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseTower.cc (modified)
	* code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseTower.h (modified)

	added functionality: Waves with different combinations of spaceships, ...


Thu, 07 May 2015 12:43:14 GMT gpregger [10429]
	* data/trunk/images/textures/bigflame.png (added)
	* data/trunk/images/textures/black.png (added)
	* data/trunk/images/textures/explosion.png (added)
	* data/trunk/images/textures/flare.png (added)
	* data/trunk/images/textures/flaretrail.png (added)
	* data/trunk/images/textures/flash.png (added)
	* data/trunk/images/textures/ring_flare.png (added)
	* data/trunk/images/textures/ring_flare2.png (added)
	* data/trunk/images/textures/shockwave.png (added)
	* data/trunk/images/textures/streak.png (added)
	* data/trunk/images/textures/streak1.png (added)
	* data/trunk/materials/orxonox_flash.material (added)
	* data/trunk/materials/orxonox_shockwave.material (added)
	* data/trunk/materials/orxonox_streak1.material (added)

	textures and materials for new explosion effect for rocket.cc


Thu, 07 May 2015 12:29:09 GMT gpregger [10428]
	* code/branches/ParticleEffectsFS15/data/DefaultResources.oxr (modified)
	* code/branches/ParticleEffectsFS15/data/levels/emptyLevel.oxw (modified)
	* code/branches/ParticleEffectsFS15/data/levels/includes/weaponSettingsAssff.oxi (modified)
	* code/branches/ParticleEffectsFS15/data/particle/orxonox_explosionFlame.particle (added)
	* code/branches/ParticleEffectsFS15/data/particle/orxonox_explosionFlash.particle (added)
	* code/branches/ParticleEffectsFS15/data/particle/orxonox_explosionShockwave.particle (added)
	* code/branches/ParticleEffectsFS15/data/particle/orxonox_explosionSparks.particle (added)
	* code/branches/ParticleEffectsFS15/data/particle/orxonox_explosionStreak1.particle (added)
	* code/branches/ParticleEffectsFS15/src/external/CMakeLists.txt (modified)
	* code/branches/ParticleEffectsFS15/src/external/ogreceguirenderer/CMakeLists.txt (modified)
	* code/branches/ParticleEffectsFS15/src/modules/weapons/CMakeLists.txt (modified)
	* code/branches/ParticleEffectsFS15/src/modules/weapons/WeaponsPrereqs.h (modified)
	* code/branches/ParticleEffectsFS15/src/modules/weapons/projectiles/CMakeLists.txt (modified)
	* code/branches/ParticleEffectsFS15/src/modules/weapons/projectiles/Rocket.cc (modified)
	* code/branches/ParticleEffectsFS15/src/modules/weapons/projectiles/RocketOld.cc (added)
	* code/branches/ParticleEffectsFS15/src/modules/weapons/projectiles/RocketOld.h (added)
	* code/branches/ParticleEffectsFS15/src/modules/weapons/weaponmodes/CMakeLists.txt (modified)
	* code/branches/ParticleEffectsFS15/src/modules/weapons/weaponmodes/RocketFireOld.cc (added)
	* code/branches/ParticleEffectsFS15/src/modules/weapons/weaponmodes/RocketFireOld.h (added)
	* code/branches/ParticleEffectsFS15/src/orxonox/worldentities/CMakeLists.txt (modified)

	waste of time + New Explosion in 'rocket.cc' + old Rocket in ...