UnstableChanges

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