# # ChangeLog for code/branches # # Generated by Trac 1.0.9 # Nov 29, 2024, 8:22:05 AM Thu, 13 Apr 2017 13:30:24 GMT jkindle [11400] * code/branches/SuperOrxoBros_FS17/data/levels/SOB.oxw (modified) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/CMakeLists.txt (modified) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBFigure.cc (modified) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBFigure.h (modified) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBItem.cc (modified) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBItem.h (modified) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBPrereqs.h (modified) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBQBlock.cc (added) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBQBlock.h (added) Added jetpack, rotation of player, Questionmark-blocks and ... Wed, 12 Apr 2017 13:12:54 GMT davidf [11398] * code/branches/SuperOrxoBros_FS17/data/levels/SOB.oxw (modified) Wed, 12 Apr 2017 08:43:26 GMT davidf [11397] * code/branches/SuperOrxoBros_FS17/data/levels/SOB.oxw (modified) Wed, 12 Apr 2017 07:58:17 GMT davidf [11396] * code/branches/SuperOrxoBros_FS17/data/levels/SOB.oxw (modified) * code/branches/SuperOrxoBros_FS17/data/levels/SuperOrxoBrosLevel.oxw (added) Added new lvl file 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 Thu, 06 Apr 2017 14:17:58 GMT rrogge [11394] * code/branches/Dialogue_FS17/data/levels/events.oxw (modified) * code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.cc (modified) DialogueManager not loadable Thu, 06 Apr 2017 13:40:23 GMT rrogge [11393] * code/branches/Dialogue_FS17/data/levels/emptyLevel.oxw (modified) * code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.cc (modified) * code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.h (modified) * code/branches/Dialogue_FS17/src/modules/dialogue/NextQuestion.cc (added) * code/branches/Dialogue_FS17/src/modules/dialogue/NextQuestion.h (added) Singleton funktioniert Thu, 06 Apr 2017 13:32:35 GMT jkindle [11392] * code/branches/SuperOrxoBros_FS17/data/levels/SOB.oxw (modified) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/CMakeLists.txt (modified) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/Orxo.h (modified) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOB.cc (modified) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBCenterpoint.h (modified) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBFigure.cc (modified) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBFigure.h (modified) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBItem.cc (added) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBItem.h (added) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBPrereqs.h (modified) Lululululululululu Thu, 30 Mar 2017 14:05:43 GMT patricwi [11391] * code/branches/HUD_HS16/data/levels/events.oxw (modified) * code/branches/HUD_HS16/src/modules/pickup/CMakeLists.txt (modified) * code/branches/HUD_HS16/src/modules/pickup/DDDialogue.cc (added) * code/branches/HUD_HS16/src/modules/pickup/DDDialogue.h (added) event example added Thu, 30 Mar 2017 14:04:09 GMT rrogge [11390] * code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.cc (modified) * code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.h (modified) Default Fenster funktioniert noch nicht Thu, 30 Mar 2017 14:02:20 GMT nyogaraj [11388] * code/branches/Boss_FS17/data/levels/Endurancefinal.oxw (modified) * code/branches/Boss_FS17/data/levels/FinalBossFS17.oxw (modified) * code/branches/Boss_FS17/data/levels/emptyLevel.oxw (modified) * code/branches/Boss_FS17/data/levels/includes/BossSpawnWeaponSetting.oxi (added) * code/branches/Boss_FS17/data/levels/includes/weaponSettingsEscort.oxi (modified) * code/branches/Boss_FS17/data/levels/templates/Bossship.oxt (added) * code/branches/Boss_FS17/data/levels/templates/Bossspawnship.oxt (added) new Boss level files Thu, 30 Mar 2017 13:55:28 GMT rrogge [11384] * code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.cc (modified) * code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.h (modified) Kein Identifier Problem mehr Thu, 30 Mar 2017 13:52:23 GMT jkindle [11383] * code/branches/SuperOrxoBros_FS17/data/levels/SOB.oxw (modified) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOB.cc (modified) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOB.h (modified) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBFigure.cc (modified) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBFigure.h (modified) Added movement of camera. Thu, 30 Mar 2017 13:14:02 GMT rrogge [11382] * code/branches/Dialogue_FS17/src/modules/CMakeLists.txt (modified) * code/branches/Dialogue_FS17/src/modules/dialogue/CMakeLists.txt (added) * code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.cc (modified) * code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.h (modified) * code/branches/Dialogue_FS17/src/modules/dialogue/DialoguePrereqs.h (added) 30 March Thu, 30 Mar 2017 12:42:31 GMT jkindle [11381] * code/branches/SuperOrxoBros_FS17/data/levels/SOB.oxw (modified) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOB.cc (modified) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOB.h (modified) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBCenterpoint.cc (modified) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBCenterpoint.h (modified) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBFigure.cc (modified) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBFigure.h (modified) Works whoow Thu, 23 Mar 2017 14:58:28 GMT nyogaraj [11380] * code/branches/Boss_FS17/data/levels/Endurancefinal.oxw (modified) * code/branches/Boss_FS17/data/levels/FinalBossFS17.oxw (added) * code/branches/Boss_FS17/data/levels/emptyLevel.oxw (modified) new level Thu, 23 Mar 2017 14:57:14 GMT jkindle [11379] * code/branches/SuperOrxoBros_FS17/data/levels/SOB.oxw (added) * code/branches/SuperOrxoBros_FS17/data/levels/templates/superorxobrow.oxw (added) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBCenterpoint.cc (added) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBCenterpoint.h (added) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBFigure.cc (added) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBFigure.h (added) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBPrereqs.h (added) added some structire. Next to do, fix Centerpoint and error when ... Thu, 23 Mar 2017 14:53:52 GMT jkindle [11378] * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/CMakeLists.txt (modified) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOB.cc (modified) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOB.h (modified) added some structire. Next to do, fix Centerpoint and error when ... Thu, 23 Mar 2017 14:51:57 GMT rrogge [11377] * code/branches/Dialogue_FS17/data/levels/emptyLevel.oxw (modified) * code/branches/Dialogue_FS17/src/modules/dialogue/Dialogue.layout (added) * code/branches/Dialogue_FS17/src/modules/dialogue/Dialogue.lua (added) * code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.cc (modified) * code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.h (modified) lua und layout1 Thu, 16 Mar 2017 15:07:47 GMT rrogge [11371] * code/branches/Dialogue_FS17/data/gui/scripts/TestDialogButttons.lua (added) * code/branches/Dialogue_FS17/data/levels/emptyLevel.oxw (modified) * code/branches/Dialogue_FS17/src/modules/dialogue (added) * code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.cc (added) * code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.h (added) h und cc file Thu, 16 Mar 2017 15:02:15 GMT jkindle [11370] * code/branches/SuperOrxoBros_FS17/data/levels/SuperOrxoBros.oxw (added) * code/branches/SuperOrxoBros_FS17/src/modules/CMakeLists.txt (modified) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros (added) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/CMakeLists.txt (added) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/Orxo.cc (added) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/Orxo.h (added) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOB.cc (added) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOB.h (added) Damn shit Thu, 16 Mar 2017 13:33:55 GMT maxima [11369] * code/branches/Alejandro_FS17 (copied) new branch for pps Thu, 16 Mar 2017 13:03:12 GMT maxima [11367] * code/branches/Boss_FS17 (copied) new branch for pps Thu, 16 Mar 2017 12:51:07 GMT maxima [11366] * code/branches/SuperOxoBros_FS17 (deleted) deleted old branch Thu, 16 Mar 2017 12:50:38 GMT maxima [11365] * code/branches/SuperOrxoBros_FS17 (copied) new branch for pps Thu, 16 Mar 2017 12:50:30 GMT maxima [11364] * code/branches/SuperOxoBros_FS17 (copied) new branch for pps Thu, 16 Mar 2017 12:47:59 GMT maxima [11361] * code/branches/ExplosionParts_FS17 (copied) new branch for pps Thu, 16 Mar 2017 12:23:40 GMT maxima [11360] * code/branches/Dialogue_FS17 (copied) new branch for pps Thu, 09 Mar 2017 12:23:50 GMT patricwi [11352] * code/branches/HUD_HS16/data/levels/pickups.oxw (modified) * code/branches/HUD_HS16/data/overlays/HUDPickupTemplate.oxo (added) * code/branches/HUD_HS16/data/overlays/HUDTemplates3.oxo (modified) most changes before the merge, added individual HUDPickupTemplate for ... Thu, 02 Mar 2017 15:02:01 GMT patricwi [11351] * code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupSystem.cc (modified) * code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupSystem.h (modified) updated graphics Mon, 19 Dec 2016 07:28:58 GMT maxima [11350] * code/branches/Presentation_HS16 (modified) * code/branches/Presentation_HS16/data/levels/Waypointstest.oxw (copied) * code/branches/Presentation_HS16/data/levels/templates/spaceshipWaypoint.oxt (copied) * code/branches/Presentation_HS16/src/modules/CMakeLists.txt (modified) * code/branches/Presentation_HS16/src/modules/waypoints (copied) * code/branches/Presentation_HS16/src/orxonox/worldentities/CMakeLists.txt (modified) * code/branches/Presentation_HS16/src/orxonox/worldentities/Waypoint.cc (copied) * code/branches/Presentation_HS16/src/orxonox/worldentities/Waypoint.h (copied) * code/branches/Presentation_HS16/src/orxonox/worldentities/Waypointarrow.cc (copied) * code/branches/Presentation_HS16/src/orxonox/worldentities/Waypointarrow.h (copied) waypoints merged to presentation Mon, 19 Dec 2016 07:25:42 GMT maxima [11349] * code/branches/QuestGuide_HS16/data/levels/Waypoints.oxw (deleted) * code/branches/QuestGuide_HS16/data/levels/Waypointstest.oxw (added) * code/branches/QuestGuide_HS16/data/levels/templates/spaceshipAssff.oxt (modified) * code/branches/QuestGuide_HS16/data/levels/templates/spaceshipWaypoint.oxt (added) separate files for Waypoints Mon, 19 Dec 2016 07:24:16 GMT maxima [11348] * code/branches/Presentation_HS16/data/levels/DialogTest.oxw (added) * code/branches/Presentation_HS16/data/overlays/HUDTemplates3.oxo (modified) * code/branches/Presentation_HS16/data/overlays/HUDTemplatesDialog.oxo (added) separate files for Dialog Mon, 19 Dec 2016 07:15:56 GMT maxima [11347] * code/branches/Presentation_HS16 (modified) * code/branches/Presentation_HS16/data/levels/missionOne.oxw (modified) * code/branches/Presentation_HS16/data/overlays/HUDTemplates3.oxo (modified) * code/branches/Presentation_HS16/src/modules/notifications/CMakeLists.txt (modified) * code/branches/Presentation_HS16/src/modules/notifications/NotificationDispatcher.h (modified) * code/branches/Presentation_HS16/src/modules/notifications/NotificationManager.h (modified) * code/branches/Presentation_HS16/src/modules/notifications/dispatchers/CMakeLists.txt (modified) * code/branches/Presentation_HS16/src/modules/notifications/dispatchers/Dialogue.cc (copied) * code/branches/Presentation_HS16/src/modules/notifications/dispatchers/Dialogue.h (copied) * code/branches/Presentation_HS16/src/modules/notifications/dispatchers/DialogueManager.cc (copied) * code/branches/Presentation_HS16/src/modules/notifications/dispatchers/DialogueManager.h (copied) * code/branches/Presentation_HS16/src/modules/overlays/hud/CMakeLists.txt (modified) * code/branches/Presentation_HS16/src/modules/overlays/hud/HUDDialogue.cc (copied) * code/branches/Presentation_HS16/src/modules/overlays/hud/HUDDialogue.h (copied) dialog branch merged to presentation Mon, 19 Dec 2016 07:12:17 GMT maxima [11346] * code/branches/Dialog_HS16/data/levels/DialogTest.oxw (added) * code/branches/Dialog_HS16/data/overlays/HUDTemplatesDialog.oxo (added) separate files for Dialog Wed, 14 Dec 2016 15:51:58 GMT maxima [11345] * code/branches/Presentation_HS16/data/levels/StoryModeMap.oxw (modified) deleted unnecessary level tags Wed, 14 Dec 2016 15:45:51 GMT maxima [11344] * code/branches/Presentation_HS16 (modified) * code/branches/Presentation_HS16/data/levels/Endurancefinal.oxw (copied) * code/branches/Presentation_HS16/data/levels/templates/endurancetest_template.oxt (copied) bigship branch merged to presentatio0n Wed, 14 Dec 2016 15:23:39 GMT maxima [11343] * code/branches/Presentation_HS16/data/levels/newnewnewspacerace.oxw (modified) solved a grammar mistake.. Wed, 14 Dec 2016 15:05:11 GMT maxima [11342] * code/branches/Presentation_HS16 (modified) * code/branches/Presentation_HS16/data/levels/Spacerace2.oxw (deleted) * code/branches/Presentation_HS16/data/levels/SurfaceRacePresentation.oxw (deleted) * code/branches/Presentation_HS16/data/levels/newnewnewspacerace.oxw (copied) * code/branches/Presentation_HS16/data/levels/spaceRace.oxw (deleted) * code/branches/Presentation_HS16/data/levels/surfaceRace.oxw (deleted) * code/branches/Presentation_HS16/data/levels/templates/fastship.oxt (copied) * code/branches/Presentation_HS16/src/modules/gametypes/CMakeLists.txt (modified) * code/branches/Presentation_HS16/src/modules/gametypes/OldRaceCheckPoint.cc (deleted) * code/branches/Presentation_HS16/src/modules/gametypes/OldRaceCheckPoint.h (deleted) * code/branches/Presentation_HS16/src/modules/gametypes/OldSpaceRace.cc (deleted) * code/branches/Presentation_HS16/src/modules/gametypes/OldSpaceRace.h (deleted) * code/branches/Presentation_HS16/src/modules/gametypes/SpaceRace.cc (modified) * code/branches/Presentation_HS16/src/modules/gametypes/SpaceRace.h (modified) * code/branches/Presentation_HS16/src/modules/gametypes/SpaceRaceBot.cc (modified) * code/branches/Presentation_HS16/src/modules/gametypes/SpaceRaceBot.h (modified) * code/branches/Presentation_HS16/src/modules/gametypes/SpaceRaceController.cc (modified) * code/branches/Presentation_HS16/src/orxonox/controllers/HumanController.h (modified) * code/branches/Presentation_HS16/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/Presentation_HS16/src/orxonox/infos/Bot.cc (modified) * code/branches/Presentation_HS16/src/orxonox/infos/GametypeInfo.h (modified) * code/branches/Presentation_HS16/src/orxonox/sound/WorldAmbientSound.cc (modified) * code/branches/Presentation_HS16/svn-commit.2.tmp (copied) * code/branches/Presentation_HS16/svn-commit.tmp (copied) spacerace branch merged to presentation Wed, 14 Dec 2016 14:33:41 GMT maxima [11341] * code/branches/Presentation_HS16 (modified) * code/branches/Presentation_HS16/data/gui/layouts/CampaignMenu.layout (modified) * code/branches/Presentation_HS16/data/gui/schemes/OrxonoxHUDWidgets.scheme (modified) * code/branches/Presentation_HS16/data/gui/schemes/OrxonoxLook.scheme (modified) * code/branches/Presentation_HS16/data/gui/schemes/OrxonoxMenuWidgets.scheme (modified) * code/branches/Presentation_HS16/data/gui/schemes/TaharezGreenHUDWidgets.scheme (modified) * code/branches/Presentation_HS16/data/gui/schemes/TaharezGreenLook.scheme (modified) * code/branches/Presentation_HS16/data/gui/schemes/TaharezGreenMenuWidgets.scheme (modified) * code/branches/Presentation_HS16/data/gui/schemes/TaharezLook.scheme (modified) * code/branches/Presentation_HS16/data/gui/scripts/CampaignMenu.lua (modified) * code/branches/Presentation_HS16/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/Presentation_HS16/data/levels/Invaders.oxw (modified) * code/branches/Presentation_HS16/data/levels/StoryModeMap.oxw (copied) * code/branches/Presentation_HS16/data/levels/emptyLevel.oxw (modified) * code/branches/Presentation_HS16/data/levels/templates/StoryMode.oxt (copied) * code/branches/Presentation_HS16/data/overlays/StoryModeHUD.oxo (copied) * code/branches/Presentation_HS16/src/orxonox/gametypes/CMakeLists.txt (modified) * code/branches/Presentation_HS16/src/orxonox/gametypes/StoryMode.cc (copied) * code/branches/Presentation_HS16/src/orxonox/gametypes/StoryMode.h (copied) storymode branch merged to presentation Wed, 14 Dec 2016 12:39:14 GMT maxima [11339] * code/branches/Presentation_HS16 (modified) * code/branches/Presentation_HS16/data/defaultConfig/orxonox.ini (modified) * code/branches/Presentation_HS16/data/gui/layouts/HighscoreMenu.layout (copied) * code/branches/Presentation_HS16/data/gui/layouts/MainMenu.layout (modified) * code/branches/Presentation_HS16/data/gui/scripts/HighscoreMenu.lua (copied) * code/branches/Presentation_HS16/data/gui/scripts/MainMenu.lua (modified) * code/branches/Presentation_HS16/data/gui/scripts/MiscConfigMenu.lua (modified) * code/branches/Presentation_HS16/src/modules/dodgerace/DodgeRace.cc (modified) * code/branches/Presentation_HS16/src/modules/invader/Invader.cc (modified) * code/branches/Presentation_HS16/src/modules/jump/Jump.cc (modified) * code/branches/Presentation_HS16/src/modules/tetris/Tetris.cc (modified) * code/branches/Presentation_HS16/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/Presentation_HS16/src/orxonox/CMakeLists.txt (modified) * code/branches/Presentation_HS16/src/orxonox/Highscore.cc (copied) * code/branches/Presentation_HS16/src/orxonox/Highscore.h (copied) * code/branches/Presentation_HS16/src/orxonox/LevelInfo.cc (modified) * code/branches/Presentation_HS16/src/orxonox/LevelInfo.h (modified) merged the highscore branch to presentation Wed, 14 Dec 2016 12:06:27 GMT maxima [11338] * code/branches/Presentation_HS16 (copied) new branch for presentation. starting with HUD branch Tue, 13 Dec 2016 16:46:18 GMT bberabi [11337] * code/branches/SpaceRace_HS16/data/levels/Spacerace2.oxw (deleted) * code/branches/SpaceRace_HS16/data/levels/SurfaceRacePresentation.oxw (deleted) * code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw (modified) * code/branches/SpaceRace_HS16/data/levels/spaceRace.oxw (deleted) * code/branches/SpaceRace_HS16/data/levels/surfaceRace.oxw (deleted) * code/branches/SpaceRace_HS16/src/modules/gametypes/OldRaceCheckPoint.cc (deleted) * code/branches/SpaceRace_HS16/src/modules/gametypes/OldRaceCheckPoint.h (deleted) * code/branches/SpaceRace_HS16/src/modules/gametypes/OldSpaceRace.cc (deleted) * code/branches/SpaceRace_HS16/src/modules/gametypes/OldSpaceRace.h (deleted) * code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRace.cc (modified) all the other unnessary spacerace files are deleted, ... Mon, 12 Dec 2016 15:20:50 GMT patricwi [11336] * code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupItem.cc (modified) * code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupItem.h (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) * code/branches/HUD_HS16/src/modules/pickup/PickupManager.h (modified) * code/branches/HUD_HS16/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/HUD_HS16/src/orxonox/gamestates/GSLevel.h (modified) finished version of HUD and PickupSystem. crash bug remaining Mon, 12 Dec 2016 14:45:36 GMT meilel [11334] * code/branches/SpaceRace_HS16/src/modules/gametypes/CMakeLists.txt (modified) * code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRace.cc (modified) * code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRaceBot.cc (modified) * code/branches/SpaceRace_HS16/src/orxonox/infos/Bot.cc (modified) final changes Mon, 12 Dec 2016 14:28:37 GMT kappenh [11333] * code/branches/Highscore_HS16/data/defaultConfig/orxonox.ini (modified) * code/branches/Highscore_HS16/data/gui/scripts/HighscoreMenu.lua (modified) * code/branches/Highscore_HS16/data/gui/scripts/MiscConfigMenu.lua (modified) * code/branches/Highscore_HS16/src/modules/dodgerace/DodgeRace.cc (modified) * code/branches/Highscore_HS16/src/modules/invader/Invader.cc (modified) * code/branches/Highscore_HS16/src/modules/jump/Jump.cc (modified) * code/branches/Highscore_HS16/src/modules/tetris/Tetris.cc (modified) * code/branches/Highscore_HS16/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/Highscore_HS16/src/orxonox/CMakeLists.txt (modified) * code/branches/Highscore_HS16/src/orxonox/Highscore.cc (modified) * code/branches/Highscore_HS16/src/orxonox/Highscore.h (modified) * code/branches/Highscore_HS16/src/orxonox/highscore (deleted) Finished Project Mon, 12 Dec 2016 14:17:21 GMT ooguz [11332] * code/branches/QuestGuide_HS16/src/modules/waypoints/Waypoint.cc (modified) * code/branches/QuestGuide_HS16/src/modules/waypoints/Waypointarrow.cc (modified) * code/branches/QuestGuide_HS16/src/modules/waypoints/Waypointarrow.h (modified) Last Commit (waypointscale ist 0) Mon, 12 Dec 2016 14:16:38 GMT dmoritz [11331] * code/branches/Dialog_HS16/src/modules/notifications/dispatchers/Dialogue.cc (modified) * code/branches/Dialog_HS16/src/modules/notifications/dispatchers/Dialogue.h (modified) * code/branches/Dialog_HS16/src/modules/overlays/hud/HUDDialogue.cc (modified) * code/branches/Dialog_HS16/src/modules/overlays/hud/HUDDialogue.h (modified) Final changes. Mon, 12 Dec 2016 14:04:10 GMT marvinh [11330] * code/branches/StoryModeMap_HS16/data/gui/layouts/CampaignMenu.layout (modified) * code/branches/StoryModeMap_HS16/data/gui/schemes/OrxonoxMenuWidgets.scheme (modified) * code/branches/StoryModeMap_HS16/data/gui/schemes/TaharezGreenHUDWidgets.scheme (modified) * code/branches/StoryModeMap_HS16/data/gui/schemes/TaharezGreenLook.scheme (modified) * code/branches/StoryModeMap_HS16/data/gui/schemes/TaharezGreenMenuWidgets.scheme (modified) * code/branches/StoryModeMap_HS16/data/gui/schemes/TaharezLook.scheme (modified) Finale Version. Die Buttons sind unsichtbar und darueber ist ein ... Mon, 12 Dec 2016 13:33:49 GMT pschefer [11329] * code/branches/BigShip_HS16/data/levels/Endurancefinal.oxw (added) * code/branches/BigShip_HS16/data/levels/emptyLevel.oxw (modified) * code/branches/BigShip_HS16/data/levels/endurancetest.oxw (deleted) * code/branches/BigShip_HS16/data/levels/endurancetestlevel.oxw (deleted) * code/branches/BigShip_HS16/data/levels/templates/endurancetest_template.oxt (modified) Final version of endurance big ship Mon, 12 Dec 2016 13:17:47 GMT meilel [11328] * code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw (modified) * code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRaceController.cc (modified) * code/branches/SpaceRace_HS16/src/orxonox/infos/Bot.cc (modified) start and finish line Mon, 12 Dec 2016 13:11:48 GMT bberabi [11327] * code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw (modified) * code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRace.cc (modified) die startpositonen und sterben von bots Fri, 09 Dec 2016 12:37:46 GMT kappenh [11326] * code/branches/Highscore_HS16/data/gui/scripts/HighscoreMenu.lua (modified) * code/branches/Highscore_HS16/src/modules/dodgerace/DodgeRace.cc (modified) * code/branches/Highscore_HS16/src/modules/invader/Invader.cc (modified) * code/branches/Highscore_HS16/src/modules/jump/Jump.cc (modified) * code/branches/Highscore_HS16/src/modules/tetris/Tetris.cc (modified) * code/branches/Highscore_HS16/src/modules/towerdefense/TowerDefense.cc (modified) Finished Project, Maybe switch enumeration of highscores in table Thu, 08 Dec 2016 17:34:27 GMT patricwi [11325] * code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupItem.cc (modified) * code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupItem.h (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) * code/branches/HUD_HS16/src/orxonox/CMakeLists.txt (modified) visualization finished, bug when ending or reloading the level Thu, 08 Dec 2016 14:21:55 GMT kappenh [11324] * code/branches/Highscore_HS16/data/gui/scripts/HighscoreMenu.lua (modified) Menu working: TODO: add more minigames Mon, 05 Dec 2016 17:01:02 GMT patricwi [11323] * code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupItem.cc (modified) * code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupItem.h (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.h (modified) bug when ending or restarting a game with non-empty inventory and ... Mon, 05 Dec 2016 15:15:27 GMT bberabi [11322] * code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRace.cc (modified) we found how to set starpositions Mon, 05 Dec 2016 15:08:31 GMT ooguz [11321] * code/branches/QuestGuide_HS16/src/modules/waypoints/WaypointGroup.cc (modified) * code/branches/QuestGuide_HS16/src/modules/waypoints/WaypointGroup.h (modified) Distance Trigger works! Mon, 05 Dec 2016 15:07:35 GMT pschefer [11320] * code/branches/BigShip_HS16/data/levels/HeavyCruiser.oxw (modified) * code/branches/BigShip_HS16/data/levels/emptyLevel.oxw (modified) * code/branches/BigShip_HS16/data/levels/endurancetestlevel.oxw (modified) * code/branches/BigShip_HS16/data/levels/templates/endurancetest_template.oxt (modified) added explosion effects, polished textures, fixed bugs Mon, 05 Dec 2016 14:59:38 GMT ooguz [11318] * code/branches/QuestGuide_HS16/src/modules/waypoints/Waypoint.cc (modified) * code/branches/QuestGuide_HS16/src/modules/waypoints/Waypoint.h (modified) * code/branches/QuestGuide_HS16/src/modules/waypoints/WaypointGroup.cc (modified) * code/branches/QuestGuide_HS16/src/modules/waypoints/WaypointGroup.h (modified) * code/branches/QuestGuide_HS16/src/modules/waypoints/Waypointarrow.cc (modified) * code/branches/QuestGuide_HS16/src/modules/waypoints/Waypointprereqs.h (added) Distance Trigger Added Mon, 05 Dec 2016 14:59:27 GMT dmoritz [11317] * code/branches/Dialog_HS16/data/levels/missionOne.oxw (modified) * code/branches/Dialog_HS16/data/overlays/HUDTemplates3.oxo (modified) * code/branches/Dialog_HS16/src/modules/notifications/CMakeLists.txt (modified) * code/branches/Dialog_HS16/src/modules/notifications/dispatchers/CMakeLists.txt (modified) * code/branches/Dialog_HS16/src/modules/notifications/dispatchers/Dialogue.cc (modified) * code/branches/Dialog_HS16/src/modules/notifications/dispatchers/Dialogue.h (modified) * code/branches/Dialog_HS16/src/modules/overlays/hud/HUDDialogue.cc (modified) * code/branches/Dialog_HS16/src/modules/overlays/hud/HUDDialogue.h (modified) Picture added Mon, 05 Dec 2016 14:57:07 GMT jhuwyler [11316] * code/branches/StoryModeMap_HS16/data/gui/layouts/CampaignMenu.layout (modified) * code/branches/StoryModeMap_HS16/data/gui/schemes/OrxonoxHUDWidgets.scheme (modified) * code/branches/StoryModeMap_HS16/data/gui/schemes/OrxonoxLook.scheme (modified) * code/branches/StoryModeMap_HS16/data/gui/scripts/CampaignMenu.lua (modified) * code/branches/StoryModeMap_HS16/data/levels/StoryModeMap.oxw (modified) Durch fehlen von Imagesetts konnte nicht alles gemacht werden. Die ... Thu, 01 Dec 2016 14:08:54 GMT kappenh [11315] * code/branches/Highscore_HS16/data/defaultConfig/orxonox.ini (modified) * code/branches/Highscore_HS16/data/gui/scripts/HighscoreMenu.lua (modified) * code/branches/Highscore_HS16/src/modules/jump/Jump.cc (modified) * code/branches/Highscore_HS16/src/orxonox/Highscore.cc (modified) * code/branches/Highscore_HS16/src/orxonox/Highscore.h (modified) updated Highscore interface and Jump save routine TODO: Menu! Mon, 28 Nov 2016 18:21:35 GMT patricwi [11314] * code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupItem.cc (modified) * code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupItem.h (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/CMakeLists.txt (modified) * code/branches/HUD_HS16/src/modules/pickup/PickupManager.cc (modified) * code/branches/HUD_HS16/src/modules/pickup/PickupManager.h (modified) linker problem solved, visuals work as long as only 1 item is picked up. Mon, 28 Nov 2016 15:53:24 GMT kappenh [11313] * code/branches/Highscore_HS16/data/defaultConfig/orxonox.ini (modified) * code/branches/Highscore_HS16/data/gui/scripts/HighscoreMenu.lua (modified) * code/branches/Highscore_HS16/src/libraries/core/CMakeLists.txt (modified) * code/branches/Highscore_HS16/src/libraries/core/Highscore.cc (deleted) * code/branches/Highscore_HS16/src/libraries/core/Highscore.h (deleted) * code/branches/Highscore_HS16/src/modules/jump/Jump.cc (modified) * code/branches/Highscore_HS16/src/orxonox/CMakeLists.txt (modified) * code/branches/Highscore_HS16/src/orxonox/Highscore.cc (added) * code/branches/Highscore_HS16/src/orxonox/Highscore.h (added) Able to save scores in ini. todo: save and retrieve pong score Mon, 28 Nov 2016 15:36:54 GMT meilel [11312] * code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw (modified) * code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRace.cc (modified) * code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRaceBot.cc (modified) * code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRaceController.cc (modified) * code/branches/SpaceRace_HS16/src/orxonox/infos/Bot.cc (modified) boards added and other stuff done Mon, 28 Nov 2016 15:07:25 GMT pschefer [11311] * code/branches/BigShip_HS16/data/levels/endurancetestlevel.oxw (modified) * code/branches/BigShip_HS16/data/levels/templates/endurancetest_template.oxt (modified) destructible parts added to spaceship, modified collisionshapes Mon, 28 Nov 2016 15:04:45 GMT ooguz [11309] * code/branches/QuestGuide_HS16/src/modules/waypoints/Waypoint.cc (modified) * code/branches/QuestGuide_HS16/src/modules/waypoints/WaypointGroup.cc (modified) * code/branches/QuestGuide_HS16/src/modules/waypoints/Waypointarrow.cc (modified) Distance Trigger base methods Mon, 28 Nov 2016 15:00:23 GMT marvinh [11308] * code/branches/StoryModeMap_HS16/data/gui/layouts/CampaignMenu.layout (modified) * code/branches/StoryModeMap_HS16/data/gui/schemes/OrxonoxHUDWidgets.scheme (modified) * code/branches/StoryModeMap_HS16/data/gui/schemes/OrxonoxLook.scheme (modified) * code/branches/StoryModeMap_HS16/data/gui/schemes/OrxonoxMenuWidgets.scheme (modified) Ein neuer Button wurde kreiert. Der JuuButton funktioniert nicht ... Mon, 28 Nov 2016 14:34:58 GMT ooguz [11307] * code/branches/QuestGuide_HS16/src/modules/waypoints/Waypointarrow.cc (modified) arrow points at the right location Mon, 28 Nov 2016 12:20:42 GMT meilel [11306] * code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw (modified) * code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRaceController.cc (modified) nada Mon, 21 Nov 2016 15:18:45 GMT patricwi [11305] * code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupItem.cc (modified) * code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupItem.h (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) * code/branches/HUD_HS16/src/modules/pickup/PickupManager.h (modified) linker error Mon, 21 Nov 2016 15:10:07 GMT kappenh [11304] * code/branches/Highscore_HS16/data/gui/scripts/HighscoreMenu.lua (modified) * code/branches/Highscore_HS16/src/libraries/core/CMakeLists.txt (modified) * code/branches/Highscore_HS16/src/libraries/core/Highscore.cc (added) * code/branches/Highscore_HS16/src/libraries/core/Highscore.h (added) * code/branches/Highscore_HS16/src/orxonox/CMakeLists.txt (modified) * code/branches/Highscore_HS16/src/orxonox/highscore (added) * code/branches/Highscore_HS16/src/orxonox/highscore/CMakeLists.txt (added) * code/branches/Highscore_HS16/src/orxonox/highscore/HighscoreIO.cc (added) * code/branches/Highscore_HS16/src/orxonox/highscore/HighscoreIO.h (added) try to save highscore Mon, 21 Nov 2016 15:06:13 GMT bberabi [11303] * code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw (modified) * code/branches/SpaceRace_HS16/data/levels/templates/fastship.oxt (modified) * code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRace.cc (modified) * code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRaceController.cc (modified) blabla Mon, 21 Nov 2016 15:04:27 GMT pschefer [11302] * code/branches/BigShip_HS16/data/levels/templates/endurancetest_template.oxt (modified) added destruction parts Mon, 21 Nov 2016 14:57:58 GMT marvinh [11299] * code/branches/StoryModeMap_HS16/data/gui/layouts/CampaignMenu.layout (modified) * code/branches/StoryModeMap_HS16/data/levels/StoryModeMap.oxw (modified) Heute wurden die Planeten an die richtige Position gesetzt und auch ... Mon, 21 Nov 2016 14:55:43 GMT ooguz [11298] * code/branches/QuestGuide_HS16/src/modules/waypoints/Waypoint.h (modified) * code/branches/QuestGuide_HS16/src/modules/waypoints/WaypointGroup.cc (modified) * code/branches/QuestGuide_HS16/src/modules/waypoints/WaypointGroup.h (modified) * code/branches/QuestGuide_HS16/src/modules/waypoints/Waypointarrow.cc (modified) * code/branches/QuestGuide_HS16/src/modules/waypoints/Waypointarrow.h (modified) Arrow movessvn add Waypoint.h! Mon, 21 Nov 2016 14:31:06 GMT pschefer [11297] * code/branches/BigShip_HS16/data/levels/endurancetestlevel.oxw (modified) * code/branches/BigShip_HS16/data/levels/templates/endurancetest_template.oxt (modified) endurance completed Mon, 21 Nov 2016 11:55:57 GMT patricwi [11295] * code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupItem.cc (modified) * code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupItem.h (modified) * code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupSystem.cc (modified) latest changes because of linker Mon, 21 Nov 2016 10:18:57 GMT ahedges [11294] * code/branches/mac_HS16/src/orxonox/worldentities/Actionpoint.cc (modified) revert commenting out of macros Thu, 17 Nov 2016 15:58:06 GMT patricwi [11293] * code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupItem.cc (modified) * code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupItem.h (modified) * code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupSystem.cc (modified) * code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupSystem.h (modified) improvements on pickup system Mon, 14 Nov 2016 15:08:55 GMT dmoritz [11292] * code/branches/Dialog_HS16/data/levels/missionOne.oxw (modified) * code/branches/Dialog_HS16/data/overlays/HUDTemplates3.oxo (modified) * code/branches/Dialog_HS16/src/modules/notifications/dispatchers/CMakeLists.txt (modified) * code/branches/Dialog_HS16/src/modules/notifications/dispatchers/Dialogue.h (modified) * code/branches/Dialog_HS16/src/modules/notifications/dispatchers/DialogueManager.cc (added) * code/branches/Dialog_HS16/src/modules/notifications/dispatchers/DialogueManager.h (added) * code/branches/Dialog_HS16/src/modules/overlays/hud/CMakeLists.txt (modified) * code/branches/Dialog_HS16/src/modules/overlays/hud/HUDDialogue.cc (added) * code/branches/Dialog_HS16/src/modules/overlays/hud/HUDDialogue.h (added) New DialogueManager Class Mon, 14 Nov 2016 15:07:34 GMT pschefer [11291] * code/branches/BigShip_HS16/data/levels/emptyLevel.oxw (modified) * code/branches/BigShip_HS16/data/levels/endurancetestlevel.oxw (modified) * code/branches/BigShip_HS16/data/levels/templates/endurancetest_template.oxt (modified) Spaceshipparts almost completed Mon, 14 Nov 2016 15:02:01 GMT meilel [11289] * code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw (modified) level file changed Mon, 14 Nov 2016 14:58:16 GMT ooguz [11288] * code/branches/QuestGuide_HS16/data/levels/Waypoints.oxw (added) * code/branches/QuestGuide_HS16/data/levels/templates/spaceshipAssff.oxt (modified) * code/branches/QuestGuide_HS16/data/levels/testStars.oxw (modified) Level file Changes Mon, 14 Nov 2016 14:57:03 GMT ooguz [11287] * code/branches/QuestGuide_HS16/src/modules/waypoints/CMakeLists.txt (modified) * code/branches/QuestGuide_HS16/src/modules/waypoints/Waypoint.cc (modified) * code/branches/QuestGuide_HS16/src/modules/waypoints/Waypoint.h (modified) * code/branches/QuestGuide_HS16/src/modules/waypoints/WaypointGroup.cc (modified) * code/branches/QuestGuide_HS16/src/modules/waypoints/WaypointGroup.h (modified) * code/branches/QuestGuide_HS16/src/modules/waypoints/Waypointarrow.cc (modified) * code/branches/QuestGuide_HS16/src/modules/waypoints/Waypointarrow.h (modified) Bugs fixed Mon, 14 Nov 2016 14:52:10 GMT marvinh [11286] * code/branches/StoryModeMap_HS16/data/gui/layouts/CampaignMenu.layout (modified) * code/branches/StoryModeMap_HS16/data/levels/StoryModeMap.oxw (modified) Der Button stellt sich als schwerer als gedacht heraus. Doch Marvin ... Mon, 14 Nov 2016 14:46:36 GMT ahedges [11285] * code/branches/mac_HS16/.clang-format (added) * code/branches/mac_HS16/cmake/CopyLibPhase.cmake (modified) * code/branches/mac_HS16/cmake/tools/FindCEGUI.cmake (modified) add clang-format config and document CopyLibPhase Mon, 14 Nov 2016 14:46:04 GMT bberabi [11284] * code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw (modified) * code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRace.cc (modified) Mon, 14 Nov 2016 13:34:29 GMT bberabi [11283] * code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRace.cc (modified) * code/branches/SpaceRace_HS16/src/orxonox/infos/Bot.cc (modified) * code/branches/SpaceRace_HS16/src/orxonox/infos/GametypeInfo.h (modified) asdas Mon, 14 Nov 2016 13:14:59 GMT meilel [11282] * code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw (modified) checkpoints Mon, 14 Nov 2016 12:37:01 GMT bberabi [11281] * code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw (modified) * code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRace.cc (modified) * code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRace.h (modified) * code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRaceBot.cc (modified) * code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRaceManager.cc (modified) * code/branches/SpaceRace_HS16/src/orxonox/infos/GametypeInfo.h (modified) bots addiert checkpoint problem gelost Mon, 14 Nov 2016 12:10:57 GMT ahedges [11280] * code/branches/mac_HS16/CMakeLists.txt (modified) add option to test clang on linux Fri, 11 Nov 2016 12:15:24 GMT bberabi [11279] * code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw (modified) * code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRaceManager.cc (modified) Tue, 08 Nov 2016 08:05:10 GMT ahedges [11278] * code/branches/mac_HS16/CMakeLists.txt (modified) * code/branches/mac_HS16/cmake/CopyLibPhase.cmake (added) * code/branches/mac_HS16/cmake/LibraryConfig.cmake (modified) * code/branches/mac_HS16/cmake/PackageConfigOSX.cmake (modified) * code/branches/mac_HS16/cmake/tools/FindCEGUI.cmake (modified) * code/branches/mac_HS16/src/external/tolua/CMakeLists.txt (modified) * code/branches/mac_HS16/src/external/tolua/tolua++.h (deleted) * code/branches/mac_HS16/src/orxonox/worldentities/Actionpoint.cc (modified) comment out some stuff and update the cmake file for macOS 10.12 Mon, 07 Nov 2016 16:08:11 GMT patricwi [11277] * code/branches/HUD_HS16/data/overlays/HUDTemplates3.oxo (modified) * code/branches/HUD_HS16/data/overlays/HUDTemplatesFPS.oxo (modified) * code/branches/HUD_HS16/src/modules/overlays/OverlaysPrereqs.h (modified) * code/branches/HUD_HS16/src/modules/overlays/hud/CMakeLists.txt (modified) * code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupItem.cc (modified) * code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupItem.h (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) visualization of pickup system initiated. next steps: add pickup ... Mon, 07 Nov 2016 15:07:14 GMT meilel [11276] * code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw (modified) * code/branches/SpaceRace_HS16/data/levels/templates/fastship.oxt (modified) level file changed Mon, 07 Nov 2016 15:04:07 GMT pschefer [11275] * code/branches/BigShip_HS16/data/levels/endurancetestlevel.oxw (modified) * code/branches/BigShip_HS16/data/levels/templates/endurancetest_template.oxt (modified) explosion parts Mon, 07 Nov 2016 15:02:03 GMT ooguz [11274] * code/branches/QuestGuide_HS16/src/modules/waypoints (added) * code/branches/QuestGuide_HS16/src/modules/waypoints/CMakeLists.txt (added) * code/branches/QuestGuide_HS16/src/modules/waypoints/Waypoint.cc (added) * code/branches/QuestGuide_HS16/src/modules/waypoints/Waypoint.h (added) * code/branches/QuestGuide_HS16/src/modules/waypoints/WaypointGroup.cc (added) * code/branches/QuestGuide_HS16/src/modules/waypoints/WaypointGroup.h (added) * code/branches/QuestGuide_HS16/src/modules/waypoints/Waypointarrow.cc (added) * code/branches/QuestGuide_HS16/src/modules/waypoints/Waypointarrow.h (added) waypoints to modules Mon, 07 Nov 2016 15:01:02 GMT ooguz [11273] * code/branches/QuestGuide_HS16/src/modules/CMakeLists.txt (modified) Waypoints to modules