Changeset 11781 for code/branches/Presentation_HS17_merge

Timestamp:

Feb 19, 2018, 11:48:23 PM (7 years ago)

Author:

landauf

Message:

eol-style native (no changes in code)

Location:

code/branches/Presentation_HS17_merge

Files:

• data/gui/layouts/Dialog.layout (modified) (1 prop)
• data/gui/layouts/HighscoreMenu.layout (modified) (1 prop)
• data/gui/scripts/Dialog.lua (modified) (1 prop)
• data/gui/scripts/HighscoreMenu.lua (modified) (1 prop)
• data/gui/scripts/TestDialogButttons.lua (modified) (1 prop)
• data/levels/ArrowLevel.oxw (modified) (1 prop)
• data/levels/AsteroidFarming.oxw (modified) (1 prop)
• data/levels/Asteroids2D.oxw (modified) (1 prop)
• data/levels/DialogShowcase.oxw (modified) (1 prop)
• data/levels/Endurancefinal.oxw (modified) (1 prop)
• data/levels/FlappyOrx.oxw (modified) (1 prop)
• data/levels/MilleniumFalconTest.oxw (modified) (1 prop)
• data/levels/NC_StoryModeLevel.oxw (modified) (1 prop)
• data/levels/ProtectBoss.oxw (modified) (1 prop)
• data/levels/SOB.oxw (modified) (1 prop)
• data/levels/StoryModeMap.oxw (modified) (1 prop)
• data/levels/includes/MFalconWeapon.oxi (modified) (1 prop)
• data/levels/includes/asteroids2DWeapon.oxi (modified) (1 prop)
• data/levels/newnewnewspacerace.oxw (modified) (1 prop)
• data/levels/templates/MFalcon.oxt (modified) (1 prop)
• data/levels/templates/StoryMode.oxt (modified) (1 prop)
• data/levels/templates/StoryModeEscort.oxt (modified) (1 prop)
• data/levels/templates/asteroidsAsteroids2D.oxt (modified) (1 prop)
• data/levels/templates/endurancetest_template.oxt (modified) (1 prop)
• data/levels/templates/enemyFlappyOrx.oxt (modified) (1 prop)
• data/levels/templates/fastship.oxt (modified) (1 prop)
• data/levels/templates/spaceshipAsteroids2D.oxt (modified) (1 prop)
• data/levels/templates/spaceshipFlappyOrx.oxt (modified) (1 prop)
• data/overlays/Asteroids2DHUD.oxo (modified) (1 prop)
• data/overlays/FlappyOrxHUD.oxo (modified) (1 prop)
• data/overlays/SOBHUD.oxo (modified) (1 prop)
• data/overlays/StoryModeHUD.oxo (modified) (1 prop)
• data/overlays/StoryModeHUD2.oxo (modified) (1 prop)
• src/modules/asteroidmining/AsteroidMinable.cc (modified) (1 prop)
• src/modules/asteroidmining/AsteroidMinable.h (modified) (1 prop)
• src/modules/asteroidmining/AsteroidMiningPrereqs.h (modified) (1 prop)
• src/modules/asteroidmining/CMakeLists.txt (modified) (1 prop)
• src/modules/asteroidmining/SpicedAsteroidBelt.cc (modified) (1 prop)
• src/modules/asteroidmining/SpicedAsteroidBelt.h (modified) (1 prop)
• src/modules/asteroidmining/SpicedAsteroidField.cc (modified) (1 prop)
• src/modules/asteroidmining/SpicedAsteroidField.h (modified) (1 prop)
• src/modules/asteroids2D/Asteroids2D.cc (modified) (1 prop)
• src/modules/asteroids2D/Asteroids2D.h (modified) (1 prop)
• src/modules/asteroids2D/Asteroids2DCenterPoint.cc (modified) (1 prop)
• src/modules/asteroids2D/Asteroids2DCenterPoint.h (modified) (1 prop)
• src/modules/asteroids2D/Asteroids2DHUDinfo.cc (modified) (1 prop)
• src/modules/asteroids2D/Asteroids2DHUDinfo.h (modified) (1 prop)
• src/modules/asteroids2D/Asteroids2DPrereqs.h (modified) (1 prop)
• src/modules/asteroids2D/Asteroids2DShip.cc (modified) (1 prop)
• src/modules/asteroids2D/Asteroids2DShip.h (modified) (1 prop)
• src/modules/asteroids2D/Asteroids2DStone.cc (modified) (1 prop)
• src/modules/asteroids2D/Asteroids2DStone.h (modified) (1 prop)
• src/modules/asteroids2D/Asteroids2DWeapon.cc (modified) (1 prop)
• src/modules/asteroids2D/Asteroids2DWeapon.h (modified) (1 prop)
• src/modules/asteroids2D/CMakeLists.txt (modified) (1 prop)
• src/modules/dialog/Answer.cc (modified) (1 prop)
• src/modules/dialog/Answer.h (modified) (1 prop)
• src/modules/dialog/AnswerId.cc (modified) (1 prop)
• src/modules/dialog/AnswerId.h (modified) (1 prop)
• src/modules/dialog/CMakeLists.txt (modified) (1 prop)
• src/modules/dialog/Dialog.cc (modified) (1 prop)
• src/modules/dialog/Dialog.h (modified) (1 prop)
• src/modules/dialog/DialogManager.cc (modified) (1 prop)
• src/modules/dialog/DialogManager.h (modified) (1 prop)
• src/modules/dialog/DialogPrereqs.h (modified) (1 prop)
• src/modules/dialog/Question.cc (modified) (1 prop)
• src/modules/dialog/Question.h (modified) (1 prop)
• src/modules/flappyorx/CMakeLists.txt (modified) (1 prop)
• src/modules/flappyorx/FlappyOrx.cc (modified) (1 prop)
• src/modules/flappyorx/FlappyOrx.h (modified) (1 prop)
• src/modules/flappyorx/FlappyOrxHUDinfo.cc (modified) (1 prop)
• src/modules/flappyorx/FlappyOrxHUDinfo.h (modified) (1 prop)
• src/modules/flappyorx/FlappyOrxPrereqs.h (modified) (1 prop)
• src/modules/flappyorx/FlappyOrxShip.cc (modified) (1 prop)
• src/modules/flappyorx/FlappyOrxShip.h (modified) (1 prop)
• src/modules/overlays/hud/HUDPickupSystem.cc (modified) (1 prop)
• src/modules/overlays/hud/HUDPickupSystem.h (modified) (1 prop)
• src/modules/overlays/hud/StoryModeHUD.cc (modified) (1 prop)
• src/modules/overlays/hud/StoryModeHUD.h (modified) (1 prop)
• src/modules/superorxobros/CMakeLists.txt (modified) (1 prop)
• src/modules/superorxobros/SOB.cc (modified) (1 prop)
• src/modules/superorxobros/SOB.h (modified) (1 prop)
• src/modules/superorxobros/SOBCastlestone.cc (modified) (1 prop)
• src/modules/superorxobros/SOBCastlestone.h (modified) (1 prop)
• src/modules/superorxobros/SOBCenterpoint.cc (modified) (1 prop)
• src/modules/superorxobros/SOBCenterpoint.h (modified) (1 prop)
• src/modules/superorxobros/SOBCoin.cc (modified) (1 prop)
• src/modules/superorxobros/SOBCoin.h (modified) (1 prop)
• src/modules/superorxobros/SOBFigure.cc (modified) (1 prop)
• src/modules/superorxobros/SOBFigure.h (modified) (1 prop)
• src/modules/superorxobros/SOBFireball.cc (modified) (1 prop)
• src/modules/superorxobros/SOBFireball.h (modified) (1 prop)
• src/modules/superorxobros/SOBFlagstone.cc (modified) (1 prop)
• src/modules/superorxobros/SOBFlagstone.h (modified) (1 prop)
• src/modules/superorxobros/SOBGumba.cc (modified) (1 prop)
• src/modules/superorxobros/SOBGumba.h (modified) (1 prop)
• src/modules/superorxobros/SOBGumbaBoss.cc (modified) (1 prop)
• src/modules/superorxobros/SOBGumbaBoss.h (modified) (1 prop)
• src/modules/superorxobros/SOBHUDInfo.cc (modified) (1 prop)
• src/modules/superorxobros/SOBHUDInfo.h (modified) (1 prop)
• src/modules/superorxobros/SOBItem.cc (modified) (1 prop)
• src/modules/superorxobros/SOBItem.h (modified) (1 prop)
• src/modules/superorxobros/SOBMushroom.cc (modified) (1 prop)
• src/modules/superorxobros/SOBMushroom.h (modified) (1 prop)
• src/modules/superorxobros/SOBPrereqs.h (modified) (1 prop)
• src/modules/superorxobros/SOBQBlock.cc (modified) (1 prop)
• src/modules/superorxobros/SOBQBlock.h (modified) (1 prop)
• src/modules/weapons/munitions/FlameMunition.cc (modified) (1 prop)
• src/modules/weapons/munitions/FlameMunition.h (modified) (1 prop)
• src/modules/weapons/projectiles/FlameGunProjectile.cc (modified) (1 prop)
• src/modules/weapons/projectiles/FlameGunProjectile.h (modified) (1 prop)
• src/modules/weapons/weaponmodes/FlameGun.cc (modified) (1 prop)
• src/modules/weapons/weaponmodes/FlameGun.h (modified) (1 prop)
• src/orxonox/Highscore.cc (modified) (1 prop)
• src/orxonox/Highscore.h (modified) (1 prop)
• src/orxonox/controllers/ArrowController.cc (modified) (1 prop)
• src/orxonox/controllers/ArrowController.h (modified) (1 prop)
• src/orxonox/gametypes/StoryMode.cc (modified) (1 prop)
• src/orxonox/gametypes/StoryMode.h (modified) (1 prop)
• src/orxonox/worldentities/Arrow.cc (modified) (1 prop)
• src/orxonox/worldentities/Arrow.h (modified) (1 prop)
• src/orxonox/worldentities/NameableStaticEntity.cc (modified) (1 prop)
• src/orxonox/worldentities/NameableStaticEntity.h (modified) (1 prop)
• src/orxonox/worldentities/pawns/ShootableObstacle.cc (modified) (1 prop)
• src/orxonox/worldentities/pawns/ShootableObstacle.h (modified) (1 prop)
• src/orxonox/worldentities/pawns/StoryModePawn.cc (modified) (1 prop)
• src/orxonox/worldentities/pawns/StoryModePawn.h (modified) (1 prop)