#
# ChangeLog for code/branches
#
# Generated by Trac 1.0.9
# Apr 29, 2024, 2:22:58 PM

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 ...


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


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


Wed, 10 Dec 2014 12:20:28 GMT richtero [10161]
	* code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgameCenterpoint.cc (deleted)
	* code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgameCenterpoint.h (deleted)

	removed centerpoint


Wed, 10 Dec 2014 12:05:12 GMT smerkli [10160]
	* code/branches/presentationHS14 (copied)

	Created a presentation branch for HS 14


Fri, 05 Dec 2014 15:27:06 GMT maxima [10159]
	* code/branches/towerdefenseHS14/data/overlays/towerdefenseHUD.oxo (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/TowerDefenseHUDController.h (modified)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefensePlayerStats.cc (modified)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefensePlayerStats.h (modified)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefensePrereqs.h (modified)

	Changes of Hannes. Upgrading towers does not work yet.


Fri, 05 Dec 2014 14:43:28 GMT maxima [10158]
	* code/branches/towerdefenseHS14/data/levels/includes/weaponSettingsTurret1.oxi (added)
	* code/branches/towerdefenseHS14/data/levels/templates/tower.oxt (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/TowerDefensePlayerStats.h (modified)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseTower.cc (modified)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseTower.h (modified)

	Changes of Nico. Upgrading the towers included.


Fri, 05 Dec 2014 14:10:42 GMT maxima [10157]
	* code/branches/storymodeHS14/data/gui/layouts/CampaignMenu.layout (added)
	* code/branches/storymodeHS14/data/gui/layouts/SingleplayerMenu.layout (modified)
	* code/branches/storymodeHS14/data/gui/scripts/CampaignMenu.lua (added)
	* code/branches/storymodeHS14/data/gui/scripts/SingleplayerMenu.lua (modified)
	* code/branches/storymodeHS14/data/gui/scripts/campaign.txt (added)
	* code/branches/storymodeHS14/src/orxonox/gametypes/Mission.cc (modified)

	Changes of Phillip. He couldn't upload himself. New Campaign Menu
	added.


Thu, 04 Dec 2014 16:16:20 GMT richtero [10156]
	* code/branches/minigame4DHS14/data/levels/4Dtest.oxw (modified)
	* 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/Mini4DgameBoard.cc (modified)
	* code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgameBoard.h (modified)
	* code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgamePrereqs.h (modified)

	getting closer to a playable version


Wed, 03 Dec 2014 16:42:49 GMT flsueess [10155]
	* code/branches/weaponupdateHS14/data/levels/FPS_Level_HS14.oxw (modified)
	* code/branches/weaponupdateHS14/data/levels/templates/spacestation_elements.oxt (modified)

	weitere collishionshapes


Wed, 03 Dec 2014 16:30:46 GMT sriedel [10154]
	* code/branches/surfaceraceHS14/data/levels/templates/spaceshipDodgeRace.oxt (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/DodgeRaceShip.cc (modified)

	Death now in endGameTimer


Wed, 03 Dec 2014 16:30:22 GMT kecks [10153]
	* code/branches/keckslevelHS14/data/levels/kecks.oxw (modified)

	Level file changed.


Wed, 03 Dec 2014 16:18:24 GMT sriedel [10152]
	* code/branches/surfaceraceHS14/data/levels/DodgeRace.oxw (modified)
	* code/branches/surfaceraceHS14/data/levels/templates/DodgeRacePattern.oxt (modified)
	* 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/DodgeRaceCube.cc (added)
	* code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceCube.h (added)
	* code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRacePrereqs.h (modified)
	* code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.cc (modified)

	Almost there. Death doesnt work


Wed, 03 Dec 2014 16:06:11 GMT erbj [10151]
	* 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)

	waves added


Wed, 03 Dec 2014 15:19:09 GMT flsueess [10150]
	* code/branches/weaponupdateHS14/data/levels/FPS_Level_HS14.oxw (modified)
	* code/branches/weaponupdateHS14/data/levels/templates/spacestation_elements.oxt (modified)

	weitere collishionsahpes


Wed, 03 Dec 2014 15:16:49 GMT aejonas [10149]
	* code/branches/hudHS14/data/overlays/HUDTemplates3.oxo (modified)
	* code/branches/hudHS14/src/modules/overlays/hud/HUDNavigation.cc (modified)

	the healthbar is now changing its size every thime the spaceship ...


Wed, 03 Dec 2014 14:54:27 GMT sujataj [10148]
	* code/branches/leveljoemeHS14/data/levels/AnihilationThreat.oxw (modified)

	pickups and more enemies


Wed, 03 Dec 2014 12:38:14 GMT maxima [10147]
	* code/branches/towerdefenseHS14/src/modules/objects/controllers (added)
	* code/branches/towerdefenseHS14/src/modules/objects/controllers/CMakeLists.txt (added)
	* code/branches/towerdefenseHS14/src/modules/objects/controllers/TeamTargetProxy.cc (added)
	* code/branches/towerdefenseHS14/src/modules/objects/controllers/TeamTargetProxy.h (added)
	* code/branches/towerdefenseHS14/src/modules/objects/controllers/TurretController.cc (added)
	* code/branches/towerdefenseHS14/src/modules/objects/controllers/TurretController.h (added)




Wed, 03 Dec 2014 12:28:02 GMT maxima [10146]
	* code/branches/towerdefenseHS14/data/levels/templates/tower.oxt (modified)




Wed, 03 Dec 2014 12:03:15 GMT maxima [10145]
	* code/branches/turretFS14/src/modules/objects/controllers (added)
	* code/branches/turretFS14/src/modules/objects/controllers/CMakeLists.txt (added)
	* code/branches/turretFS14/src/modules/objects/controllers/TeamTargetProxy.cc (added)
	* code/branches/turretFS14/src/modules/objects/controllers/TeamTargetProxy.h (added)
	* code/branches/turretFS14/src/modules/objects/controllers/TurretController.cc (added)
	* code/branches/turretFS14/src/modules/objects/controllers/TurretController.h (added)




Wed, 03 Dec 2014 11:49:15 GMT maxima [10144]
	* code/branches/towerdefenseHS14/data/levels/includes/weaponSettingsTurret.oxi (modified)
	* code/branches/towerdefenseHS14/data/levels/templates/enemytowerdefense.oxt (modified)
	* code/branches/towerdefenseHS14/data/levels/templates/standardTurret.oxt (added)
	* code/branches/towerdefenseHS14/data/levels/templates/tower.oxt (modified)
	* code/branches/towerdefenseHS14/data/levels/towerDefense.oxw (modified)
	* code/branches/towerdefenseHS14/data/levels/turretTest.oxw (modified)
	* code/branches/towerdefenseHS14/src/libraries/core/input/InputManager.cc (modified)
	* code/branches/towerdefenseHS14/src/modules/objects/CMakeLists.txt (modified)
	* code/branches/towerdefenseHS14/src/modules/objects/Turret.cc (modified)
	* code/branches/towerdefenseHS14/src/modules/objects/Turret.h (modified)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefense.cc (modified)
	* code/branches/towerdefenseHS14/src/orxonox/controllers/ArtificialController.cc (modified)
	* code/branches/towerdefenseHS14/src/orxonox/worldentities/WorldEntity.cc (modified)

	Geaenderte Turret Klassen hinzugefuegt. Neues Template towerturret. ...


Wed, 26 Nov 2014 16:18:44 GMT aejonas [10143]
	* code/branches/hudHS14/src/modules/overlays/hud/HUDEnemyHealthBar.cc (modified)
	* code/branches/hudHS14/src/modules/overlays/hud/HUDNavigation.cc (modified)

	acces to GetHealth in HUDNavigation for scaling the healthbar


Wed, 26 Nov 2014 16:14:33 GMT maxima [10142]
	* code/branches/towerdefenseHS14/data/levels/templates/tower.oxt (modified)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/CMakeLists.txt (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/TowerDefensePlayerStats.h (modified)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefensePrereqs.h (modified)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseTower.cc (added)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseTower.h (added)

	hzilly. Alle files zusammengefuegt.


Wed, 26 Nov 2014 15:41:02 GMT maxima [10141]
	* code/branches/towerdefenseHS14/data/levels/towerDefense.oxw (modified)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefense.cc (modified)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefense.h (modified)

	falsche aenderungen rueckgaening gemacht


Wed, 26 Nov 2014 15:30:10 GMT maxima [10140]
	* code/branches/towerdefenseHS14/data/levels/templates/tower.oxt (modified)
	* code/branches/towerdefenseHS14/data/levels/towerDefense.oxw (modified)
	* code/branches/towerdefenseHS14/data/overlays/towerdefenseHUD.oxo (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/TowerDefenseHUDController.cc (modified)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseHUDController.h (modified)

	nhaenni. HUD angepasst.


Wed, 26 Nov 2014 15:19:03 GMT sriedel [10139]
	* code/branches/surfaceraceHS14/data/levels/templates/DodgeRacePattern.oxt (modified)

	Update added trial pattern.


Wed, 26 Nov 2014 15:07:45 GMT kecks [10138]
	* code/branches/keckslevelHS14/data/levels/kecks.oxw (modified)

	Level file changed.


Wed, 26 Nov 2014 15:03:46 GMT flsueess [10137]
	* code/branches/weaponupdateHS14/data/levels/FPS_Level_HS14.oxw (modified)
	* code/branches/weaponupdateHS14/data/levels/templates/FPS_HS14.oxt (modified)
	* code/branches/weaponupdateHS14/data/levels/templates/spacestation_elements.oxt (modified)

	noch mehr collishion shapes


Wed, 26 Nov 2014 15:01:07 GMT sujataj [10136]
	* code/branches/leveljoemeHS14/data/levels/AnihilationThreat.oxw (modified)
	* code/branches/leveljoemeHS14/src/modules/notifications/NotificationQueueCEGUI.cc (modified)

	pickups and enemies


Wed, 26 Nov 2014 14:59:37 GMT sriedel [10135]
	* code/branches/surfaceraceHS14/data/levels/DodgeRace.oxw (modified)
	* code/branches/surfaceraceHS14/data/levels/templates/DodgeRacePattern.oxt (added)
	* code/branches/surfaceraceHS14/data/levels/templates/spaceshipDodgeRace.oxt (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/DodgeRaceShip.cc (modified)

	Working version, Blockpattern are strange.


Wed, 26 Nov 2014 14:58:47 GMT erbj [10134]
	* code/branches/towerdefenseHS14/data/levels/templates/enemyTowerdefense.oxt (deleted)
	* code/branches/towerdefenseHS14/data/levels/templates/enemytowerdefense.oxt (added)
	* code/branches/towerdefenseHS14/data/levels/towerDefense.oxw (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)

	different models with style


Wed, 19 Nov 2014 15:27:48 GMT flsueess [10133]
	* code/branches/weaponupdateHS14/data/levels/FPS_Level_HS14.oxw (modified)
	* code/branches/weaponupdateHS14/data/levels/templates/spacestation_elements.oxt (modified)

	CollisionShapes hinzugefuegt


Wed, 19 Nov 2014 15:20:18 GMT maxima [10132]
	* code/branches/towerdefenseHS14/data/levels/templates/enemyTowerdefense.oxt (modified)
	* code/branches/towerdefenseHS14/data/levels/towerDefense.oxw (modified)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/Tower.cc (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/TowerDefenseController.cc (modified)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseEnemy.cc (modified)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseEnemy.h (modified)




Wed, 19 Nov 2014 15:08:42 GMT richtero [10131]
	* code/branches/minigame4DHS14/data/levels/4Dtest.oxw (modified)
	* 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.h (modified)
	* code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgameBoard.cc (added)
	* code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgameBoard.h (added)
	* code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgameCenterpoint.cc (modified)
	* code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgameCenterpoint.h (modified)
	* code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgamePrereqs.h (modified)

	new structure: Board in separate class


Wed, 19 Nov 2014 15:07:53 GMT kecks [10130]
	* code/branches/keckslevelHS14/data/levels/kecks.oxw (modified)

	Level file changed.


Wed, 19 Nov 2014 15:02:55 GMT sujataj [10129]
	* code/branches/leveljoemeHS14/data/levels/AnihilationThreat.oxw (modified)

	added allies


Wed, 19 Nov 2014 15:00:53 GMT sriedel [10128]
	* code/branches/surfaceraceHS14/data/levels/DodgeRace.oxw (added)
	* code/branches/surfaceraceHS14/data/levels/templates/spaceshipDodgeRace.oxt (modified)
	* code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.cc (modified)
	* code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.h (modified)

	Should work so far


Wed, 19 Nov 2014 13:10:51 GMT sriedel [10127]
	* code/branches/surfaceraceHS14/data/levels/DodgeRace.oxw (deleted)
	* code/branches/surfaceraceHS14/data/levels/DodgeRacePlus.oxw (deleted)
	* code/branches/surfaceraceHS14/data/levels/DodgeRaceold.oxw (deleted)
	* code/branches/surfaceraceHS14/data/levels/templates/spaceshipDodgeRace.oxt (modified)
	* code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.cc (modified)

	Level files added.


Wed, 19 Nov 2014 12:14:02 GMT maxima [10126]
	* code/branches/towerdefenseHS14/data/levels/templates/enemyTowerdefense.oxt (modified)
	* code/branches/towerdefenseHS14/data/levels/towerDefense.oxw (modified)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefense.cc (modified)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseEnemy.cc (modified)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseEnemy.h (modified)

	Waypointcontroller in Enemy template


Wed, 12 Nov 2014 22:53:34 GMT maxima [10125]
	* code/branches/towerdefenseHS14/data/levels/templates/TowerdefenseEnemy.oxt (deleted)
	* code/branches/towerdefenseHS14/data/levels/templates/enemyTowerdefense.oxt (added)
	* code/branches/towerdefenseHS14/data/levels/towerDefense.oxw (modified)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/TDCoordinate.cc (modified)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefense.cc (modified)

	Enemies use the new template enemytowerdefense


Wed, 12 Nov 2014 15:11:00 GMT sriedel [10124]
	* 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)
	* code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.h (modified)

	still working atm. including function after function, currently HUD.


Wed, 12 Nov 2014 15:09:35 GMT erbj [10123]
	* code/branches/towerdefenseHS14/data/levels/templates/TowerdefenseEnemy.oxt (added)
	* 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)

	Template not working


Wed, 12 Nov 2014 15:08:14 GMT aejonas [10122]
	* code/branches/hudHS14/src/modules/overlays/hud/HUDNavigation.cc (modified)
	* code/branches/hudHS14/src/modules/overlays/hud/HUDNavigation.h (modified)

	health bar is now under the spaceship while moving


Wed, 12 Nov 2014 15:07:10 GMT richtero [10121]
	* 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 (added)
	* code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgameAI.h (added)
	* code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgameCenterpoint.cc (modified)
	* code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgameCenterpoint.h (modified)

	finished getWinner function which checks if somebody has won and ...


Wed, 12 Nov 2014 15:04:45 GMT flsueess [10120]
	* code/branches/weaponupdateHS14/data/levels/FPS_Level_HS14.oxw (modified)
	* code/branches/weaponupdateHS14/data/levels/templates/spacestation_elements.oxt (modified)

	verschiedene Anpassungen


Wed, 12 Nov 2014 15:04:44 GMT kecks [10119]
	* code/branches/keckslevelHS14/data/levels/kecks.oxw (modified)

	Level file changed.


Wed, 12 Nov 2014 14:58:59 GMT sriedel [10118]
	* 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.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)

	Working atm. including function after function.


Wed, 12 Nov 2014 13:27:50 GMT sriedel [10117]
	* 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/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 (added)
	* code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.h (added)

	Bullshit


Wed, 05 Nov 2014 15:45:29 GMT sriedel [10116]
	* code/branches/surfaceraceHS14/data/overlays/DodgeRaceHUD.oxo (added)
	* code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.cc (modified)

	DodgeRaceHUD added


Wed, 05 Nov 2014 15:39:31 GMT richtero [10115]
	* code/branches/minigame4DHS14/data/levels/4Dtest.oxw (modified)
	* code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4Dgame.h (modified)
	* code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgameCenterpoint.cc (modified)
	* code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgameCenterpoint.h (modified)

	started programming game logic


Wed, 05 Nov 2014 15:33:51 GMT sriedel [10114]
	* code/branches/surfaceraceHS14/src/modules/CMakeLists.txt (modified)
	* code/branches/surfaceraceHS14/src/modules/dodgerace (deleted)
	* code/branches/surfaceraceHS14/src/modules/dodgerace2 (added)
	* code/branches/surfaceraceHS14/src/modules/dodgerace2/CMakeLists.txt (added)
	* code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.cc (added)
	* code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.h (added)
	* code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceCenterPoint.cc (added)
	* code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceCenterPoint.h (added)
	* code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceHUDinfo.cc (added)
	* code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceHUDinfo.h (added)
	* code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRacePrereqs.h (added)
	* code/branches/surfaceraceHS14/src/modules/invader/CMakeLists.txt (modified)
	* code/branches/surfaceraceHS14/src/modules/invader/DodgePlayer.cc (deleted)
	* code/branches/surfaceraceHS14/src/modules/invader/DodgePlayer.h (deleted)
	* code/branches/surfaceraceHS14/src/modules/invader/DodgeRace.cc (deleted)
	* code/branches/surfaceraceHS14/src/modules/invader/DodgeRace.h (deleted)
	* code/branches/surfaceraceHS14/src/modules/invader/Invader.cc (added)
	* code/branches/surfaceraceHS14/src/modules/invader/Invader.h (added)
	* code/branches/surfaceraceHS14/src/modules/invader/InvaderCenterPoint.cc (added)
	* code/branches/surfaceraceHS14/src/modules/invader/InvaderCenterPoint.h (added)
	* code/branches/surfaceraceHS14/src/modules/invader/InvaderEnemy.cc (added)
	* code/branches/surfaceraceHS14/src/modules/invader/InvaderEnemy.h (added)
	* code/branches/surfaceraceHS14/src/modules/invader/InvaderEnemyShooter.cc (added)
	* code/branches/surfaceraceHS14/src/modules/invader/InvaderEnemyShooter.h (added)
	* code/branches/surfaceraceHS14/src/modules/invader/InvaderHUDinfo.cc (added)
	* code/branches/surfaceraceHS14/src/modules/invader/InvaderHUDinfo.h (added)
	* code/branches/surfaceraceHS14/src/modules/invader/InvaderPrereqs.h (added)
	* code/branches/surfaceraceHS14/src/modules/invader/InvaderShip.cc (added)
	* code/branches/surfaceraceHS14/src/modules/invader/InvaderShip.h (added)
	* code/branches/surfaceraceHS14/src/modules/invader/InvaderWeapon.cc (added)
	* code/branches/surfaceraceHS14/src/modules/invader/InvaderWeapon.h (added)
	* code/branches/surfaceraceHS14/src/modules/invader/InvaderWeaponEnemy.cc (added)
	* code/branches/surfaceraceHS14/src/modules/invader/InvaderWeaponEnemy.h (added)
	* code/branches/surfaceraceHS14/svn-commit.tmp (added)

	Started copying all over again, HUD doesnt work


Wed, 05 Nov 2014 15:13:41 GMT flsueess [10113]
	* code/branches/weaponupdateHS14/data/levels/FPS_Level_HS14.oxw (modified)
	* code/branches/weaponupdateHS14/data/levels/templates/FPS_HS14.oxt (modified)
	* code/branches/weaponupdateHS14/data/levels/templates/spacestation_elements.oxt (added)
	* code/branches/weaponupdateHS14/data/levels/templates/ss_tube01.oxt (modified)

	neues template mit allen bis jetzt vorhandenen Spacestation Elementen


Wed, 05 Nov 2014 15:11:07 GMT fvultier [10112]
	* code/branches/pickupsFS14/data/levels/jump.oxw (modified)

	this is the correct version


Wed, 05 Nov 2014 15:06:09 GMT fvultier [10111]
	* 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/JumpCenterpoint.cc (modified)
	* code/branches/pickupsFS14/src/modules/jump/JumpCenterpoint.h (modified)
	* code/branches/pickupsFS14/src/modules/jump/JumpEnemy.cc (modified)
	* code/branches/pickupsFS14/src/modules/jump/JumpEnemy.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.cc (modified)
	* code/branches/pickupsFS14/src/modules/jump/JumpItem.h (modified)
	* code/branches/pickupsFS14/src/modules/jump/JumpPlatform.cc (modified)
	* code/branches/pickupsFS14/src/modules/jump/JumpPlatform.h (modified)
	* code/branches/pickupsFS14/src/modules/jump/JumpPlatformDisappear.cc (modified)
	* code/branches/pickupsFS14/src/modules/jump/JumpPlatformDisappear.h (modified)
	* code/branches/pickupsFS14/src/modules/jump/JumpPlatformFake.cc (modified)
	* code/branches/pickupsFS14/src/modules/jump/JumpPlatformFake.h (modified)
	* code/branches/pickupsFS14/src/modules/jump/JumpPlatformHMove.cc (modified)
	* code/branches/pickupsFS14/src/modules/jump/JumpPlatformHMove.h (modified)
	* code/branches/pickupsFS14/src/modules/jump/JumpPlatformStatic.cc (modified)
	* code/branches/pickupsFS14/src/modules/jump/JumpPlatformStatic.h (modified)
	* code/branches/pickupsFS14/src/modules/jump/JumpPlatformTimer.cc (modified)
	* code/branches/pickupsFS14/src/modules/jump/JumpPlatformTimer.h (modified)
	* code/branches/pickupsFS14/src/modules/jump/JumpPlatformVMove.cc (modified)
	* code/branches/pickupsFS14/src/modules/jump/JumpPlatformVMove.h (modified)
	* code/branches/pickupsFS14/src/modules/jump/JumpPrereqs.h (modified)
	* code/branches/pickupsFS14/src/modules/jump/JumpProjectile.cc (modified)
	* code/branches/pickupsFS14/src/modules/jump/JumpProjectile.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)
	* code/branches/pickupsFS14/src/modules/jump/JumpSpring.cc (modified)
	* code/branches/pickupsFS14/src/modules/jump/JumpSpring.h (modified)




Wed, 05 Nov 2014 15:04:51 GMT aejonas [10110]
	* 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)
	* code/branches/hudHS14/src/modules/overlays/hud/HUDNavigation.cc (modified)
	* code/branches/hudHS14/src/modules/overlays/hud/HUDNavigation.h (modified)

	new way to display the healthbar on the screen (in a similar way like ...


Wed, 05 Nov 2014 14:59:18 GMT erbj [10109]
	* code/branches/towerdefenseHS14/src/modules/towerdefense/CMakeLists.txt (modified)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/Enemy.cc (deleted)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/Enemy.h (deleted)
	* 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 (added)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseEnemy.h (added)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefensePrereqs.h (modified)

	EnemyAdd implementierung


Wed, 05 Nov 2014 14:55:40 GMT sujataj [10108]
	* code/branches/leveljoemeHS14/data/levels/AnihilationThreat.oxw (modified)

	modified level. works now


Wed, 05 Nov 2014 12:15:55 GMT sriedel [10107]
	* code/branches/surfaceraceHS14/data/levels/DodgeRace (deleted)
	* code/branches/surfaceraceHS14/data/levels/DodgeRace.oxw (modified)
	* code/branches/surfaceraceHS14/data/levels/DodgeRacePlus.oxw (added)
	* code/branches/surfaceraceHS14/data/levels/DodgeRaceold.oxw (added)
	* code/branches/surfaceraceHS14/data/levels/templates/spaceshipDodgeRace.oxt (modified)
	* code/branches/surfaceraceHS14/data/levels/templates/spaceshipInvader.oxt (modified)
	* code/branches/surfaceraceHS14/src/modules/dodgerace (added)
	* code/branches/surfaceraceHS14/src/modules/dodgerace/CMakeLists.txt (added)
	* code/branches/surfaceraceHS14/src/modules/dodgerace/DodgeRace.cc (added)
	* code/branches/surfaceraceHS14/src/modules/dodgerace/DodgeRace.h (added)
	* code/branches/surfaceraceHS14/src/modules/dodgerace/InvaderCenterPoint.cc (added)
	* code/branches/surfaceraceHS14/src/modules/dodgerace/InvaderCenterPoint.h (added)
	* code/branches/surfaceraceHS14/src/modules/dodgerace/InvaderEnemy.cc (added)
	* code/branches/surfaceraceHS14/src/modules/dodgerace/InvaderEnemy.h (added)
	* code/branches/surfaceraceHS14/src/modules/dodgerace/InvaderEnemyShooter.cc (added)
	* code/branches/surfaceraceHS14/src/modules/dodgerace/InvaderEnemyShooter.h (added)
	* code/branches/surfaceraceHS14/src/modules/dodgerace/InvaderHUDinfo.cc (added)
	* code/branches/surfaceraceHS14/src/modules/dodgerace/InvaderHUDinfo.h (added)
	* code/branches/surfaceraceHS14/src/modules/dodgerace/InvaderPrereqs.h (added)
	* code/branches/surfaceraceHS14/src/modules/dodgerace/InvaderShip.cc (added)
	* code/branches/surfaceraceHS14/src/modules/dodgerace/InvaderShip.h (added)
	* code/branches/surfaceraceHS14/src/modules/dodgerace/InvaderWeapon.cc (added)
	* code/branches/surfaceraceHS14/src/modules/dodgerace/InvaderWeapon.h (added)
	* code/branches/surfaceraceHS14/src/modules/dodgerace/InvaderWeaponEnemy.cc (added)
	* code/branches/surfaceraceHS14/src/modules/dodgerace/InvaderWeaponEnemy.h (added)

	New commitment trial


Tue, 04 Nov 2014 07:04:19 GMT smerkli [10106]
	* code/branches/towerdefenseHS14/src/modules/towerdefense/CMakeLists.txt (modified)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/Enemy.cc (modified)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/TDCoordinate.cc (modified)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/TDCoordinate.h (modified)

	Fixed the list problem, it was a circular include.


Mon, 03 Nov 2014 15:33:54 GMT erbj [10105]
	* code/branches/towerdefenseHS14/data/levels/towerDefense.oxw (modified)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/CMakeLists.txt (modified)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/Enemy.cc (added)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/Enemy.h (added)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/TDCoordinate.cc (added)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/TDCoordinate.h (added)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefense.cc (modified)
	* code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefense.h (modified)

	Added TDCoordinate and more updates


Wed, 29 Oct 2014 15:11:05 GMT richtero [10104]
	* code/branches/minigame4DHS14/data/levels/4Dtest.oxw (modified)
	* code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgamePrereqs.h (added)

	final commit 29-10-14


Wed, 29 Oct 2014 15:01:03 GMT sujataj [10103]
	* code/branches/leveljoemeHS14/data/levels/AnihilationThreat.oxw (modified)

	level changed, nothing works


Wed, 29 Oct 2014 15:00:09 GMT flsueess [10102]
	* code/branches/weaponupdateHS14/data/levels/FPS_Level_HS14.oxw (modified)
	* code/branches/weaponupdateHS14/data/levels/pirateAttack.oxw (modified)
	* code/branches/weaponupdateHS14/data/levels/templates/ss_tube01.oxt (added)

	oxt file für spacestation erstellt, bestehende level files angepasst


Wed, 29 Oct 2014 14:31:05 GMT richtero [10101]
	* code/branches/minigame4DHS14/data/levels/4Dtest.oxw (modified)
	* code/branches/minigame4DHS14/src/modules/CMakeLists.txt (modified)
	* 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/Mini4DgameCenterpoint.h (modified)

	first working compile


Wed, 29 Oct 2014 12:21:53 GMT richtero [10100]
	* code/branches/minigame4DHS14/data/levels/4Dtest.oxw (modified)
	* code/branches/minigame4DHS14/src/modules/mini4Dgame/CMakeLists.txt (added)
	* code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4Dgame.cc (modified)
	* code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4Dgame.h (modified)

	CMakeList added


Wed, 22 Oct 2014 14:15:31 GMT sriedel [10099]
	* code/branches/surfaceraceHS14/data/levels/DodgeRace.oxw (added)

	Versuech 2


Wed, 22 Oct 2014 14:13:29 GMT flsueess [10098]
	* code/branches/weaponupdateHS14/data/levels/FPS_Level_HS14.oxw (added)
	* code/branches/weaponupdateHS14/data/levels/includes/weaponSettingsFPS_HS14.oxi (added)
	* code/branches/weaponupdateHS14/data/levels/pirateAttack.oxw (modified)
	* code/branches/weaponupdateHS14/data/levels/templates/FPS_HS14.oxt (added)
	* code/branches/weaponupdateHS14/src/modules/weapons/RocketController.cc (modified)
	* code/branches/weaponupdateHS14/src/modules/weapons/RocketController.h (modified)

	new files


Wed, 22 Oct 2014 14:11:42 GMT richtero [10097]
	* code/branches/minigame4DHS14/src/modules/mini4Dgame (added)
	* code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4Dgame.cc (added)
	* code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4Dgame.h (added)
	* code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgameCenterpoint.cc (added)
	* code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgameCenterpoint.h (added)

	added mini4Dgame folder