#
# ChangeLog for code
#
# Generated by Trac 1.0.9
# May 6, 2024, 7:19:33 PM

Fri, 06 Feb 2015 22:30:26 GMT landauf [10262]
	* code/trunk/data/defaultConfig/orxonox.ini (modified)
	* code/trunk/data/gui/layouts/CampaignMenu.layout (modified)
	* code/trunk/data/gui/scripts/CampaignMenu.lua (modified)
	* code/trunk/data/gui/scripts/testscript.lua (modified)
	* code/trunk/data/levels/4Dtest.oxw (modified)
	* code/trunk/data/levels/AnihilationThreat.oxw (modified)
	* code/trunk/data/levels/DodgeRace.oxw (modified)
	* code/trunk/data/levels/FPS_Level_HS14.oxw (modified)
	* code/trunk/data/levels/ModularShipsTest0.oxw (modified)
	* code/trunk/data/levels/ModularShipsTest1.oxw (modified)
	* code/trunk/data/levels/collisionShapes.oxw (modified)
	* code/trunk/data/levels/includes/weaponSettingsFPS_HS14.oxi (modified)
	* code/trunk/data/levels/includes/weaponSettingsTurret1.oxi (modified)
	* code/trunk/data/levels/jump.oxw (modified)
	* code/trunk/data/levels/kecks.oxw (modified)
	* code/trunk/data/levels/levelTry.oxw (modified)
	* code/trunk/data/levels/michaelstestfile.lua (modified)
	* code/trunk/data/levels/scriptController.oxw (modified)
	* code/trunk/data/levels/templates/DodgeRacePattern.oxt (modified)
	* code/trunk/data/levels/templates/FPS_HS14.oxt (modified)
	* code/trunk/data/levels/templates/ModularSpaceShipTest.oxt (modified)
	* code/trunk/data/levels/templates/enemytowerdefense.oxt (modified)
	* code/trunk/data/levels/templates/spaceshipDodgeRace.oxt (modified)
	* code/trunk/data/levels/templates/spacestation_elements.oxt (modified)
	* code/trunk/data/levels/templates/ss_tube01.oxt (modified)
	* code/trunk/data/levels/templates/standardTurret.oxt (modified)
	* code/trunk/data/overlays/DodgeRaceHUD.oxo (modified)
	* code/trunk/data/overlays/jumpHUD.oxo (modified)
	* code/trunk/src/libraries/tools/BulletDebugDrawer.cc (modified)
	* code/trunk/src/libraries/tools/BulletDebugDrawer.h (modified)
	* code/trunk/src/libraries/tools/DebugDrawer.cc (modified)
	* code/trunk/src/libraries/tools/DebugDrawer.h (modified)
	* code/trunk/src/libraries/tools/IcoSphere.cc (modified)
	* code/trunk/src/libraries/tools/IcoSphere.h (modified)
	* code/trunk/src/libraries/tools/OgreBulletUtils.h (modified)
	* code/trunk/src/modules/gametypes/SpaceRaceBot.cc (modified)
	* code/trunk/src/modules/gametypes/SpaceRaceBot.h (modified)
	* code/trunk/src/modules/gametypes/SpaceRaceController.cc (modified)
	* code/trunk/src/modules/gametypes/SpaceRaceController.h (modified)
	* code/trunk/src/modules/jump/CMakeLists.txt (modified)
	* code/trunk/src/modules/jump/Jump.cc (modified)
	* code/trunk/src/modules/jump/Jump.h (modified)
	* code/trunk/src/modules/jump/JumpBoots.cc (modified)
	* code/trunk/src/modules/jump/JumpBoots.h (modified)
	* code/trunk/src/modules/jump/JumpCenterpoint.cc (modified)
	* code/trunk/src/modules/jump/JumpCenterpoint.h (modified)
	* code/trunk/src/modules/jump/JumpEnemy.cc (modified)
	* code/trunk/src/modules/jump/JumpEnemy.h (modified)
	* code/trunk/src/modules/jump/JumpFigure.cc (modified)
	* code/trunk/src/modules/jump/JumpFigure.h (modified)
	* code/trunk/src/modules/jump/JumpItem.cc (modified)
	* code/trunk/src/modules/jump/JumpItem.h (modified)
	* code/trunk/src/modules/jump/JumpPlatform.cc (modified)
	* code/trunk/src/modules/jump/JumpPlatform.h (modified)
	* code/trunk/src/modules/jump/JumpPlatformDisappear.cc (modified)
	* code/trunk/src/modules/jump/JumpPlatformDisappear.h (modified)
	* code/trunk/src/modules/jump/JumpPlatformFake.cc (modified)
	* code/trunk/src/modules/jump/JumpPlatformFake.h (modified)
	* code/trunk/src/modules/jump/JumpPlatformHMove.cc (modified)
	* code/trunk/src/modules/jump/JumpPlatformHMove.h (modified)
	* code/trunk/src/modules/jump/JumpPlatformStatic.cc (modified)
	* code/trunk/src/modules/jump/JumpPlatformStatic.h (modified)
	* code/trunk/src/modules/jump/JumpPlatformTimer.cc (modified)
	* code/trunk/src/modules/jump/JumpPlatformTimer.h (modified)
	* code/trunk/src/modules/jump/JumpPlatformVMove.cc (modified)
	* code/trunk/src/modules/jump/JumpPlatformVMove.h (modified)
	* code/trunk/src/modules/jump/JumpPrereqs.h (modified)
	* code/trunk/src/modules/jump/JumpProjectile.cc (modified)
	* code/trunk/src/modules/jump/JumpProjectile.h (modified)
	* code/trunk/src/modules/jump/JumpPropeller.cc (modified)
	* code/trunk/src/modules/jump/JumpPropeller.h (modified)
	* code/trunk/src/modules/jump/JumpRocket.cc (modified)
	* code/trunk/src/modules/jump/JumpRocket.h (modified)
	* code/trunk/src/modules/jump/JumpScore.cc (modified)
	* code/trunk/src/modules/jump/JumpScore.h (modified)
	* code/trunk/src/modules/jump/JumpShield.cc (modified)
	* code/trunk/src/modules/jump/JumpShield.h (modified)
	* code/trunk/src/modules/jump/JumpSpring.cc (modified)
	* code/trunk/src/modules/jump/JumpSpring.h (modified)
	* code/trunk/src/modules/objects/Turret.cc (modified)
	* code/trunk/src/modules/objects/Turret.h (modified)
	* code/trunk/src/modules/objects/collisionshapes/CylinderCollisionShape.cc (modified)
	* code/trunk/src/modules/objects/collisionshapes/CylinderCollisionShape.h (modified)
	* code/trunk/src/modules/objects/controllers/CMakeLists.txt (modified)
	* code/trunk/src/modules/objects/controllers/TeamTargetProxy.cc (modified)
	* code/trunk/src/modules/objects/controllers/TeamTargetProxy.h (modified)
	* code/trunk/src/modules/objects/controllers/TurretController.cc (modified)
	* code/trunk/src/modules/objects/controllers/TurretController.h (modified)
	* code/trunk/src/modules/tetris/TetrisBrick.cc (modified)
	* code/trunk/src/modules/tetris/TetrisBrick.h (modified)
	* code/trunk/src/modules/tetris/TetrisScore.cc (modified)
	* code/trunk/src/modules/tetris/TetrisScore.h (modified)
	* code/trunk/src/orxonox/ShipPartManager.cc (modified)
	* code/trunk/src/orxonox/ShipPartManager.h (modified)
	* code/trunk/src/orxonox/controllers/ControllerDirector.cc (modified)
	* code/trunk/src/orxonox/controllers/ControllerDirector.h (modified)
	* code/trunk/src/orxonox/controllers/ScriptController.cc (modified)
	* code/trunk/src/orxonox/controllers/ScriptController.h (modified)
	* code/trunk/src/orxonox/controllers/testscript.lua (modified)
	* code/trunk/src/orxonox/items/PartDestructionEvent.cc (modified)
	* code/trunk/src/orxonox/items/PartDestructionEvent.h (modified)
	* code/trunk/src/orxonox/items/ShipPart.cc (modified)
	* code/trunk/src/orxonox/items/ShipPart.h (modified)
	* code/trunk/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified)
	* code/trunk/src/orxonox/worldentities/pawns/ModularSpaceShip.h (modified)

	eol-style native. no changes in code.


Fri, 06 Feb 2015 22:11:10 GMT landauf [10261]
	* code/trunk/src/modules/jump/Jump.cc (modified)

	fixed warning


Fri, 06 Feb 2015 22:03:00 GMT landauf [10260]
	* code/trunk (modified)
	* code/trunk/data/levels/jump.oxw (modified)
	* code/trunk/data/overlays/jumpHUD.oxo (modified)
	* code/trunk/src/modules/jump/Jump.cc (modified)
	* code/trunk/src/modules/jump/Jump.h (modified)
	* code/trunk/src/modules/jump/JumpBoots.cc (modified)
	* code/trunk/src/modules/jump/JumpBoots.h (modified)
	* code/trunk/src/modules/jump/JumpFigure.cc (modified)
	* code/trunk/src/modules/jump/JumpFigure.h (modified)
	* code/trunk/src/modules/jump/JumpItem.h (modified)
	* code/trunk/src/modules/jump/JumpPropeller.cc (modified)
	* code/trunk/src/modules/jump/JumpPropeller.h (modified)
	* code/trunk/src/modules/jump/JumpRocket.cc (modified)
	* code/trunk/src/modules/jump/JumpRocket.h (modified)
	* code/trunk/src/modules/jump/JumpScore.cc (modified)
	* code/trunk/src/modules/jump/JumpScore.h (modified)
	* code/trunk/src/modules/jump/JumpShield.cc (modified)
	* code/trunk/src/modules/jump/JumpShield.h (modified)

	merged the latest changes from pickupsFS14 to trunk


Fri, 06 Feb 2015 21:55:17 GMT landauf [10259]
	* code/trunk (modified)
	* code/trunk/data/levels/jump.oxw (modified)
	* code/trunk/src/modules/jump/Jump.cc (modified)

	recorded merge of pickupsFS14 up to r10112 (which was already mostly ...


Thu, 05 Feb 2015 22:47:13 GMT landauf [10258]
	* code/trunk (modified)
	* code/trunk/cmake/LibraryConfig.cmake (modified)
	* code/trunk/data/defaultConfig/orxonox.ini (copied)
	* code/trunk/data/gui/layouts/CampaignMenu.layout (copied)
	* code/trunk/data/gui/layouts/SingleplayerMenu.layout (modified)
	* code/trunk/data/gui/scripts/CampaignMenu.lua (copied)
	* code/trunk/data/gui/scripts/SingleplayerMenu.lua (modified)
	* code/trunk/data/levels/4Dtest.oxw (copied)
	* code/trunk/data/levels/AnihilationThreat.oxw (copied)
	* code/trunk/data/levels/DodgeRace.oxw (copied)
	* code/trunk/data/levels/FPS_Level_HS14.oxw (copied)
	* code/trunk/data/levels/includes/weaponSettingsFPS_HS14.oxi (copied)
	* code/trunk/data/levels/includes/weaponSettingsTurret1.oxi (copied)
	* code/trunk/data/levels/kecks.oxw (copied)
	* code/trunk/data/levels/presentationHS13.oxw (modified)
	* code/trunk/data/levels/templates/DodgeRacePattern.oxt (copied)
	* code/trunk/data/levels/templates/FPS.oxt (modified)
	* code/trunk/data/levels/templates/FPS_HS14.oxt (copied)
	* code/trunk/data/levels/templates/enemytowerdefense.oxt (copied)
	* code/trunk/data/levels/templates/spaceshipDodgeRace.oxt (copied)
	* code/trunk/data/levels/templates/spacestation_elements.oxt (copied)
	* code/trunk/data/levels/templates/ss_tube01.oxt (copied)
	* code/trunk/data/levels/templates/tower.oxt (modified)
	* code/trunk/data/levels/towerDefense.oxw (modified)
	* code/trunk/data/overlays/DodgeRaceHUD.oxo (copied)
	* code/trunk/data/overlays/HUDTemplates3.oxo (modified)
	* code/trunk/data/overlays/towerdefenseHUD.oxo (modified)
	* code/trunk/src/modules/CMakeLists.txt (modified)
	* code/trunk/src/modules/dodgerace (copied)
	* code/trunk/src/modules/mini4dgame (copied)
	* code/trunk/src/modules/notifications/NotificationQueueCEGUI.cc (modified)
	* code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified)
	* code/trunk/src/modules/overlays/hud/HUDNavigation.h (modified)
	* code/trunk/src/modules/towerdefense/CMakeLists.txt (modified)
	* code/trunk/src/modules/towerdefense/TDCoordinate.cc (copied)
	* code/trunk/src/modules/towerdefense/TDCoordinate.h (copied)
	* code/trunk/src/modules/towerdefense/TDEnemy.h (modified)
	* code/trunk/src/modules/towerdefense/Tower.cc (modified)
	* code/trunk/src/modules/towerdefense/TowerDefense.cc (modified)
	* code/trunk/src/modules/towerdefense/TowerDefense.h (modified)
	* code/trunk/src/modules/towerdefense/TowerDefenseController.cc (modified)
	* code/trunk/src/modules/towerdefense/TowerDefenseEnemy.cc (copied)
	* code/trunk/src/modules/towerdefense/TowerDefenseEnemy.h (copied)
	* code/trunk/src/modules/towerdefense/TowerDefenseHUDController.cc (modified)
	* code/trunk/src/modules/towerdefense/TowerDefenseHUDController.h (modified)
	* code/trunk/src/modules/towerdefense/TowerDefensePlayerStats.cc (modified)
	* code/trunk/src/modules/towerdefense/TowerDefensePlayerStats.h (modified)
	* code/trunk/src/modules/towerdefense/TowerDefensePrereqs.h (modified)
	* code/trunk/src/modules/towerdefense/TowerDefenseTower.cc (copied)
	* code/trunk/src/modules/towerdefense/TowerDefenseTower.h (copied)
	* code/trunk/src/modules/towerdefense/TowerTurret.cc (copied)
	* code/trunk/src/modules/towerdefense/TowerTurret.h (copied)
	* code/trunk/src/modules/weapons/RocketController.cc (modified)
	* code/trunk/src/orxonox/LevelManager.cc (modified)
	* code/trunk/src/orxonox/LevelManager.h (modified)
	* code/trunk/src/orxonox/gametypes/Mission.cc (modified)

	merged presentationHS14merge back to trunk


Thu, 05 Feb 2015 22:43:24 GMT landauf [10257]
	* code/branches/presentationHS14merge/data/levels/kecks.oxw (modified)

	fixed tag


Thu, 05 Feb 2015 22:21:35 GMT landauf [10256]
	* code/branches/presentationHS14merge/src/modules/mini4dgame/Mini4DgamePrereqs.h (modified)
	* code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefenseEnemy.cc (modified)
	* code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefenseEnemy.h (modified)

	found some hidden changes in a merge commit in presentationHS14 and ...


Wed, 04 Feb 2015 21:21:28 GMT landauf [10255]
	* code/branches/presentationHS14merge (modified)
	* code/branches/presentationHS14merge/cmake/LibraryConfig.cmake (modified)
	* code/branches/presentationHS14merge/data/defaultConfig/orxonox.ini (copied)
	* code/branches/presentationHS14merge/data/gui/layouts/CampaignMenu.layout (copied)
	* code/branches/presentationHS14merge/data/gui/layouts/SingleplayerMenu.layout (modified)
	* code/branches/presentationHS14merge/data/gui/scripts/CampaignMenu.lua (copied)
	* code/branches/presentationHS14merge/data/gui/scripts/SingleplayerMenu.lua (modified)
	* code/branches/presentationHS14merge/src/orxonox/LevelManager.cc (modified)
	* code/branches/presentationHS14merge/src/orxonox/LevelManager.h (modified)
	* code/branches/presentationHS14merge/src/orxonox/gametypes/Mission.cc (modified)

	merged storymodeHS14


Tue, 03 Feb 2015 22:43:42 GMT landauf [10254]
	* code/branches/storymodeHS14/data/gui/scripts/SingleplayerMenu.lua (modified)
	* code/branches/storymodeHS14/src/orxonox/gametypes/Mission.cc (modified)

	cleanup


Tue, 03 Feb 2015 22:38:07 GMT landauf [10253]
	* code/branches/storymodeHS14/data/defaultConfig/orxonox.ini (added)
	* code/branches/storymodeHS14/data/gui/layouts/CampaignMenu.layout (modified)
	* code/branches/storymodeHS14/data/gui/scripts/CampaignMenu.lua (modified)
	* code/branches/storymodeHS14/data/tcl (modified)
	* code/branches/storymodeHS14/src/orxonox/LevelManager.cc (modified)
	* code/branches/storymodeHS14/src/orxonox/LevelManager.h (modified)
	* code/branches/storymodeHS14/src/orxonox/gametypes/Mission.cc (modified)

	improved campaign mode. use config value instead of writing a new ...


Mon, 02 Feb 2015 12:04:55 GMT muemart [10252]
	* code/trunk/cmake/tools/TargetUtilities.cmake (modified)

	Fix MSVC debugging environment for newer versions


Sun, 01 Feb 2015 22:46:42 GMT landauf [10251]
	* code/branches/storymodeHS14/data/gui/scripts/CampaignMenu.lua (modified)
	* code/branches/storymodeHS14/data/tcl (modified)
	* code/branches/storymodeHS14/src/orxonox/gametypes/Mission.cc (modified)

	use relative path


Sun, 01 Feb 2015 21:51:47 GMT landauf [10250]
	* code/branches/storymodeHS14/cmake/LibraryConfig.cmake (modified)
	* code/branches/storymodeHS14/data/gui/scripts/CampaignMenu.lua (modified)
	* code/branches/storymodeHS14/data/gui/scripts/SingleplayerMenu.lua (modified)
	* code/branches/storymodeHS14/data/gui/scripts/campaign.txt (deleted)

	tabs -> spaces. removed temp-file


Sun, 01 Feb 2015 21:37:36 GMT landauf [10249]
	* code/branches/storymodeHS14/src/orxonox/gametypes/Mission.cc (modified)

	autoformatted code and removed commented block


Sun, 01 Feb 2015 21:21:51 GMT landauf [10248]
	* code/branches/presentationHS14merge (modified)
	* code/branches/presentationHS14merge/data/levels/includes/weaponSettingsTurret1.oxi (copied)
	* code/branches/presentationHS14merge/data/levels/templates/enemytowerdefense.oxt (copied)
	* code/branches/presentationHS14merge/data/levels/templates/tower.oxt (modified)
	* code/branches/presentationHS14merge/data/levels/towerDefense.oxw (modified)
	* code/branches/presentationHS14merge/data/overlays/towerdefenseHUD.oxo (modified)
	* code/branches/presentationHS14merge/src/modules/towerdefense/CMakeLists.txt (modified)
	* code/branches/presentationHS14merge/src/modules/towerdefense/TDCoordinate.cc (copied)
	* code/branches/presentationHS14merge/src/modules/towerdefense/TDCoordinate.h (copied)
	* code/branches/presentationHS14merge/src/modules/towerdefense/TDEnemy.h (modified)
	* code/branches/presentationHS14merge/src/modules/towerdefense/Tower.cc (modified)
	* code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefense.cc (modified)
	* code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefense.h (modified)
	* code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefenseController.cc (modified)
	* code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefenseEnemy.cc (copied)
	* code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefenseEnemy.h (copied)
	* code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefenseHUDController.cc (modified)
	* code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefenseHUDController.h (modified)
	* code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefensePlayerStats.cc (modified)
	* code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefensePlayerStats.h (modified)
	* code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefensePrereqs.h (modified)
	* code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefenseTower.cc (copied)
	* code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefenseTower.h (copied)
	* code/branches/presentationHS14merge/src/modules/towerdefense/TowerTurret.cc (copied)
	* code/branches/presentationHS14merge/src/modules/towerdefense/TowerTurret.h (copied)

	merged towerdefenseHS14 (except some debug code)


Sun, 01 Feb 2015 20:32:19 GMT landauf [10247]
	* code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseTower.cc (modified)

	fixed warnings (MinGW)


Sun, 01 Feb 2015 20:30:37 GMT landauf [10246]
	* code/branches/towerdefenseHS14/src/modules/towerdefense/TDCoordinate.cc (modified)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/TDCoordinate.h (modified)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefense.cc (modified)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefense.h (modified)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseEnemy.cc (modified)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseEnemy.h (modified)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefensePlayerStats.h (modified)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseTower.cc (modified)

	replaced tabs with spaces + some formatting sometimes. no changes in ...


Sun, 01 Feb 2015 20:23:00 GMT landauf [10245]
	* code/branches/towerdefenseHS14/src/modules/towerdefense/TDCoordinate.cc (modified)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseTower.cc (modified)

	fixed some warnings (MSVC)


Sun, 01 Feb 2015 20:20:47 GMT landauf [10244]
	* code/branches/towerdefenseHS14/src/modules/towerdefense/TDCoordinate.cc (modified)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/TDCoordinate.h (modified)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseEnemy.cc (modified)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseEnemy.h (modified)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseTower.cc (modified)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseTower.h (modified)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/TowerTurret.cc (modified)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/TowerTurret.h (modified)

	eol-style native


Sun, 01 Feb 2015 20:18:22 GMT landauf [10243]
	* code/branches/towerdefenseHS14/src/modules/objects/controllers (copied)

	merged the updated controller files from trunk (including SVN
	history)


Sun, 01 Feb 2015 19:58:38 GMT landauf [10242]
	* code/branches/presentationHS14merge (modified)
	* code/branches/presentationHS14merge/data/overlays/HUDTemplates3.oxo (modified)
	* code/branches/presentationHS14merge/src/modules/overlays/hud/HUDNavigation.cc (modified)
	* code/branches/presentationHS14merge/src/modules/overlays/hud/HUDNavigation.h (modified)

	merged hudHS14


Sun, 01 Feb 2015 19:57:37 GMT landauf [10241]
	* code/branches/hudHS14/data/overlays/HUDTemplates3.oxo (modified)
	* code/branches/hudHS14/src/modules/overlays/hud/HUDEnemyHealthBar.cc (modified)
	* code/branches/hudHS14/src/modules/overlays/hud/HUDHealthBar.cc (modified)

	cleanup


Sun, 01 Feb 2015 19:52:31 GMT landauf [10240]
	* code/branches/hudHS14/src/modules/overlays/hud/HUDNavigation.cc (modified)
	* code/branches/hudHS14/src/modules/overlays/hud/HUDNavigation.h (modified)

	replaced tabs with spaces. no changes in code.


Sun, 01 Feb 2015 19:50:08 GMT landauf [10239]
	* code/branches/hudHS14/src/modules/overlays/hud/HUDNavigation.cc (modified)

	fixed some warnings (MSVC)


Sun, 01 Feb 2015 17:42:19 GMT landauf [10238]
	* code/branches/presentationHS14merge (modified)
	* code/branches/presentationHS14merge/data/levels/FPS_Level_HS14.oxw (copied)
	* code/branches/presentationHS14merge/data/levels/includes/weaponSettingsFPS_HS14.oxi (copied)
	* code/branches/presentationHS14merge/data/levels/presentationHS13.oxw (modified)
	* code/branches/presentationHS14merge/data/levels/templates/FPS.oxt (modified)
	* code/branches/presentationHS14merge/data/levels/templates/FPS_HS14.oxt (copied)
	* code/branches/presentationHS14merge/data/levels/templates/spacestation_elements.oxt (copied)
	* code/branches/presentationHS14merge/data/levels/templates/ss_tube01.oxt (copied)
	* code/branches/presentationHS14merge/src/modules/weapons/RocketController.cc (modified)

	merged weaponupdateHS14 (except some unnecessary changes)


Sun, 01 Feb 2015 14:57:57 GMT landauf [10237]
	* code/branches/presentationHS14merge (modified)
	* code/branches/presentationHS14merge/data/levels/DodgeRace.oxw (copied)
	* code/branches/presentationHS14merge/data/levels/templates/DodgeRacePattern.oxt (copied)
	* code/branches/presentationHS14merge/data/levels/templates/spaceshipDodgeRace.oxt (copied)
	* code/branches/presentationHS14merge/data/overlays/DodgeRaceHUD.oxo (copied)
	* code/branches/presentationHS14merge/src/modules/CMakeLists.txt (modified)
	* code/branches/presentationHS14merge/src/modules/dodgerace (copied)

	merged surfaceraceHS14 (but without all the strange stuff that ...


Sun, 01 Feb 2015 14:56:21 GMT landauf [10236]
	* code/branches/surfaceraceHS14/src/modules/dodgerace/DodgeRace.cc (modified)
	* code/branches/surfaceraceHS14/src/modules/dodgerace/DodgeRace.h (modified)
	* code/branches/surfaceraceHS14/src/modules/dodgerace/DodgeRaceCube.cc (modified)
	* code/branches/surfaceraceHS14/src/modules/dodgerace/DodgeRaceHUDinfo.cc (modified)
	* code/branches/surfaceraceHS14/src/modules/dodgerace/DodgeRaceShip.cc (modified)
	* code/branches/surfaceraceHS14/src/modules/dodgerace/DodgeRaceShip.h (modified)

	replaced tabs with spaces. no changes in code.


Sun, 01 Feb 2015 14:43:14 GMT landauf [10235]
	* code/branches/surfaceraceHS14/src/modules/dodgerace/DodgeRace.cc (modified)
	* code/branches/surfaceraceHS14/src/modules/dodgerace/DodgeRace.h (modified)

	fixed build and warnings (MSVC)


Sun, 01 Feb 2015 14:22:58 GMT landauf [10234]
	* code/branches/surfaceraceHS14/src/modules/CMakeLists.txt (modified)
	* code/branches/surfaceraceHS14/src/modules/dodgerace (modified)
	* code/branches/surfaceraceHS14/src/modules/dodgerace/CMakeLists.txt (modified)
	* code/branches/surfaceraceHS14/src/modules/dodgerace/DodgeRace.h (modified)
	* code/branches/surfaceraceHS14/src/modules/dodgerace/DodgeRaceCenterPoint.h (modified)
	* code/branches/surfaceraceHS14/src/modules/dodgerace/DodgeRaceCube.h (modified)
	* code/branches/surfaceraceHS14/src/modules/dodgerace/DodgeRaceHUDinfo.h (modified)
	* code/branches/surfaceraceHS14/src/modules/dodgerace/DodgeRaceShip.h (modified)

	changed paths


Sun, 01 Feb 2015 14:20:57 GMT landauf [10233]
	* code/branches/surfaceraceHS14/src/modules/dodgerace (moved)

	renamed module dodgerace2 -> dodgerace


Sun, 01 Feb 2015 14:19:54 GMT landauf [10232]
	* code/branches/surfaceraceHS14/src/modules/dodgerace2/CMakeLists.txt (modified)
	* code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.cc (modified)
	* code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.h (modified)
	* code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceCenterPoint.cc (modified)
	* code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceCenterPoint.h (modified)
	* code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceCube.cc (modified)
	* code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceCube.h (modified)
	* code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceHUDinfo.cc (modified)
	* code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceHUDinfo.h (modified)
	* code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRacePrereqs.h (modified)
	* code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.cc (modified)
	* code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.h (modified)

	eol-style native


Sun, 01 Feb 2015 14:07:00 GMT landauf [10231]
	* code/branches/presentationHS14merge (modified)
	* code/branches/presentationHS14merge/data/levels/4Dtest.oxw (copied)
	* code/branches/presentationHS14merge/src/modules/CMakeLists.txt (modified)
	* code/branches/presentationHS14merge/src/modules/mini4dgame (copied)

	merged minigame4DHS14


Sun, 01 Feb 2015 13:55:44 GMT landauf [10230]
	* code/branches/minigame4DHS14/src/modules/mini4dgame/Mini4Dgame.cc (modified)
	* code/branches/minigame4DHS14/src/modules/mini4dgame/Mini4Dgame.h (modified)
	* code/branches/minigame4DHS14/src/modules/mini4dgame/Mini4DgameAI.cc (modified)
	* code/branches/minigame4DHS14/src/modules/mini4dgame/Mini4DgameAI.h (modified)
	* code/branches/minigame4DHS14/src/modules/mini4dgame/Mini4DgameBoard.cc (modified)
	* code/branches/minigame4DHS14/src/modules/mini4dgame/Mini4DgameBoard.h (modified)

	replaced tabs with spaces. no changes in code.


Sun, 01 Feb 2015 13:50:46 GMT landauf [10229]
	* code/branches/minigame4DHS14/src/modules/mini4dgame/Mini4Dgame.cc (modified)
	* code/branches/minigame4DHS14/src/modules/mini4dgame/Mini4DgameBoard.cc (modified)
	* code/branches/minigame4DHS14/src/modules/mini4dgame/Mini4DgameBoard.h (modified)

	fixed warnings & details


Sun, 01 Feb 2015 13:27:56 GMT landauf [10228]
	* code/branches/minigame4DHS14/src/modules/mini4dgame (modified)

	removed accidentally added merge-info (where did that come from?)


Sun, 01 Feb 2015 13:25:02 GMT landauf [10227]
	* code/branches/minigame4DHS14/src/modules/CMakeLists.txt (modified)
	* code/branches/minigame4DHS14/src/modules/mini4dgame/CMakeLists.txt (modified)
	* code/branches/minigame4DHS14/src/modules/mini4dgame/Mini4Dgame.h (modified)
	* code/branches/minigame4DHS14/src/modules/mini4dgame/Mini4DgameAI.h (modified)
	* code/branches/minigame4DHS14/src/modules/mini4dgame/Mini4DgameBoard.h (modified)
	* code/branches/minigame4DHS14/src/modules/mini4dgame/Mini4DgamePrereqs.h (modified)

	changed paths & fixed macro in Mini4DgamePrereqs.h


Sun, 01 Feb 2015 13:23:41 GMT landauf [10226]
	* code/branches/minigame4DHS14/src/modules/mini4dgame (moved)

	use only lowercase characters in module names


Sun, 01 Feb 2015 13:20:04 GMT landauf [10225]
	* code/branches/minigame4DHS14/src/modules/mini4Dgame/CMakeLists.txt (modified)
	* code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4Dgame.cc (modified)
	* code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4Dgame.h (modified)
	* code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgameAI.cc (modified)
	* code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgameAI.h (modified)
	* code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgameBoard.cc (modified)
	* code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgameBoard.h (modified)
	* code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgamePrereqs.h (modified)

	eol-style native


Sun, 01 Feb 2015 13:03:23 GMT landauf [10224]
	* code/branches/presentationHS14merge (modified)
	* code/branches/presentationHS14merge/data/levels/AnihilationThreat.oxw (copied)
	* code/branches/presentationHS14merge/src/modules/notifications/NotificationQueueCEGUI.cc (modified)

	merged leveljoemeHS14


Sun, 01 Feb 2015 13:02:26 GMT landauf [10223]
	* code/branches/presentationHS14merge (modified)
	* code/branches/presentationHS14merge/data/levels/kecks.oxw (copied)

	merged keckslevelHS14


Sun, 01 Feb 2015 12:51:57 GMT landauf [10222]
	* code/branches/presentationHS14merge (copied)

	created new branch to merge the changes from HS14


Sun, 01 Feb 2015 12:39:16 GMT landauf [10221]
	* code/branches/presentationHS14/src/modules/CMakeLists.txt (modified)
	* code/branches/presentationHS14/src/modules/dodgerace (moved)
	* code/branches/presentationHS14/src/modules/dodgerace/CMakeLists.txt (modified)
	* code/branches/presentationHS14/src/modules/dodgerace/DodgeRace.cc (copied)
	* code/branches/presentationHS14/src/modules/dodgerace/DodgeRace.h (modified)
	* code/branches/presentationHS14/src/modules/dodgerace/DodgeRaceCenterPoint.h (modified)
	* code/branches/presentationHS14/src/modules/dodgerace/DodgeRaceCube.h (modified)
	* code/branches/presentationHS14/src/modules/dodgerace/DodgeRaceHUDinfo.h (modified)
	* code/branches/presentationHS14/src/modules/dodgerace/DodgeRaceShip.h (modified)

	renamed module: dodgerace2 -> dodgerace (this also fixes build on ...


Sun, 01 Feb 2015 12:37:29 GMT landauf [10220]
	* code/branches/presentationHS14/src/modules/mini4Dgame/Mini4DgamePrereqs.h (modified)
	* code/branches/presentationHS14/src/modules/objects/controllers/TeamTargetProxy.h (modified)
	* code/branches/presentationHS14/src/modules/objects/controllers/TurretController.cc (modified)
	* code/branches/presentationHS14/src/modules/objects/controllers/TurretController.h (modified)

	fixed build of objects and mini4Dgame modules (MSVC)


Sat, 31 Jan 2015 22:54:35 GMT landauf [10219]
	* code/branches/presentationHS14/src/modules/dodgerace2/DodgeRace.cc (modified)
	* code/branches/presentationHS14/src/modules/towerdefense/TowerDefenseTower.cc (modified)

	fixed build (DodgeRace) and warnings (TowerDefenseTower) for MinGW on ...


Sat, 31 Jan 2015 22:29:45 GMT landauf [10218]
	* code/trunk/src/modules/jump/Jump.cc (modified)
	* code/trunk/src/modules/jump/JumpFigure.cc (modified)
	* code/trunk/src/modules/jump/JumpPrereqs.h (modified)
	* code/trunk/src/modules/objects/controllers/TeamTargetProxy.h (modified)
	* code/trunk/src/modules/objects/controllers/TurretController.cc (modified)
	* code/trunk/src/modules/objects/controllers/TurretController.h (modified)

	fixed build and warnings with MSVC


Sat, 31 Jan 2015 17:05:40 GMT landauf [10217]
	* code/branches/ScriptableController (deleted)
	* code/branches/modularships (deleted)
	* code/branches/presentationFS14 (deleted)
	* code/branches/turretFS14 (deleted)

	removed old & merged branches from FS14


Sat, 31 Jan 2015 17:03:17 GMT landauf [10216]
	* code/trunk (modified)
	* code/trunk/data/gui/scripts/testscript.lua (copied)
	* code/trunk/data/levels/ModularShipsTest0.oxw (copied)
	* code/trunk/data/levels/ModularShipsTest1.oxw (copied)
	* code/trunk/data/levels/includes/weaponSettingsTurret.oxi (modified)
	* code/trunk/data/levels/jump.oxw (copied)
	* code/trunk/data/levels/levelTry.oxw (copied)
	* code/trunk/data/levels/michaelstestfile.lua (copied)
	* code/trunk/data/levels/scriptController.oxw (copied)
	* code/trunk/data/levels/templates/HeavyCruiser.oxt (modified)
	* code/trunk/data/levels/templates/ModularSpaceShipTest.oxt (copied)
	* code/trunk/data/levels/templates/standardTurret.oxt (copied)
	* code/trunk/data/levels/turretTest.oxw (modified)
	* code/trunk/data/overlays/jumpHUD.oxo (copied)
	* code/trunk/src/modules/CMakeLists.txt (modified)
	* code/trunk/src/modules/invader/InvaderWeapon.cc (modified)
	* code/trunk/src/modules/jump (copied)
	* code/trunk/src/modules/objects/CMakeLists.txt (modified)
	* code/trunk/src/modules/objects/Turret.cc (modified)
	* code/trunk/src/modules/objects/Turret.h (modified)
	* code/trunk/src/modules/objects/controllers (copied)
	* code/trunk/src/modules/weapons/projectiles/BasicProjectile.cc (modified)
	* code/trunk/src/modules/weapons/projectiles/BasicProjectile.h (modified)
	* code/trunk/src/modules/weapons/projectiles/Projectile.cc (modified)
	* code/trunk/src/modules/weapons/projectiles/Projectile.h (modified)
	* code/trunk/src/modules/weapons/projectiles/Rocket.cc (modified)
	* code/trunk/src/modules/weapons/projectiles/Rocket.h (modified)
	* code/trunk/src/modules/weapons/projectiles/SimpleRocket.cc (modified)
	* code/trunk/src/modules/weapons/projectiles/SimpleRocket.h (modified)
	* code/trunk/src/orxonox/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/trunk/src/orxonox/Scene.cc (modified)
	* code/trunk/src/orxonox/ShipPartManager.cc (copied)
	* code/trunk/src/orxonox/ShipPartManager.h (copied)
	* code/trunk/src/orxonox/collisionshapes/CollisionShape.cc (modified)
	* code/trunk/src/orxonox/controllers/ArtificialController.cc (modified)
	* code/trunk/src/orxonox/controllers/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/controllers/ControllerDirector.cc (copied)
	* code/trunk/src/orxonox/controllers/ControllerDirector.h (copied)
	* code/trunk/src/orxonox/controllers/NewHumanController.cc (modified)
	* code/trunk/src/orxonox/controllers/ScriptController.cc (copied)
	* code/trunk/src/orxonox/controllers/ScriptController.h (copied)
	* code/trunk/src/orxonox/controllers/testscript.lua (copied)
	* code/trunk/src/orxonox/items/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/items/PartDestructionEvent.cc (copied)
	* code/trunk/src/orxonox/items/PartDestructionEvent.h (copied)
	* code/trunk/src/orxonox/items/ShipPart.cc (copied)
	* code/trunk/src/orxonox/items/ShipPart.h (copied)
	* code/trunk/src/orxonox/worldentities/MovableEntity.cc (modified)
	* code/trunk/src/orxonox/worldentities/MovableEntity.h (modified)
	* code/trunk/src/orxonox/worldentities/WorldEntity.h (modified)
	* code/trunk/src/orxonox/worldentities/pawns/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (copied)
	* code/trunk/src/orxonox/worldentities/pawns/ModularSpaceShip.h (copied)
	* code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified)
	* code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc (modified)
	* code/trunk/src/orxonox/worldentities/pawns/SpaceShip.h (modified)

	merged branch presentationFS14 back to trunk


Sat, 31 Jan 2015 16:31:23 GMT landauf [10215]
	* code/branches/presentationFS14/src/modules/jump/Jump.cc (modified)
	* code/branches/presentationFS14/src/modules/jump/JumpBoots.cc (modified)
	* code/branches/presentationFS14/src/modules/jump/JumpEnemy.cc (modified)
	* code/branches/presentationFS14/src/modules/jump/JumpFigure.cc (modified)
	* code/branches/presentationFS14/src/modules/jump/JumpFigure.h (modified)
	* code/branches/presentationFS14/src/modules/jump/JumpItem.cc (modified)
	* code/branches/presentationFS14/src/modules/jump/JumpPlatform.cc (modified)
	* code/branches/presentationFS14/src/modules/jump/JumpPlatformDisappear.cc (modified)
	* code/branches/presentationFS14/src/modules/jump/JumpPlatformDisappear.h (modified)
	* code/branches/presentationFS14/src/modules/jump/JumpPlatformFake.h (modified)
	* code/branches/presentationFS14/src/modules/jump/JumpPlatformHMove.cc (modified)
	* code/branches/presentationFS14/src/modules/jump/JumpPlatformHMove.h (modified)
	* code/branches/presentationFS14/src/modules/jump/JumpPlatformStatic.cc (modified)
	* code/branches/presentationFS14/src/modules/jump/JumpPlatformStatic.h (modified)
	* code/branches/presentationFS14/src/modules/jump/JumpPlatformTimer.cc (modified)
	* code/branches/presentationFS14/src/modules/jump/JumpPlatformTimer.h (modified)
	* code/branches/presentationFS14/src/modules/jump/JumpPlatformVMove.cc (modified)
	* code/branches/presentationFS14/src/modules/jump/JumpPlatformVMove.h (modified)
	* code/branches/presentationFS14/src/modules/jump/JumpProjectile.cc (modified)
	* code/branches/presentationFS14/src/modules/jump/JumpPropeller.cc (modified)
	* code/branches/presentationFS14/src/modules/jump/JumpRocket.cc (modified)
	* code/branches/presentationFS14/src/modules/jump/JumpScore.cc (modified)
	* code/branches/presentationFS14/src/modules/jump/JumpShield.cc (modified)
	* code/branches/presentationFS14/src/modules/jump/JumpSpring.cc (modified)
	* code/branches/presentationFS14/src/modules/objects/controllers/TeamTargetProxy.cc (modified)
	* code/branches/presentationFS14/src/modules/objects/controllers/TeamTargetProxy.h (modified)
	* code/branches/presentationFS14/src/modules/objects/controllers/TurretController.cc (modified)
	* code/branches/presentationFS14/src/modules/objects/controllers/TurretController.h (modified)
	* code/branches/presentationFS14/src/orxonox/controllers/ControllerDirector.cc (modified)
	* code/branches/presentationFS14/src/orxonox/controllers/ControllerDirector.h (modified)

	replaced tabs with spaces. no changes in code.


Sat, 31 Jan 2015 15:54:16 GMT landauf [10214]
	* code/branches/presentationFS14/src/orxonox/items/PartDestructionEvent.cc (modified)
	* code/branches/presentationFS14/src/orxonox/worldentities/pawns/SpaceShip.cc (modified)

	fixed segfault. after removing the engine from the ship, we need to ...


Sat, 31 Jan 2015 15:21:49 GMT landauf [10213]
	* code/branches/presentationFS14/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified)
	* code/branches/presentationFS14/src/orxonox/worldentities/pawns/ModularSpaceShip.h (modified)

	removed attach() from ModularSpaceShip because it shadows the non- ...


Sat, 31 Jan 2015 15:14:57 GMT landauf [10212]
	* code/branches/presentationFS14/src/orxonox/worldentities/WorldEntity.h (modified)
	* code/branches/presentationFS14/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified)
	* code/branches/presentationFS14/src/orxonox/worldentities/pawns/ModularSpaceShip.h (modified)

	removed detach() from ModularSpaceShip which was just copy-pasted ...


Sat, 31 Jan 2015 14:51:08 GMT landauf [10211]
	* code/branches/presentationFS14/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified)
	* code/branches/presentationFS14/src/orxonox/worldentities/pawns/ModularSpaceShip.h (modified)
	* code/branches/presentationFS14/src/orxonox/worldentities/pawns/SpaceShip.cc (modified)
	* code/branches/presentationFS14/src/orxonox/worldentities/pawns/SpaceShip.h (modified)

	made SpaceShip::engineList_ private again. moved function from ...


Sat, 31 Jan 2015 14:35:49 GMT landauf [10210]
	* code/trunk/cmake/PackageConfigMSVC.cmake (modified)

	not sure how the MSVC dependency package v7 works, but v6 still needs ...


Thu, 29 Jan 2015 16:44:37 GMT muemart [10209]
	* code/trunk/cmake/PackageConfigMSVC.cmake (modified)
	* code/trunk/cmake/tools/FindVLD.cmake (modified)
	* code/trunk/src/SourceConfig.cmake (modified)

	More MSVC fixes
	- Update dependecy package version requirements
	- ...


Thu, 29 Jan 2015 09:29:56 GMT muemart [10208]
	* code/trunk/cmake/PackageConfigMSVC.cmake (modified)
	* code/trunk/cmake/tools/FindCEGUI.cmake (modified)
	* code/trunk/src/libraries/core/CoreIncludes.h (modified)

	Some small fixes for the MSVC build
	- Don't hardcode library names. ...


Tue, 27 Jan 2015 22:35:50 GMT bknecht [10207]
	* code/trunk/src/libraries/tools/IcoSphere.cc (modified)

	Replacing MSVC code for long integer with cross plattform compatible
	one


Tue, 27 Jan 2015 22:23:47 GMT landauf [10206]
	* code/trunk/src/libraries/tools/IcoSphere.h (modified)

	fixed build


Sun, 25 Jan 2015 23:22:57 GMT landauf [10205]
	* code/branches/presentationFS14/src/orxonox/collisionshapes/CollisionShape.cc (modified)

	the previous commit was not correct. re-added the call to ...


Sun, 25 Jan 2015 22:32:17 GMT landauf [10204]
	* code/branches/presentationFS14/src/orxonox/collisionshapes/CompoundCollisionShape.cc (modified)

	i think this can be removed as well. the user pointer was probably ...


Sun, 25 Jan 2015 22:15:24 GMT landauf [10203]
	* code/branches/presentationFS14/src/external/bullet/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp (modified)
	* code/branches/presentationFS14/src/orxonox/Scene.h (modified)
	* code/branches/presentationFS14/src/orxonox/collisionshapes/CollisionShape.h (modified)
	* code/branches/presentationFS14/src/orxonox/collisionshapes/CompoundCollisionShape.cc (modified)
	* code/branches/presentationFS14/src/orxonox/collisionshapes/CompoundCollisionShape.h (modified)
	* code/branches/presentationFS14/src/orxonox/worldentities/StaticEntity.cc (modified)
	* code/branches/presentationFS14/src/orxonox/worldentities/WorldEntity.cc (modified)
	* code/branches/presentationFS14/src/orxonox/worldentities/WorldEntity.h (modified)
	* code/branches/presentationFS14/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/branches/presentationFS14/src/orxonox/worldentities/pawns/Pawn.h (modified)

	removed unused code and debug output


Sun, 25 Jan 2015 20:18:15 GMT landauf [10202]
	* code/branches/formationupdate (deleted)
	* code/branches/libs (deleted)

	removed two merged branches


Sun, 25 Jan 2015 18:32:42 GMT landauf [10201]
	* code/branches/Racingbot (deleted)
	* code/branches/invaders (deleted)
	* code/branches/largeShip1 (deleted)
	* code/branches/levelElias (deleted)
	* code/branches/levelKaan (deleted)
	* code/branches/levelMichael (deleted)
	* code/branches/presentationHS12 (deleted)
	* code/branches/presentationHS13 (deleted)
	* code/branches/radarDreiD (deleted)
	* code/branches/sfxThilo (deleted)
	* code/branches/spaceNavigation (deleted)
	* code/branches/spacestationentry (deleted)
	* code/branches/turret (deleted)

	removed old (and merged) branches from HS12 and HS12.
	notes:
	 - ...


Sun, 25 Jan 2015 17:48:12 GMT landauf [10200]
	* code/branches/LevelLoader (deleted)
	* code/branches/core7 (deleted)
	* code/branches/questlog (deleted)
	* code/branches/revampbigships (deleted)
	* code/branches/sfxSebastian (deleted)
	* code/branches/strongTurret (deleted)

	removed old branches that never received any commits


Sun, 25 Jan 2015 14:43:11 GMT landauf [10199]
	* code/branches/presentationFS14/data/levels/templates/spaceshipTurret.oxt (copied)

	reverted spaceshipTurret.oxt to the old (and correct) version of
	r10071


Sun, 25 Jan 2015 14:39:30 GMT landauf [10198]
	* code/branches/presentationFS14/data/levels/templates/standardTurret.oxt (modified)
	* code/branches/presentationFS14/src/orxonox/worldentities/WorldEntity.cc (modified)

	disabled physics for turret -> removed attachment-hack in WorldEntity


Sat, 17 Jan 2015 17:43:35 GMT landauf [10197]
	* code/trunk/src/libraries/util/MultiType.h (modified)
	* code/trunk/src/orxonox/gamestates/GSServer.cc (modified)
	* code/trunk/test/util/MultiTypeTest.cc (modified)

	avoid implicit conversion in MultiType.get<T>()


Tue, 13 Jan 2015 21:55:12 GMT landauf [10196]
	* code/trunk/src/orxonox/Scene.cc (modified)
	* code/trunk/src/orxonox/Scene.h (modified)

	added BulletDebugDrawer to Scene.
	added console command to ...


Tue, 13 Jan 2015 21:54:15 GMT landauf [10195]
	* code/trunk/src/libraries/tools/BulletDebugDrawer.cc (modified)
	* code/trunk/src/libraries/tools/DebugDrawer.cc (modified)

	removed unnecessary material from BulletDebugDrawer.
	fixed crash ...


Tue, 13 Jan 2015 20:59:01 GMT landauf [10194]
	* code/trunk/src/libraries/tools/DebugDrawer.cc (modified)

	bugfix


Sun, 11 Jan 2015 21:06:04 GMT landauf [10193]
	* code/trunk/data/levels/collisionShapes.oxw (modified)
	* code/trunk/src/libraries/tools/BulletDebugDrawer.cc (modified)
	* code/trunk/src/libraries/tools/BulletDebugDrawer.h (modified)
	* code/trunk/src/libraries/tools/DebugDrawer.cc (modified)
	* code/trunk/src/libraries/tools/DebugDrawer.h (modified)

	details, made debug drawer more configurable


Sun, 11 Jan 2015 20:30:08 GMT landauf [10192]
	* code/trunk/src/orxonox/Scene.cc (modified)

	destroy elements in Scene in the opposite order of their creation.


Sun, 11 Jan 2015 20:28:39 GMT landauf [10191]
	* code/trunk/data/levels/collisionShapes.oxw (modified)
	* code/trunk/src/libraries/tools/BulletDebugDrawer.cc (modified)
	* code/trunk/src/libraries/tools/BulletDebugDrawer.h (modified)
	* code/trunk/src/libraries/tools/DebugDrawer.cc (modified)
	* code/trunk/src/libraries/tools/DebugDrawer.h (modified)

	added customized visualization for cylinders and cones to ...


Sun, 11 Jan 2015 17:21:51 GMT landauf [10190]
	* code/trunk/src/libraries/tools/BulletDebugDrawer.cc (added)
	* code/trunk/src/libraries/tools/BulletDebugDrawer.h (added)
	* code/trunk/src/libraries/tools/CMakeLists.txt (modified)
	* code/trunk/src/libraries/tools/DebugDrawer.cc (added)
	* code/trunk/src/libraries/tools/DebugDrawer.h (added)
	* code/trunk/src/libraries/tools/IcoSphere.cc (added)
	* code/trunk/src/libraries/tools/IcoSphere.h (added)
	* code/trunk/src/libraries/tools/OgreBulletUtils.h (added)
	* code/trunk/src/libraries/tools/ToolsPrereqs.h (modified)

	added utility to visualize collision shapes


Sun, 11 Jan 2015 14:40:41 GMT landauf [10189]
	* code/trunk/data/levels/collisionShapes.oxw (added)
	* code/trunk/src/libraries/core/CoreIncludes.h (modified)
	* code/trunk/src/modules/objects/ObjectsPrereqs.h (modified)
	* code/trunk/src/modules/objects/collisionshapes/AbstractRadiusHeightCollisionShape.cc (copied)
	* code/trunk/src/modules/objects/collisionshapes/AbstractRadiusHeightCollisionShape.h (copied)
	* code/trunk/src/modules/objects/collisionshapes/CMakeLists.txt (modified)
	* code/trunk/src/modules/objects/collisionshapes/ConeCollisionShape.cc (modified)
	* code/trunk/src/modules/objects/collisionshapes/ConeCollisionShape.h (modified)
	* code/trunk/src/modules/objects/collisionshapes/CylinderCollisionShape.cc (added)
	* code/trunk/src/modules/objects/collisionshapes/CylinderCollisionShape.h (added)

	added new collision shape (cylinder)


Sat, 10 Jan 2015 15:39:15 GMT landauf [10188]
	* code/trunk/test/CMakeLists.txt (modified)
	* code/trunk/test/core/CMakeLists.txt (modified)
	* code/trunk/test/util/CMakeLists.txt (modified)

	change cmake policy in order to avoid warning because we currently ...


Sat, 10 Jan 2015 13:48:02 GMT landauf [10187]
	* code/trunk/cmake/tools/PrecompiledHeaderFiles.cmake (modified)

	fixed dependency issue in cmake script (which also fixes a bunch of ...


Sat, 10 Jan 2015 13:35:30 GMT landauf [10186]
	* code/trunk/cmake/tools/TargetUtilities.cmake (modified)
	* code/trunk/src/CMakeLists.txt (modified)

	trying to make cmake policy settings backwards compatible


Sat, 10 Jan 2015 13:22:06 GMT landauf [10185]
	* code/trunk/cmake/tools/TargetUtilities.cmake (modified)
	* code/trunk/src/CMakeLists.txt (modified)

	fixed warnings with cmake 3.1


Wed, 17 Dec 2014 14:43:07 GMT fvultier [10184]
	* code/branches/pickupsFS14/data/levels/emptyLevel.oxw (modified)
	* code/branches/pickupsFS14/data/levels/jump.oxw (modified)
	* code/branches/pickupsFS14/data/overlays/jumpHUD.oxo (modified)
	* code/branches/pickupsFS14/src/modules/jump/Jump.cc (modified)
	* code/branches/pickupsFS14/src/modules/jump/Jump.h (modified)
	* code/branches/pickupsFS14/src/modules/jump/JumpBoots.cc (modified)
	* code/branches/pickupsFS14/src/modules/jump/JumpBoots.h (modified)
	* code/branches/pickupsFS14/src/modules/jump/JumpFigure.cc (modified)
	* code/branches/pickupsFS14/src/modules/jump/JumpFigure.h (modified)
	* code/branches/pickupsFS14/src/modules/jump/JumpItem.h (modified)
	* code/branches/pickupsFS14/src/modules/jump/JumpPropeller.cc (modified)
	* code/branches/pickupsFS14/src/modules/jump/JumpPropeller.h (modified)
	* code/branches/pickupsFS14/src/modules/jump/JumpRocket.cc (modified)
	* code/branches/pickupsFS14/src/modules/jump/JumpRocket.h (modified)
	* code/branches/pickupsFS14/src/modules/jump/JumpScore.cc (modified)
	* code/branches/pickupsFS14/src/modules/jump/JumpScore.h (modified)
	* code/branches/pickupsFS14/src/modules/jump/JumpShield.cc (modified)
	* code/branches/pickupsFS14/src/modules/jump/JumpShield.h (modified)

	Es wird nun angezeigt, wie lange ein item noch aktiv ist.


Mon, 15 Dec 2014 15:12:02 GMT maxima [10182]
	* code/branches/presentationHS14/src/orxonox/gametypes/Mission.cc (modified)

	Had to change Mission::start() to play the mission levels.


Mon, 15 Dec 2014 14:58:14 GMT maxima [10181]
	* code/branches/presentationHS14 (modified)
	* code/branches/presentationHS14/data/levels/includes/weaponSettingsTurret.oxi (modified)
	* code/branches/presentationHS14/data/levels/includes/weaponSettingsTurret1.oxi (copied)
	* code/branches/presentationHS14/data/levels/templates/enemytowerdefense.oxt (copied)
	* code/branches/presentationHS14/data/levels/templates/standardTurret.oxt (copied)
	* code/branches/presentationHS14/data/levels/templates/tower.oxt (modified)
	* code/branches/presentationHS14/data/levels/towerDefense.oxw (modified)
	* code/branches/presentationHS14/data/levels/turretTest.oxw (modified)
	* code/branches/presentationHS14/data/overlays/towerdefenseHUD.oxo (modified)
	* code/branches/presentationHS14/src/libraries/core/input/InputManager.cc (modified)
	* code/branches/presentationHS14/src/modules/objects/CMakeLists.txt (modified)
	* code/branches/presentationHS14/src/modules/objects/Turret.cc (modified)
	* code/branches/presentationHS14/src/modules/objects/Turret.h (modified)
	* code/branches/presentationHS14/src/modules/objects/controllers (copied)
	* code/branches/presentationHS14/src/modules/towerdefense/CMakeLists.txt (modified)
	* code/branches/presentationHS14/src/modules/towerdefense/TDCoordinate.cc (copied)
	* code/branches/presentationHS14/src/modules/towerdefense/TDCoordinate.h (copied)
	* code/branches/presentationHS14/src/modules/towerdefense/TDEnemy.h (modified)
	* code/branches/presentationHS14/src/modules/towerdefense/Tower.cc (modified)
	* code/branches/presentationHS14/src/modules/towerdefense/TowerDefense.cc (modified)
	* code/branches/presentationHS14/src/modules/towerdefense/TowerDefense.h (modified)
	* code/branches/presentationHS14/src/modules/towerdefense/TowerDefenseController.cc (modified)
	* code/branches/presentationHS14/src/modules/towerdefense/TowerDefenseEnemy.cc (copied)
	* code/branches/presentationHS14/src/modules/towerdefense/TowerDefenseEnemy.h (copied)
	* code/branches/presentationHS14/src/modules/towerdefense/TowerDefenseHUDController.cc (modified)
	* code/branches/presentationHS14/src/modules/towerdefense/TowerDefenseHUDController.h (modified)
	* code/branches/presentationHS14/src/modules/towerdefense/TowerDefensePlayerStats.cc (modified)
	* code/branches/presentationHS14/src/modules/towerdefense/TowerDefensePlayerStats.h (modified)
	* code/branches/presentationHS14/src/modules/towerdefense/TowerDefensePrereqs.h (modified)
	* code/branches/presentationHS14/src/modules/towerdefense/TowerDefenseTower.cc (copied)
	* code/branches/presentationHS14/src/modules/towerdefense/TowerDefenseTower.h (copied)
	* code/branches/presentationHS14/src/modules/towerdefense/TowerTurret.cc (copied)
	* code/branches/presentationHS14/src/modules/towerdefense/TowerTurret.h (copied)
	* code/branches/presentationHS14/src/orxonox/controllers/ArtificialController.cc (modified)
	* code/branches/presentationHS14/src/orxonox/worldentities/WorldEntity.cc (modified)

	towerdefenseHS14 merged.


Mon, 15 Dec 2014 14:07:39 GMT maxima [10180]
	* code/branches/presentationHS14 (modified)
	* code/branches/presentationHS14/data/levels/FPS_Level_HS14.oxw (copied)
	* code/branches/presentationHS14/data/levels/includes/weaponSettingsFPS_HS14.oxi (copied)
	* code/branches/presentationHS14/data/levels/presentationHS13.oxw (modified)
	* code/branches/presentationHS14/data/levels/templates/FPS.oxt (modified)
	* code/branches/presentationHS14/data/levels/templates/FPS_HS14.oxt (copied)
	* code/branches/presentationHS14/data/levels/templates/spacestation_elements.oxt (copied)
	* code/branches/presentationHS14/data/levels/templates/ss_tube01.oxt (copied)

	weaponupdateHS14 merged.


Mon, 15 Dec 2014 13:51:32 GMT maxima [10179]
	* code/branches/presentationHS14 (modified)
	* code/branches/presentationHS14/data/levels/4Dtest.oxw (copied)
	* code/branches/presentationHS14/src/modules/CMakeLists.txt (modified)
	* code/branches/presentationHS14/src/modules/mini4Dgame (copied)

	minigame4DHS14 merged


Fri, 12 Dec 2014 12:25:38 GMT flsueess [10178]
	* code/branches/weaponupdateHS14/data/levels/FPS_Level_HS14.oxw (modified)
	* code/branches/weaponupdateHS14/data/levels/templates/FPS.oxt (modified)
	* code/branches/weaponupdateHS14/data/levels/templates/FPS_HS14.oxt (modified)

	bugfixes


Thu, 11 Dec 2014 16:06:41 GMT flsueess [10177]
	* code/branches/weaponupdateHS14/data/levels/FPS_Level_HS14.oxw (modified)
	* code/branches/weaponupdateHS14/data/levels/presentationHS13.oxw (modified)

	holos gesetzt


Thu, 11 Dec 2014 15:09:29 GMT maxima [10176]
	* code/branches/presentationHS14 (modified)
	* code/branches/presentationHS14/data/gui/scripts/CampaignMenu.lua (modified)
	* code/branches/presentationHS14/data/gui/scripts/campaign.txt (modified)
	* code/branches/presentationHS14/data/levels/DodgeRace.oxw (copied)
	* code/branches/presentationHS14/data/levels/templates/DodgeRacePattern.oxt (copied)
	* code/branches/presentationHS14/data/levels/templates/spaceshipDodgeRace.oxt (copied)
	* code/branches/presentationHS14/data/levels/templates/spaceshipInvader.oxt (modified)
	* code/branches/presentationHS14/data/overlays/DodgeRaceHUD.oxo (copied)
	* code/branches/presentationHS14/src/modules/CMakeLists.txt (modified)
	* code/branches/presentationHS14/src/modules/dodgerace2 (copied)
	* code/branches/presentationHS14/src/modules/dodgerace2/CMakeLists.txt (copied)
	* code/branches/presentationHS14/src/modules/dodgerace2/DodgeRace.cc (copied)
	* code/branches/presentationHS14/src/modules/dodgerace2/DodgeRace.h (copied)
	* code/branches/presentationHS14/src/modules/dodgerace2/DodgeRaceCenterPoint.cc (copied)
	* code/branches/presentationHS14/src/modules/dodgerace2/DodgeRaceCenterPoint.h (copied)
	* code/branches/presentationHS14/src/modules/dodgerace2/DodgeRaceCube.cc (copied)
	* code/branches/presentationHS14/src/modules/dodgerace2/DodgeRaceCube.h (copied)
	* code/branches/presentationHS14/src/modules/dodgerace2/DodgeRaceHUDinfo.cc (copied)
	* code/branches/presentationHS14/src/modules/dodgerace2/DodgeRaceHUDinfo.h (copied)
	* code/branches/presentationHS14/src/modules/dodgerace2/DodgeRacePrereqs.h (copied)
	* code/branches/presentationHS14/src/modules/dodgerace2/DodgeRaceShip.cc (copied)
	* code/branches/presentationHS14/src/modules/dodgerace2/DodgeRaceShip.h (copied)
	* code/branches/presentationHS14/src/modules/invader/Invader.cc (copied)
	* code/branches/presentationHS14/src/modules/invader/Invader.h (copied)
	* code/branches/presentationHS14/src/modules/invader/InvaderCenterPoint.cc (copied)
	* code/branches/presentationHS14/src/modules/invader/InvaderCenterPoint.h (copied)
	* code/branches/presentationHS14/src/modules/invader/InvaderEnemy.cc (copied)
	* code/branches/presentationHS14/src/modules/invader/InvaderEnemy.h (copied)
	* code/branches/presentationHS14/src/modules/invader/InvaderEnemyShooter.cc (copied)
	* code/branches/presentationHS14/src/modules/invader/InvaderEnemyShooter.h (copied)
	* code/branches/presentationHS14/src/modules/invader/InvaderHUDinfo.cc (copied)
	* code/branches/presentationHS14/src/modules/invader/InvaderHUDinfo.h (copied)
	* code/branches/presentationHS14/src/modules/invader/InvaderPrereqs.h (copied)
	* code/branches/presentationHS14/src/modules/invader/InvaderShip.cc (copied)
	* code/branches/presentationHS14/src/modules/invader/InvaderShip.h (copied)
	* code/branches/presentationHS14/src/modules/invader/InvaderWeapon.cc (copied)
	* code/branches/presentationHS14/src/modules/invader/InvaderWeapon.h (copied)
	* code/branches/presentationHS14/src/modules/invader/InvaderWeaponEnemy.cc (copied)
	* code/branches/presentationHS14/src/modules/invader/InvaderWeaponEnemy.h (copied)
	* code/branches/presentationHS14/svn-commit.tmp (copied)

	dodgeraceHS14 merged.


Thu, 11 Dec 2014 14:55:25 GMT maxima [10175]
	* code/branches/presentationHS14 (modified)
	* code/branches/presentationHS14/data/gui/layouts/CampaignMenu.layout (copied)
	* code/branches/presentationHS14/data/gui/layouts/SingleplayerMenu.layout (modified)
	* code/branches/presentationHS14/data/gui/scripts/CampaignMenu.lua (copied)
	* code/branches/presentationHS14/data/gui/scripts/SingleplayerMenu.lua (modified)
	* code/branches/presentationHS14/data/gui/scripts/campaign.txt (copied)
	* code/branches/presentationHS14/src/orxonox/gametypes/Mission.cc (modified)

	storymodeHS14 merged. You have to change the link to campaign.txt in ...


Thu, 11 Dec 2014 14:51:27 GMT maxima [10174]
	* code/branches/storymodeHS14/data/gui/scripts/CampaignMenu.lua (modified)
	* code/branches/storymodeHS14/data/gui/scripts/campaign.txt (modified)
	* code/branches/storymodeHS14/src/orxonox/gametypes/Mission.cc (modified)

	Final version for presentation.


Thu, 11 Dec 2014 12:10:38 GMT maxima [10173]
	* code/branches/presentationHS14 (modified)
	* code/branches/presentationHS14/data/levels/AnihilationThreat.oxw (copied)
	* code/branches/presentationHS14/src/modules/notifications/NotificationQueueCEGUI.cc (modified)

	Branch leveljoemeHS14 merged with presentation branch


Thu, 11 Dec 2014 12:05:08 GMT maxima [10172]
	* code/branches/towerdefenseHS14/src/modules/towerdefense/TDEnemy.h (modified)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefense.cc (modified)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefense.h (modified)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseEnemy.cc (modified)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseEnemy.h (modified)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseHUDController.cc (modified)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefensePlayerStats.h (modified)

	final version for presentation


Thu, 11 Dec 2014 12:01:28 GMT maxima [10171]
	* code/branches/presentationHS14 (modified)
	* code/branches/presentationHS14/data/levels/kecks.oxw (modified)
	* code/branches/presentationHS14/data/overlays/HUDTemplates3.oxo (modified)
	* code/branches/presentationHS14/src/modules/overlays/hud/HUDEnemyHealthBar.cc (modified)
	* code/branches/presentationHS14/src/modules/overlays/hud/HUDHealthBar.cc (modified)
	* code/branches/presentationHS14/src/modules/overlays/hud/HUDNavigation.cc (modified)
	* code/branches/presentationHS14/src/modules/overlays/hud/HUDNavigation.h (modified)

	Branch hudHS14 merged with presentation branch


Thu, 11 Dec 2014 11:34:16 GMT maxima [10170]
	* code/branches/presentationHS14 (modified)
	* code/branches/presentationHS14/data/levels/kecks.oxw (copied)

	Branch keckslevelHS14 merged with presentationHS14 branch


Wed, 10 Dec 2014 16:17:54 GMT flsueess [10169]
	* code/branches/weaponupdateHS14/data/levels/FPS_Level_HS14.oxw (modified)
	* code/branches/weaponupdateHS14/data/levels/templates/spacestation_elements.oxt (modified)

	alle collisionshapes fertig


Wed, 10 Dec 2014 15:15:08 GMT richtero [10168]
	* code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4Dgame.cc (modified)
	* code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4Dgame.h (modified)
	* code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgameBoard.cc (modified)
	* code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgameBoard.h (modified)

	working game


Wed, 10 Dec 2014 14:51:52 GMT sujataj [10167]
	* code/branches/leveljoemeHS14/data/levels/AnihilationThreat.oxw (modified)

	final stage


Wed, 10 Dec 2014 14:40:05 GMT sriedel [10166]
	* code/branches/surfaceraceHS14/data/levels/DodgeRace.oxw (modified)
	* code/branches/surfaceraceHS14/data/levels/templates/spaceshipDodgeRace.oxt (modified)
	* code/branches/surfaceraceHS14/data/overlays/DodgeRaceHUD.oxo (modified)
	* code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.cc (modified)
	* code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.h (modified)
	* code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceHUDinfo.cc (modified)
	* code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceHUDinfo.h (modified)
	* code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.cc (modified)

	Final version


Wed, 10 Dec 2014 14:19:06 GMT kecks [10165]
	* code/branches/keckslevelHS14/data/levels/kecks.oxw (modified)

	Level file changed to final version.


Wed, 10 Dec 2014 14:16:33 GMT kecks [10164]
	* code/branches/keckslevelHS14/data/levels/kecks.oxw (modified)

	Level file changed.


Wed, 10 Dec 2014 14:10:55 GMT aejonas [10163]
	* code/branches/hudHS14/src/modules/overlays/hud/HUDNavigation.cc (modified)
	* code/branches/hudHS14/src/modules/overlays/hud/HUDNavigation.h (modified)

	completed healthbar project


Wed, 10 Dec 2014 14:07:30 GMT sujataj [10162]
	* code/branches/leveljoemeHS14/data/levels/AnihilationThreat.oxw (modified)

	finalised level