# # ChangeLog for code/branches/HUD_HS16 # # Generated by Trac 1.0.9 # Jun 1, 2024, 4:48:33 PM Mon, 13 Nov 2017 15:14:47 GMT patricwi [11558] * code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupSystem.cc (modified) * code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupSystem.h (modified) * code/branches/HUD_HS16/src/modules/pickup/PickupManager.cc (modified) no more segfaults but still not exiting properly - maybe never ending ... Mon, 06 Nov 2017 15:05:15 GMT patricwi [11540] * code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupItem.cc (modified) * code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupSystem.cc (modified) * code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupSystem.h (modified) * code/branches/HUD_HS16/src/modules/pickup/PickupManager.cc (modified) sync function added without success, order of pickups in HUD is mixed up Mon, 23 Oct 2017 14:41:56 GMT patricwi [11510] * code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupItem.cc (modified) * code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupSystem.cc (modified) * code/branches/HUD_HS16/src/modules/pickup/PickupManager.cc (modified) * code/branches/HUD_HS16/src/orxonox/interfaces/Pickupable.cc (modified) looking for SEGFault Mon, 23 Oct 2017 13:14:56 GMT patricwi [11502] * code/branches/HUD_HS16 (modified) * code/branches/HUD_HS16/data/gui/layouts/CampaignMenu.layout (modified) * code/branches/HUD_HS16/data/gui/layouts/Dialogue.layout (copied) * code/branches/HUD_HS16/data/gui/layouts/HighscoreMenu.layout (copied) * code/branches/HUD_HS16/data/gui/layouts/MainMenu.layout (modified) * code/branches/HUD_HS16/data/gui/schemes/OrxonoxHUDWidgets.scheme (modified) * code/branches/HUD_HS16/data/gui/schemes/OrxonoxLook.scheme (modified) * code/branches/HUD_HS16/data/gui/schemes/OrxonoxMenuWidgets.scheme (modified) * code/branches/HUD_HS16/data/gui/schemes/TaharezGreenHUDWidgets.scheme (modified) * code/branches/HUD_HS16/data/gui/schemes/TaharezGreenLook.scheme (modified) * code/branches/HUD_HS16/data/gui/schemes/TaharezGreenMenuWidgets.scheme (modified) * code/branches/HUD_HS16/data/gui/schemes/TaharezLook.scheme (modified) * code/branches/HUD_HS16/data/gui/scripts/CampaignMenu.lua (modified) * code/branches/HUD_HS16/data/gui/scripts/Dialogue.lua (copied) * code/branches/HUD_HS16/data/gui/scripts/HighscoreMenu.lua (copied) * code/branches/HUD_HS16/data/gui/scripts/MainMenu.lua (modified) * code/branches/HUD_HS16/data/gui/scripts/MiscConfigMenu.lua (modified) * code/branches/HUD_HS16/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/HUD_HS16/data/gui/scripts/TestDialogButttons.lua (copied) * code/branches/HUD_HS16/data/levels/DialogueShowcase.oxw (copied) * code/branches/HUD_HS16/data/levels/Endurancefinal.oxw (copied) * code/branches/HUD_HS16/data/levels/HeavyCruiser.oxw (modified) * code/branches/HUD_HS16/data/levels/MilleniumFalconTest.oxw (copied) * code/branches/HUD_HS16/data/levels/SOB.oxw (copied) * code/branches/HUD_HS16/data/levels/Spacerace2.oxw (deleted) * code/branches/HUD_HS16/data/levels/StoryModeMap.oxw (copied) * code/branches/HUD_HS16/data/levels/SurfaceRacePresentation.oxw (deleted) * code/branches/HUD_HS16/data/levels/emptyLevel.oxw (modified) * code/branches/HUD_HS16/data/levels/events.oxw (modified) * code/branches/HUD_HS16/data/levels/includes/MFalconWeapon.oxi (copied) * code/branches/HUD_HS16/data/levels/newnewnewspacerace.oxw (copied) * code/branches/HUD_HS16/data/levels/spaceRace.oxw (deleted) * code/branches/HUD_HS16/data/levels/surfaceRace.oxw (deleted) * code/branches/HUD_HS16/data/levels/templates/MFalcon.oxt (copied) * code/branches/HUD_HS16/data/levels/templates/StoryMode.oxt (copied) * code/branches/HUD_HS16/data/levels/templates/endurancetest_template.oxt (copied) * code/branches/HUD_HS16/data/levels/templates/fastship.oxt (copied) * code/branches/HUD_HS16/data/levels/templates/test11.oxt (copied) * code/branches/HUD_HS16/data/overlays/HUDTemplates3.oxo (modified) * code/branches/HUD_HS16/data/overlays/SOBHUD.oxo (copied) * code/branches/HUD_HS16/data/overlays/StoryModeHUD.oxo (copied) * code/branches/HUD_HS16/src/modules/CMakeLists.txt (modified) * code/branches/HUD_HS16/src/modules/dialogue (copied) * code/branches/HUD_HS16/src/modules/dodgerace/DodgeRace.cc (modified) * code/branches/HUD_HS16/src/modules/gametypes/CMakeLists.txt (modified) * code/branches/HUD_HS16/src/modules/gametypes/OldRaceCheckPoint.cc (deleted) * code/branches/HUD_HS16/src/modules/gametypes/OldRaceCheckPoint.h (deleted) * code/branches/HUD_HS16/src/modules/gametypes/OldSpaceRace.cc (deleted) * code/branches/HUD_HS16/src/modules/gametypes/OldSpaceRace.h (deleted) * code/branches/HUD_HS16/src/modules/gametypes/SpaceRace.cc (modified) * code/branches/HUD_HS16/src/modules/gametypes/SpaceRace.h (modified) * code/branches/HUD_HS16/src/modules/gametypes/SpaceRaceBot.cc (modified) * code/branches/HUD_HS16/src/modules/gametypes/SpaceRaceBot.h (modified) * code/branches/HUD_HS16/src/modules/gametypes/SpaceRaceController.cc (modified) * code/branches/HUD_HS16/src/modules/invader/Invader.cc (modified) * code/branches/HUD_HS16/src/modules/jump/Jump.cc (modified) * code/branches/HUD_HS16/src/modules/superorxobros (copied) * code/branches/HUD_HS16/src/modules/tetris/Tetris.cc (modified) * code/branches/HUD_HS16/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/HUD_HS16/src/orxonox/CMakeLists.txt (modified) * code/branches/HUD_HS16/src/orxonox/Highscore.cc (copied) * code/branches/HUD_HS16/src/orxonox/Highscore.h (copied) * code/branches/HUD_HS16/src/orxonox/LevelInfo.cc (modified) * code/branches/HUD_HS16/src/orxonox/LevelInfo.h (modified) * code/branches/HUD_HS16/src/orxonox/controllers/HumanController.h (modified) * code/branches/HUD_HS16/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/HUD_HS16/src/orxonox/gamestates/GSLevel.h (modified) * code/branches/HUD_HS16/src/orxonox/gametypes/CMakeLists.txt (modified) * code/branches/HUD_HS16/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/HUD_HS16/src/orxonox/gametypes/StoryMode.cc (copied) * code/branches/HUD_HS16/src/orxonox/gametypes/StoryMode.h (copied) * code/branches/HUD_HS16/src/orxonox/infos/Bot.cc (modified) * code/branches/HUD_HS16/src/orxonox/infos/GametypeInfo.h (modified) * code/branches/HUD_HS16/src/orxonox/sound/WorldAmbientSound.cc (modified) * code/branches/HUD_HS16/src/test.txt (copied) updated HUD by merging trunk into it Mon, 23 Oct 2017 13:02:27 GMT patricwi [11501] * code/branches/HUD_HS16/src/modules/dialogue (deleted) removed dialogue folder Mon, 23 Oct 2017 12:56:00 GMT patricwi [11499] * code/branches/HUD_HS16 (modified) * code/branches/HUD_HS16/data/gui/layouts/CampaignMenu.layout (modified) * code/branches/HUD_HS16/data/gui/layouts/Dialogue.layout (deleted) * code/branches/HUD_HS16/data/gui/layouts/HighscoreMenu.layout (deleted) * code/branches/HUD_HS16/data/gui/layouts/MainMenu.layout (modified) * code/branches/HUD_HS16/data/gui/schemes/OrxonoxHUDWidgets.scheme (modified) * code/branches/HUD_HS16/data/gui/schemes/OrxonoxLook.scheme (modified) * code/branches/HUD_HS16/data/gui/schemes/OrxonoxMenuWidgets.scheme (modified) * code/branches/HUD_HS16/data/gui/schemes/TaharezGreenHUDWidgets.scheme (modified) * code/branches/HUD_HS16/data/gui/schemes/TaharezGreenLook.scheme (modified) * code/branches/HUD_HS16/data/gui/schemes/TaharezGreenMenuWidgets.scheme (modified) * code/branches/HUD_HS16/data/gui/schemes/TaharezLook.scheme (modified) * code/branches/HUD_HS16/data/gui/scripts/CampaignMenu.lua (modified) * code/branches/HUD_HS16/data/gui/scripts/Dialogue.lua (deleted) * code/branches/HUD_HS16/data/gui/scripts/HighscoreMenu.lua (deleted) * code/branches/HUD_HS16/data/gui/scripts/MainMenu.lua (modified) * code/branches/HUD_HS16/data/gui/scripts/MiscConfigMenu.lua (modified) * code/branches/HUD_HS16/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/HUD_HS16/data/gui/scripts/TestDialogButttons.lua (deleted) * code/branches/HUD_HS16/data/levels/DialogueShowcase.oxw (deleted) * code/branches/HUD_HS16/data/levels/Endurancefinal.oxw (deleted) * code/branches/HUD_HS16/data/levels/HeavyCruiser.oxw (modified) * code/branches/HUD_HS16/data/levels/MilleniumFalconTest.oxw (deleted) * code/branches/HUD_HS16/data/levels/SOB.oxw (deleted) * code/branches/HUD_HS16/data/levels/Spacerace2.oxw (copied) * code/branches/HUD_HS16/data/levels/StoryModeMap.oxw (deleted) * code/branches/HUD_HS16/data/levels/SurfaceRacePresentation.oxw (copied) * code/branches/HUD_HS16/data/levels/emptyLevel.oxw (modified) * code/branches/HUD_HS16/data/levels/events.oxw (modified) * code/branches/HUD_HS16/data/levels/includes/MFalconWeapon.oxi (deleted) * code/branches/HUD_HS16/data/levels/newnewnewspacerace.oxw (deleted) * code/branches/HUD_HS16/data/levels/spaceRace.oxw (copied) * code/branches/HUD_HS16/data/levels/surfaceRace.oxw (copied) * code/branches/HUD_HS16/data/levels/templates/MFalcon.oxt (deleted) * code/branches/HUD_HS16/data/levels/templates/StoryMode.oxt (deleted) * code/branches/HUD_HS16/data/levels/templates/endurancetest_template.oxt (deleted) * code/branches/HUD_HS16/data/levels/templates/fastship.oxt (deleted) * code/branches/HUD_HS16/data/levels/templates/test11.oxt (deleted) * code/branches/HUD_HS16/data/overlays/HUDTemplates3.oxo (modified) * code/branches/HUD_HS16/data/overlays/SOBHUD.oxo (deleted) * code/branches/HUD_HS16/data/overlays/StoryModeHUD.oxo (deleted) * code/branches/HUD_HS16/src/modules/CMakeLists.txt (modified) * code/branches/HUD_HS16/src/modules/dialogue/CMakeLists.txt (modified) * code/branches/HUD_HS16/src/modules/dodgerace/DodgeRace.cc (modified) * code/branches/HUD_HS16/src/modules/gametypes/CMakeLists.txt (modified) * code/branches/HUD_HS16/src/modules/gametypes/OldRaceCheckPoint.cc (copied) * code/branches/HUD_HS16/src/modules/gametypes/OldRaceCheckPoint.h (copied) * code/branches/HUD_HS16/src/modules/gametypes/OldSpaceRace.cc (copied) * code/branches/HUD_HS16/src/modules/gametypes/OldSpaceRace.h (copied) * code/branches/HUD_HS16/src/modules/gametypes/SpaceRace.cc (modified) * code/branches/HUD_HS16/src/modules/gametypes/SpaceRace.h (modified) * code/branches/HUD_HS16/src/modules/gametypes/SpaceRaceBot.cc (modified) * code/branches/HUD_HS16/src/modules/gametypes/SpaceRaceBot.h (modified) * code/branches/HUD_HS16/src/modules/gametypes/SpaceRaceController.cc (modified) * code/branches/HUD_HS16/src/modules/invader/Invader.cc (modified) * code/branches/HUD_HS16/src/modules/jump/Jump.cc (modified) * code/branches/HUD_HS16/src/modules/pickup/DDDialogue.cc (modified) * code/branches/HUD_HS16/src/modules/superorxobros (deleted) * code/branches/HUD_HS16/src/modules/tetris/Tetris.cc (modified) * code/branches/HUD_HS16/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/HUD_HS16/src/orxonox/CMakeLists.txt (modified) * code/branches/HUD_HS16/src/orxonox/Highscore.cc (deleted) * code/branches/HUD_HS16/src/orxonox/Highscore.h (deleted) * code/branches/HUD_HS16/src/orxonox/LevelInfo.cc (modified) * code/branches/HUD_HS16/src/orxonox/LevelInfo.h (modified) * code/branches/HUD_HS16/src/orxonox/controllers/HumanController.h (modified) * code/branches/HUD_HS16/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/HUD_HS16/src/orxonox/gamestates/GSLevel.h (modified) * code/branches/HUD_HS16/src/orxonox/gametypes/CMakeLists.txt (modified) * code/branches/HUD_HS16/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/HUD_HS16/src/orxonox/gametypes/StoryMode.cc (deleted) * code/branches/HUD_HS16/src/orxonox/gametypes/StoryMode.h (deleted) * code/branches/HUD_HS16/src/orxonox/infos/Bot.cc (modified) * code/branches/HUD_HS16/src/orxonox/infos/GametypeInfo.h (modified) * code/branches/HUD_HS16/src/orxonox/sound/WorldAmbientSound.cc (modified) * code/branches/HUD_HS16/src/test.txt (deleted) reset back in time Mon, 23 Oct 2017 12:25:36 GMT patricwi [11498] * code/branches/HUD_HS16 (modified) merge trunk into hud Mon, 23 Oct 2017 12:22:13 GMT patricwi [11497] * code/branches/HUD_HS16 (modified) * code/branches/HUD_HS16/data/gui/layouts/CampaignMenu.layout (modified) * code/branches/HUD_HS16/data/gui/layouts/Dialogue.layout (copied) * code/branches/HUD_HS16/data/gui/layouts/HighscoreMenu.layout (copied) * code/branches/HUD_HS16/data/gui/layouts/MainMenu.layout (modified) * code/branches/HUD_HS16/data/gui/schemes/OrxonoxHUDWidgets.scheme (modified) * code/branches/HUD_HS16/data/gui/schemes/OrxonoxLook.scheme (modified) * code/branches/HUD_HS16/data/gui/schemes/OrxonoxMenuWidgets.scheme (modified) * code/branches/HUD_HS16/data/gui/schemes/TaharezGreenHUDWidgets.scheme (modified) * code/branches/HUD_HS16/data/gui/schemes/TaharezGreenLook.scheme (modified) * code/branches/HUD_HS16/data/gui/schemes/TaharezGreenMenuWidgets.scheme (modified) * code/branches/HUD_HS16/data/gui/schemes/TaharezLook.scheme (modified) * code/branches/HUD_HS16/data/gui/scripts/CampaignMenu.lua (modified) * code/branches/HUD_HS16/data/gui/scripts/Dialogue.lua (copied) * code/branches/HUD_HS16/data/gui/scripts/HighscoreMenu.lua (copied) * code/branches/HUD_HS16/data/gui/scripts/MainMenu.lua (modified) * code/branches/HUD_HS16/data/gui/scripts/MiscConfigMenu.lua (modified) * code/branches/HUD_HS16/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/HUD_HS16/data/gui/scripts/TestDialogButttons.lua (copied) * code/branches/HUD_HS16/data/levels/DialogueShowcase.oxw (copied) * code/branches/HUD_HS16/data/levels/Endurancefinal.oxw (copied) * code/branches/HUD_HS16/data/levels/HeavyCruiser.oxw (modified) * code/branches/HUD_HS16/data/levels/MilleniumFalconTest.oxw (copied) * code/branches/HUD_HS16/data/levels/SOB.oxw (copied) * code/branches/HUD_HS16/data/levels/Spacerace2.oxw (deleted) * code/branches/HUD_HS16/data/levels/StoryModeMap.oxw (copied) * code/branches/HUD_HS16/data/levels/SurfaceRacePresentation.oxw (deleted) * code/branches/HUD_HS16/data/levels/emptyLevel.oxw (modified) * code/branches/HUD_HS16/data/levels/events.oxw (modified) * code/branches/HUD_HS16/data/levels/includes/MFalconWeapon.oxi (copied) * code/branches/HUD_HS16/data/levels/newnewnewspacerace.oxw (copied) * code/branches/HUD_HS16/data/levels/spaceRace.oxw (deleted) * code/branches/HUD_HS16/data/levels/surfaceRace.oxw (deleted) * code/branches/HUD_HS16/data/levels/templates/MFalcon.oxt (copied) * code/branches/HUD_HS16/data/levels/templates/StoryMode.oxt (copied) * code/branches/HUD_HS16/data/levels/templates/endurancetest_template.oxt (copied) * code/branches/HUD_HS16/data/levels/templates/fastship.oxt (copied) * code/branches/HUD_HS16/data/levels/templates/test11.oxt (copied) * code/branches/HUD_HS16/data/overlays/HUDTemplates3.oxo (modified) * code/branches/HUD_HS16/data/overlays/SOBHUD.oxo (copied) * code/branches/HUD_HS16/data/overlays/StoryModeHUD.oxo (copied) * code/branches/HUD_HS16/src/modules/CMakeLists.txt (modified) * code/branches/HUD_HS16/src/modules/dodgerace/DodgeRace.cc (modified) * code/branches/HUD_HS16/src/modules/gametypes/CMakeLists.txt (modified) * code/branches/HUD_HS16/src/modules/gametypes/OldRaceCheckPoint.cc (deleted) * code/branches/HUD_HS16/src/modules/gametypes/OldRaceCheckPoint.h (deleted) * code/branches/HUD_HS16/src/modules/gametypes/OldSpaceRace.cc (deleted) * code/branches/HUD_HS16/src/modules/gametypes/OldSpaceRace.h (deleted) * code/branches/HUD_HS16/src/modules/gametypes/SpaceRace.cc (modified) * code/branches/HUD_HS16/src/modules/gametypes/SpaceRace.h (modified) * code/branches/HUD_HS16/src/modules/gametypes/SpaceRaceBot.cc (modified) * code/branches/HUD_HS16/src/modules/gametypes/SpaceRaceBot.h (modified) * code/branches/HUD_HS16/src/modules/gametypes/SpaceRaceController.cc (modified) * code/branches/HUD_HS16/src/modules/invader/Invader.cc (modified) * code/branches/HUD_HS16/src/modules/jump/Jump.cc (modified) * code/branches/HUD_HS16/src/modules/superorxobros (copied) * code/branches/HUD_HS16/src/modules/tetris/Tetris.cc (modified) * code/branches/HUD_HS16/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/HUD_HS16/src/orxonox/CMakeLists.txt (modified) * code/branches/HUD_HS16/src/orxonox/Highscore.cc (copied) * code/branches/HUD_HS16/src/orxonox/Highscore.h (copied) * code/branches/HUD_HS16/src/orxonox/LevelInfo.cc (modified) * code/branches/HUD_HS16/src/orxonox/LevelInfo.h (modified) * code/branches/HUD_HS16/src/orxonox/controllers/HumanController.h (modified) * code/branches/HUD_HS16/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/HUD_HS16/src/orxonox/gamestates/GSLevel.h (modified) * code/branches/HUD_HS16/src/orxonox/gametypes/CMakeLists.txt (modified) * code/branches/HUD_HS16/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/HUD_HS16/src/orxonox/gametypes/StoryMode.cc (copied) * code/branches/HUD_HS16/src/orxonox/gametypes/StoryMode.h (copied) * code/branches/HUD_HS16/src/orxonox/infos/Bot.cc (modified) * code/branches/HUD_HS16/src/orxonox/infos/GametypeInfo.h (modified) * code/branches/HUD_HS16/src/orxonox/sound/WorldAmbientSound.cc (modified) * code/branches/HUD_HS16/src/test.txt (copied) trunk merged into hud Thu, 06 Apr 2017 14:18:21 GMT patricwi [11395] * code/branches/HUD_HS16/data/levels/events.oxw (modified) * code/branches/HUD_HS16/src/modules/CMakeLists.txt (modified) * code/branches/HUD_HS16/src/modules/dialogue (added) * code/branches/HUD_HS16/src/modules/dialogue/CMakeLists.txt (added) * code/branches/HUD_HS16/src/modules/dialogue/Dialogue.layout (added) * code/branches/HUD_HS16/src/modules/dialogue/Dialogue.lua (added) * code/branches/HUD_HS16/src/modules/dialogue/DialogueManager.cc (added) * code/branches/HUD_HS16/src/modules/dialogue/DialogueManager.h (added) * code/branches/HUD_HS16/src/modules/dialogue/DialoguePrereqs.h (added) * code/branches/HUD_HS16/src/modules/dialogue/NextQuestion.cc (added) * code/branches/HUD_HS16/src/modules/dialogue/NextQuestion.h (added) * code/branches/HUD_HS16/src/modules/pickup/DDDialogue.cc (modified) dialogue classes added