# # ChangeLog for code/branches # # Generated by Trac 1.0.9 # May 17, 2024, 1:11:46 AM Mon, 19 Feb 2018 23:09:09 GMT landauf [11782] * code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DStone.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DStone.h (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/Answer.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/Answer.h (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/AnswerId.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/AnswerId.h (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/Dialog.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/Dialog.h (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/DialogManager.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/Question.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/Question.h (modified) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/NameableStaticEntity.cc (modified) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/NameableStaticEntity.h (modified) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/ShootableObstacle.h (modified) tabs -> spaces Mon, 19 Feb 2018 22:48:23 GMT landauf [11781] * code/branches/Presentation_HS17_merge/data/gui/layouts/Dialog.layout (modified) * code/branches/Presentation_HS17_merge/data/gui/layouts/HighscoreMenu.layout (modified) * code/branches/Presentation_HS17_merge/data/gui/scripts/Dialog.lua (modified) * code/branches/Presentation_HS17_merge/data/gui/scripts/HighscoreMenu.lua (modified) * code/branches/Presentation_HS17_merge/data/gui/scripts/TestDialogButttons.lua (modified) * code/branches/Presentation_HS17_merge/data/levels/ArrowLevel.oxw (modified) * code/branches/Presentation_HS17_merge/data/levels/AsteroidFarming.oxw (modified) * code/branches/Presentation_HS17_merge/data/levels/Asteroids2D.oxw (modified) * code/branches/Presentation_HS17_merge/data/levels/DialogShowcase.oxw (modified) * code/branches/Presentation_HS17_merge/data/levels/Endurancefinal.oxw (modified) * code/branches/Presentation_HS17_merge/data/levels/FlappyOrx.oxw (modified) * code/branches/Presentation_HS17_merge/data/levels/MilleniumFalconTest.oxw (modified) * code/branches/Presentation_HS17_merge/data/levels/NC_StoryModeLevel.oxw (modified) * code/branches/Presentation_HS17_merge/data/levels/ProtectBoss.oxw (modified) * code/branches/Presentation_HS17_merge/data/levels/SOB.oxw (modified) * code/branches/Presentation_HS17_merge/data/levels/StoryModeMap.oxw (modified) * code/branches/Presentation_HS17_merge/data/levels/includes/MFalconWeapon.oxi (modified) * code/branches/Presentation_HS17_merge/data/levels/includes/asteroids2DWeapon.oxi (modified) * code/branches/Presentation_HS17_merge/data/levels/newnewnewspacerace.oxw (modified) * code/branches/Presentation_HS17_merge/data/levels/templates/MFalcon.oxt (modified) * code/branches/Presentation_HS17_merge/data/levels/templates/StoryMode.oxt (modified) * code/branches/Presentation_HS17_merge/data/levels/templates/StoryModeEscort.oxt (modified) * code/branches/Presentation_HS17_merge/data/levels/templates/asteroidsAsteroids2D.oxt (modified) * code/branches/Presentation_HS17_merge/data/levels/templates/endurancetest_template.oxt (modified) * code/branches/Presentation_HS17_merge/data/levels/templates/enemyFlappyOrx.oxt (modified) * code/branches/Presentation_HS17_merge/data/levels/templates/fastship.oxt (modified) * code/branches/Presentation_HS17_merge/data/levels/templates/spaceshipAsteroids2D.oxt (modified) * code/branches/Presentation_HS17_merge/data/levels/templates/spaceshipFlappyOrx.oxt (modified) * code/branches/Presentation_HS17_merge/data/overlays/Asteroids2DHUD.oxo (modified) * code/branches/Presentation_HS17_merge/data/overlays/FlappyOrxHUD.oxo (modified) * code/branches/Presentation_HS17_merge/data/overlays/SOBHUD.oxo (modified) * code/branches/Presentation_HS17_merge/data/overlays/StoryModeHUD.oxo (modified) * code/branches/Presentation_HS17_merge/data/overlays/StoryModeHUD2.oxo (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMinable.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMinable.h (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMiningPrereqs.h (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/CMakeLists.txt (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidBelt.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidBelt.h (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidField.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidField.h (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2D.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2D.h (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DCenterPoint.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DCenterPoint.h (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DHUDinfo.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DHUDinfo.h (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DPrereqs.h (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DShip.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DShip.h (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DStone.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DStone.h (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DWeapon.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DWeapon.h (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroids2D/CMakeLists.txt (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/Answer.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/Answer.h (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/AnswerId.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/AnswerId.h (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/CMakeLists.txt (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/Dialog.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/Dialog.h (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/DialogManager.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/DialogManager.h (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/DialogPrereqs.h (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/Question.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/Question.h (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/CMakeLists.txt (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.h (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxHUDinfo.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxHUDinfo.h (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxPrereqs.h (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxShip.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxShip.h (modified) * code/branches/Presentation_HS17_merge/src/modules/overlays/hud/HUDPickupSystem.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/overlays/hud/HUDPickupSystem.h (modified) * code/branches/Presentation_HS17_merge/src/modules/overlays/hud/StoryModeHUD.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/overlays/hud/StoryModeHUD.h (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/CMakeLists.txt (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.h (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCastlestone.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCastlestone.h (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCenterpoint.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCenterpoint.h (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCoin.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCoin.h (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFigure.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFigure.h (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFireball.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFireball.h (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFlagstone.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFlagstone.h (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumba.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumba.h (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumbaBoss.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumbaBoss.h (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBHUDInfo.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBHUDInfo.h (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBItem.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBItem.h (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBMushroom.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBMushroom.h (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBPrereqs.h (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBQBlock.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBQBlock.h (modified) * code/branches/Presentation_HS17_merge/src/modules/weapons/munitions/FlameMunition.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/weapons/munitions/FlameMunition.h (modified) * code/branches/Presentation_HS17_merge/src/modules/weapons/projectiles/FlameGunProjectile.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/weapons/projectiles/FlameGunProjectile.h (modified) * code/branches/Presentation_HS17_merge/src/modules/weapons/weaponmodes/FlameGun.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/weapons/weaponmodes/FlameGun.h (modified) * code/branches/Presentation_HS17_merge/src/orxonox/Highscore.cc (modified) * code/branches/Presentation_HS17_merge/src/orxonox/Highscore.h (modified) * code/branches/Presentation_HS17_merge/src/orxonox/controllers/ArrowController.cc (modified) * code/branches/Presentation_HS17_merge/src/orxonox/controllers/ArrowController.h (modified) * code/branches/Presentation_HS17_merge/src/orxonox/gametypes/StoryMode.cc (modified) * code/branches/Presentation_HS17_merge/src/orxonox/gametypes/StoryMode.h (modified) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/Arrow.cc (modified) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/Arrow.h (modified) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/NameableStaticEntity.cc (modified) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/NameableStaticEntity.h (modified) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/ShootableObstacle.cc (modified) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/ShootableObstacle.h (modified) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/StoryModePawn.cc (modified) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/StoryModePawn.h (modified) eol-style native (no changes in code) Mon, 19 Feb 2018 21:51:15 GMT landauf [11780] * code/branches/Presentation_HS17_merge/data/levels/ArrowLevel.oxw (modified) [Waypoints_HS17] use uppercase mesh-name to avoid errors Mon, 19 Feb 2018 21:33:09 GMT landauf [11778] * code/branches/Presentation_HS17_merge/data/levels/ArrowLevel.oxw (modified) [Waypoints_HS17] fixed run-time warning when loading level Mon, 19 Feb 2018 21:32:12 GMT landauf [11777] * code/branches/Presentation_HS17_merge/data/levels/ArrowLevel.oxw (modified) * code/branches/Presentation_HS17_merge/src/orxonox/controllers/ArrowController.cc (modified) * code/branches/Presentation_HS17_merge/src/orxonox/controllers/ArrowController.h (modified) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/Arrow.cc (modified) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/Arrow.h (modified) [Waypoints_HS17] removed lots of copy-paste- and otherwise ... Sun, 18 Feb 2018 23:34:42 GMT landauf [11776] * code/branches/Presentation_HS17_merge/data/levels/emptyLevel.oxw (modified) * code/branches/Presentation_HS17_merge/data/levels/tutorial.oxw (modified) * code/branches/Presentation_HS17_merge/data/overlays/HUDTemplate_test.oxo (deleted) * code/branches/Presentation_HS17_merge/src/modules/overlays/hud/CMakeLists.txt (modified) * code/branches/Presentation_HS17_merge/src/modules/overlays/hud/HUDWaypoints.cc (deleted) * code/branches/Presentation_HS17_merge/src/modules/overlays/hud/HUDWaypoints.h (deleted) * code/branches/Presentation_HS17_merge/src/modules/questsystem/Quest.cc (modified) * code/branches/Presentation_HS17_merge/src/orxonox/controllers/AutonomousDroneController.cc (deleted) * code/branches/Presentation_HS17_merge/src/orxonox/controllers/AutonomousDroneController.h (deleted) * code/branches/Presentation_HS17_merge/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/Presentation_HS17_merge/src/orxonox/controllers/WaypointArrow.cc (deleted) * code/branches/Presentation_HS17_merge/src/orxonox/controllers/WaypointArrow.h (deleted) * code/branches/Presentation_HS17_merge/src/orxonox/graphics/Model.cc (modified) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/AutonomousDrone.cc (deleted) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/AutonomousDrone.h (deleted) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/CMakeLists.txt (modified) [Waypoints_HS17] removed/reverted a huge number of unwanted changes Sun, 18 Feb 2018 22:09:54 GMT landauf [11775] * code/branches/Presentation_HS17_merge/src/modules/overlays/hud/HUDWaypoints.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/overlays/hud/HUDWaypoints.h (modified) [Waypoints_HS17] fixed build Sun, 18 Feb 2018 17:42:50 GMT landauf [11774] * code/branches/Presentation_HS17_merge (modified) * code/branches/Presentation_HS17_merge/data/levels/ArrowLevel.oxw (copied) * code/branches/Presentation_HS17_merge/data/levels/emptyLevel.oxw (modified) * code/branches/Presentation_HS17_merge/data/levels/tutorial.oxw (modified) * code/branches/Presentation_HS17_merge/data/overlays/HUDTemplate_test.oxo (copied) * code/branches/Presentation_HS17_merge/src/modules/overlays/hud/CMakeLists.txt (modified) * code/branches/Presentation_HS17_merge/src/modules/overlays/hud/HUDWaypoints.cc (copied) * code/branches/Presentation_HS17_merge/src/modules/overlays/hud/HUDWaypoints.h (copied) * code/branches/Presentation_HS17_merge/src/modules/questsystem/Quest.cc (modified) * code/branches/Presentation_HS17_merge/src/orxonox/controllers/ArrowController.cc (copied) * code/branches/Presentation_HS17_merge/src/orxonox/controllers/ArrowController.h (copied) * code/branches/Presentation_HS17_merge/src/orxonox/controllers/AutonomousDroneController.cc (copied) * code/branches/Presentation_HS17_merge/src/orxonox/controllers/AutonomousDroneController.h (copied) * code/branches/Presentation_HS17_merge/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/Presentation_HS17_merge/src/orxonox/controllers/WaypointArrow.cc (copied) * code/branches/Presentation_HS17_merge/src/orxonox/controllers/WaypointArrow.h (copied) * code/branches/Presentation_HS17_merge/src/orxonox/graphics/Model.cc (modified) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/Arrow.cc (copied) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/Arrow.h (copied) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/AutonomousDrone.cc (copied) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/AutonomousDrone.h (copied) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/CMakeLists.txt (modified) merged Waypoints_HS17 Sun, 18 Feb 2018 17:21:10 GMT landauf [11773] * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.h (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFireball.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBQBlock.cc (modified) [SOBv2_HS17] fixed a bunch of compiler warnings (MSVC) Sun, 18 Feb 2018 16:49:32 GMT landauf [11772] * code/branches/Presentation_HS17_merge/data/levels/SOB.oxw (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFireball.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumba.cc (modified) [SOBv2_HS17] fixed a bunch of runtime warnings Sun, 18 Feb 2018 16:33:19 GMT landauf [11770] * code/branches/Presentation_HS17_merge/src/libraries/tools/Mesh.cc (modified) * code/branches/Presentation_HS17_merge/src/libraries/tools/Mesh.h (modified) * code/branches/Presentation_HS17_merge/src/orxonox/graphics/Model.cc (modified) * code/branches/Presentation_HS17_merge/src/orxonox/graphics/Model.h (modified) [SOBv2_HS17] some cleanup in Model/Mesh Sun, 18 Feb 2018 16:23:29 GMT landauf [11769] * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.h (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCoin.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCoin.h (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFigure.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFigure.h (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFireball.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFireball.h (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFlagstone.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumba.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumba.h (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumbaBoss.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBMushroom.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBMushroom.h (modified) [SOBv2_HS17] removed unused variables, added some initializations Sun, 18 Feb 2018 15:27:43 GMT landauf [11768] * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFigure.cc (modified) * code/branches/Presentation_HS17_merge/src/orxonox/Highscore.cc (modified) * code/branches/Presentation_HS17_merge/src/orxonox/Highscore.h (modified) [SOBv2_HS17] fixed build (Highscopre API has changed) Sun, 18 Feb 2018 15:10:35 GMT landauf [11767] * code/branches/Presentation_HS17_merge/BlenderFilesSOB (deleted) * code/branches/Presentation_HS17_merge/SOB.oxw (deleted) * code/branches/Presentation_HS17_merge/TRANSFER (deleted) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/Orxo.cc (deleted) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/Orxo.h (deleted) [SOBv2_HS17] removed a bunch of files that shouldn't be here Sun, 18 Feb 2018 15:02:50 GMT landauf [11766] * code/branches/Presentation_HS17_merge (modified) * code/branches/Presentation_HS17_merge/BlenderFilesSOB (copied) * code/branches/Presentation_HS17_merge/SOB.oxw (copied) * code/branches/Presentation_HS17_merge/TRANSFER (copied) * code/branches/Presentation_HS17_merge/data/levels/SOB.oxw (modified) * code/branches/Presentation_HS17_merge/src/libraries/tools/Mesh.cc (modified) * code/branches/Presentation_HS17_merge/src/libraries/tools/Mesh.h (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/CMakeLists.txt (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.h (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFigure.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFigure.h (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFireball.cc (copied) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFireball.h (copied) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFlagstone.h (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumba.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumba.h (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumbaBoss.cc (copied) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumbaBoss.h (copied) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBPrereqs.h (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBQBlock.cc (modified) * code/branches/Presentation_HS17_merge/src/orxonox/graphics/Model.cc (modified) * code/branches/Presentation_HS17_merge/src/orxonox/graphics/Model.h (modified) merged SOBv2_HS17 Sun, 18 Feb 2018 00:32:05 GMT landauf [11765] * code/branches/Presentation_HS17_merge/data/levels/ProtectBoss.oxw (modified) * code/branches/Presentation_HS17_merge/data/levels/emptyLevel.oxw (modified) [ProtectBoss_HS17] fixed level and reverted unwanted changes from ... Sun, 18 Feb 2018 00:17:48 GMT landauf [11764] * code/branches/Presentation_HS17_merge (modified) * code/branches/Presentation_HS17_merge/data/levels/ProtectBoss.oxw (copied) * code/branches/Presentation_HS17_merge/data/levels/emptyLevel.oxw (modified) * code/branches/Presentation_HS17_merge/src/orxonox/controllers/DroneController.cc (modified) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/CMakeLists.txt (modified) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/ShootableObstacle.cc (copied) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/ShootableObstacle.h (copied) merged ProtectBoss_HS17 Sun, 18 Feb 2018 00:13:20 GMT landauf [11763] * code/branches/Presentation_HS17_merge/data/levels/FlappyOrx.oxw (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.cc (modified) [FlappyOrx_HS17] found better solution to avoid warning when loading ... Sun, 18 Feb 2018 00:02:47 GMT landauf [11762] * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.cc (modified) [FlappyOrx_HS17] bugfix: always check for queue size before accessing ... Sat, 17 Feb 2018 23:50:22 GMT landauf [11761] * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxShip.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxShip.h (modified) [FlappyOrx_HS17] bugfix: velocity was never initialized (expecially ... Sat, 17 Feb 2018 22:50:25 GMT landauf [11760] * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.h (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxHUDinfo.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxHUDinfo.h (modified) [FlappyOrx_HS17] some cleanup Sat, 17 Feb 2018 22:43:12 GMT landauf [11759] * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxHUDinfo.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxShip.cc (modified) [FlappyOrx_HS17] initialize all variables Sat, 17 Feb 2018 22:36:30 GMT landauf [11758] * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.h (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxHUDinfo.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxHUDinfo.h (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxShip.h (modified) [FlappyOrx_HS17] removed unused variables Sat, 17 Feb 2018 22:06:06 GMT landauf [11757] * code/branches/Presentation_HS17_merge/data/levels/FlappyOrx.oxw (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/CMakeLists.txt (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.h (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxCenterPoint.cc (deleted) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxCenterPoint.h (deleted) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxPrereqs.h (modified) [FlappyOrx_HS17] removed FlappyOrxCenterPoint, it doesn't seem to be ... Sat, 17 Feb 2018 21:54:16 GMT landauf [11756] * code/branches/Presentation_HS17_merge/data/levels/FlappyOrx.oxw (modified) [FlappyOrx_HS17] avoid warning when loading level Thu, 15 Feb 2018 23:37:37 GMT landauf [11755] * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.h (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxHUDinfo.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxShip.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxShip.h (modified) [FlappyOrx_HS17] fixed some warnings (MSVC) Thu, 15 Feb 2018 22:42:36 GMT landauf [11754] * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxShip.cc (modified) [FlappyOrx_HS17] fixed build (Highscopre API has changed; usleep is ... Thu, 15 Feb 2018 22:36:40 GMT landauf [11753] * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxPrereqs.h (modified) [FlappyOrx_HS17] fixed dll linkage for MSVC Thu, 15 Feb 2018 22:32:36 GMT landauf [11752] * code/branches/Presentation_HS17_merge (modified) * code/branches/Presentation_HS17_merge/data/levels/FlappyOrx.oxw (copied) * code/branches/Presentation_HS17_merge/data/levels/templates/enemyFlappyOrx.oxt (copied) * code/branches/Presentation_HS17_merge/data/levels/templates/spaceshipFlappyOrx.oxt (copied) * code/branches/Presentation_HS17_merge/data/overlays/FlappyOrxHUD.oxo (copied) * code/branches/Presentation_HS17_merge/data/particle/fire3.particle (modified) * code/branches/Presentation_HS17_merge/src/modules/CMakeLists.txt (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx (copied) merged FlappyOrx_HS17 Thu, 15 Feb 2018 22:29:31 GMT landauf [11751] * code/branches/Presentation_HS17_merge/data/gui/layouts/Dialog.layout (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/DialogManager.cc (modified) [Dialog_HS17] details Thu, 15 Feb 2018 22:18:38 GMT landauf [11750] * code/branches/Presentation_HS17_merge/src/modules/dialog/Dialog.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/Dialog.h (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/DialogManager.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/Question.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/Question.h (modified) [Dialog_HS17] cleanup XMLPort collection getters Thu, 15 Feb 2018 21:42:30 GMT landauf [11749] * code/branches/Presentation_HS17_merge/src/modules/dialog/Answer.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/Answer.h (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/AnswerId.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/AnswerId.h (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/Dialog.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/Dialog.h (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/DialogManager.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/DialogManager.h (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/Question.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/Question.h (modified) [Dialog_HS17] added license text Thu, 15 Feb 2018 21:36:32 GMT landauf [11748] * code/branches/Presentation_HS17_merge/src/modules/dialog/AnswerId.h (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/DialogManager.h (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/DialogPrereqs.h (modified) [Dialog_HS17] fixed dll linkage for MSVC Thu, 15 Feb 2018 21:28:52 GMT landauf [11747] * code/branches/Presentation_HS17_merge (modified) * code/branches/Presentation_HS17_merge/data/gui/layouts/Dialog.layout (copied) * code/branches/Presentation_HS17_merge/data/gui/layouts/Dialogue.layout (deleted) * code/branches/Presentation_HS17_merge/data/gui/scripts/Dialog.lua (copied) * code/branches/Presentation_HS17_merge/data/gui/scripts/Dialogue.lua (deleted) * code/branches/Presentation_HS17_merge/data/levels/DialogShowcase.oxw (copied) * code/branches/Presentation_HS17_merge/data/levels/DialogueShowcase.oxw (deleted) * code/branches/Presentation_HS17_merge/data/overlays/HUDTemplates3.oxo (modified) * code/branches/Presentation_HS17_merge/src/modules/CMakeLists.txt (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog (copied) * code/branches/Presentation_HS17_merge/src/modules/dialogue (deleted) merged Dialog_HS17 Wed, 14 Feb 2018 23:11:35 GMT landauf [11746] * code/branches/Presentation_HS17_merge/data/overlays/HUDTemplatesFPS.oxo (modified) * code/branches/Presentation_HS17_merge/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/Presentation_HS17_merge/src/orxonox/controllers/HumanController.h (modified) * code/branches/Presentation_HS17_merge/src/orxonox/interfaces/RadarViewable.h (modified) removed some more occurrences of "Map" (a class that doesn't seem to ... Wed, 14 Feb 2018 23:11:04 GMT landauf [11745] * code/branches/Presentation_HS17_merge/src/modules/overlays/hud/StoryModeHUD.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/overlays/hud/StoryModeHUD.h (modified) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/NameableStaticEntity.h (modified) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/StoryModePawn.cc (modified) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/StoryModePawn.h (modified) [CampaignMap_HS17] some cleanup Wed, 14 Feb 2018 22:44:50 GMT landauf [11744] * code/branches/Presentation_HS17_merge/data/levels/NC_StoryModeLevel (deleted) * code/branches/Presentation_HS17_merge/src/orxonox/gametypes/StoryMode.cc (modified) * code/branches/Presentation_HS17_merge/src/orxonox/gametypes/StoryMode.h (modified) * code/branches/Presentation_HS17_merge/src/orxonox/infos/Bot.cc (modified) * code/branches/Presentation_HS17_merge/svn-commit.tmp (deleted) [CampaignMap_HS17] reverted some unwanted changes Wed, 14 Feb 2018 22:31:43 GMT landauf [11743] * code/branches/Presentation_HS17_merge (modified) * code/branches/Presentation_HS17_merge/data/levels/NC_StoryModeLevel (copied) * code/branches/Presentation_HS17_merge/data/levels/NC_StoryModeLevel.oxw (copied) * code/branches/Presentation_HS17_merge/data/levels/templates/StoryModeEscort.oxt (copied) * code/branches/Presentation_HS17_merge/data/overlays/HUDTemplates3.oxo (modified) * code/branches/Presentation_HS17_merge/data/overlays/StoryModeHUD.oxo (modified) * code/branches/Presentation_HS17_merge/data/overlays/StoryModeHUD2.oxo (copied) * code/branches/Presentation_HS17_merge/src/modules/overlays/hud/CMakeLists.txt (modified) * code/branches/Presentation_HS17_merge/src/modules/overlays/hud/StoryModeHUD.cc (copied) * code/branches/Presentation_HS17_merge/src/modules/overlays/hud/StoryModeHUD.h (copied) * code/branches/Presentation_HS17_merge/src/orxonox/gametypes/StoryMode.cc (modified) * code/branches/Presentation_HS17_merge/src/orxonox/gametypes/StoryMode.h (modified) * code/branches/Presentation_HS17_merge/src/orxonox/infos/Bot.cc (modified) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/CMakeLists.txt (modified) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/NameableStaticEntity.cc (copied) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/NameableStaticEntity.h (copied) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/CMakeLists.txt (modified) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/StoryModePawn.cc (copied) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/StoryModePawn.h (copied) * code/branches/Presentation_HS17_merge/svn-commit.tmp (copied) merged CampaignMap_HS17 Sun, 11 Feb 2018 23:24:38 GMT landauf [11742] * code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DStone.cc (modified) [Asteroid_HS17] use enum instead of string Sun, 11 Feb 2018 23:24:13 GMT landauf [11741] * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMinable.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMinable.h (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidBelt.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidBelt.h (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidField.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidField.h (modified) [AsteroidMining_HS17] fixed author Sun, 11 Feb 2018 23:20:18 GMT landauf [11740] * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidBelt.cc (modified) [AsteroidMining_HS17] use existing definitions of pi and abs Sun, 11 Feb 2018 23:17:34 GMT landauf [11739] * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMinable.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMinable.h (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidBelt.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidBelt.h (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidField.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidField.h (modified) [AsteroidMining_HS17] fixed a bunch of compiler warnings Sun, 11 Feb 2018 22:31:58 GMT landauf [11738] * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMinable.cc (modified) [AsteroidMining_HS17] fixed two buffer overflows that caused random ... Sun, 11 Feb 2018 21:43:00 GMT landauf [11737] * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/CMakeLists.txt (modified) fixed dependency Sun, 11 Feb 2018 21:31:46 GMT landauf [11736] * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMinable.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMinable.h (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/CMakeLists.txt (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidBelt.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidBelt.h (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidField.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidField.h (modified) [AsteroidMining_HS17] some cleanup - Field and Belt should not depend ... Sun, 11 Feb 2018 18:19:57 GMT landauf [11735] * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMinable.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidBelt.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidField.cc (modified) [AsteroidMining_HS17] fixed a bunch of memory leaks Sun, 11 Feb 2018 17:06:18 GMT landauf [11734] * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMinable.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/pickup/Pickup.h (modified) * code/branches/Presentation_HS17_merge/src/modules/pickup/PickupSpawner.h (modified) [AsteroidMining_HS17] cleanup changes in common code Sun, 11 Feb 2018 17:04:36 GMT landauf [11733] * code/branches/Presentation_HS17_merge/data/levels/AsteroidFarming.oxw (modified) [AsteroidMining_HS17] fixed level file Sun, 11 Feb 2018 17:04:01 GMT landauf [11732] * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMinable.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMinable.h (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidBelt.cc (modified) [AsteroidMining_HS17] fixed a bunch of compile- and run-time errors ... Sun, 11 Feb 2018 16:13:24 GMT landauf [11731] * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMinable.h (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMiningPrereqs.h (added) * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidBelt.h (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidField.h (modified) [AsteroidMining_HS17] fixed dll linkage for MSVC Sun, 11 Feb 2018 15:52:54 GMT landauf [11730] * code/branches/Presentation_HS17_merge (modified) * code/branches/Presentation_HS17_merge/data/levels/AsteroidFarming.oxw (copied) * code/branches/Presentation_HS17_merge/src/modules/CMakeLists.txt (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroidmining (copied) * code/branches/Presentation_HS17_merge/src/modules/pickup/Pickup.h (modified) * code/branches/Presentation_HS17_merge/src/modules/pickup/PickupSpawner.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/pickup/PickupSpawner.h (modified) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/Pawn.h (modified) merged AsteroidMining_HS17 Sun, 11 Feb 2018 15:49:56 GMT landauf [11729] * code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2D.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2D.h (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DStone.h (modified) * code/branches/Presentation_HS17_merge/src/modules/dodgerace/DodgeRace.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/dodgerace/DodgeRace.h (modified) fixed crash when setting highscore Sun, 11 Feb 2018 15:13:55 GMT landauf [11728] * code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DStone.cc (modified) [Asteroid_HS17] fixed a bunch of bugs in the placement of stones Sun, 11 Feb 2018 14:44:49 GMT landauf [11727] * code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2D.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2D.h (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DCenterPoint.h (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DHUDinfo.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DHUDinfo.h (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DPrereqs.h (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DShip.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DShip.h (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DWeapon.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DWeapon.h (modified) [Asteroid_HS17] cleanup (mostly includes) Sat, 10 Feb 2018 23:33:56 GMT landauf [11726] * code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2D.cc (modified) [Asteroid_HS17] fixed build - highscore API was changed in the meantime Sat, 10 Feb 2018 23:26:40 GMT landauf [11725] * code/branches/Presentation_HS17_merge (modified) * code/branches/Presentation_HS17_merge/data/levels/Asteroids2D.oxw (copied) * code/branches/Presentation_HS17_merge/data/levels/includes/asteroids2DWeapon.oxi (copied) * code/branches/Presentation_HS17_merge/data/levels/templates/asteroidsAsteroids2D.oxt (copied) * code/branches/Presentation_HS17_merge/data/levels/templates/spaceshipAsteroids2D.oxt (copied) * code/branches/Presentation_HS17_merge/data/overlays/Asteroids2DHUD.oxo (copied) * code/branches/Presentation_HS17_merge/src/modules/CMakeLists.txt (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroids2D (copied) merged Asteroid_HS17 Sat, 10 Feb 2018 23:24:16 GMT landauf [11724] * code/branches/Presentation_HS17_merge/src/modules/pickup/PickupPrereqs.h (modified) fixed compiler warning Sat, 10 Feb 2018 23:00:43 GMT landauf [11723] * code/branches/Presentation_HS17_merge (copied) created new branch to merge HS17 projects back to trunk Mon, 18 Dec 2017 11:40:00 GMT patricwi [11690] * code/branches/Presentation_HS17 (modified) * code/branches/Presentation_HS17/data/levels/ArrowLevel.oxw (deleted) * code/branches/Presentation_HS17/data/levels/scriptableControllerTest.oxw (deleted) * code/branches/Presentation_HS17/data/levels/scripts (deleted) * code/branches/Presentation_HS17/data/overlays/HUDPickupTemplate.oxo (modified) * code/branches/Presentation_HS17/data/overlays/HUDTemplate_test.oxo (copied) * code/branches/Presentation_HS17/data/overlays/HUDTemplates3.oxo (modified) * code/branches/Presentation_HS17/src/libraries/core/BaseObject.h (modified) * code/branches/Presentation_HS17/src/libraries/tools/Timer.cc (modified) * code/branches/Presentation_HS17/src/libraries/tools/Timer.h (modified) * code/branches/Presentation_HS17/src/modules/overlays/hud/CMakeLists.txt (modified) * code/branches/Presentation_HS17/src/modules/overlays/hud/HUDWaypoints.cc (deleted) * code/branches/Presentation_HS17/src/modules/overlays/hud/HUDWaypoints.h (deleted) * code/branches/Presentation_HS17/src/modules/questsystem/Quest.cc (modified) * code/branches/Presentation_HS17/src/orxonox/CMakeLists.txt (modified) * code/branches/Presentation_HS17/src/orxonox/Level.cc (modified) * code/branches/Presentation_HS17/src/orxonox/Level.h (modified) * code/branches/Presentation_HS17/src/orxonox/controllers/ArrowController.cc (deleted) * code/branches/Presentation_HS17/src/orxonox/controllers/ArrowController.h (deleted) * code/branches/Presentation_HS17/src/orxonox/controllers/AutonomousDroneController.cc (deleted) * code/branches/Presentation_HS17/src/orxonox/controllers/AutonomousDroneController.h (deleted) * code/branches/Presentation_HS17/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/Presentation_HS17/src/orxonox/controllers/WaypointArrow.cc (deleted) * code/branches/Presentation_HS17/src/orxonox/controllers/WaypointArrow.h (deleted) * code/branches/Presentation_HS17/src/orxonox/graphics/Model.cc (modified) * code/branches/Presentation_HS17/src/orxonox/infos/GametypeInfo.cc (modified) * code/branches/Presentation_HS17/src/orxonox/infos/GametypeInfo.h (modified) * code/branches/Presentation_HS17/src/orxonox/infos/HumanPlayer.cc (modified) * code/branches/Presentation_HS17/src/orxonox/items/ShipPart.cc (modified) * code/branches/Presentation_HS17/src/orxonox/scriptablecontroller (deleted) * code/branches/Presentation_HS17/src/orxonox/worldentities/Arrow.cc (deleted) * code/branches/Presentation_HS17/src/orxonox/worldentities/Arrow.h (deleted) * code/branches/Presentation_HS17/src/orxonox/worldentities/AutonomousDrone.cc (deleted) * code/branches/Presentation_HS17/src/orxonox/worldentities/AutonomousDrone.h (deleted) * code/branches/Presentation_HS17/src/orxonox/worldentities/CMakeLists.txt (modified) * code/branches/Presentation_HS17/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/branches/Presentation_HS17/src/orxonox/worldentities/ControllableEntity.h (modified) * code/branches/Presentation_HS17/src/orxonox/worldentities/MobileEntity.cc (modified) * code/branches/Presentation_HS17/src/orxonox/worldentities/WorldEntity.cc (modified) * code/branches/Presentation_HS17/src/orxonox/worldentities/WorldEntity.h (modified) * code/branches/Presentation_HS17/src/orxonox/worldentities/pawns/Pawn.cc (modified) rolled back to functional without 2 branches Sun, 17 Dec 2017 18:09:12 GMT patricwi [11688] * code/branches/Presentation_HS17 (modified) * code/branches/Presentation_HS17/src/orxonox/controllers/ArrowController.cc (copied) * code/branches/Presentation_HS17/src/orxonox/controllers/ArrowController.h (copied) finished merging presentation projects Sun, 17 Dec 2017 16:28:37 GMT jostoffe [11687] * code/branches/Waypoints_HS17/src/orxonox/controllers/ArrowController.cc (added) * code/branches/Waypoints_HS17/src/orxonox/controllers/ArrowController.h (added) Sun, 17 Dec 2017 13:37:50 GMT patricwi [11686] * code/branches/Presentation_HS17 (modified) * code/branches/Presentation_HS17/data/levels/scriptableControllerTest.oxw (copied) * code/branches/Presentation_HS17/data/levels/scripts (copied) * code/branches/Presentation_HS17/src/libraries/core/BaseObject.h (modified) * code/branches/Presentation_HS17/src/libraries/tools/Timer.cc (modified) * code/branches/Presentation_HS17/src/libraries/tools/Timer.h (modified) * code/branches/Presentation_HS17/src/orxonox/CMakeLists.txt (modified) * code/branches/Presentation_HS17/src/orxonox/Level.cc (modified) * code/branches/Presentation_HS17/src/orxonox/Level.h (modified) * code/branches/Presentation_HS17/src/orxonox/infos/GametypeInfo.cc (modified) * code/branches/Presentation_HS17/src/orxonox/infos/GametypeInfo.h (modified) * code/branches/Presentation_HS17/src/orxonox/infos/HumanPlayer.cc (modified) * code/branches/Presentation_HS17/src/orxonox/items/ShipPart.cc (modified) * code/branches/Presentation_HS17/src/orxonox/scriptablecontroller (copied) * code/branches/Presentation_HS17/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/branches/Presentation_HS17/src/orxonox/worldentities/ControllableEntity.h (modified) * code/branches/Presentation_HS17/src/orxonox/worldentities/MobileEntity.cc (modified) * code/branches/Presentation_HS17/src/orxonox/worldentities/WorldEntity.cc (modified) * code/branches/Presentation_HS17/src/orxonox/worldentities/WorldEntity.h (modified) * code/branches/Presentation_HS17/src/orxonox/worldentities/pawns/Pawn.cc (modified) merged scriptable controller but not tested Sun, 17 Dec 2017 13:35:52 GMT patricwi [11685] * code/branches/Presentation_HS17 (modified) * code/branches/Presentation_HS17/data/levels/ArrowLevel.oxw (copied) * code/branches/Presentation_HS17/data/overlays/HUDTemplates3.oxo (modified) * code/branches/Presentation_HS17/src/modules/overlays/hud/CMakeLists.txt (modified) * code/branches/Presentation_HS17/src/modules/overlays/hud/HUDWaypoints.cc (copied) * code/branches/Presentation_HS17/src/modules/overlays/hud/HUDWaypoints.h (copied) * code/branches/Presentation_HS17/src/orxonox/controllers/AutonomousDroneController.cc (copied) * code/branches/Presentation_HS17/src/orxonox/controllers/AutonomousDroneController.h (copied) * code/branches/Presentation_HS17/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/Presentation_HS17/src/orxonox/controllers/WaypointArrow.cc (copied) * code/branches/Presentation_HS17/src/orxonox/controllers/WaypointArrow.h (copied) * code/branches/Presentation_HS17/src/orxonox/graphics/Model.cc (modified) * code/branches/Presentation_HS17/src/orxonox/worldentities/Arrow.cc (copied) * code/branches/Presentation_HS17/src/orxonox/worldentities/Arrow.h (copied) * code/branches/Presentation_HS17/src/orxonox/worldentities/AutonomousDrone.cc (copied) * code/branches/Presentation_HS17/src/orxonox/worldentities/AutonomousDrone.h (copied) * code/branches/Presentation_HS17/src/orxonox/worldentities/CMakeLists.txt (modified) files missing are ArrowController.cc and .h Sat, 16 Dec 2017 19:52:37 GMT kohlia [11684] * code/branches/ScriptableController_HS17/data/levels/scriptableControllerTest.oxw (added) * code/branches/ScriptableController_HS17/data/levels/scripts (added) * code/branches/ScriptableController_HS17/data/levels/scripts/scriptableControllerTest.lua (added) Added test level/script Sat, 16 Dec 2017 14:10:43 GMT patricwi [11683] * code/branches/Presentation_HS17 (modified) * code/branches/Presentation_HS17/data/levels/Asteroids2D.oxw (copied) * code/branches/Presentation_HS17/data/levels/includes/asteroids2DWeapon.oxi (copied) * code/branches/Presentation_HS17/data/levels/templates/asteroidsAsteroids2D.oxt (copied) * code/branches/Presentation_HS17/data/levels/templates/spaceshipAsteroids2D.oxt (copied) * code/branches/Presentation_HS17/data/overlays/Asteroids2DHUD.oxo (copied) * code/branches/Presentation_HS17/src/modules/CMakeLists.txt (modified) * code/branches/Presentation_HS17/src/modules/asteroids2D (copied) asteroids merged Sat, 16 Dec 2017 12:44:42 GMT patricwi [11682] * code/branches/Presentation_HS17 (modified) * code/branches/Presentation_HS17/data/gui/layouts/Dialog.layout (copied) * code/branches/Presentation_HS17/data/gui/layouts/Dialogue.layout (deleted) * code/branches/Presentation_HS17/data/gui/scripts/Dialog.lua (copied) * code/branches/Presentation_HS17/data/gui/scripts/Dialogue.lua (deleted) * code/branches/Presentation_HS17/data/levels/DialogShowcase.oxw (copied) * code/branches/Presentation_HS17/data/levels/DialogueShowcase.oxw (deleted) * code/branches/Presentation_HS17/data/overlays/HUDTemplates3.oxo (modified) * code/branches/Presentation_HS17/src/modules/CMakeLists.txt (modified) * code/branches/Presentation_HS17/src/modules/dialog (copied) * code/branches/Presentation_HS17/src/modules/dialogue (deleted) dialog merged Sat, 16 Dec 2017 12:32:02 GMT patricwi [11681] * code/branches/Presentation_HS17 (modified) * code/branches/Presentation_HS17/data/levels/NC_StoryModeLevel (copied) * code/branches/Presentation_HS17/data/levels/NC_StoryModeLevel.oxw (copied) * code/branches/Presentation_HS17/data/levels/StoryModeMap.oxw (modified) * code/branches/Presentation_HS17/data/levels/templates/StoryMode.oxt (modified) * code/branches/Presentation_HS17/data/levels/templates/StoryModeEscort.oxt (copied) * code/branches/Presentation_HS17/data/overlays/HUDTemplates3.oxo (modified) * code/branches/Presentation_HS17/data/overlays/StoryModeHUD.oxo (modified) * code/branches/Presentation_HS17/data/overlays/StoryModeHUD2.oxo (copied) * code/branches/Presentation_HS17/src/modules/overlays/hud/CMakeLists.txt (modified) * code/branches/Presentation_HS17/src/modules/overlays/hud/StoryModeHUD.cc (copied) * code/branches/Presentation_HS17/src/modules/overlays/hud/StoryModeHUD.h (copied) * code/branches/Presentation_HS17/src/orxonox/gametypes/StoryMode.cc (modified) * code/branches/Presentation_HS17/src/orxonox/gametypes/StoryMode.h (modified) * code/branches/Presentation_HS17/src/orxonox/infos/Bot.cc (modified) * code/branches/Presentation_HS17/src/orxonox/worldentities/CMakeLists.txt (modified) * code/branches/Presentation_HS17/src/orxonox/worldentities/NameableStaticEntity.cc (copied) * code/branches/Presentation_HS17/src/orxonox/worldentities/NameableStaticEntity.h (copied) * code/branches/Presentation_HS17/src/orxonox/worldentities/pawns/CMakeLists.txt (modified) * code/branches/Presentation_HS17/src/orxonox/worldentities/pawns/StoryModePawn.cc (copied) * code/branches/Presentation_HS17/src/orxonox/worldentities/pawns/StoryModePawn.h (copied) added storyMode Sat, 16 Dec 2017 12:04:11 GMT patricwi [11680] * code/branches/Presentation_HS17 (modified) * code/branches/Presentation_HS17/data/levels/ProtectBoss.oxw (copied) * code/branches/Presentation_HS17/src/orxonox/controllers/DroneController.cc (modified) * code/branches/Presentation_HS17/src/orxonox/worldentities/pawns/CMakeLists.txt (modified) * code/branches/Presentation_HS17/src/orxonox/worldentities/pawns/ShootableObstacle.cc (copied) * code/branches/Presentation_HS17/src/orxonox/worldentities/pawns/ShootableObstacle.h (copied) merged ProtectBoss Sat, 16 Dec 2017 11:52:32 GMT patricwi [11679] * code/branches/Presentation_HS17 (modified) * code/branches/Presentation_HS17/data/levels/AsteroidFarming.oxw (copied) * code/branches/Presentation_HS17/src/modules/CMakeLists.txt (modified) * code/branches/Presentation_HS17/src/modules/asteroidmining (copied) * code/branches/Presentation_HS17/src/modules/pickup/Pickup.h (modified) * code/branches/Presentation_HS17/src/modules/pickup/PickupSpawner.cc (modified) * code/branches/Presentation_HS17/src/modules/pickup/PickupSpawner.h (modified) * code/branches/Presentation_HS17/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/Presentation_HS17/src/orxonox/worldentities/pawns/Pawn.h (modified) merged AsteroidMining Sat, 16 Dec 2017 11:24:20 GMT patricwi [11678] * code/branches/Presentation_HS17 (modified) * code/branches/Presentation_HS17/BlenderFilesSOB (copied) * code/branches/Presentation_HS17/SOB.oxw (copied) * code/branches/Presentation_HS17/TRANSFER (copied) * code/branches/Presentation_HS17/data/levels/FlappyOrx.oxw (copied) * code/branches/Presentation_HS17/data/levels/SOB.oxw (modified) * code/branches/Presentation_HS17/data/levels/templates/enemyFlappyOrx.oxt (copied) * code/branches/Presentation_HS17/data/levels/templates/spaceshipFlappyOrx.oxt (copied) * code/branches/Presentation_HS17/data/overlays/FlappyOrxHUD.oxo (copied) * code/branches/Presentation_HS17/data/particle/fire3.particle (modified) * code/branches/Presentation_HS17/src/libraries/tools/Mesh.cc (modified) * code/branches/Presentation_HS17/src/libraries/tools/Mesh.h (modified) * code/branches/Presentation_HS17/src/modules/CMakeLists.txt (modified) * code/branches/Presentation_HS17/src/modules/flappyorx (copied) * code/branches/Presentation_HS17/src/modules/superorxobros/CMakeLists.txt (modified) * code/branches/Presentation_HS17/src/modules/superorxobros/SOB.cc (modified) * code/branches/Presentation_HS17/src/modules/superorxobros/SOB.h (modified) * code/branches/Presentation_HS17/src/modules/superorxobros/SOBFigure.cc (modified) * code/branches/Presentation_HS17/src/modules/superorxobros/SOBFigure.h (modified) * code/branches/Presentation_HS17/src/modules/superorxobros/SOBFireball.cc (copied) * code/branches/Presentation_HS17/src/modules/superorxobros/SOBFireball.h (copied) * code/branches/Presentation_HS17/src/modules/superorxobros/SOBFlagstone.h (modified) * code/branches/Presentation_HS17/src/modules/superorxobros/SOBGumba.cc (modified) * code/branches/Presentation_HS17/src/modules/superorxobros/SOBGumba.h (modified) * code/branches/Presentation_HS17/src/modules/superorxobros/SOBGumbaBoss.cc (copied) * code/branches/Presentation_HS17/src/modules/superorxobros/SOBGumbaBoss.h (copied) * code/branches/Presentation_HS17/src/modules/superorxobros/SOBPrereqs.h (modified) * code/branches/Presentation_HS17/src/modules/superorxobros/SOBQBlock.cc (modified) * code/branches/Presentation_HS17/src/orxonox/graphics/Model.cc (modified) * code/branches/Presentation_HS17/src/orxonox/graphics/Model.h (modified) merged FlappyOrx and SOBv2 Sat, 16 Dec 2017 10:13:06 GMT patricwi [11677] * code/branches/Presentation_HS17 (copied) created new Presentation branch Fri, 15 Dec 2017 11:36:35 GMT fanconic [11676] * code/branches/CampaignMap_HS17/data/levels/NC_StoryModeLevel.oxw (modified) * code/branches/CampaignMap_HS17/data/overlays/StoryModeHUD2.oxo (modified) * code/branches/CampaignMap_HS17/src/modules/overlays/hud/StoryModeHUD.cc (modified) resolved segfault by simply not deleting the newly created ... Fri, 15 Dec 2017 11:07:58 GMT fanconic [11675] * code/branches/CampaignMap_HS17/data/levels/NC_StoryModeLevel.oxw (modified) * code/branches/CampaignMap_HS17/data/levels/emptyLevel.oxw (modified) * code/branches/CampaignMap_HS17/src/modules/objects/StoryModePlanet.cc (deleted) * code/branches/CampaignMap_HS17/src/modules/objects/StoryModePlanet.h (deleted) * code/branches/CampaignMap_HS17/src/modules/overlays/hud/StoryModeHUD.cc (modified) * code/branches/CampaignMap_HS17/src/orxonox/worldentities/CMakeLists.txt (modified) * code/branches/CampaignMap_HS17/src/orxonox/worldentities/NameableStaticEntity.cc (added) * code/branches/CampaignMap_HS17/src/orxonox/worldentities/NameableStaticEntity.h (added) * code/branches/CampaignMap_HS17/src/orxonox/worldentities/StoryModePlanet.cc (deleted) * code/branches/CampaignMap_HS17/src/orxonox/worldentities/StoryModePlanet.h (deleted) renamed storymodeplanet to NameableStaticEntity Thu, 14 Dec 2017 16:07:43 GMT kohlia [11674] * code/branches/ScriptableController_HS17/src/orxonox/gamestates/GSLevel.cc (modified) Cleanup Thu, 14 Dec 2017 15:04:14 GMT kohlia [11673] * code/branches/ScriptableController_HS17/src/orxonox/infos/GametypeInfo.cc (modified) * code/branches/ScriptableController_HS17/src/orxonox/infos/GametypeInfo.h (modified) * code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/is_callable.h (modified) * code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/luatb.h (modified) * code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/luatb_typed_stack.h (modified) * code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller.cc (modified) * code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller.h (modified) * code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller_api.cc (modified) * code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller_api.h (modified) The ScriptableController should work now. A demo level called ... Thu, 14 Dec 2017 15:03:06 GMT lrigoni [11672] * code/branches/ProtectBoss_HS17/data/levels/ProtectBoss.oxw (modified) Final changes Thu, 14 Dec 2017 14:26:04 GMT vyang [11671] * code/branches/Asteroid_HS17/data/levels/MiniGameTest.oxw (deleted) * code/branches/Asteroid_HS17/data/levels/templates/spaceshipMiniGameTest.oxt (deleted) * code/branches/Asteroid_HS17/data/overlays/MiniGameTestHUD.oxo (deleted) * code/branches/Asteroid_HS17/data/overlays/asteroidsHUD.oxo (deleted) * code/branches/Asteroid_HS17/src/modules/CMakeLists.txt (modified) * code/branches/Asteroid_HS17/src/modules/minigametest (deleted) MiniGameTest (Minigame fuers Testen) geloescht Thu, 14 Dec 2017 08:42:44 GMT kuchlert [11670] * code/branches/Dialog_HS17/data/levels/DialogShowcase.oxw (modified) showcase ueberarbeitet Wed, 13 Dec 2017 10:32:26 GMT vyang [11669] * code/branches/Asteroid_HS17/data/levels/Asteroids2D.oxw (modified) * code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2D.cc (modified) * code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2D.h (modified) * code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DCenterPoint.cc (modified) * code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DHUDinfo.cc (modified) * code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DHUDinfo.h (modified) * code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DPrereqs.h (modified) * code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DStone.cc (modified) * code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DWeapon.cc (modified) * code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DWeapon.h (modified) Kommentare Wed, 13 Dec 2017 08:21:25 GMT vyang [11668] * code/branches/Asteroid_HS17/data/levels/Asteroid.oxw (deleted) * code/branches/Asteroid_HS17/data/levels/templates/spaceshipAsteroids2D.oxt (modified) * code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2D.cc (modified) * code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2D.h (modified) * code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DShip.cc (modified) * code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DShip.h (modified) * code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DStone.cc (modified) * code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DWeapon.cc (modified) Kommentare hinzugefuegt und Projektile in die richtige Richtung ... Tue, 12 Dec 2017 19:29:52 GMT remartin [11667] * code/branches/AsteroidMining_HS17/data/levels/AsteroidFarming.oxw (modified) * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.cc (modified) * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.h (modified) * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/SpicedAsteroidBelt.cc (modified) * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/SpicedAsteroidBelt.h (modified) * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/SpicedAsteroidField.cc (modified) * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/SpicedAsteroidField.h (modified) Added tilting for the spicedAsteroidBelt. Finished commenting, polish ... Tue, 12 Dec 2017 16:43:22 GMT vyang [11666] * code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DShip.cc (modified) * code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DStone.cc (modified) * code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DStone.h (modified) damage Funktion der Steine ueberschrieben -> Sie koennen sich teilen Mon, 11 Dec 2017 17:06:20 GMT remartin [11665] * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/SpicedAsteroidBelt.cc (added) * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/SpicedAsteroidBelt.h (added) Mon, 11 Dec 2017 17:05:17 GMT remartin [11664] * code/branches/AsteroidMining_HS17/data/levels/AsteroidFarming.oxw (modified) * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.cc (modified) * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.h (modified) * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/CMakeLists.txt (modified) * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/SpicedAsteroidField.cc (modified) * code/branches/AsteroidMining_HS17/src/modules/asteroidmining/SpicedAsteroidField.h (modified) SpicedAsteroidBelt erstellt, kosmetische Veränderungen. Offener Punkt ... Mon, 11 Dec 2017 16:39:48 GMT fanconic [11663] * code/branches/CampaignMap_HS17/data/levels/NC_StoryModeLevel.oxw (modified) * code/branches/CampaignMap_HS17/data/levels/templates/StoryModeEscort.oxt (modified) * code/branches/CampaignMap_HS17/src/modules/overlays/hud/StoryModeHUD.cc (modified) * code/branches/CampaignMap_HS17/src/orxonox/gametypes/StoryMode.cc (modified) * code/branches/CampaignMap_HS17/src/orxonox/gametypes/StoryMode.h (modified) * code/branches/CampaignMap_HS17/src/orxonox/worldentities/pawns/StoryModePawn.cc (modified) * code/branches/CampaignMap_HS17/src/orxonox/worldentities/pawns/StoryModePawn.h (modified) Changes in the Cameraorientation aswell as new objects inside the level Mon, 11 Dec 2017 15:35:38 GMT kohlia [11662] * code/branches/ScriptableController_HS17/src/orxonox/infos/GametypeInfo.cc (modified) * code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller.cc (modified) * code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller_api.cc (modified) * code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller_api.h (modified) Crashes when killing the player Mon, 11 Dec 2017 15:06:56 GMT jostoffe [11661] * code/branches/Waypoints_HS17/src/orxonox/worldentities/Arrow.cc (modified) Der Pfeil zeigt nun in die richtige Richtung. Es ist jeweils nur ... Mon, 11 Dec 2017 15:06:44 GMT vyang [11660] * code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2D.cc (modified) * code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2D.h (modified) * code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DCenterPoint.cc (modified) * code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DCenterPoint.h (modified) * code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DShip.cc (modified) * code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DShip.h (modified) * code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DStone.cc (modified) * code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DWeapon.cc (modified) * code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DWeapon.h (modified) Projektile fliegen in 2D Ebene, jedoch in eine falsche Richtung. ... Mon, 11 Dec 2017 14:49:17 GMT jostoffe [11659] * code/branches/Waypoints_HS17/data/levels/ArrowLevel.oxw (added) * code/branches/Waypoints_HS17/data/levels/emptyLevel.oxw (modified) Sicherung Mon, 11 Dec 2017 14:49:01 GMT kuchlert [11658] * code/branches/Dialog_HS17/src/modules/dialog/DialogManager.h (modified) updated todo in dialogManager for future improvement Mon, 11 Dec 2017 14:41:12 GMT jostoffe [11657] * code/branches/Waypoints_HS17/data/levels/emptyLevel.oxw (modified) Sicherung Mon, 11 Dec 2017 14:35:50 GMT kuchlert [11656] * code/branches/Dialog_HS17/src/modules/dialog/Answer.h (modified) * code/branches/Dialog_HS17/src/modules/dialog/AnswerId.h (modified) * code/branches/Dialog_HS17/src/modules/dialog/Dialog.h (modified) * code/branches/Dialog_HS17/src/modules/dialog/DialogManager.h (modified) * code/branches/Dialog_HS17/src/modules/dialog/Question.h (modified) fertig kommentierte version Mon, 11 Dec 2017 14:24:03 GMT jostoffe [11655] * code/branches/Waypoints_HS17/data/levels/emptyLevel.oxw (modified) * code/branches/Waypoints_HS17/src/orxonox/graphics/Model.cc (modified) Sicherung Mon, 11 Dec 2017 14:17:02 GMT varxth [11654] * code/branches/SOBv2_HS17/src/modules/superorxobros/SOBGumba.cc (modified) * code/branches/SOBv2_HS17/src/modules/superorxobros/SOBGumba.h (modified) * code/branches/SOBv2_HS17/src/modules/superorxobros/SOBGumbaBoss.cc (modified) better than evverevver Mon, 11 Dec 2017 14:03:56 GMT zarron [11653] * code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFireball.cc (modified) * code/branches/SOBv2_HS17/src/modules/superorxobros/SOBGumbaBoss.cc (modified) * code/branches/SOBv2_HS17/src/modules/superorxobros/SOBGumbaBoss.h (modified) Boss spawned Gumbas have now max lifetime 2 Mon, 11 Dec 2017 13:33:45 GMT kuchlert [11652] * code/branches/Dialog_HS17/data/gui/layouts/Dialog.layout (modified) * code/branches/Dialog_HS17/data/gui/layouts/Dialogue.layout (deleted) * code/branches/Dialog_HS17/data/gui/scripts/Dialog.lua (modified) * code/branches/Dialog_HS17/data/gui/scripts/Dialogue.lua (deleted) * code/branches/Dialog_HS17/data/levels/DialogShowcase.oxw (added) * code/branches/Dialog_HS17/data/levels/DialogueShowcase.oxw (deleted) * code/branches/Dialog_HS17/data/levels/DialogueShowcase2.oxw (deleted) * code/branches/Dialog_HS17/data/overlays/HUDTemplates3.oxo (modified) * code/branches/Dialog_HS17/src/modules/CMakeLists.txt (modified) * code/branches/Dialog_HS17/src/modules/dialogue (deleted) altes Dialogue entfernt Mon, 11 Dec 2017 13:20:57 GMT zarron [11651] * code/branches/SOBv2_HS17/src/modules/superorxobros/SOBGumba.cc (modified) * code/branches/SOBv2_HS17/src/modules/superorxobros/SOBGumba.h (modified) Boss spawned Gumbas have now max lifetime Mon, 11 Dec 2017 13:14:15 GMT varxth [11650] * code/branches/SOBv2_HS17/SOB.oxw (modified) * code/branches/SOBv2_HS17/data/levels/SOB.oxw (modified) * code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFigure.cc (modified) * code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFlagstone.h (modified) * code/branches/SOBv2_HS17/src/modules/superorxobros/SOBGumba.cc (modified) * code/branches/SOBv2_HS17/src/modules/superorxobros/SOBGumbaBoss.cc (modified) * code/branches/SOBv2_HS17/src/modules/superorxobros/SOBGumbaBoss.h (modified) better than evver Mon, 11 Dec 2017 12:35:58 GMT merholzl [11648] * code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw (modified) Important changes Mon, 11 Dec 2017 12:26:00 GMT zarron [11647] * code/branches/SOBv2_HS17/data/levels/SOB.oxw (modified) * code/branches/SOBv2_HS17/src/modules/superorxobros/SOBGumbaBoss.cc (modified) Castle hight corrected