# # ChangeLog for code/branches/Presentation_HS17_merge # # Generated by Trac 1.0.9 # Nov 25, 2024, 5:11:04 AM 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 Sat, 10 Feb 2018 00:02:18 GMT landauf [11722] * code/trunk/data/levels/StoryModeMap.oxw (modified) * code/trunk/data/levels/templates/StoryMode.oxt (modified) [StoryModeMap_HS16] fixed warnings in console