Changes

Summary

1. merged Presentation_HS17_merge back to trunk

Revision 11783 by Fabian Landau: merged Presentation_HS17_merge back to trunk
Change Type	Path in Repository	Path in Workspace
	/code/trunk	.
	/code/trunk/data/gui/layouts/Dialog.layout	data/gui/layouts/Dialog.layout
	/code/trunk/data/gui/layouts/Dialogue.layout	data/gui/layouts/Dialogue.layout
	/code/trunk/data/gui/layouts/HighscoreMenu.layout	data/gui/layouts/HighscoreMenu.layout
	/code/trunk/data/gui/scripts/Dialog.lua	data/gui/scripts/Dialog.lua
	/code/trunk/data/gui/scripts/Dialogue.lua	data/gui/scripts/Dialogue.lua
	/code/trunk/data/gui/scripts/HighscoreMenu.lua	data/gui/scripts/HighscoreMenu.lua
	/code/trunk/data/gui/scripts/TestDialogButttons.lua	data/gui/scripts/TestDialogButttons.lua
	/code/trunk/data/levels/ArrowLevel.oxw	data/levels/ArrowLevel.oxw
	/code/trunk/data/levels/AsteroidFarming.oxw	data/levels/AsteroidFarming.oxw
	/code/trunk/data/levels/Asteroids2D.oxw	data/levels/Asteroids2D.oxw
	/code/trunk/data/levels/DialogShowcase.oxw	data/levels/DialogShowcase.oxw
	/code/trunk/data/levels/DialogueShowcase.oxw	data/levels/DialogueShowcase.oxw
	/code/trunk/data/levels/Endurancefinal.oxw	data/levels/Endurancefinal.oxw
	/code/trunk/data/levels/FlappyOrx.oxw	data/levels/FlappyOrx.oxw
	/code/trunk/data/levels/MilleniumFalconTest.oxw	data/levels/MilleniumFalconTest.oxw
	/code/trunk/data/levels/NC_StoryModeLevel.oxw	data/levels/NC_StoryModeLevel.oxw
	/code/trunk/data/levels/ProtectBoss.oxw	data/levels/ProtectBoss.oxw
	/code/trunk/data/levels/SOB.oxw	data/levels/SOB.oxw
	/code/trunk/data/levels/StoryModeMap.oxw	data/levels/StoryModeMap.oxw
	/code/trunk/data/levels/includes/MFalconWeapon.oxi	data/levels/includes/MFalconWeapon.oxi
	/code/trunk/data/levels/includes/asteroids2DWeapon.oxi	data/levels/includes/asteroids2DWeapon.oxi
	/code/trunk/data/levels/newnewnewspacerace.oxw	data/levels/newnewnewspacerace.oxw
	/code/trunk/data/levels/templates/MFalcon.oxt	data/levels/templates/MFalcon.oxt
	/code/trunk/data/levels/templates/StoryMode.oxt	data/levels/templates/StoryMode.oxt
	/code/trunk/data/levels/templates/StoryModeEscort.oxt	data/levels/templates/StoryModeEscort.oxt
	/code/trunk/data/levels/templates/asteroidsAsteroids2D.oxt	data/levels/templates/asteroidsAsteroids2D.oxt
	/code/trunk/data/levels/templates/endurancetest_template.oxt	data/levels/templates/endurancetest_template.oxt
	/code/trunk/data/levels/templates/enemyFlappyOrx.oxt	data/levels/templates/enemyFlappyOrx.oxt
	/code/trunk/data/levels/templates/fastship.oxt	data/levels/templates/fastship.oxt
	/code/trunk/data/levels/templates/spaceshipAsteroids2D.oxt	data/levels/templates/spaceshipAsteroids2D.oxt
	/code/trunk/data/levels/templates/spaceshipFlappyOrx.oxt	data/levels/templates/spaceshipFlappyOrx.oxt
	/code/trunk/data/overlays/Asteroids2DHUD.oxo	data/overlays/Asteroids2DHUD.oxo
	/code/trunk/data/overlays/FlappyOrxHUD.oxo	data/overlays/FlappyOrxHUD.oxo
	/code/trunk/data/overlays/HUDTemplates3.oxo	data/overlays/HUDTemplates3.oxo
	/code/trunk/data/overlays/HUDTemplatesFPS.oxo	data/overlays/HUDTemplatesFPS.oxo
	/code/trunk/data/overlays/SOBHUD.oxo	data/overlays/SOBHUD.oxo
	/code/trunk/data/overlays/StoryModeHUD.oxo	data/overlays/StoryModeHUD.oxo
	/code/trunk/data/overlays/StoryModeHUD2.oxo	data/overlays/StoryModeHUD2.oxo
	/code/trunk/data/particle/fire3.particle	data/particle/fire3.particle
	/code/trunk/src/libraries/tools/Mesh.cc	src/libraries/tools/Mesh.cc
	/code/trunk/src/libraries/tools/Mesh.h	src/libraries/tools/Mesh.h
	/code/trunk/src/modules/CMakeLists.txt	src/modules/CMakeLists.txt
	/code/trunk/src/modules/asteroidmining	src/modules/asteroidmining
	/code/trunk/src/modules/asteroids2D	src/modules/asteroids2D
	/code/trunk/src/modules/dialog	src/modules/dialog
	/code/trunk/src/modules/dialogue	src/modules/dialogue
	/code/trunk/src/modules/dodgerace/DodgeRace.cc	src/modules/dodgerace/DodgeRace.cc
	/code/trunk/src/modules/dodgerace/DodgeRace.h	src/modules/dodgerace/DodgeRace.h
	/code/trunk/src/modules/flappyorx	src/modules/flappyorx
	/code/trunk/src/modules/overlays/hud/CMakeLists.txt	src/modules/overlays/hud/CMakeLists.txt
	/code/trunk/src/modules/overlays/hud/HUDPickupSystem.cc	src/modules/overlays/hud/HUDPickupSystem.cc
	/code/trunk/src/modules/overlays/hud/HUDPickupSystem.h	src/modules/overlays/hud/HUDPickupSystem.h
	/code/trunk/src/modules/overlays/hud/StoryModeHUD.cc	src/modules/overlays/hud/StoryModeHUD.cc
	/code/trunk/src/modules/overlays/hud/StoryModeHUD.h	src/modules/overlays/hud/StoryModeHUD.h
	/code/trunk/src/modules/pickup/PickupPrereqs.h	src/modules/pickup/PickupPrereqs.h
	/code/trunk/src/modules/pickup/PickupSpawner.cc	src/modules/pickup/PickupSpawner.cc
	/code/trunk/src/modules/pickup/PickupSpawner.h	src/modules/pickup/PickupSpawner.h
	/code/trunk/src/modules/superorxobros/CMakeLists.txt	src/modules/superorxobros/CMakeLists.txt
	/code/trunk/src/modules/superorxobros/Orxo.cc	src/modules/superorxobros/Orxo.cc
	/code/trunk/src/modules/superorxobros/Orxo.h	src/modules/superorxobros/Orxo.h
	/code/trunk/src/modules/superorxobros/SOB.cc	src/modules/superorxobros/SOB.cc
	/code/trunk/src/modules/superorxobros/SOB.h	src/modules/superorxobros/SOB.h
	/code/trunk/src/modules/superorxobros/SOBCastlestone.cc	src/modules/superorxobros/SOBCastlestone.cc
	/code/trunk/src/modules/superorxobros/SOBCastlestone.h	src/modules/superorxobros/SOBCastlestone.h
	/code/trunk/src/modules/superorxobros/SOBCenterpoint.cc	src/modules/superorxobros/SOBCenterpoint.cc
	/code/trunk/src/modules/superorxobros/SOBCenterpoint.h	src/modules/superorxobros/SOBCenterpoint.h
	/code/trunk/src/modules/superorxobros/SOBCoin.cc	src/modules/superorxobros/SOBCoin.cc
	/code/trunk/src/modules/superorxobros/SOBCoin.h	src/modules/superorxobros/SOBCoin.h
	/code/trunk/src/modules/superorxobros/SOBFigure.cc	src/modules/superorxobros/SOBFigure.cc
	/code/trunk/src/modules/superorxobros/SOBFigure.h	src/modules/superorxobros/SOBFigure.h
	/code/trunk/src/modules/superorxobros/SOBFireball.cc	src/modules/superorxobros/SOBFireball.cc
	/code/trunk/src/modules/superorxobros/SOBFireball.h	src/modules/superorxobros/SOBFireball.h
	/code/trunk/src/modules/superorxobros/SOBFlagstone.cc	src/modules/superorxobros/SOBFlagstone.cc
	/code/trunk/src/modules/superorxobros/SOBFlagstone.h	src/modules/superorxobros/SOBFlagstone.h
	/code/trunk/src/modules/superorxobros/SOBGumba.cc	src/modules/superorxobros/SOBGumba.cc
	/code/trunk/src/modules/superorxobros/SOBGumba.h	src/modules/superorxobros/SOBGumba.h
	/code/trunk/src/modules/superorxobros/SOBGumbaBoss.cc	src/modules/superorxobros/SOBGumbaBoss.cc
	/code/trunk/src/modules/superorxobros/SOBGumbaBoss.h	src/modules/superorxobros/SOBGumbaBoss.h
	/code/trunk/src/modules/superorxobros/SOBHUDInfo.cc	src/modules/superorxobros/SOBHUDInfo.cc
	/code/trunk/src/modules/superorxobros/SOBHUDInfo.h	src/modules/superorxobros/SOBHUDInfo.h
	/code/trunk/src/modules/superorxobros/SOBItem.cc	src/modules/superorxobros/SOBItem.cc
	/code/trunk/src/modules/superorxobros/SOBItem.h	src/modules/superorxobros/SOBItem.h
	/code/trunk/src/modules/superorxobros/SOBMushroom.cc	src/modules/superorxobros/SOBMushroom.cc
	/code/trunk/src/modules/superorxobros/SOBMushroom.h	src/modules/superorxobros/SOBMushroom.h
	/code/trunk/src/modules/superorxobros/SOBPrereqs.h	src/modules/superorxobros/SOBPrereqs.h
	/code/trunk/src/modules/superorxobros/SOBQBlock.cc	src/modules/superorxobros/SOBQBlock.cc
	/code/trunk/src/modules/superorxobros/SOBQBlock.h	src/modules/superorxobros/SOBQBlock.h
	/code/trunk/src/modules/weapons/munitions/FlameMunition.cc	src/modules/weapons/munitions/FlameMunition.cc
	/code/trunk/src/modules/weapons/munitions/FlameMunition.h	src/modules/weapons/munitions/FlameMunition.h
	/code/trunk/src/modules/weapons/projectiles/FlameGunProjectile.cc	src/modules/weapons/projectiles/FlameGunProjectile.cc
	/code/trunk/src/modules/weapons/projectiles/FlameGunProjectile.h	src/modules/weapons/projectiles/FlameGunProjectile.h
	/code/trunk/src/modules/weapons/weaponmodes/FlameGun.cc	src/modules/weapons/weaponmodes/FlameGun.cc
	/code/trunk/src/modules/weapons/weaponmodes/FlameGun.h	src/modules/weapons/weaponmodes/FlameGun.h
	/code/trunk/src/orxonox/Highscore.cc	src/orxonox/Highscore.cc
	/code/trunk/src/orxonox/Highscore.h	src/orxonox/Highscore.h
	/code/trunk/src/orxonox/OrxonoxPrereqs.h	src/orxonox/OrxonoxPrereqs.h
	/code/trunk/src/orxonox/controllers/ArrowController.cc	src/orxonox/controllers/ArrowController.cc
	/code/trunk/src/orxonox/controllers/ArrowController.h	src/orxonox/controllers/ArrowController.h
	/code/trunk/src/orxonox/controllers/CMakeLists.txt	src/orxonox/controllers/CMakeLists.txt
	/code/trunk/src/orxonox/controllers/DroneController.cc	src/orxonox/controllers/DroneController.cc
	/code/trunk/src/orxonox/controllers/HumanController.h	src/orxonox/controllers/HumanController.h
	/code/trunk/src/orxonox/gametypes/StoryMode.cc	src/orxonox/gametypes/StoryMode.cc
	/code/trunk/src/orxonox/gametypes/StoryMode.h	src/orxonox/gametypes/StoryMode.h
	/code/trunk/src/orxonox/graphics/Model.cc	src/orxonox/graphics/Model.cc
	/code/trunk/src/orxonox/graphics/Model.h	src/orxonox/graphics/Model.h
	/code/trunk/src/orxonox/interfaces/RadarViewable.h	src/orxonox/interfaces/RadarViewable.h
	/code/trunk/src/orxonox/worldentities/Arrow.cc	src/orxonox/worldentities/Arrow.cc
	/code/trunk/src/orxonox/worldentities/Arrow.h	src/orxonox/worldentities/Arrow.h
	/code/trunk/src/orxonox/worldentities/CMakeLists.txt	src/orxonox/worldentities/CMakeLists.txt
	/code/trunk/src/orxonox/worldentities/NameableStaticEntity.cc	src/orxonox/worldentities/NameableStaticEntity.cc
	/code/trunk/src/orxonox/worldentities/NameableStaticEntity.h	src/orxonox/worldentities/NameableStaticEntity.h
	/code/trunk/src/orxonox/worldentities/pawns/CMakeLists.txt	src/orxonox/worldentities/pawns/CMakeLists.txt
	/code/trunk/src/orxonox/worldentities/pawns/Pawn.cc	src/orxonox/worldentities/pawns/Pawn.cc
	/code/trunk/src/orxonox/worldentities/pawns/Pawn.h	src/orxonox/worldentities/pawns/Pawn.h
	/code/trunk/src/orxonox/worldentities/pawns/ShootableObstacle.cc	src/orxonox/worldentities/pawns/ShootableObstacle.cc
	/code/trunk/src/orxonox/worldentities/pawns/ShootableObstacle.h	src/orxonox/worldentities/pawns/ShootableObstacle.h
	/code/trunk/src/orxonox/worldentities/pawns/StoryModePawn.cc	src/orxonox/worldentities/pawns/StoryModePawn.cc
	/code/trunk/src/orxonox/worldentities/pawns/StoryModePawn.h	src/orxonox/worldentities/pawns/StoryModePawn.h