Changes

Summary

1. story mode map merged
2. space race merged
3. big ship merged
4. merged space race with trunk
5. deleted comments
6. merged updated HUD branch to trunk
7. merged HUD branch to trunk

Revision 11359 by patricwi: story mode map merged
Change Type	Path in Repository	Path in Workspace
	/code/trunk (diff)	.
	/code/trunk/data/gui/layouts/CampaignMenu.layout (diff)	data/gui/layouts/CampaignMenu.layout
	/code/trunk/data/gui/schemes/OrxonoxHUDWidgets.scheme (diff)	data/gui/schemes/OrxonoxHUDWidgets.scheme
	/code/trunk/data/gui/schemes/OrxonoxLook.scheme (diff)	data/gui/schemes/OrxonoxLook.scheme
	/code/trunk/data/gui/schemes/OrxonoxMenuWidgets.scheme (diff)	data/gui/schemes/OrxonoxMenuWidgets.scheme
	/code/trunk/data/gui/schemes/TaharezGreenHUDWidgets.scheme (diff)	data/gui/schemes/TaharezGreenHUDWidgets.scheme
	/code/trunk/data/gui/schemes/TaharezGreenLook.scheme (diff)	data/gui/schemes/TaharezGreenLook.scheme
	/code/trunk/data/gui/schemes/TaharezGreenMenuWidgets.scheme (diff)	data/gui/schemes/TaharezGreenMenuWidgets.scheme
	/code/trunk/data/gui/schemes/TaharezLook.scheme (diff)	data/gui/schemes/TaharezLook.scheme
	/code/trunk/data/gui/scripts/CampaignMenu.lua (diff)	data/gui/scripts/CampaignMenu.lua
	/code/trunk/data/gui/scripts/SingleplayerMenu.lua (diff)	data/gui/scripts/SingleplayerMenu.lua
	/code/trunk/data/levels/StoryModeMap.oxw	data/levels/StoryModeMap.oxw
	/code/trunk/data/levels/templates/StoryMode.oxt	data/levels/templates/StoryMode.oxt
	/code/trunk/data/overlays/StoryModeHUD.oxo	data/overlays/StoryModeHUD.oxo
	/code/trunk/src/orxonox/gametypes/CMakeLists.txt (diff)	src/orxonox/gametypes/CMakeLists.txt
	/code/trunk/src/orxonox/gametypes/StoryMode.cc	src/orxonox/gametypes/StoryMode.cc
	/code/trunk/src/orxonox/gametypes/StoryMode.h	src/orxonox/gametypes/StoryMode.h
Revision 11358 by patricwi: space race merged
Change Type	Path in Repository	Path in Workspace
	/code/trunk (diff)	.
	/code/trunk/data/levels/Spacerace2.oxw	data/levels/Spacerace2.oxw
	/code/trunk/data/levels/SurfaceRacePresentation.oxw	data/levels/SurfaceRacePresentation.oxw
	/code/trunk/data/levels/newnewnewspacerace.oxw	data/levels/newnewnewspacerace.oxw
	/code/trunk/data/levels/spaceRace.oxw	data/levels/spaceRace.oxw
	/code/trunk/data/levels/surfaceRace.oxw	data/levels/surfaceRace.oxw
	/code/trunk/data/levels/templates/fastship.oxt	data/levels/templates/fastship.oxt
	/code/trunk/src/modules/gametypes/CMakeLists.txt (diff)	src/modules/gametypes/CMakeLists.txt
	/code/trunk/src/modules/gametypes/OldRaceCheckPoint.cc	src/modules/gametypes/OldRaceCheckPoint.cc
	/code/trunk/src/modules/gametypes/OldRaceCheckPoint.h	src/modules/gametypes/OldRaceCheckPoint.h
	/code/trunk/src/modules/gametypes/OldSpaceRace.cc	src/modules/gametypes/OldSpaceRace.cc
	/code/trunk/src/modules/gametypes/OldSpaceRace.h	src/modules/gametypes/OldSpaceRace.h
	/code/trunk/src/modules/gametypes/SpaceRace.cc (diff)	src/modules/gametypes/SpaceRace.cc
	/code/trunk/src/modules/gametypes/SpaceRace.h (diff)	src/modules/gametypes/SpaceRace.h
	/code/trunk/src/modules/gametypes/SpaceRaceBot.cc (diff)	src/modules/gametypes/SpaceRaceBot.cc
	/code/trunk/src/modules/gametypes/SpaceRaceBot.h (diff)	src/modules/gametypes/SpaceRaceBot.h
	/code/trunk/src/modules/gametypes/SpaceRaceController.cc (diff)	src/modules/gametypes/SpaceRaceController.cc
	/code/trunk/src/orxonox/controllers/HumanController.h (diff)	src/orxonox/controllers/HumanController.h
	/code/trunk/src/orxonox/gametypes/Gametype.cc (diff)	src/orxonox/gametypes/Gametype.cc
	/code/trunk/src/orxonox/infos/Bot.cc (diff)	src/orxonox/infos/Bot.cc
	/code/trunk/src/orxonox/infos/GametypeInfo.h (diff)	src/orxonox/infos/GametypeInfo.h
	/code/trunk/src/orxonox/sound/WorldAmbientSound.cc (diff)	src/orxonox/sound/WorldAmbientSound.cc
Revision 11357 by patricwi: big ship merged
Change Type	Path in Repository	Path in Workspace
	/code/trunk (diff)	.
	/code/trunk/data/levels/Endurancefinal.oxw	data/levels/Endurancefinal.oxw
	/code/trunk/data/levels/HeavyCruiser.oxw (diff)	data/levels/HeavyCruiser.oxw
	/code/trunk/data/levels/emptyLevel.oxw (diff)	data/levels/emptyLevel.oxw
	/code/trunk/data/levels/templates/endurancetest_template.oxt	data/levels/templates/endurancetest_template.oxt
	/code/trunk/data/levels/templates/test11.oxt	data/levels/templates/test11.oxt
	/code/trunk/src/test.txt	src/test.txt
Revision 11356 by patricwi: merged space race with trunk
Change Type	Path in Repository	Path in Workspace
	/code/trunk (diff)	.
	/code/trunk/data/gui/layouts/HighscoreMenu.layout	data/gui/layouts/HighscoreMenu.layout
	/code/trunk/data/gui/layouts/MainMenu.layout (diff)	data/gui/layouts/MainMenu.layout
	/code/trunk/data/gui/scripts/HighscoreMenu.lua	data/gui/scripts/HighscoreMenu.lua
	/code/trunk/data/gui/scripts/MainMenu.lua (diff)	data/gui/scripts/MainMenu.lua
	/code/trunk/data/gui/scripts/MiscConfigMenu.lua (diff)	data/gui/scripts/MiscConfigMenu.lua
	/code/trunk/src/modules/dodgerace/DodgeRace.cc (diff)	src/modules/dodgerace/DodgeRace.cc
	/code/trunk/src/modules/invader/Invader.cc (diff)	src/modules/invader/Invader.cc
	/code/trunk/src/modules/jump/Jump.cc (diff)	src/modules/jump/Jump.cc
	/code/trunk/src/modules/tetris/Tetris.cc (diff)	src/modules/tetris/Tetris.cc
	/code/trunk/src/modules/towerdefense/TowerDefense.cc (diff)	src/modules/towerdefense/TowerDefense.cc
	/code/trunk/src/orxonox/CMakeLists.txt (diff)	src/orxonox/CMakeLists.txt
	/code/trunk/src/orxonox/Highscore.cc	src/orxonox/Highscore.cc
	/code/trunk/src/orxonox/Highscore.h	src/orxonox/Highscore.h
	/code/trunk/src/orxonox/LevelInfo.cc (diff)	src/orxonox/LevelInfo.cc
	/code/trunk/src/orxonox/LevelInfo.h (diff)	src/orxonox/LevelInfo.h
Revision 11355 by patricwi: deleted comments
Change Type	Path in Repository	Path in Workspace
	/code/trunk/src/orxonox/gamestates/GSLevel.cc (diff)	src/orxonox/gamestates/GSLevel.cc
	/code/trunk/src/orxonox/gamestates/GSLevel.h (diff)	src/orxonox/gamestates/GSLevel.h
Revision 11354 by patricwi: merged updated HUD branch to trunk
Change Type	Path in Repository	Path in Workspace
	/code/trunk (diff)	.
	/code/trunk/data/levels/pickups.oxw (diff)	data/levels/pickups.oxw
	/code/trunk/data/overlays/HUDPickupTemplate.oxo	data/overlays/HUDPickupTemplate.oxo
	/code/trunk/data/overlays/HUDTemplates3.oxo (diff)	data/overlays/HUDTemplates3.oxo
	/code/trunk/src/modules/overlays/hud/HUDPickupSystem.cc (diff)	src/modules/overlays/hud/HUDPickupSystem.cc
	/code/trunk/src/modules/overlays/hud/HUDPickupSystem.h (diff)	src/modules/overlays/hud/HUDPickupSystem.h
Revision 11353 by patricwi: merged HUD branch to trunk
Change Type	Path in Repository	Path in Workspace
	/code/trunk (diff)	.
	/code/trunk/README (diff)	README
	/code/trunk/data/defaultConfig/keybindings.ini (diff)	data/defaultConfig/keybindings.ini
	/code/trunk/data/gui/scripts/KeyBindMenu.lua (diff)	data/gui/scripts/KeyBindMenu.lua
	/code/trunk/data/overlays/HUDTemplates3.oxo (diff)	data/overlays/HUDTemplates3.oxo
	/code/trunk/data/overlays/HUDTemplatesFPS.oxo (diff)	data/overlays/HUDTemplatesFPS.oxo
	/code/trunk/src/modules/overlays/OverlaysPrereqs.h (diff)	src/modules/overlays/OverlaysPrereqs.h
	/code/trunk/src/modules/overlays/hud/CMakeLists.txt (diff)	src/modules/overlays/hud/CMakeLists.txt
	/code/trunk/src/modules/overlays/hud/HUDPickupItem.cc	src/modules/overlays/hud/HUDPickupItem.cc
	/code/trunk/src/modules/overlays/hud/HUDPickupItem.h	src/modules/overlays/hud/HUDPickupItem.h
	/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/pickup/CMakeLists.txt (diff)	src/modules/pickup/CMakeLists.txt
	/code/trunk/src/modules/pickup/PickupManager.cc (diff)	src/modules/pickup/PickupManager.cc
	/code/trunk/src/modules/pickup/PickupManager.h (diff)	src/modules/pickup/PickupManager.h
	/code/trunk/src/modules/pickup/items/SpeedPickup.h (diff)	src/modules/pickup/items/SpeedPickup.h
	/code/trunk/src/orxonox/CMakeLists.txt (diff)	src/orxonox/CMakeLists.txt
	/code/trunk/src/orxonox/controllers/HumanController.h (diff)	src/orxonox/controllers/HumanController.h
	/code/trunk/src/orxonox/gamestates/GSLevel.cc (diff)	src/orxonox/gamestates/GSLevel.cc
	/code/trunk/src/orxonox/gamestates/GSLevel.h (diff)	src/orxonox/gamestates/GSLevel.h
	/code/trunk/src/orxonox/interfaces/Pickupable.h (diff)	src/orxonox/interfaces/Pickupable.h