#
# ChangeLog for code/branches
#
# Generated by Trac 1.0.9
# Nov 25, 2024, 4:42:16 AM

Mon, 10 Oct 2016 12:55:18 GMT bberabi [11224]
	* code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRaceBot.h (modified)

	hello


Mon, 10 Oct 2016 12:52:40 GMT patricwi [11223]
	* code/branches/HUD_HS16/README (modified)

	reverted changes in readme file


Mon, 10 Oct 2016 12:48:11 GMT patricwi [11222]
	* code/branches/HUD_HS16/README (modified)

	changed readme file


Mon, 10 Oct 2016 12:39:43 GMT marvinh [11221]
	* code/branches/StoryModeMap_HS16 (copied)

	New branch for PPS HS16, Story mode map ticket


Mon, 10 Oct 2016 12:23:56 GMT ljovin [11220]
	* code/branches/BigShip_HS16/src/test.txt (added)




Mon, 10 Oct 2016 12:12:26 GMT fvultier [11218]
	* code/branches/Fvultier_HS16 (copied)

	New banch for fvultier for HS16.


Mon, 10 Oct 2016 11:57:55 GMT maxima [11217]
	* code/branches/SpaceRaceAI_HS16 (copied)

	new branch for PPS


Mon, 10 Oct 2016 11:30:24 GMT maxima [11216]
	* code/branches/mac_HS16 (copied)

	new branch for PPS


Mon, 10 Oct 2016 11:29:22 GMT maxima [11215]
	* code/branches/QuestGuide_HS16 (copied)

	new branch for PPS


Mon, 10 Oct 2016 11:28:44 GMT maxima [11214]
	* code/branches/SpaceRace_HS16 (copied)

	new branch for PPS


Mon, 10 Oct 2016 11:28:03 GMT maxima [11213]
	* code/branches/BigShip_HS16 (copied)

	new branch for PPS


Mon, 10 Oct 2016 11:27:20 GMT maxima [11212]
	* code/branches/HUD_HS16 (copied)

	new branch for PPS


Tue, 05 Jul 2016 21:46:10 GMT bknecht [11211]
	* code/branches/ogre1.9 (modified)
	* code/branches/ogre1.9/cmake/tools/FindCEGUI.cmake (modified)
	* code/branches/ogre1.9/data/gui/configs/CEGUIConfig.xsd (modified)
	* code/branches/ogre1.9/data/gui/layouts/AudioMenu.layout (modified)
	* code/branches/ogre1.9/data/gui/layouts/CampaignMenu.layout (modified)
	* code/branches/ogre1.9/data/gui/layouts/ChatBox-inputonly.layout (modified)
	* code/branches/ogre1.9/data/gui/layouts/ChatBox.layout (modified)
	* code/branches/ogre1.9/data/gui/layouts/ControlsMenu.layout (modified)
	* code/branches/ogre1.9/data/gui/layouts/CreditsMenu.layout (modified)
	* code/branches/ogre1.9/data/gui/layouts/DecisionPopup.layout (modified)
	* code/branches/ogre1.9/data/gui/layouts/DockingDialog.layout (modified)
	* code/branches/ogre1.9/data/gui/layouts/GUILayout.xsd (modified)
	* code/branches/ogre1.9/data/gui/layouts/GameplayMenu.layout (modified)
	* code/branches/ogre1.9/data/gui/layouts/GraphicsMenu.layout (modified)
	* code/branches/ogre1.9/data/gui/layouts/HostMenu.layout (modified)
	* code/branches/ogre1.9/data/gui/layouts/InGameMenu.layout (modified)
	* code/branches/ogre1.9/data/gui/layouts/InGamePickupHUD.layout (modified)
	* code/branches/ogre1.9/data/gui/layouts/InGameTest.layout (modified)
	* code/branches/ogre1.9/data/gui/layouts/InfoPopup.layout (modified)
	* code/branches/ogre1.9/data/gui/layouts/KeyBindMenu.layout (modified)
	* code/branches/ogre1.9/data/gui/layouts/MainMenu.layout (modified)
	* code/branches/ogre1.9/data/gui/layouts/MainMenuBackground.layout (modified)
	* code/branches/ogre1.9/data/gui/layouts/MiscConfigMenu.layout (modified)
	* code/branches/ogre1.9/data/gui/layouts/MouseControlsMenu.layout (modified)
	* code/branches/ogre1.9/data/gui/layouts/MultiplayerMenu.layout (modified)
	* code/branches/ogre1.9/data/gui/layouts/MultiplayerOptionsMenu.layout (modified)
	* code/branches/ogre1.9/data/gui/layouts/NotificationLayer.layout (modified)
	* code/branches/ogre1.9/data/gui/layouts/PickupInventory.layout (modified)
	* code/branches/ogre1.9/data/gui/layouts/QuestGUI.layout (modified)
	* code/branches/ogre1.9/data/gui/layouts/SettingsMenu.layout (modified)
	* code/branches/ogre1.9/data/gui/layouts/ShipSelectionMenu.layout (modified)
	* code/branches/ogre1.9/data/gui/layouts/SingleplayerConfigMenu.layout (modified)
	* code/branches/ogre1.9/data/gui/layouts/SingleplayerMenu.layout (modified)
	* code/branches/ogre1.9/data/gui/layouts/UndockingDialog.layout (modified)
	* code/branches/ogre1.9/data/gui/schemes/GUIScheme.xsd (modified)
	* code/branches/ogre1.9/data/gui/schemes/OrxonoxGUIScheme.scheme (modified)
	* code/branches/ogre1.9/data/gui/schemes/OrxonoxHUDWidgets.scheme (modified)
	* code/branches/ogre1.9/data/gui/schemes/OrxonoxLook.scheme (modified)
	* code/branches/ogre1.9/data/gui/schemes/OrxonoxMenuWidgets.scheme (modified)
	* code/branches/ogre1.9/data/gui/schemes/SleekSpaceHUDWidgets.scheme (modified)
	* code/branches/ogre1.9/data/gui/schemes/SleekSpaceLook.scheme (modified)
	* code/branches/ogre1.9/data/gui/schemes/SleekSpaceMenuWidgets.scheme (modified)
	* code/branches/ogre1.9/data/gui/schemes/TaharezGreenHUDWidgets.scheme (modified)
	* code/branches/ogre1.9/data/gui/schemes/TaharezGreenLook.scheme (modified)
	* code/branches/ogre1.9/data/gui/schemes/TaharezGreenMenuWidgets.scheme (modified)
	* code/branches/ogre1.9/data/gui/schemes/TaharezHUDWidgets.scheme (modified)
	* code/branches/ogre1.9/data/gui/schemes/TaharezLook.scheme (modified)
	* code/branches/ogre1.9/data/gui/schemes/TaharezMenuWidgets.scheme (modified)
	* code/branches/ogre1.9/data/gui/schemes/VanillaHUDWidgets.scheme (modified)
	* code/branches/ogre1.9/data/gui/schemes/VanillaLook.scheme (modified)
	* code/branches/ogre1.9/data/gui/schemes/VanillaMenuWidgets.scheme (modified)
	* code/branches/ogre1.9/data/gui/schemes/WindowsHUDWidgets.scheme (modified)
	* code/branches/ogre1.9/data/gui/schemes/WindowsLook.scheme (modified)
	* code/branches/ogre1.9/data/gui/schemes/WindowsMenuWidgets.scheme (modified)
	* code/branches/ogre1.9/data/gui/scripts/AudioMenu.lua (modified)
	* code/branches/ogre1.9/data/gui/scripts/DockingDialog.lua (modified)
	* code/branches/ogre1.9/data/gui/scripts/GUISheet.lua (modified)
	* code/branches/ogre1.9/data/gui/scripts/GameplayMenu.lua (modified)
	* code/branches/ogre1.9/data/gui/scripts/GraphicsMenu.lua (modified)
	* code/branches/ogre1.9/data/gui/scripts/HostMenu.lua (modified)
	* code/branches/ogre1.9/data/gui/scripts/InitialiseGUI.lua (modified)
	* code/branches/ogre1.9/data/gui/scripts/MainMenu.lua (modified)
	* code/branches/ogre1.9/data/gui/scripts/MultiplayerMenu.lua (modified)
	* code/branches/ogre1.9/data/gui/scripts/PickupInventory.lua (modified)
	* code/branches/ogre1.9/data/gui/scripts/QuestGUI.lua (modified)
	* code/branches/ogre1.9/data/gui/scripts/SheetManager.lua (modified)
	* code/branches/ogre1.9/data/gui/scripts/ShipSelectionMenu.lua (modified)
	* code/branches/ogre1.9/data/gui/scripts/SingleplayerMenu.lua (modified)
	* code/branches/ogre1.9/data/gui/scripts/UndockingDialog.lua (modified)
	* code/branches/ogre1.9/src/libraries/core/GUIManager.cc (modified)
	* code/branches/ogre1.9/src/orxonox/chat/ChatInputHandler.cc (modified)

	Merging cegui0.8 branch into ogre1.9 branch


Mon, 30 May 2016 08:21:29 GMT fvultier [11209]
	* code/branches/presentationFS16/data/gui/layouts/CampaignMenu.layout (modified)
	* code/branches/presentationFS16/data/levels/florin_johnny_presentation.oxw (modified)

	Preparation for the presentation. Failing the mission in ...


Thu, 26 May 2016 14:53:34 GMT fvultier [11208]
	* code/branches/presentationFS16 (modified)
	* code/branches/presentationFS16/data/defaultConfig/keybindings.ini (modified)
	* code/branches/presentationFS16/data/gui/scripts/KeyBindMenu.lua (modified)
	* code/branches/presentationFS16/data/levels/emptyLevel.oxw (modified)
	* code/branches/presentationFS16/data/levels/florin_johnny_presentation.oxw (copied)
	* code/branches/presentationFS16/data/levels/includes/weaponSettingsEscort.oxi (modified)
	* code/branches/presentationFS16/data/levels/includes/weaponSettingsEscortDischarger.oxi (copied)
	* code/branches/presentationFS16/data/levels/includes/weaponSettingsFx112.oxi (copied)
	* code/branches/presentationFS16/data/levels/missionOne.oxw (modified)
	* code/branches/presentationFS16/data/levels/templates/spaceshipEscortDischarger.oxt (copied)
	* code/branches/presentationFS16/data/levels/templates/spaceshipFx112.oxt (copied)
	* code/branches/presentationFS16/data/overlays/HUDTemplates3.oxo (modified)
	* code/branches/presentationFS16/src/modules/invader/InvaderEnemyShooter.cc (modified)
	* code/branches/presentationFS16/src/modules/invader/InvaderShip.cc (modified)
	* code/branches/presentationFS16/src/modules/jump/JumpFigure.cc (modified)
	* code/branches/presentationFS16/src/modules/jump/JumpFigure.h (modified)
	* code/branches/presentationFS16/src/modules/objects/controllers/TurretController.cc (modified)
	* code/branches/presentationFS16/src/modules/overlays/hud/CMakeLists.txt (modified)
	* code/branches/presentationFS16/src/modules/overlays/hud/HUDChargeBar.cc (copied)
	* code/branches/presentationFS16/src/modules/overlays/hud/HUDChargeBar.h (copied)
	* code/branches/presentationFS16/src/modules/towerdefense/TowerDefenseSelecter.cc (modified)
	* code/branches/presentationFS16/src/modules/towerdefense/TowerDefenseSelecter.h (modified)
	* code/branches/presentationFS16/src/modules/weapons/WeaponsPrereqs.h (modified)
	* code/branches/presentationFS16/src/modules/weapons/projectiles/Rocket.cc (modified)
	* code/branches/presentationFS16/src/modules/weapons/projectiles/Rocket.h (modified)
	* code/branches/presentationFS16/src/modules/weapons/projectiles/RocketOld.cc (modified)
	* code/branches/presentationFS16/src/modules/weapons/projectiles/RocketOld.h (modified)
	* code/branches/presentationFS16/src/modules/weapons/weaponmodes/CMakeLists.txt (modified)
	* code/branches/presentationFS16/src/modules/weapons/weaponmodes/Discharger.cc (copied)
	* code/branches/presentationFS16/src/modules/weapons/weaponmodes/Discharger.h (copied)
	* code/branches/presentationFS16/src/orxonox/controllers/AIController.cc (modified)
	* code/branches/presentationFS16/src/orxonox/controllers/ArtificialController.cc (modified)
	* code/branches/presentationFS16/src/orxonox/controllers/ArtificialController.h (modified)
	* code/branches/presentationFS16/src/orxonox/controllers/DroneController.cc (modified)
	* code/branches/presentationFS16/src/orxonox/controllers/FightingController.cc (modified)
	* code/branches/presentationFS16/src/orxonox/controllers/HumanController.cc (modified)
	* code/branches/presentationFS16/src/orxonox/controllers/HumanController.h (modified)
	* code/branches/presentationFS16/src/orxonox/controllers/NewHumanController.cc (modified)
	* code/branches/presentationFS16/src/orxonox/controllers/NewHumanController.h (modified)
	* code/branches/presentationFS16/src/orxonox/controllers/WaypointPatrolController.cc (modified)
	* code/branches/presentationFS16/src/orxonox/weaponsystem/Weapon.cc (modified)
	* code/branches/presentationFS16/src/orxonox/weaponsystem/Weapon.h (modified)
	* code/branches/presentationFS16/src/orxonox/weaponsystem/WeaponMode.cc (modified)
	* code/branches/presentationFS16/src/orxonox/weaponsystem/WeaponMode.h (modified)
	* code/branches/presentationFS16/src/orxonox/weaponsystem/WeaponPack.cc (modified)
	* code/branches/presentationFS16/src/orxonox/weaponsystem/WeaponPack.h (modified)
	* code/branches/presentationFS16/src/orxonox/weaponsystem/WeaponSet.cc (modified)
	* code/branches/presentationFS16/src/orxonox/weaponsystem/WeaponSet.h (modified)
	* code/branches/presentationFS16/src/orxonox/weaponsystem/WeaponSystem.cc (modified)
	* code/branches/presentationFS16/src/orxonox/weaponsystem/WeaponSystem.h (modified)
	* code/branches/presentationFS16/src/orxonox/worldentities/ControllableEntity.cc (modified)
	* code/branches/presentationFS16/src/orxonox/worldentities/ControllableEntity.h (modified)
	* code/branches/presentationFS16/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/branches/presentationFS16/src/orxonox/worldentities/pawns/Pawn.h (modified)
	* code/branches/presentationFS16/src/orxonox/worldentities/pawns/Spectator.cc (modified)
	* code/branches/presentationFS16/src/orxonox/worldentities/pawns/Spectator.h (modified)

	merged discharger, thats the last one


Thu, 26 May 2016 14:38:51 GMT fvultier [11207]
	* code/branches/presentationFS16 (modified)
	* code/branches/presentationFS16/data/gui/scripts/testscript.lua (modified)
	* code/branches/presentationFS16/data/levels/scriptController.oxw (modified)
	* code/branches/presentationFS16/src/orxonox/CMakeLists.txt (modified)
	* code/branches/presentationFS16/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/branches/presentationFS16/src/orxonox/controllers/CMakeLists.txt (modified)
	* code/branches/presentationFS16/src/orxonox/controllers/ControllerDirector.cc (modified)
	* code/branches/presentationFS16/src/orxonox/controllers/ControllerDirector.h (modified)
	* code/branches/presentationFS16/src/orxonox/controllers/NewScriptController.cc (copied)
	* code/branches/presentationFS16/src/orxonox/controllers/NewScriptController.h (copied)
	* code/branches/presentationFS16/src/orxonox/controllers/ScriptController.cc (modified)
	* code/branches/presentationFS16/src/orxonox/controllers/ScriptController.h (modified)
	* code/branches/presentationFS16/src/orxonox/controllers/scriptTasks (copied)

	merged scriptable controller


Thu, 26 May 2016 14:15:54 GMT fvultier [11206]
	* code/branches/presentationFS16 (modified)
	* code/branches/presentationFS16/data/defaultConfig/orxonox.ini (modified)
	* code/branches/presentationFS16/data/gui/layouts/CampaignMenu.layout (modified)
	* code/branches/presentationFS16/data/gui/scripts/CampaignMenu.lua (modified)
	* code/branches/presentationFS16/data/gui/scripts/SingleplayerMenu.lua (modified)
	* code/branches/presentationFS16/src/orxonox/CMakeLists.txt (modified)
	* code/branches/presentationFS16/src/orxonox/LevelManager.cc (modified)
	* code/branches/presentationFS16/src/orxonox/LevelManager.h (modified)
	* code/branches/presentationFS16/src/orxonox/LevelStatus.cc (copied)
	* code/branches/presentationFS16/src/orxonox/LevelStatus.h (copied)
	* code/branches/presentationFS16/src/orxonox/gametypes/Mission.cc (modified)
	* code/branches/presentationFS16/src/orxonox/gametypes/Mission.h (modified)
	* code/branches/presentationFS16/src/orxonox/overlays/CMakeLists.txt (modified)
	* code/branches/presentationFS16/src/orxonox/overlays/CampaignMenu.cc (copied)
	* code/branches/presentationFS16/src/orxonox/overlays/CampaignMenu.h (copied)
	* code/branches/presentationFS16/src/orxonox/overlays/GUISheet.cc (modified)

	merged campain menu


Thu, 26 May 2016 13:58:37 GMT sagerj [11205]
	* code/branches/sagerjFS16/data/levels/florin_johnny_presentation.oxw (added)
	* code/branches/sagerjFS16/data/levels/includes/weaponSettingsEscortDischarger.oxi (modified)
	* code/branches/sagerjFS16/data/levels/includes/weaponSettingsFx112.oxi (added)
	* code/branches/sagerjFS16/data/levels/templates/spaceshipFx112.oxt (added)
	* code/branches/sagerjFS16/src/modules/overlays/hud/HUDChargeBar.cc (modified)
	* code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.cc (modified)
	* code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.h (modified)

	zusammengemerged mit florin project


Thu, 26 May 2016 13:54:24 GMT plehmann [11204]
	* code/branches/plehmannFS16/data/gui/scripts/testscript.lua (modified)
	* code/branches/plehmannFS16/src/orxonox/controllers/ControllerDirector.h (modified)
	* code/branches/plehmannFS16/src/orxonox/controllers/NewScriptController.cc (modified)
	* code/branches/plehmannFS16/src/orxonox/controllers/NewScriptController.h (modified)
	* code/branches/plehmannFS16/src/orxonox/controllers/scriptTasks/CMakeLists.txt (modified)
	* code/branches/plehmannFS16/src/orxonox/controllers/scriptTasks/MoveToTask.cc (modified)
	* code/branches/plehmannFS16/src/orxonox/controllers/scriptTasks/MoveToTask.h (modified)

	implemented the update function of MoveToTask. but it does not yet ...


Thu, 26 May 2016 13:28:46 GMT fvultier [11202]
	* code/branches/presentationFS16/src/modules/hover/HoverOrigin.h (modified)

	fixed some weird merge conflict


Thu, 26 May 2016 13:19:53 GMT tgidron [11201]
	* code/branches/tgidronFS16/data/levels/templates/spaceshipHover.oxt (modified)

	Final Project


Thu, 26 May 2016 13:13:51 GMT fvultier [11199]
	* code/branches/presentationFS16/data/levels/Hover.oxw (modified)
	* code/branches/presentationFS16/data/levels/emptyLevel.oxw (modified)
	* code/branches/presentationFS16/data/levels/includes/weaponSettingsHover.oxi (modified)
	* code/branches/presentationFS16/data/levels/templates/spaceshipHover.oxt (modified)
	* code/branches/presentationFS16/data/overlays/HoverHUD.oxo (modified)
	* code/branches/presentationFS16/src/modules/hover/CMakeLists.txt (modified)
	* code/branches/presentationFS16/src/modules/hover/Hover.cc (modified)
	* code/branches/presentationFS16/src/modules/hover/Hover.h (modified)
	* code/branches/presentationFS16/src/modules/hover/HoverFlag.cc (modified)
	* code/branches/presentationFS16/src/modules/hover/HoverOrigin.cc (modified)
	* code/branches/presentationFS16/src/modules/hover/HoverOrigin.h (modified)
	* code/branches/presentationFS16/src/modules/hover/HoverShip.cc (modified)
	* code/branches/presentationFS16/src/modules/hover/HoverShip.h (modified)
	* code/branches/presentationFS16/src/modules/hover/TFlagsLivesLevelHUD.cc (copied)
	* code/branches/presentationFS16/src/modules/hover/TFlagsLivesLevelHUD.h (copied)
	* code/branches/presentationFS16/src/modules/invader/Invader.cc (modified)
	* code/branches/presentationFS16/src/modules/pickup/PickupSpawner.h (modified)
	* code/branches/presentationFS16/src/modules/weapons/weaponmodes/HsW01.cc (modified)
	* code/branches/presentationFS16/src/modules/weapons/weaponmodes/HsW01.h (modified)

	merged branch hover


Thu, 26 May 2016 13:12:04 GMT tgidron [11198]
	* code/branches/tgidronFS16/src/modules/hover/HoverOrigin.h (modified)

	Final Project


Thu, 26 May 2016 12:49:44 GMT tgidron [11196]
	* code/branches/tgidronFS16/data/levels/Hover.oxw (modified)
	* code/branches/tgidronFS16/data/overlays/HoverHUD.oxo (modified)
	* code/branches/tgidronFS16/src/modules/hover/Hover.cc (modified)
	* code/branches/tgidronFS16/src/modules/hover/Hover.h (modified)
	* code/branches/tgidronFS16/src/modules/hover/HoverOrigin.cc (modified)
	* code/branches/tgidronFS16/src/modules/hover/HoverOrigin.h (modified)
	* code/branches/tgidronFS16/src/modules/hover/TFlagsLivesLevelHUD.cc (modified)
	* code/branches/tgidronFS16/src/modules/hover/TFlagsLivesLevelHUD.h (modified)

	Final Project


Thu, 26 May 2016 12:40:16 GMT binderm [11194]
	* code/branches/bindermFS16/src/orxonox/LevelManager.cc (modified)
	* code/branches/bindermFS16/src/orxonox/LevelManager.h (modified)
	* code/branches/bindermFS16/src/orxonox/LevelStatus.cc (modified)
	* code/branches/bindermFS16/src/orxonox/LevelStatus.h (modified)

	final commit


Thu, 26 May 2016 12:15:53 GMT fvultier [11193]
	* code/branches/presentationFS16 (copied)

	New branch for presentation of the PPS projects FS16. Will merge all ...


Thu, 19 May 2016 15:50:36 GMT tgidron [11192]
	* code/branches/tgidronFS16/data/levels/Hover.oxw (modified)
	* code/branches/tgidronFS16/data/levels/includes/weaponSettingsHover.oxi (modified)
	* code/branches/tgidronFS16/data/levels/templates/spaceshipHover.oxt (modified)
	* code/branches/tgidronFS16/data/overlays/HoverHUD.oxo (modified)
	* code/branches/tgidronFS16/src/modules/hover/Hover.cc (modified)
	* code/branches/tgidronFS16/src/modules/hover/Hover.h (modified)
	* code/branches/tgidronFS16/src/modules/hover/HoverOrigin.cc (modified)
	* code/branches/tgidronFS16/src/modules/hover/HoverOrigin.h (modified)
	* code/branches/tgidronFS16/src/modules/hover/TFlagsLivesLevelHUD.cc (modified)
	* code/branches/tgidronFS16/src/modules/hover/TFlagsLivesLevelHUD.h (modified)
	* code/branches/tgidronFS16/src/modules/invader/Invader.cc (modified)
	* code/branches/tgidronFS16/src/modules/weapons/weaponmodes/HsW01.cc (modified)
	* code/branches/tgidronFS16/src/modules/weapons/weaponmodes/HsW01.h (modified)

	New Floor, Level HUD, Pickups work


Thu, 19 May 2016 15:37:05 GMT binderm [11191]
	* code/branches/bindermFS16/data/gui/scripts/CampaignMenu.lua (modified)
	* code/branches/bindermFS16/src/orxonox/CMakeLists.txt (modified)
	* code/branches/bindermFS16/src/orxonox/LevelManager.cc (modified)
	* code/branches/bindermFS16/src/orxonox/LevelManager.h (modified)
	* code/branches/bindermFS16/src/orxonox/LevelStatus.h (modified)
	* code/branches/bindermFS16/src/orxonox/gametypes/Mission.h (modified)

	The Campaign menu now works. The levels are structured in a tree. If ...


Thu, 19 May 2016 15:34:38 GMT plehmann [11190]
	* code/branches/plehmannFS16/src/orxonox/controllers/NewScriptController.cc (modified)
	* code/branches/plehmannFS16/src/orxonox/controllers/NewScriptController.h (modified)
	* code/branches/plehmannFS16/src/orxonox/controllers/scriptTasks/MoveToTask.cc (modified)
	* code/branches/plehmannFS16/src/orxonox/controllers/scriptTasks/MoveToTask.h (modified)
	* code/branches/plehmannFS16/src/orxonox/controllers/scriptTasks/Task.cc (modified)
	* code/branches/plehmannFS16/src/orxonox/controllers/scriptTasks/Task.h (modified)

	modified newScriptController to prevent memory leacks caused by tasks


Thu, 19 May 2016 15:04:41 GMT sagerj [11189]
	* code/branches/sagerjFS16/data/levels/emptyLevel.oxw (modified)
	* code/branches/sagerjFS16/data/levels/includes/weaponSettingsEscort.oxi (modified)
	* code/branches/sagerjFS16/data/levels/includes/weaponSettingsEscortDischarger.oxi (added)
	* code/branches/sagerjFS16/data/levels/templates/spaceshipEscortDischarger.oxt (added)
	* code/branches/sagerjFS16/data/overlays/HUDTemplates3.oxo (modified)
	* code/branches/sagerjFS16/src/modules/overlays/hud/HUDChargeBar.cc (modified)
	* code/branches/sagerjFS16/src/modules/overlays/hud/HUDChargeBar.h (modified)
	* code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.cc (modified)
	* code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.h (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.h (modified)

	done/fixed everything, weaponmode/discharger fully commented only ...


Thu, 19 May 2016 11:34:34 GMT binderm [11188]
	* code/branches/bindermFS16/src/orxonox/LevelManager.cc (modified)
	* code/branches/bindermFS16/src/orxonox/LevelStatus.cc (modified)
	* code/branches/bindermFS16/src/orxonox/LevelStatus.h (modified)




Thu, 12 May 2016 14:08:32 GMT plehmann [11187]
	* code/branches/plehmannFS16/src/orxonox/controllers/NewScriptController.cc (modified)
	* code/branches/plehmannFS16/src/orxonox/controllers/NewScriptController.h (modified)
	* code/branches/plehmannFS16/src/orxonox/controllers/scriptTasks/MoveToTask.cc (added)
	* code/branches/plehmannFS16/src/orxonox/controllers/scriptTasks/MoveToTask.h (added)

	added a MoveToTask TODO: implement the update function


Thu, 12 May 2016 14:07:25 GMT binderm [11186]
	* code/branches/bindermFS16/data/gui/layouts/CampaignMenu.layout (modified)
	* code/branches/bindermFS16/data/gui/scripts/CampaignMenu.lua (modified)
	* code/branches/bindermFS16/src/orxonox/CMakeLists.txt (modified)
	* code/branches/bindermFS16/src/orxonox/LevelManager.cc (modified)
	* code/branches/bindermFS16/src/orxonox/LevelManager.h (modified)
	* code/branches/bindermFS16/src/orxonox/LevelStatus.cc (added)
	* code/branches/bindermFS16/src/orxonox/LevelStatus.h (added)
	* code/branches/bindermFS16/src/orxonox/gametypes/Mission.cc (modified)

	LevelStatus and levelmanager in two files, LevelStatus saves and ...


Thu, 12 May 2016 14:03:47 GMT sagerj [11185]
	* code/branches/sagerjFS16/data/levels/includes/weaponSettingsEscort.oxi (modified)
	* code/branches/sagerjFS16/data/levels/missionOne.oxw (modified)
	* code/branches/sagerjFS16/data/overlays/HUDTemplates3.oxo (modified)
	* code/branches/sagerjFS16/src/modules/overlays/hud/CMakeLists.txt (modified)
	* code/branches/sagerjFS16/src/modules/overlays/hud/HUDChargeBar.cc (added)
	* code/branches/sagerjFS16/src/modules/overlays/hud/HUDChargeBar.h (added)
	* code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.cc (modified)
	* code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.h (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.h (modified)

	fix the charging during reloadtime, the hudchargebar working so
	far...


Thu, 12 May 2016 14:02:21 GMT tgidron [11184]
	* code/branches/tgidronFS16 (modified)
	* code/branches/tgidronFS16/cmake/CompilerConfigClang.cmake (modified)
	* code/branches/tgidronFS16/data/levels/Hover.oxw (modified)
	* code/branches/tgidronFS16/data/levels/emptyLevel.oxw (modified)
	* code/branches/tgidronFS16/data/levels/includes/weaponSettingsHover.oxi (modified)
	* code/branches/tgidronFS16/data/levels/templates/spaceshipHover.oxt (modified)
	* code/branches/tgidronFS16/src/libraries/core/command/TclThreadManager.cc (modified)
	* code/branches/tgidronFS16/src/modules/hover/Hover.cc (modified)
	* code/branches/tgidronFS16/src/modules/hover/HoverFlag.cc (modified)
	* code/branches/tgidronFS16/src/modules/hover/HoverOrigin.cc (modified)
	* code/branches/tgidronFS16/src/orxonox/Scene.h (modified)
	* code/branches/tgidronFS16/src/orxonox/gametypes/TeamGametype.cc (modified)
	* code/branches/tgidronFS16/src/orxonox/weaponsystem/WeaponSystem.h (modified)
	* code/branches/tgidronFS16/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/branches/tgidronFS16/src/orxonox/worldentities/pawns/Pawn.h (modified)
	* code/branches/tgidronFS16/test/util/StringUtilsTest.cc (modified)

	New Pickup + try to create ground from separate tiles


Thu, 12 May 2016 13:28:30 GMT plehmann [11183]
	* code/branches/plehmannFS16/data/gui/scripts/testscript.lua (modified)
	* code/branches/plehmannFS16/src/orxonox/controllers/CMakeLists.txt (modified)
	* code/branches/plehmannFS16/src/orxonox/controllers/DebugTask.cc (deleted)
	* code/branches/plehmannFS16/src/orxonox/controllers/DebugTask.h (deleted)
	* code/branches/plehmannFS16/src/orxonox/controllers/NewScriptController.cc (modified)
	* code/branches/plehmannFS16/src/orxonox/controllers/NewScriptController.h (modified)
	* code/branches/plehmannFS16/src/orxonox/controllers/Task.cc (deleted)
	* code/branches/plehmannFS16/src/orxonox/controllers/Task.h (deleted)
	* code/branches/plehmannFS16/src/orxonox/controllers/scriptTasks (added)
	* code/branches/plehmannFS16/src/orxonox/controllers/scriptTasks/CMakeLists.txt (added)
	* code/branches/plehmannFS16/src/orxonox/controllers/scriptTasks/DebugTask.cc (added)
	* code/branches/plehmannFS16/src/orxonox/controllers/scriptTasks/DebugTask.h (added)
	* code/branches/plehmannFS16/src/orxonox/controllers/scriptTasks/Task.cc (added)
	* code/branches/plehmannFS16/src/orxonox/controllers/scriptTasks/Task.h (added)
	* code/branches/plehmannFS16/src/orxonox/controllers/scriptTasks/stringOutTask.cc (added)
	* code/branches/plehmannFS16/src/orxonox/controllers/scriptTasks/stringOutTask.h (added)
	* code/branches/plehmannFS16/src/orxonox/controllers/stringOutTask.cc (deleted)
	* code/branches/plehmannFS16/src/orxonox/controllers/stringOutTask.h (deleted)

	moved the task classes to the scriptTasks folder. modified the ...


Thu, 12 May 2016 11:45:44 GMT tgidron [11182]
	* code/branches/tgidronFS16/data/levels/Hover.oxw (modified)
	* code/branches/tgidronFS16/src/modules/hover/Hover.cc (modified)
	* code/branches/tgidronFS16/src/modules/hover/Hover.h (modified)
	* code/branches/tgidronFS16/src/modules/hover/HoverOrigin.cc (modified)
	* code/branches/tgidronFS16/src/modules/hover/HoverOrigin.h (modified)

	New Pickup


Tue, 10 May 2016 10:29:37 GMT binderm [11181]
	* code/branches/bindermFS16/src/orxonox/LevelManager.cc (modified)

	some minor changes


Tue, 10 May 2016 10:09:09 GMT binderm [11180]
	* code/branches/bindermFS16/data/gui/layouts/CampaignMenu.layout (modified)
	* code/branches/bindermFS16/data/gui/scripts/CampaignMenu.lua (modified)
	* code/branches/bindermFS16/src/orxonox/LevelManager.cc (modified)
	* code/branches/bindermFS16/src/orxonox/LevelManager.h (modified)
	* code/branches/bindermFS16/src/orxonox/gametypes/Mission.cc (modified)

	logic to show only certain levels and not all together, also not all ...


Thu, 28 Apr 2016 14:09:08 GMT plehmann [11179]
	* code/branches/plehmannFS16/src/orxonox/controllers/stringOutTask.cc (added)
	* code/branches/plehmannFS16/src/orxonox/controllers/stringOutTask.h (added)

	added the stringOutTask for scriptcontroller


Thu, 28 Apr 2016 14:08:07 GMT plehmann [11178]
	* code/branches/plehmannFS16/data/gui/scripts/testscript.lua (modified)
	* code/branches/plehmannFS16/data/levels/scriptController.oxw (modified)
	* code/branches/plehmannFS16/src/orxonox/controllers/CMakeLists.txt (modified)
	* code/branches/plehmannFS16/src/orxonox/controllers/DebugTask.cc (modified)
	* code/branches/plehmannFS16/src/orxonox/controllers/NewScriptController.cc (modified)
	* code/branches/plehmannFS16/src/orxonox/controllers/NewScriptController.h (modified)
	* code/branches/plehmannFS16/src/orxonox/controllers/Task.h (modified)

	scriptcontroller task system doesnt work. it seems like queue is the ...


Thu, 28 Apr 2016 14:04:42 GMT tgidron [11177]
	* code/branches/tgidronFS16/data/levels/Hover.oxw (modified)
	* code/branches/tgidronFS16/data/levels/includes/weaponSettingsHover.oxi (modified)
	* code/branches/tgidronFS16/data/levels/templates/spaceshipHover.oxt (modified)
	* code/branches/tgidronFS16/data/overlays/HoverHUD.oxo (modified)
	* code/branches/tgidronFS16/src/modules/hover/CMakeLists.txt (modified)
	* code/branches/tgidronFS16/src/modules/hover/FlagsAndLivesHUD.cc (deleted)
	* code/branches/tgidronFS16/src/modules/hover/FlagsAndLivesHUD.h (deleted)
	* code/branches/tgidronFS16/src/modules/hover/Hover.cc (modified)
	* code/branches/tgidronFS16/src/modules/hover/Hover.h (modified)
	* code/branches/tgidronFS16/src/modules/hover/HoverOrigin.cc (modified)
	* code/branches/tgidronFS16/src/modules/hover/HoverOrigin.h (modified)
	* code/branches/tgidronFS16/src/modules/hover/TFlagsLivesLevelHUD.cc (added)
	* code/branches/tgidronFS16/src/modules/hover/TFlagsLivesLevelHUD.h (added)

	New Pickups (speed); Level Counter and Crate spawn (not working)


Thu, 28 Apr 2016 13:09:26 GMT sagerj [11175]
	* code/branches/sagerjFS16/data/defaultConfig/keybindings.ini (modified)
	* code/branches/sagerjFS16/src/modules/invader/InvaderEnemyShooter.cc (modified)
	* code/branches/sagerjFS16/src/modules/invader/InvaderShip.cc (modified)
	* code/branches/sagerjFS16/src/modules/jump/JumpFigure.cc (modified)
	* code/branches/sagerjFS16/src/modules/jump/JumpFigure.h (modified)
	* code/branches/sagerjFS16/src/modules/objects/controllers/TurretController.cc (modified)
	* code/branches/sagerjFS16/src/modules/towerdefense/TowerDefenseSelecter.cc (modified)
	* code/branches/sagerjFS16/src/modules/towerdefense/TowerDefenseSelecter.h (modified)
	* code/branches/sagerjFS16/src/modules/weapons/projectiles/Rocket.cc (modified)
	* code/branches/sagerjFS16/src/modules/weapons/projectiles/Rocket.h (modified)
	* code/branches/sagerjFS16/src/modules/weapons/projectiles/RocketOld.cc (modified)
	* code/branches/sagerjFS16/src/modules/weapons/projectiles/RocketOld.h (modified)
	* code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.cc (modified)
	* code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.h (modified)
	* code/branches/sagerjFS16/src/orxonox/controllers/AIController.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/controllers/ArtificialController.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/controllers/ArtificialController.h (modified)
	* code/branches/sagerjFS16/src/orxonox/controllers/DroneController.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/controllers/FightingController.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/controllers/WaypointPatrolController.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.h (modified)
	* code/branches/sagerjFS16/src/orxonox/worldentities/ControllableEntity.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/worldentities/pawns/Spectator.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/worldentities/pawns/Spectator.h (modified)

	overwritten many fire functions now only need to implement
	timer/charges


Thu, 21 Apr 2016 14:47:39 GMT sagerj [11174]
	* code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.cc (modified)
	* code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.h (modified)
	* code/branches/sagerjFS16/src/orxonox/controllers/HumanController.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/controllers/HumanController.h (modified)
	* code/branches/sagerjFS16/src/orxonox/controllers/NewHumanController.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/controllers/NewHumanController.h (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/Weapon.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/Weapon.h (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.h (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponPack.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponPack.h (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponSet.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponSet.h (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponSystem.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponSystem.h (modified)
	* code/branches/sagerjFS16/src/orxonox/worldentities/ControllableEntity.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/worldentities/ControllableEntity.h (modified)
	* code/branches/sagerjFS16/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/worldentities/pawns/Pawn.h (modified)

	everything beneath weaponmode changed to push/release - wm modified ...


Thu, 21 Apr 2016 14:05:15 GMT binderm [11173]
	* code/branches/bindermFS16/data/defaultConfig/orxonox.ini (modified)
	* code/branches/bindermFS16/data/gui/layouts/CampaignMenu.layout (modified)
	* code/branches/bindermFS16/data/gui/scripts/CampaignMenu.lua (modified)
	* code/branches/bindermFS16/data/gui/scripts/SingleplayerMenu.lua (modified)
	* code/branches/bindermFS16/src/orxonox/CMakeLists.txt (modified)
	* code/branches/bindermFS16/src/orxonox/LevelManager.cc (modified)
	* code/branches/bindermFS16/src/orxonox/LevelManager.h (modified)
	* code/branches/bindermFS16/src/orxonox/gametypes/Mission.cc (modified)
	* code/branches/bindermFS16/src/orxonox/overlays/CampaignMenu.cc (modified)
	* code/branches/bindermFS16/src/orxonox/overlays/CampaignMenu.h (modified)

	Campaignmenu improved, it's now possible to only show single levels ...


Thu, 21 Apr 2016 14:02:06 GMT plehmann [11172]
	* code/branches/plehmannFS16/src/orxonox/CMakeLists.txt (modified)
	* code/branches/plehmannFS16/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/branches/plehmannFS16/src/orxonox/controllers/CMakeLists.txt (modified)
	* code/branches/plehmannFS16/src/orxonox/controllers/ControllerDirector.cc (modified)
	* code/branches/plehmannFS16/src/orxonox/controllers/DebugTask.cc (modified)
	* code/branches/plehmannFS16/src/orxonox/controllers/DebugTask.h (modified)
	* code/branches/plehmannFS16/src/orxonox/controllers/NewScriptController.cc (modified)
	* code/branches/plehmannFS16/src/orxonox/controllers/NewScriptController.h (modified)
	* code/branches/plehmannFS16/src/orxonox/controllers/ScriptController.cc (modified)
	* code/branches/plehmannFS16/src/orxonox/controllers/Task.cc (modified)
	* code/branches/plehmannFS16/src/orxonox/controllers/Task.h (modified)

	updated some files so NewScriptController lua binds are created. ...


Thu, 21 Apr 2016 13:37:28 GMT tgidron [11171]
	* code/branches/tgidronFS16/data/levels/Hover.oxw (modified)
	* code/branches/tgidronFS16/data/levels/includes/weaponSettingsHover.oxi (modified)
	* code/branches/tgidronFS16/data/overlays/HoverHUD.oxo (modified)
	* code/branches/tgidronFS16/src/modules/hover/CMakeLists.txt (modified)
	* code/branches/tgidronFS16/src/modules/hover/FlagsAndLivesHUD.cc (added)
	* code/branches/tgidronFS16/src/modules/hover/FlagsAndLivesHUD.h (added)
	* code/branches/tgidronFS16/src/modules/hover/Hover.cc (modified)
	* code/branches/tgidronFS16/src/modules/hover/Hover.h (modified)
	* code/branches/tgidronFS16/src/modules/hover/HoverShip.cc (modified)
	* code/branches/tgidronFS16/src/modules/hover/HoverShip.h (modified)
	* code/branches/tgidronFS16/src/modules/hover/TotFlagsHUD.cc (deleted)
	* code/branches/tgidronFS16/src/modules/hover/TotFlagsHUD.h (deleted)

	Pickups work; Lives Counter and Total Flag Counter


Thu, 21 Apr 2016 13:33:48 GMT sagerj [11170]
	* code/branches/sagerjFS16/data/levels/includes/weaponSettingsEscort.oxi (modified)
	* code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.cc (modified)
	* code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.h (modified)
	* code/branches/sagerjFS16/src/orxonox/controllers/HumanController.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/controllers/NewHumanController.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/Weapon.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.h (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponPack.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponSet.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponSystem.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/worldentities/ControllableEntity.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/worldentities/pawns/Pawn.cc (modified)

	running backup


Sun, 17 Apr 2016 18:40:05 GMT fvultier [11169]
	* code/branches/tgidronFS16/data/levels/Hover.oxw (modified)
	* code/branches/tgidronFS16/data/overlays/HoverHUD.oxo (modified)
	* code/branches/tgidronFS16/src/modules/hover/Hover.cc (modified)
	* code/branches/tgidronFS16/src/modules/hover/Hover.h (modified)
	* code/branches/tgidronFS16/src/modules/hover/HoverOrigin.cc (modified)
	* code/branches/tgidronFS16/src/modules/hover/HoverOrigin.h (modified)

	Fixed errors with pickups.


Thu, 14 Apr 2016 14:05:48 GMT tgidron [11168]
	* code/branches/tgidronFS16/data/levels/Hover.oxw (modified)
	* code/branches/tgidronFS16/data/levels/includes/weaponSettingsHover.oxi (modified)
	* code/branches/tgidronFS16/data/levels/templates/spaceshipHover.oxt (modified)
	* code/branches/tgidronFS16/data/overlays/HoverHUD.oxo (modified)
	* code/branches/tgidronFS16/src/modules/hover/CMakeLists.txt (modified)
	* code/branches/tgidronFS16/src/modules/hover/Hover.cc (modified)
	* code/branches/tgidronFS16/src/modules/hover/Hover.h (modified)
	* code/branches/tgidronFS16/src/modules/hover/HoverOrigin.cc (modified)
	* code/branches/tgidronFS16/src/modules/hover/HoverOrigin.h (modified)
	* code/branches/tgidronFS16/src/modules/hover/TotFlagsHUD.cc (added)
	* code/branches/tgidronFS16/src/modules/hover/TotFlagsHUD.h (added)
	* code/branches/tgidronFS16/src/modules/pickup/PickupSpawner.h (modified)

	Pickups + Flags HUD


Thu, 14 Apr 2016 14:03:16 GMT plehmann [11167]
	* code/branches/plehmannFS16/data/gui/scripts/testscript.lua (modified)
	* code/branches/plehmannFS16/src/orxonox/controllers/CMakeLists.txt (modified)
	* code/branches/plehmannFS16/src/orxonox/controllers/ControllerDirector.cc (modified)
	* code/branches/plehmannFS16/src/orxonox/controllers/DebugTask.cc (modified)
	* code/branches/plehmannFS16/src/orxonox/controllers/DebugTask.h (modified)
	* code/branches/plehmannFS16/src/orxonox/controllers/NewScriptController.cc (modified)
	* code/branches/plehmannFS16/src/orxonox/controllers/NewScriptController.h (modified)
	* code/branches/plehmannFS16/src/orxonox/controllers/ScriptController.h (modified)
	* code/branches/plehmannFS16/src/orxonox/controllers/Task.cc (modified)
	* code/branches/plehmannFS16/src/orxonox/controllers/Task.h (modified)

	changed the NewScriptController and Task classes


Thu, 14 Apr 2016 14:02:00 GMT sagerj [11166]
	* code/branches/sagerjFS16/data/levels/includes/weaponSettingsEscort.oxi (modified)
	* code/branches/sagerjFS16/src/modules/weapons/WeaponsPrereqs.h (modified)
	* code/branches/sagerjFS16/src/modules/weapons/weaponmodes/CMakeLists.txt (modified)
	* code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.cc (modified)
	* code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.h (modified)
	* code/branches/sagerjFS16/src/orxonox/controllers/HumanController.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/controllers/NewHumanController.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/controllers/NewHumanController.h (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/Weapon.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.h (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponPack.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponSet.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponSystem.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/worldentities/ControllableEntity.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/worldentities/pawns/Pawn.h (modified)

	today I got pawn'ed


Thu, 14 Apr 2016 11:24:08 GMT plehmann [11165]
	* code/branches/plehmannFS16/src/orxonox/controllers/CMakeLists.txt (modified)
	* code/branches/plehmannFS16/src/orxonox/controllers/DebugTask.cc (added)
	* code/branches/plehmannFS16/src/orxonox/controllers/DebugTask.h (added)
	* code/branches/plehmannFS16/src/orxonox/controllers/NewScriptController.cc (added)
	* code/branches/plehmannFS16/src/orxonox/controllers/NewScriptController.h (added)
	* code/branches/plehmannFS16/src/orxonox/controllers/Task.cc (added)
	* code/branches/plehmannFS16/src/orxonox/controllers/Task.h (added)

	added new files for newScriptController
	--This lines, and those ...


Thu, 14 Apr 2016 11:11:00 GMT sagerj [11164]
	* code/branches/sagerjFS16/src/orxonox/controllers/HumanController.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/controllers/HumanController.h (modified)
	* code/branches/sagerjFS16/src/orxonox/controllers/NewHumanController.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/controllers/NewHumanController.h (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/Weapon.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/Weapon.h (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.h (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponPack.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponPack.h (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponSet.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponSet.h (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponSystem.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponSystem.h (modified)
	* code/branches/sagerjFS16/src/orxonox/worldentities/ControllableEntity.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/worldentities/ControllableEntity.h (modified)

	added orxout() for every release lvl for debug purpose


Thu, 14 Apr 2016 11:00:08 GMT tgidron [11163]
	* code/branches/tgidronFS16/data/levels/Hover.oxw (modified)
	* code/branches/tgidronFS16/data/levels/templates/spaceshipHover.oxt (modified)
	* code/branches/tgidronFS16/data/overlays/HoverHUD.oxo (modified)
	* code/branches/tgidronFS16/src/modules/hover/FlagHUD.cc (modified)
	* code/branches/tgidronFS16/src/modules/hover/Hover.cc (modified)
	* code/branches/tgidronFS16/src/modules/hover/Hover.h (modified)

	Pickup Development


Fri, 01 Apr 2016 17:38:22 GMT fvultier [11162]
	* code/branches/bindermFS16/data/gui/scripts/SingleplayerMenu.lua (modified)
	* code/branches/bindermFS16/src/orxonox/CMakeLists.txt (modified)
	* code/branches/bindermFS16/src/orxonox/overlays/CampaignMenu.cc (modified)
	* code/branches/bindermFS16/src/orxonox/overlays/CampaignMenu.h (modified)

	Managed to call a C++ test function from a Lua script that gets ...


Thu, 24 Mar 2016 14:56:35 GMT sagerj [11153]
	* code/branches/sagerjFS16/data/defaultConfig/keybindings.ini (modified)
	* code/branches/sagerjFS16/data/gui/scripts/KeyBindMenu.lua (modified)
	* code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.cc (modified)
	* code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.h (modified)
	* code/branches/sagerjFS16/src/orxonox/controllers/HumanController.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/controllers/HumanController.h (modified)
	* code/branches/sagerjFS16/src/orxonox/controllers/NewHumanController.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/controllers/NewHumanController.h (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponSystem.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponSystem.h (modified)

	added release functions in various classes: weaponmode, weaponsystem, ...


Thu, 24 Mar 2016 14:54:06 GMT plehmann [11152]
	* code/branches/plehmannFS16/data/gui/scripts/testscript.lua (modified)
	* code/branches/plehmannFS16/data/levels/scriptController.oxw (modified)
	* code/branches/plehmannFS16/src/orxonox/controllers/ScriptController.cc (modified)
	* code/branches/plehmannFS16/src/orxonox/controllers/ScriptController.h (modified)

	took the event functions out of the tick function


Thu, 24 Mar 2016 14:53:28 GMT tgidron [11151]
	* code/branches/tgidronFS16/data/levels/templates/spaceshipHover.oxt (modified)
	* code/branches/tgidronFS16/data/overlays/HoverHUD.oxo (modified)
	* code/branches/tgidronFS16/src/modules/hover/FlagHUD.cc (modified)
	* code/branches/tgidronFS16/src/modules/hover/Hover.cc (modified)
	* code/branches/tgidronFS16/src/modules/hover/Hover.h (modified)
	* code/branches/tgidronFS16/src/modules/hover/HoverShip.cc (modified)

	New Level Up


Thu, 24 Mar 2016 14:52:07 GMT binderm [11150]
	* code/branches/bindermFS16/data/gui/scripts/SingleplayerMenu.lua (modified)
	* code/branches/bindermFS16/src/orxonox/overlays/CampaignMenu.cc (modified)
	* code/branches/bindermFS16/src/orxonox/overlays/CampaignMenu.h (modified)
	* code/branches/bindermFS16/src/orxonox/overlays/GUISheet.cc (modified)

	tried consoleCommand, doesn't work  yet. Please have a look;)


Thu, 24 Mar 2016 13:12:41 GMT binderm [11149]
	* code/branches/bindermFS16/data/gui/scripts/SingleplayerMenu.lua (modified)
	* code/branches/bindermFS16/src/orxonox/overlays/CMakeLists.txt (modified)
	* code/branches/bindermFS16/src/orxonox/overlays/CampaignMenu.cc (added)
	* code/branches/bindermFS16/src/orxonox/overlays/CampaignMenu.h (added)

	new files  for campaign menu


Thu, 17 Mar 2016 14:53:19 GMT sagerj [11142]
	* code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.cc (added)
	* code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.h (added)
	* code/branches/sagerjFS16/src/orxonox/controllers/NewHumanController.cc (modified)
	* code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.h (modified)

	first commit, added discharger weaponclass


Thu, 17 Mar 2016 14:40:22 GMT plehmann [11141]
	* code/branches/plehmannFS16/src/orxonox/controllers/ScriptController.cc (modified)

	added a comment


Thu, 17 Mar 2016 13:05:06 GMT fvultier [11140]
	* code/branches/tgidronFS16 (copied)

	New branch for PPS FS16


Thu, 17 Mar 2016 12:59:01 GMT fvultier [11139]
	* code/branches/bindermFS16 (copied)

	New branch for PPS FS16


Thu, 17 Mar 2016 12:57:56 GMT fvultier [11138]
	* code/branches/sagerjFS16 (copied)




Thu, 17 Mar 2016 12:33:29 GMT plehmann [11137]
	* code/branches/plehmannFS16 (copied)

	new branch for pps


Wed, 09 Mar 2016 16:26:32 GMT fvultier [11136]
	* code/branches/tutorial6/src/orxonox/controllers/AutonomousDroneController.cc (modified)

	Made tutorial compatible with the new core.


Mon, 07 Mar 2016 15:13:18 GMT fvultier [11135]
	* code/branches/tutorial6/src/orxonox/worldentities/AutonomousDrone.cc (modified)




Mon, 07 Mar 2016 14:42:44 GMT fvultier [11134]
	* code/branches/tutorial6/data/levels/tutorial.oxw (modified)
	* code/branches/tutorial6/src/orxonox/controllers/AutonomousDroneController.cc (added)
	* code/branches/tutorial6/src/orxonox/controllers/AutonomousDroneController.h (added)
	* code/branches/tutorial6/src/orxonox/worldentities/AutonomousDrone.cc (added)
	* code/branches/tutorial6/src/orxonox/worldentities/AutonomousDrone.h (added)

	Files needed for the tutorial added.


Mon, 07 Mar 2016 14:26:29 GMT fvultier [11133]
	* code/branches/tutorial6 (copied)

	branch for new tutorial


Sun, 06 Mar 2016 20:18:13 GMT landauf [11132]
	* code/branches/ogre1.9/src/libraries/core/CMakeLists.txt (modified)
	* code/branches/ogre1.9/src/libraries/core/GraphicsManager.cc (modified)
	* code/branches/ogre1.9/src/libraries/core/GraphicsManager.h (modified)
	* code/branches/ogre1.9/src/orxonox/Scene.cc (modified)
	* code/branches/ogre1.9/src/orxonox/Scene.h (modified)

	fixed overlays with ogre 1.9.
	OverlaySystem must be initialized once ...


Sun, 06 Mar 2016 15:43:02 GMT landauf [11131]
	* code/branches/ogre1.9/src/libraries/util/OgreForwardRefs.h (modified)
	* code/branches/ogre1.9/src/orxonox/Scene.cc (modified)
	* code/branches/ogre1.9/src/orxonox/Scene.h (modified)

	initialize overlay component


Sun, 06 Mar 2016 15:13:15 GMT landauf [11130]
	* code/branches/ogre1.9/src/modules/designtools/ScreenshotManager.cc (modified)
	* code/branches/ogre1.9/src/modules/hover/FlagHUD.cc (modified)

	forgot to commit 2 files in my previous commit:
	orxonox now compiles ...


Sun, 06 Mar 2016 14:32:26 GMT landauf [11129]
	* code/branches/ogre1.9/src/libraries/util/DisplayStringConversions.h (modified)
	* code/branches/ogre1.9/src/libraries/util/OgreForwardRefs.h (modified)
	* code/branches/ogre1.9/src/modules/objects/Planet.cc (modified)
	* code/branches/ogre1.9/src/modules/objects/Planet.h (modified)
	* code/branches/ogre1.9/src/modules/overlays/FadeoutText.cc (modified)
	* code/branches/ogre1.9/src/modules/overlays/OverlayText.cc (modified)
	* code/branches/ogre1.9/src/modules/overlays/hud/ChatOverlay.cc (modified)
	* code/branches/ogre1.9/src/modules/overlays/hud/ChatOverlay.h (modified)
	* code/branches/ogre1.9/src/modules/overlays/hud/HUDBar.cc (modified)
	* code/branches/ogre1.9/src/modules/overlays/hud/HUDBar.h (modified)
	* code/branches/ogre1.9/src/modules/overlays/hud/HUDNavigation.cc (modified)
	* code/branches/ogre1.9/src/modules/overlays/hud/HUDRadar.cc (modified)
	* code/branches/ogre1.9/src/modules/overlays/hud/HUDWeapon.cc (modified)
	* code/branches/ogre1.9/src/modules/overlays/hud/HUDWeapon.h (modified)
	* code/branches/ogre1.9/src/modules/overlays/hud/HUDWeaponMode.cc (modified)
	* code/branches/ogre1.9/src/modules/overlays/hud/HUDWeaponMode.h (modified)
	* code/branches/ogre1.9/src/modules/overlays/stats/Stats.cc (modified)
	* code/branches/ogre1.9/src/orxonox/RenderQueueListener.cc (modified)
	* code/branches/ogre1.9/src/orxonox/controllers/NewHumanController.cc (modified)
	* code/branches/ogre1.9/src/orxonox/graphics/Camera.cc (modified)
	* code/branches/ogre1.9/src/orxonox/graphics/Model.cc (modified)
	* code/branches/ogre1.9/src/orxonox/graphics/Model.h (modified)
	* code/branches/ogre1.9/src/orxonox/overlays/InGameConsole.cc (modified)
	* code/branches/ogre1.9/src/orxonox/overlays/OrxonoxOverlay.cc (modified)
	* code/branches/ogre1.9/src/orxonox/worldentities/WorldEntity.cc (modified)

	orxonox now compiles with ogre 1.9 (but still needs some other
	changes)


Sun, 06 Mar 2016 12:56:26 GMT landauf [11128]
	* code/branches/ogre1.9/data/levels/Spacerace2.oxw (modified)
	* code/branches/ogre1.9/data/levels/asteroidField.oxw (modified)
	* code/branches/ogre1.9/data/levels/dockingToASpaceStation.oxw (modified)
	* code/branches/ogre1.9/data/levels/dynamicMatch.oxw (modified)
	* code/branches/ogre1.9/data/levels/earth.oxw (modified)
	* code/branches/ogre1.9/data/levels/expeditionSector.oxw (modified)
	* code/branches/ogre1.9/data/levels/iiJohnVane_Area51UnderFire.oxw (modified)
	* code/branches/ogre1.9/data/levels/iiiJohnVane_EscapeTheBastards.oxw (modified)
	* code/branches/ogre1.9/data/levels/kecks.oxw (modified)
	* code/branches/ogre1.9/data/levels/levelTry.oxw (modified)
	* code/branches/ogre1.9/data/levels/missionOne.oxw (modified)
	* code/branches/ogre1.9/data/levels/planets.oxw (modified)
	* code/branches/ogre1.9/data/levels/presentation09.oxw (modified)
	* code/branches/ogre1.9/data/levels/presentationFS11.oxw (modified)
	* code/branches/ogre1.9/data/levels/presentationHS09.oxw (modified)
	* code/branches/ogre1.9/data/levels/presentationHS12.oxw (modified)
	* code/branches/ogre1.9/data/levels/shadertest.oxw (modified)
	* code/branches/ogre1.9/data/levels/shuttleAttack.oxw (modified)
	* code/branches/ogre1.9/data/levels/shuttleRetaliation.oxw (modified)
	* code/branches/ogre1.9/data/levels/spaceRace.oxw (modified)
	* code/branches/ogre1.9/data/levels/testSwallow.oxw (modified)
	* code/branches/ogre1.9/src/modules/objects/Planet.cc (modified)
	* code/branches/ogre1.9/src/modules/objects/Planet.h (modified)
	* code/branches/ogre1.9/src/orxonox/graphics/Model.h (modified)

	let Planet inherit from Model to avoid code duplication (especially ...


Sun, 21 Feb 2016 22:15:03 GMT landauf [11127]
	* code/branches/ogre1.9/cmake/tools/FindOGRE.cmake (modified)
	* code/branches/ogre1.9/src/orxonox/CMakeLists.txt (modified)

	in ogre 1.9, overlays were moved into a separate component (i.e. a ...


Sun, 21 Feb 2016 21:21:46 GMT landauf [11126]
	* code/branches/ogre1.9/src/orxonox/graphics/AnimatedModel.cc (modified)
	* code/branches/ogre1.9/src/orxonox/graphics/Model.h (modified)

	small refactoring: make variables in Model private


Sun, 21 Feb 2016 21:09:24 GMT landauf [11125]
	* code/branches/ogre1.9 (copied)

	new branch to add support for ogre 1.9 to orxonox


Sat, 20 Feb 2016 17:28:28 GMT landauf [11124]
	* code/branches/cegui0.8/data/gui/scripts/AudioMenu.lua (modified)
	* code/branches/cegui0.8/data/gui/scripts/DockingDialog.lua (modified)
	* code/branches/cegui0.8/data/gui/scripts/GameplayMenu.lua (modified)
	* code/branches/cegui0.8/data/gui/scripts/GraphicsMenu.lua (modified)
	* code/branches/cegui0.8/data/gui/scripts/HostMenu.lua (modified)
	* code/branches/cegui0.8/data/gui/scripts/MultiplayerMenu.lua (modified)
	* code/branches/cegui0.8/data/gui/scripts/PickupInventory.lua (modified)
	* code/branches/cegui0.8/data/gui/scripts/QuestGUI.lua (modified)
	* code/branches/cegui0.8/data/gui/scripts/ShipSelectionMenu.lua (modified)
	* code/branches/cegui0.8/data/gui/scripts/SingleplayerMenu.lua (modified)
	* code/branches/cegui0.8/data/gui/scripts/UndockingDialog.lua (modified)

	fixed some more errors: use 0.8-notation for images


Thu, 18 Feb 2016 21:58:18 GMT landauf [11121]
	* code/branches/cegui0.8/data/gui/configs/CEGUIConfig.xsd (modified)
	* code/branches/cegui0.8/data/gui/layouts/GUILayout.xsd (modified)
	* code/branches/cegui0.8/data/gui/schemes/GUIScheme.xsd (modified)

	updated xsd files


Tue, 16 Feb 2016 21:10:43 GMT bknecht [11118]
	* code/branches/cegui0.8/cmake/tools/FindCEGUI.cmake (modified)
	* code/branches/cegui0.8/data/gui/layouts/AudioMenu.layout (modified)
	* code/branches/cegui0.8/data/gui/layouts/CampaignMenu.layout (modified)
	* code/branches/cegui0.8/data/gui/layouts/ChatBox-inputonly.layout (modified)
	* code/branches/cegui0.8/data/gui/layouts/ChatBox.layout (modified)
	* code/branches/cegui0.8/data/gui/layouts/ControlsMenu.layout (modified)
	* code/branches/cegui0.8/data/gui/layouts/CreditsMenu.layout (modified)
	* code/branches/cegui0.8/data/gui/layouts/DecisionPopup.layout (modified)
	* code/branches/cegui0.8/data/gui/layouts/DockingDialog.layout (modified)
	* code/branches/cegui0.8/data/gui/layouts/GameplayMenu.layout (modified)
	* code/branches/cegui0.8/data/gui/layouts/GraphicsMenu.layout (modified)
	* code/branches/cegui0.8/data/gui/layouts/HostMenu.layout (modified)
	* code/branches/cegui0.8/data/gui/layouts/InGameMenu.layout (modified)
	* code/branches/cegui0.8/data/gui/layouts/InGamePickupHUD.layout (modified)
	* code/branches/cegui0.8/data/gui/layouts/InGameTest.layout (modified)
	* code/branches/cegui0.8/data/gui/layouts/InfoPopup.layout (modified)
	* code/branches/cegui0.8/data/gui/layouts/KeyBindMenu.layout (modified)
	* code/branches/cegui0.8/data/gui/layouts/MainMenu.layout (modified)
	* code/branches/cegui0.8/data/gui/layouts/MainMenuBackground.layout (modified)
	* code/branches/cegui0.8/data/gui/layouts/MiscConfigMenu.layout (modified)
	* code/branches/cegui0.8/data/gui/layouts/MouseControlsMenu.layout (modified)
	* code/branches/cegui0.8/data/gui/layouts/MultiplayerMenu.layout (modified)
	* code/branches/cegui0.8/data/gui/layouts/MultiplayerOptionsMenu.layout (modified)
	* code/branches/cegui0.8/data/gui/layouts/NotificationLayer.layout (modified)
	* code/branches/cegui0.8/data/gui/layouts/PickupInventory.layout (modified)
	* code/branches/cegui0.8/data/gui/layouts/QuestGUI.layout (modified)
	* code/branches/cegui0.8/data/gui/layouts/SettingsMenu.layout (modified)
	* code/branches/cegui0.8/data/gui/layouts/ShipSelectionMenu.layout (modified)
	* code/branches/cegui0.8/data/gui/layouts/SingleplayerConfigMenu.layout (modified)
	* code/branches/cegui0.8/data/gui/layouts/SingleplayerMenu.layout (modified)
	* code/branches/cegui0.8/data/gui/layouts/UndockingDialog.layout (modified)
	* code/branches/cegui0.8/data/gui/schemes/OrxonoxGUIScheme.scheme (modified)
	* code/branches/cegui0.8/data/gui/schemes/OrxonoxHUDWidgets.scheme (modified)
	* code/branches/cegui0.8/data/gui/schemes/OrxonoxLook.scheme (modified)
	* code/branches/cegui0.8/data/gui/schemes/OrxonoxMenuWidgets.scheme (modified)
	* code/branches/cegui0.8/data/gui/schemes/SleekSpaceHUDWidgets.scheme (modified)
	* code/branches/cegui0.8/data/gui/schemes/SleekSpaceLook.scheme (modified)
	* code/branches/cegui0.8/data/gui/schemes/SleekSpaceMenuWidgets.scheme (modified)
	* code/branches/cegui0.8/data/gui/schemes/TaharezGreenHUDWidgets.scheme (modified)
	* code/branches/cegui0.8/data/gui/schemes/TaharezGreenLook.scheme (modified)
	* code/branches/cegui0.8/data/gui/schemes/TaharezGreenMenuWidgets.scheme (modified)
	* code/branches/cegui0.8/data/gui/schemes/TaharezHUDWidgets.scheme (modified)
	* code/branches/cegui0.8/data/gui/schemes/TaharezLook.scheme (modified)
	* code/branches/cegui0.8/data/gui/schemes/TaharezMenuWidgets.scheme (modified)
	* code/branches/cegui0.8/data/gui/schemes/VanillaHUDWidgets.scheme (modified)
	* code/branches/cegui0.8/data/gui/schemes/VanillaLook.scheme (modified)
	* code/branches/cegui0.8/data/gui/schemes/VanillaMenuWidgets.scheme (modified)
	* code/branches/cegui0.8/data/gui/schemes/WindowsHUDWidgets.scheme (modified)
	* code/branches/cegui0.8/data/gui/schemes/WindowsLook.scheme (modified)
	* code/branches/cegui0.8/data/gui/schemes/WindowsMenuWidgets.scheme (modified)
	* code/branches/cegui0.8/data/gui/scripts/GUISheet.lua (modified)
	* code/branches/cegui0.8/data/gui/scripts/InitialiseGUI.lua (modified)
	* code/branches/cegui0.8/data/gui/scripts/MainMenu.lua (modified)
	* code/branches/cegui0.8/data/gui/scripts/SheetManager.lua (modified)
	* code/branches/cegui0.8/src/libraries/core/GUIManager.cc (modified)
	* code/branches/cegui0.8/src/orxonox/chat/ChatInputHandler.cc (modified)

	initial commit to get orxonox to find and compile and start with ...


Sun, 07 Feb 2016 17:47:15 GMT bknecht [11110]
	* code/branches/cegui0.8 (copied)

	Create CEGUI v0.8 migration branch


Sun, 31 Jan 2016 13:52:12 GMT landauf [11102]
	* code/branches/AI_HS15 (deleted)
	* code/branches/campaignHS15 (deleted)
	* code/branches/cpp11_v2 (deleted)
	* code/branches/cpp11_v3 (deleted)
	* code/branches/explosionChunksHS15 (deleted)
	* code/branches/fabienHS15 (deleted)
	* code/branches/hoverHS15 (deleted)
	* code/branches/particleEffectsHS15 (deleted)
	* code/branches/planetLevelHS15 (deleted)
	* code/branches/presentationHS15 (deleted)
	* code/branches/shaders (deleted)
	* code/branches/shaders_merge (deleted)

	removed merged branches from HS15


Tue, 19 Jan 2016 22:05:02 GMT landauf [11079]
	* code/branches/shaders_merge/src/orxonox/graphics/LensFlare.cc (modified)
	* code/branches/shaders_merge/src/orxonox/graphics/LensFlare.h (modified)

	bugfix: the attached objects are stored in a set, so there's no ...


Tue, 19 Jan 2016 21:49:57 GMT landauf [11078]
	* code/branches/shaders_merge/src/orxonox/Scene.cc (modified)
	* code/branches/shaders_merge/src/orxonox/graphics/LensFlare.cc (modified)
	* code/branches/shaders_merge/src/orxonox/graphics/LensFlare.h (modified)

	fixed numerous issues:
	 - fixed memory leaks (delete allocated heap ...


Mon, 18 Jan 2016 21:35:11 GMT landauf [11075]
	* code/branches/shaders_merge/src/orxonox/RenderQueueListener.cc (modified)
	* code/branches/shaders_merge/src/orxonox/RenderQueueListener.h (modified)
	* code/branches/shaders_merge/src/orxonox/graphics/Billboard.cc (modified)
	* code/branches/shaders_merge/src/orxonox/graphics/LensFlare.cc (modified)
	* code/branches/shaders_merge/src/orxonox/graphics/LensFlare.h (modified)

	fixed author and added some c++11 features


Mon, 18 Jan 2016 21:15:35 GMT landauf [11074]
	* code/branches/shaders_merge/data/levels/shadertest.oxw (modified)
	* code/branches/shaders_merge/src/orxonox/RenderQueueListener.cc (modified)
	* code/branches/shaders_merge/src/orxonox/RenderQueueListener.h (modified)
	* code/branches/shaders_merge/src/orxonox/graphics/LensFlare.cc (modified)
	* code/branches/shaders_merge/src/orxonox/graphics/LensFlare.h (modified)

	eol-style native


Mon, 18 Jan 2016 21:12:53 GMT landauf [11073]
	* code/branches/shaders_merge (modified)
	* code/branches/shaders_merge/data/levels/shadertest.oxw (copied)
	* code/branches/shaders_merge/src/libraries/tools/Mesh.cc (modified)
	* code/branches/shaders_merge/src/libraries/tools/Mesh.h (modified)
	* code/branches/shaders_merge/src/orxonox/CMakeLists.txt (modified)
	* code/branches/shaders_merge/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/branches/shaders_merge/src/orxonox/RenderQueueListener.cc (copied)
	* code/branches/shaders_merge/src/orxonox/RenderQueueListener.h (copied)
	* code/branches/shaders_merge/src/orxonox/Scene.cc (modified)
	* code/branches/shaders_merge/src/orxonox/Scene.h (modified)
	* code/branches/shaders_merge/src/orxonox/graphics/Billboard.cc (modified)
	* code/branches/shaders_merge/src/orxonox/graphics/Billboard.h (modified)
	* code/branches/shaders_merge/src/orxonox/graphics/CMakeLists.txt (modified)
	* code/branches/shaders_merge/src/orxonox/graphics/LensFlare.cc (copied)
	* code/branches/shaders_merge/src/orxonox/graphics/LensFlare.h (copied)
	* code/branches/shaders_merge/src/orxonox/graphics/Model.cc (modified)
	* code/branches/shaders_merge/src/orxonox/graphics/Model.h (modified)

	merged branch 'shaders' into branch 'shaders_merge'


Mon, 18 Jan 2016 20:58:41 GMT landauf [11072]
	* code/branches/shaders_merge (copied)

	created branch to merge 'shaders' branch (from pps HS 2012)


Sun, 17 Jan 2016 19:40:36 GMT landauf [11070]
	* code/branches/cpp11_v3/src/libraries/core/class/Identifier.h (modified)
	* code/branches/cpp11_v3/src/libraries/core/config/ConfigFile.cc (modified)
	* code/branches/cpp11_v3/src/libraries/core/config/ConfigFileSection.h (modified)
	* code/branches/cpp11_v3/src/orxonox/items/MultiStateEngine.cc (modified)
	* code/branches/cpp11_v3/src/orxonox/worldentities/EffectContainer.h (modified)

	return collections directly instead of begin and end iterators.
	this ...


Sun, 17 Jan 2016 17:44:19 GMT landauf [11069]
	* code/branches/cpp11_v3/src/modules/hover/HoverFlag.cc (modified)
	* code/branches/cpp11_v3/src/modules/hover/HoverWall.cc (modified)
	* code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponMode.cc (modified)
	* code/branches/cpp11_v3/src/modules/weapons/projectiles/MineProjectile.cc (modified)

	fixed enums


Sun, 17 Jan 2016 17:41:22 GMT landauf [11068]
	* code/branches/cpp11_v3 (modified)
	* code/branches/cpp11_v3/src/OrxonoxConfig.h.in (modified)
	* code/branches/cpp11_v3/src/libraries/core/CorePrereqs.h (modified)
	* code/branches/cpp11_v3/src/libraries/core/XMLPort.h (modified)
	* code/branches/cpp11_v3/src/libraries/core/command/ConsoleCommand.h (modified)
	* code/branches/cpp11_v3/src/libraries/core/command/Executor.h (modified)
	* code/branches/cpp11_v3/src/libraries/core/command/Functor.h (modified)
	* code/branches/cpp11_v3/src/libraries/core/command/IOConsolePOSIX.cc (modified)
	* code/branches/cpp11_v3/src/libraries/core/command/IOConsoleWindows.cc (modified)
	* code/branches/cpp11_v3/src/libraries/core/command/Shell.cc (modified)
	* code/branches/cpp11_v3/src/libraries/core/command/Shell.h (modified)
	* code/branches/cpp11_v3/src/libraries/core/config/ConfigFileSection.h (modified)
	* code/branches/cpp11_v3/src/libraries/network/Connection.cc (modified)
	* code/branches/cpp11_v3/src/libraries/network/Connection.h (modified)
	* code/branches/cpp11_v3/src/libraries/network/NetworkPrereqs.h (modified)
	* code/branches/cpp11_v3/src/libraries/network/packet/Acknowledgement.cc (modified)
	* code/branches/cpp11_v3/src/libraries/network/packet/Chat.cc (modified)
	* code/branches/cpp11_v3/src/libraries/network/packet/ClassID.cc (modified)
	* code/branches/cpp11_v3/src/libraries/network/packet/DeleteObjects.cc (modified)
	* code/branches/cpp11_v3/src/libraries/network/packet/FunctionCalls.cc (modified)
	* code/branches/cpp11_v3/src/libraries/network/packet/FunctionIDs.cc (modified)
	* code/branches/cpp11_v3/src/libraries/network/packet/Gamestate.h (modified)
	* code/branches/cpp11_v3/src/libraries/network/packet/Packet.cc (modified)
	* code/branches/cpp11_v3/src/libraries/network/packet/Packet.h (modified)
	* code/branches/cpp11_v3/src/libraries/network/packet/Welcome.cc (modified)
	* code/branches/cpp11_v3/src/libraries/network/synchronisable/Synchronisable.h (modified)
	* code/branches/cpp11_v3/src/libraries/util/Math.h (modified)
	* code/branches/cpp11_v3/src/libraries/util/MultiType.cc (modified)
	* code/branches/cpp11_v3/src/libraries/util/MultiType.h (modified)
	* code/branches/cpp11_v3/src/libraries/util/MultiTypeValue.h (modified)
	* code/branches/cpp11_v3/src/libraries/util/SubString.cc (modified)
	* code/branches/cpp11_v3/src/libraries/util/SubString.h (modified)
	* code/branches/cpp11_v3/src/libraries/util/UtilPrereqs.h (modified)
	* code/branches/cpp11_v3/src/modules/gametypes/OldRaceCheckPoint.cc (modified)
	* code/branches/cpp11_v3/src/modules/gametypes/RaceCheckPoint.cc (modified)
	* code/branches/cpp11_v3/src/modules/jump/Jump.cc (modified)
	* code/branches/cpp11_v3/src/modules/mini4dgame/Mini4Dgame.h (modified)
	* code/branches/cpp11_v3/src/modules/mini4dgame/Mini4DgameAI.cc (modified)
	* code/branches/cpp11_v3/src/modules/mini4dgame/Mini4DgameAI.h (modified)
	* code/branches/cpp11_v3/src/modules/mini4dgame/Mini4DgameBoard.cc (modified)
	* code/branches/cpp11_v3/src/modules/mini4dgame/Mini4DgameBoard.h (modified)
	* code/branches/cpp11_v3/src/modules/notifications/NotificationDispatcher.cc (modified)
	* code/branches/cpp11_v3/src/modules/notifications/NotificationManager.cc (modified)
	* code/branches/cpp11_v3/src/modules/notifications/NotificationManager.h (modified)
	* code/branches/cpp11_v3/src/modules/objects/ForceField.cc (modified)
	* code/branches/cpp11_v3/src/modules/objects/ForceField.h (modified)
	* code/branches/cpp11_v3/src/modules/objects/Script.h (modified)
	* code/branches/cpp11_v3/src/modules/objects/Turret.cc (modified)
	* code/branches/cpp11_v3/src/modules/objects/triggers/CheckPoint.cc (modified)
	* code/branches/cpp11_v3/src/modules/objects/triggers/DistanceMultiTrigger.cc (modified)
	* code/branches/cpp11_v3/src/modules/objects/triggers/DistanceMultiTrigger.h (modified)
	* code/branches/cpp11_v3/src/modules/objects/triggers/DistanceTrigger.cc (modified)
	* code/branches/cpp11_v3/src/modules/objects/triggers/DistanceTrigger.h (modified)
	* code/branches/cpp11_v3/src/modules/objects/triggers/EventTrigger.cc (modified)
	* code/branches/cpp11_v3/src/modules/objects/triggers/EventTrigger.h (modified)
	* code/branches/cpp11_v3/src/modules/objects/triggers/Trigger.cc (modified)
	* code/branches/cpp11_v3/src/modules/objects/triggers/Trigger.h (modified)
	* code/branches/cpp11_v3/src/modules/objects/triggers/TriggerBase.h (modified)
	* code/branches/cpp11_v3/src/modules/overlays/OverlayText.cc (modified)
	* code/branches/cpp11_v3/src/modules/overlays/OverlayText.h (modified)
	* code/branches/cpp11_v3/src/modules/overlays/hud/HUDRadar.cc (modified)
	* code/branches/cpp11_v3/src/modules/overlays/stats/CreateLines.h (modified)
	* code/branches/cpp11_v3/src/modules/pickup/Pickup.cc (modified)
	* code/branches/cpp11_v3/src/modules/pickup/Pickup.h (modified)
	* code/branches/cpp11_v3/src/modules/pickup/items/DronePickup.cc (modified)
	* code/branches/cpp11_v3/src/modules/pickup/items/HealthPickup.cc (modified)
	* code/branches/cpp11_v3/src/modules/pickup/items/HealthPickup.h (modified)
	* code/branches/cpp11_v3/src/modules/pickup/items/MetaPickup.cc (modified)
	* code/branches/cpp11_v3/src/modules/pickup/items/MetaPickup.h (modified)
	* code/branches/cpp11_v3/src/modules/portals/PortalEndPoint.cc (modified)
	* code/branches/cpp11_v3/src/modules/questsystem/GlobalQuest.cc (modified)
	* code/branches/cpp11_v3/src/modules/questsystem/GlobalQuest.h (modified)
	* code/branches/cpp11_v3/src/modules/questsystem/LocalQuest.cc (modified)
	* code/branches/cpp11_v3/src/modules/questsystem/LocalQuest.h (modified)
	* code/branches/cpp11_v3/src/modules/questsystem/Quest.h (modified)
	* code/branches/cpp11_v3/src/modules/questsystem/QuestDescription.cc (modified)
	* code/branches/cpp11_v3/src/modules/questsystem/QuestEffectBeacon.h (modified)
	* code/branches/cpp11_v3/src/modules/questsystem/QuestHint.cc (modified)
	* code/branches/cpp11_v3/src/modules/questsystem/QuestHint.h (modified)
	* code/branches/cpp11_v3/src/modules/questsystem/QuestListener.h (modified)
	* code/branches/cpp11_v3/src/modules/towerdefense/TowerDefense.cc (modified)
	* code/branches/cpp11_v3/src/modules/towerdefense/TowerDefenseEnemy.cc (modified)
	* code/branches/cpp11_v3/src/modules/towerdefense/TowerDefenseField.cc (modified)
	* code/branches/cpp11_v3/src/modules/towerdefense/TowerDefenseField.h (modified)
	* code/branches/cpp11_v3/src/modules/towerdefense/TowerDefenseTower.cc (modified)
	* code/branches/cpp11_v3/src/modules/weapons/projectiles/GravityBomb.cc (modified)
	* code/branches/cpp11_v3/src/modules/weapons/projectiles/GravityBombField.cc (modified)
	* code/branches/cpp11_v3/src/modules/weapons/projectiles/IceGunProjectile.cc (modified)
	* code/branches/cpp11_v3/src/modules/weapons/projectiles/LightningGunProjectile.cc (modified)
	* code/branches/cpp11_v3/src/modules/weapons/projectiles/Projectile.cc (modified)
	* code/branches/cpp11_v3/src/modules/weapons/projectiles/Rocket.cc (modified)
	* code/branches/cpp11_v3/src/modules/weapons/projectiles/RocketOld.cc (modified)
	* code/branches/cpp11_v3/src/modules/weapons/projectiles/SimpleRocket.cc (modified)
	* code/branches/cpp11_v3/src/orxonox/Main.h (modified)
	* code/branches/cpp11_v3/src/orxonox/Radar.cc (modified)
	* code/branches/cpp11_v3/src/orxonox/gametypes/Gametype.h (modified)
	* code/branches/cpp11_v3/src/orxonox/graphics/Light.cc (modified)
	* code/branches/cpp11_v3/src/orxonox/graphics/Light.h (modified)
	* code/branches/cpp11_v3/src/orxonox/infos/GametypeInfo.cc (modified)
	* code/branches/cpp11_v3/src/orxonox/interfaces/NotificationListener.cc (modified)
	* code/branches/cpp11_v3/src/orxonox/interfaces/NotificationListener.h (modified)
	* code/branches/cpp11_v3/src/orxonox/interfaces/RadarViewable.cc (modified)
	* code/branches/cpp11_v3/src/orxonox/interfaces/RadarViewable.h (modified)
	* code/branches/cpp11_v3/src/orxonox/items/MultiStateEngine.cc (modified)
	* code/branches/cpp11_v3/src/orxonox/items/MultiStateEngine.h (modified)
	* code/branches/cpp11_v3/src/orxonox/items/PartDestructionEvent.cc (modified)
	* code/branches/cpp11_v3/src/orxonox/items/PartDestructionEvent.h (modified)
	* code/branches/cpp11_v3/src/orxonox/overlays/InGameConsole.cc (modified)
	* code/branches/cpp11_v3/src/orxonox/overlays/OrxonoxOverlay.cc (modified)
	* code/branches/cpp11_v3/src/orxonox/overlays/OrxonoxOverlay.h (modified)
	* code/branches/cpp11_v3/src/orxonox/sound/BaseSound.cc (modified)
	* code/branches/cpp11_v3/src/orxonox/sound/BaseSound.h (modified)
	* code/branches/cpp11_v3/src/orxonox/sound/WorldSound.cc (modified)
	* code/branches/cpp11_v3/src/orxonox/worldentities/Drone.cc (modified)
	* code/branches/cpp11_v3/src/orxonox/worldentities/MobileEntity.cc (modified)
	* code/branches/cpp11_v3/src/orxonox/worldentities/StaticEntity.cc (modified)
	* code/branches/cpp11_v3/src/orxonox/worldentities/WorldEntity.cc (modified)
	* code/branches/cpp11_v3/src/orxonox/worldentities/WorldEntity.h (modified)
	* code/branches/cpp11_v3/src/orxonox/worldentities/pawns/FpsPlayer.cc (modified)
	* code/branches/cpp11_v3/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/branches/cpp11_v3/src/orxonox/worldentities/pawns/SpaceShip.cc (modified)
	* code/branches/cpp11_v3/src/orxonox/worldentities/pawns/TeamBaseMatchBase.cc (modified)
	* code/branches/cpp11_v3/src/orxonox/worldentities/pawns/TeamBaseMatchBase.h (modified)
	* code/branches/cpp11_v3/test/util/MultiTypeTest.cc (modified)

	merged remaining commits from cpp11_v2 to cpp11_v3 (for some reason ...


Sun, 17 Jan 2016 13:58:59 GMT landauf [11067]
	* code/branches/cpp11_v3/src/orxonox/controllers/SectionController.cc (modified)
	* code/branches/cpp11_v3/src/orxonox/controllers/WingmanController.cc (modified)

	shortened code


Sun, 17 Jan 2016 13:03:27 GMT landauf [11066]
	* code/branches/cpp11_v3/src/libraries/core/object/Destroyable.cc (modified)

	fixed unittests (IdentifierManager doesn't always exist in tests)


Sun, 17 Jan 2016 12:59:00 GMT landauf [11065]
	* code/branches/cpp11_v3/src/modules/hover/FlagHUD.cc (modified)
	* code/branches/cpp11_v3/src/modules/hover/FlagHUD.h (modified)
	* code/branches/cpp11_v3/src/modules/hover/Hover.cc (modified)
	* code/branches/cpp11_v3/src/modules/hover/Hover.h (modified)
	* code/branches/cpp11_v3/src/modules/hover/HoverFlag.cc (modified)
	* code/branches/cpp11_v3/src/modules/hover/HoverFlag.h (modified)
	* code/branches/cpp11_v3/src/modules/hover/HoverOrigin.cc (modified)
	* code/branches/cpp11_v3/src/modules/hover/HoverOrigin.h (modified)
	* code/branches/cpp11_v3/src/modules/hover/HoverShip.h (modified)
	* code/branches/cpp11_v3/src/modules/hover/HoverWall.cc (modified)
	* code/branches/cpp11_v3/src/modules/hover/TimeHUD.cc (modified)
	* code/branches/cpp11_v3/src/modules/hover/TimeHUD.h (modified)
	* code/branches/cpp11_v3/src/modules/overlays/hud/HUDEnemyShieldBar.cc (modified)
	* code/branches/cpp11_v3/src/modules/overlays/hud/HUDEnemyShieldBar.h (modified)
	* code/branches/cpp11_v3/src/modules/overlays/hud/HUDRocketFuelBar.cc (modified)
	* code/branches/cpp11_v3/src/modules/overlays/hud/HUDRocketFuelBar.h (modified)
	* code/branches/cpp11_v3/src/modules/overlays/hud/HUDShieldBar.cc (modified)
	* code/branches/cpp11_v3/src/modules/overlays/hud/HUDShieldBar.h (modified)
	* code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeapon.cc (modified)
	* code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeapon.h (modified)
	* code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponMode.cc (modified)
	* code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponMode.h (modified)
	* code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponSystem.cc (modified)
	* code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponSystem.h (modified)
	* code/branches/cpp11_v3/src/modules/pickup/items/BoostPickup.cc (modified)
	* code/branches/cpp11_v3/src/modules/pickup/items/BoostPickup.h (modified)
	* code/branches/cpp11_v3/src/modules/pickup/items/MunitionContainer.h (modified)
	* code/branches/cpp11_v3/src/modules/pickup/items/MunitionPickup.cc (modified)
	* code/branches/cpp11_v3/src/modules/pickup/items/MunitionPickup.h (modified)
	* code/branches/cpp11_v3/src/modules/weapons/projectiles/MineProjectile.cc (modified)
	* code/branches/cpp11_v3/src/modules/weapons/projectiles/MineProjectile.h (modified)
	* code/branches/cpp11_v3/src/modules/weapons/weaponmodes/MineGun.h (modified)
	* code/branches/cpp11_v3/src/orxonox/controllers/ActionpointController.cc (modified)
	* code/branches/cpp11_v3/src/orxonox/controllers/ActionpointController.h (modified)
	* code/branches/cpp11_v3/src/orxonox/controllers/CommonController.cc (modified)
	* code/branches/cpp11_v3/src/orxonox/controllers/DivisionController.cc (modified)
	* code/branches/cpp11_v3/src/orxonox/controllers/DivisionController.h (modified)
	* code/branches/cpp11_v3/src/orxonox/controllers/FightingController.cc (modified)
	* code/branches/cpp11_v3/src/orxonox/controllers/FightingController.h (modified)
	* code/branches/cpp11_v3/src/orxonox/controllers/FlyingController.cc (modified)
	* code/branches/cpp11_v3/src/orxonox/controllers/FlyingController.h (modified)
	* code/branches/cpp11_v3/src/orxonox/controllers/MasterController.cc (modified)
	* code/branches/cpp11_v3/src/orxonox/controllers/MasterController.h (modified)
	* code/branches/cpp11_v3/src/orxonox/controllers/SectionController.cc (modified)
	* code/branches/cpp11_v3/src/orxonox/controllers/SectionController.h (modified)
	* code/branches/cpp11_v3/src/orxonox/controllers/WingmanController.cc (modified)
	* code/branches/cpp11_v3/src/orxonox/controllers/WingmanController.h (modified)
	* code/branches/cpp11_v3/src/orxonox/weaponsystem/Munition.cc (modified)
	* code/branches/cpp11_v3/src/orxonox/weaponsystem/ReplenishingMunition.h (modified)
	* code/branches/cpp11_v3/src/orxonox/worldentities/Actionpoint.h (modified)
	* code/branches/cpp11_v3/src/orxonox/worldentities/ExplosionPart.cc (modified)
	* code/branches/cpp11_v3/src/orxonox/worldentities/ExplosionPart.h (modified)
	* code/branches/cpp11_v3/test/core_plugin/PluginTest.cc (modified)

	added c++11 features to code that was added in presentationHS15


Thu, 14 Jan 2016 21:58:46 GMT landauf [11064]
	* code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeapon.h (modified)
	* code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponMode.h (modified)
	* code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponSystem.h (modified)
	* code/branches/cpp11_v3/src/modules/pickup/items/MunitionPickup.h (modified)
	* code/branches/cpp11_v3/src/modules/weapons/projectiles/MineProjectile.h (modified)
	* code/branches/cpp11_v3/src/orxonox/weaponsystem/ReplenishingMunition.h (modified)

	made some functions non-virtual


Thu, 14 Jan 2016 21:27:10 GMT landauf [11063]
	* code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponMode.cc (modified)

	ups, forgot to commit a file


Wed, 13 Jan 2016 22:13:30 GMT landauf [11062]
	* code/branches/cpp11_v3/src/libraries/core/GUIManager.cc (modified)
	* code/branches/cpp11_v3/src/libraries/core/module/Plugin.cc (modified)
	* code/branches/cpp11_v3/src/modules/overlays/hud/HUDHealthBar.h (modified)
	* code/branches/cpp11_v3/src/modules/weapons/munitions/FusionMunition.h (modified)
	* code/branches/cpp11_v3/src/modules/weapons/munitions/GravityBombMunition.h (modified)
	* code/branches/cpp11_v3/src/modules/weapons/munitions/IceMunition.h (modified)
	* code/branches/cpp11_v3/src/modules/weapons/munitions/LaserMunition.h (modified)
	* code/branches/cpp11_v3/src/modules/weapons/munitions/LightningMunition.h (modified)
	* code/branches/cpp11_v3/src/modules/weapons/munitions/MineMunition.h (modified)
	* code/branches/cpp11_v3/src/modules/weapons/munitions/RocketMunition.h (modified)
	* code/branches/cpp11_v3/src/modules/weapons/munitions/SplitMunition.h (modified)
	* code/branches/cpp11_v3/src/orxonox/gametypes/Dynamicmatch.cc (modified)
	* code/branches/cpp11_v3/src/orxonox/overlays/OverlayGroup.cc (modified)
	* code/branches/cpp11_v3/src/orxonox/weaponsystem/Munition.cc (modified)
	* code/branches/cpp11_v3/src/orxonox/weaponsystem/Munition.h (modified)
	* code/branches/cpp11_v3/src/orxonox/weaponsystem/Weapon.cc (modified)
	* code/branches/cpp11_v3/src/orxonox/weaponsystem/WeaponPack.cc (modified)
	* code/branches/cpp11_v3/src/orxonox/weaponsystem/WeaponSystem.cc (modified)
	* code/branches/cpp11_v3/src/orxonox/worldentities/TeamSpawnPoint.h (modified)
	* code/branches/cpp11_v3/src/orxonox/worldentities/pawns/Pawn.cc (modified)

	added c++11 features to code that was modified in presentationHS15


Wed, 13 Jan 2016 22:02:33 GMT landauf [11061]
	* code/branches/cpp11_v3/src/modules/overlays/hud/HUDHealthBar.h (modified)
	* code/branches/cpp11_v3/src/modules/weapons/projectiles/Rocket.h (modified)
	* code/branches/cpp11_v3/src/orxonox/overlays/OrxonoxOverlay.h (modified)

	made some functions non-virtual