[Jenkins]Jenkins

SuccessChanges

Summary

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