# # ChangeLog for code # # Generated by Trac 1.0.9 # Nov 25, 2024, 6:49:17 PM Mon, 29 May 2017 15:39:55 GMT patricwi [11439] * code/branches/Presentation_FS17 (modified) * code/branches/Presentation_FS17/data/levels/MilleniumFalconTest.oxw (copied) * code/branches/Presentation_FS17/data/levels/includes/MFalconWeapon.oxi (copied) * code/branches/Presentation_FS17/data/levels/templates/MFalcon.oxt (copied) Millenium Falcon added Mon, 29 May 2017 15:26:24 GMT patricwi [11438] * code/branches/Presentation_FS17 (modified) * code/branches/Presentation_FS17/data/levels/SOB.oxw (copied) * code/branches/Presentation_FS17/data/levels/SOB_Level2.oxw (copied) * code/branches/Presentation_FS17/data/levels/SuperOrxoBros.oxw (copied) * code/branches/Presentation_FS17/data/levels/SuperOrxoBrosLevel.oxw (copied) * code/branches/Presentation_FS17/data/levels/templates/superorxobrow.oxw (copied) * code/branches/Presentation_FS17/data/overlays/SOBHUD.oxo (copied) * code/branches/Presentation_FS17/src/modules/CMakeLists.txt (modified) * code/branches/Presentation_FS17/src/modules/superorxobros (copied) SuperOrxoBros works Mon, 29 May 2017 14:18:43 GMT patricwi [11437] * code/branches/Presentation_FS17 (modified) * code/branches/Presentation_FS17/data/gui/layouts/Dialogue.layout (copied) * code/branches/Presentation_FS17/data/gui/scripts/Dialogue.lua (copied) * code/branches/Presentation_FS17/data/gui/scripts/TestDialogButttons.lua (copied) * code/branches/Presentation_FS17/data/levels/DialogueShowcase.oxw (copied) * code/branches/Presentation_FS17/data/overlays/HUDTemplates3.oxo (modified) * code/branches/Presentation_FS17/data/tcl/core (copied) * code/branches/Presentation_FS17/src/modules/CMakeLists.txt (modified) * code/branches/Presentation_FS17/src/modules/dialogue (copied) * code/branches/Presentation_FS17/src/modules/dialogue/DialogueManager.cc (modified) Dialogue project merged Mon, 29 May 2017 13:37:40 GMT patricwi [11436] * code/branches/Presentation_FS17 (copied) Creating Presentation branch Fri, 26 May 2017 13:40:04 GMT rrogge [11435] * code/branches/Dialogue_FS17/data/gui/scripts/Dialogue.lua (modified) * code/branches/Dialogue_FS17/data/levels/DialogueShowcase.oxw (added) * code/branches/Dialogue_FS17/data/levels/emptyLevel.oxw (modified) * code/branches/Dialogue_FS17/data/tcl/core (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 (modified) * code/branches/Dialogue_FS17/src/modules/dialogue/NextQuestion.h (modified) Code aufgeraeumt Thu, 18 May 2017 15:27:15 GMT rrogge [11433] * code/branches/Dialogue_FS17/data/gui/scripts/Dialogue.lua (modified) * code/branches/Dialogue_FS17/data/levels/events.oxw (modified) * code/branches/Dialogue_FS17/src/modules/dialogue/NextQuestion.cc (modified) Everything works Thu, 18 May 2017 15:05:53 GMT rrogge [11432] * code/branches/Dialogue_FS17/data/gui/scripts/Dialogue.lua (modified) * code/branches/Dialogue_FS17/data/levels/events.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 (modified) * code/branches/Dialogue_FS17/src/modules/dialogue/NextQuestion.h (modified) Reload works now Thu, 18 May 2017 14:32:13 GMT davidf [11431] * code/branches/SuperOrxoBros_FS17/data/levels/SOB.oxw (modified) Thu, 18 May 2017 14:06:53 GMT rrogge [11428] * code/branches/Dialogue_FS17/data/gui/scripts/Dialogue.lua (modified) * code/branches/Dialogue_FS17/data/tcl/core (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 (modified) Alles funktionioniert so weit, bloss kann man pro Spiel bloss einmal ... Thu, 18 May 2017 14:06:09 GMT aungriah [11427] * code/branches/Alejandro_FS17/data/levels/includes/MFalconWeapon.oxi (modified) Level for Presentation Thu, 18 May 2017 13:57:10 GMT davidf [11426] * code/branches/SuperOrxoBros_FS17/data/levels/SOB.oxw (modified) Thu, 18 May 2017 13:44:49 GMT nyogaraj [11424] * code/branches/Boss_FS17/data/levels/FinalBossFS17.oxw (modified) * code/branches/Boss_FS17/data/levels/includes/BossSpawnWeaponSetting.oxi (modified) * code/branches/Boss_FS17/data/levels/includes/weaponSettingsEscort.oxi (modified) * code/branches/Boss_FS17/data/levels/shieldTest.oxw (modified) * code/branches/Boss_FS17/data/levels/templates/Bossship.oxt (modified) * code/branches/Boss_FS17/data/levels/templates/Bossspawnship.oxt (modified) * code/branches/Boss_FS17/src/modules/weapons/weaponmodes/IceGun.cc (modified) * code/branches/Boss_FS17/src/orxonox/items/PartDestructionEvent.cc (modified) i finished the project without ever making any commits Thu, 18 May 2017 13:44:35 GMT aungriah [11423] * code/branches/Alejandro_FS17/data/levels/MilleniumFalconTest.oxw (added) * code/branches/Alejandro_FS17/data/levels/includes/MFalconWeapon.oxi (added) * code/branches/Alejandro_FS17/data/levels/templates/MFalcon.oxt (added) BlenderToOrxonox Thu, 18 May 2017 12:55:34 GMT rrogge [11422] * code/branches/Dialogue_FS17/data/gui/scripts/Dialogue.lua (modified) everything updates Thu, 18 May 2017 12:49:13 GMT rrogge [11421] * code/branches/Dialogue_FS17/data/gui/scripts/Dialogue.lua (modified) * code/branches/Dialogue_FS17/data/tcl/core (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/NextQuestion.cc (modified) * code/branches/Dialogue_FS17/src/modules/dialogue/NextQuestion.h (modified) question updates Thu, 18 May 2017 12:16:01 GMT jkindle [11420] * code/branches/SuperOrxoBros_FS17/data/levels/SOB.oxw (modified) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBCoin.cc (modified) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBFigure.cc (modified) Added rotation of coins Thu, 18 May 2017 11:50:21 GMT davidf [11419] * code/branches/SuperOrxoBros_FS17/data/levels/SOB.oxw (modified) Thu, 18 May 2017 11:24:43 GMT jkindle [11418] * code/branches/SuperOrxoBros_FS17/data/overlays/SOBHUD.oxo (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) IMPROVED JUMP ALGORITHM OH GHAD YEES JEES Thu, 11 May 2017 14:15:10 GMT rrogge [11417] * code/branches/Dialogue_FS17/data/gui/scripts/Dialogue.lua (modified) * code/branches/Dialogue_FS17/data/levels/events.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/DialoguePrereqs.h (modified) * code/branches/Dialogue_FS17/src/modules/dialogue/NextQuestion.cc (modified) * code/branches/Dialogue_FS17/src/modules/dialogue/NextQuestion.h (modified) Funktion der Buttons noch fehlerhaft Thu, 11 May 2017 13:18:27 GMT jkindle [11416] * 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/SOB.cc (modified) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOB.h (modified) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBCastlestone.cc (added) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBCastlestone.h (added) * 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/SOBCoin.cc (added) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBCoin.h (added) * 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/SOBFlagstone.cc (modified) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBFlagstone.h (modified) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBGumba.cc (modified) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBGumba.h (modified) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBHUDInfo.cc (modified) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBHUDInfo.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/SOBMushroom.cc (modified) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBMushroom.h (modified) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBPrereqs.h (modified) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBQBlock.cc (modified) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBQBlock.h (modified) Added the animation for the level end (walk into castle), Coins for ... Thu, 11 May 2017 13:04:50 GMT rrogge [11415] * code/branches/Dialogue_FS17/data/gui/scripts/Dialogue.lua (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 (modified) Singletonkram figured out Tue, 09 May 2017 09:11:13 GMT davidf [11414] * code/branches/SuperOrxoBros_FS17/data/levels/SOB.oxw (modified) * code/branches/SuperOrxoBros_FS17/data/levels/SOB_Level2.oxw (modified) new models, controll lvl2 Thu, 04 May 2017 14:11:36 GMT rrogge [11413] * code/branches/Dialogue_FS17/data/gui/scripts/Dialogue.lua (modified) * code/branches/Dialogue_FS17/data/levels/events.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 (modified) * code/branches/Dialogue_FS17/src/modules/dialogue/NextQuestion.h (modified) Buttons Thu, 04 May 2017 13:17:59 GMT jkindle [11412] * code/branches/SuperOrxoBros_FS17/data/levels/SOB.oxw (modified) * code/branches/SuperOrxoBros_FS17/data/overlays/SOBHUD.oxo (modified) * 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) * 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/SOBFlagstone.cc (added) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBFlagstone.h (added) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBGumba.cc (added) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBGumba.h (added) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBHUDInfo.cc (modified) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBMushroom.cc (modified) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBMushroom.h (modified) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBPrereqs.h (modified) Fixed turning, added and finished Gumbas, added turnOnCollide for all ... Thu, 04 May 2017 09:26:52 GMT davidf [11411] * code/branches/SuperOrxoBros_FS17/data/levels/SOB.oxw (modified) * code/branches/SuperOrxoBros_FS17/data/levels/SOB_Level2.oxw (modified) new models and lvl 1 and 2 m Mon, 01 May 2017 10:57:26 GMT davidf [11410] * code/branches/SuperOrxoBros_FS17/data/levels/SOB.oxw (modified) * code/branches/SuperOrxoBros_FS17/data/levels/SOB_Level2.oxw (added) new level and level1 finished Fri, 28 Apr 2017 14:09:26 GMT davidf [11409] * code/branches/SuperOrxoBros_FS17/data/levels/SOB.oxw (modified) Thu, 27 Apr 2017 14:08:36 GMT maxima [11408] * code/branches/Dialogue_FS17/data/tcl/core (deleted) delete, delete, delete Thu, 27 Apr 2017 14:05:23 GMT rrogge [11407] * code/branches/Dialogue_FS17/data/gui/layouts/Dialogue.layout (modified) * code/branches/Dialogue_FS17/data/gui/scripts/Dialogue.lua (modified) lua Buttons angefangen Thu, 27 Apr 2017 13:36:57 GMT rrogge [11406] * code/branches/Dialogue_FS17/data/gui/layouts/Dialogue.layout (added) * code/branches/Dialogue_FS17/data/gui/scripts/Dialogue.lua (modified) * code/branches/Dialogue_FS17/data/tcl/core (added) * code/branches/Dialogue_FS17/src/modules/dialogue/CMakeLists.txt (modified) * code/branches/Dialogue_FS17/src/modules/dialogue/Dialogue.layout (deleted) * code/branches/Dialogue_FS17/src/modules/dialogue/Dialogue.lua (deleted) * 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 (modified) Dialogfenster geht auf :D Thu, 27 Apr 2017 13:08:16 GMT jkindle [11405] * code/branches/SuperOrxoBros_FS17/data/levels/SOB.oxw (modified) * code/branches/SuperOrxoBros_FS17/data/overlays/SOBHUD.oxo (added) * 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/SOB.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/SOBHUDInfo.cc (added) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBHUDInfo.h (added) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBMushroom.cc (modified) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBMushroom.h (modified) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBPrereqs.h (modified) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBQBlock.cc (modified) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBQBlock.h (modified) Added a HUD and type to QBlocks Thu, 27 Apr 2017 10:32:58 GMT davidf [11404] * code/branches/SuperOrxoBros_FS17/data/levels/SOB.oxw (modified) Wed, 26 Apr 2017 09:07:48 GMT davidf [11403] * code/branches/SuperOrxoBros_FS17/data/levels/SOB.oxw (modified) Tue, 25 Apr 2017 12:51:44 GMT jkindle [11402] * 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/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/SOBMushroom.cc (added) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBMushroom.h (added) * code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBPrereqs.h (modified) Added mushrooms and deadzone Thu, 13 Apr 2017 13:47:48 GMT rrogge [11401] * code/branches/Dialogue_FS17/data/gui/scripts/Dialogue.lua (added) * code/branches/Dialogue_FS17/data/levels/events.oxw (modified) * code/branches/Dialogue_FS17/data/overlays/HUDTemplates3.oxo (modified) * code/branches/Dialogue_FS17/src/modules/dialogue/CMakeLists.txt (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 (modified) * code/branches/Dialogue_FS17/src/modules/dialogue/NextQuestion.h (modified) zeigt PickupInventory an 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 Mon, 20 Mar 2017 23:20:34 GMT landauf [11376] * code/trunk/test/util/MathTest.cc (modified) test: fixed unittest Mon, 20 Mar 2017 22:43:07 GMT landauf [11375] * code/trunk/test/util/MathTest.cc (modified) testing commit mailinglist Mon, 20 Mar 2017 22:27:13 GMT landauf [11374] * code/trunk/test/util/MathTest.cc (modified) test: failing unittest Mon, 20 Mar 2017 00:10:46 GMT landauf [11373] * code/trunk/test.txt (deleted) test Mon, 20 Mar 2017 00:01:57 GMT landauf [11372] * code/trunk/test.txt (added) test 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 15:30:11 GMT patricwi [11359] * code/trunk (modified) * code/trunk/data/gui/layouts/CampaignMenu.layout (modified) * code/trunk/data/gui/schemes/OrxonoxHUDWidgets.scheme (modified) * code/trunk/data/gui/schemes/OrxonoxLook.scheme (modified) * code/trunk/data/gui/schemes/OrxonoxMenuWidgets.scheme (modified) * code/trunk/data/gui/schemes/TaharezGreenHUDWidgets.scheme (modified) * code/trunk/data/gui/schemes/TaharezGreenLook.scheme (modified) * code/trunk/data/gui/schemes/TaharezGreenMenuWidgets.scheme (modified) * code/trunk/data/gui/schemes/TaharezLook.scheme (modified) * code/trunk/data/gui/scripts/CampaignMenu.lua (modified) * code/trunk/data/gui/scripts/SingleplayerMenu.lua (modified) * code/trunk/data/levels/StoryModeMap.oxw (copied) * code/trunk/data/levels/templates/StoryMode.oxt (copied) * code/trunk/data/overlays/StoryModeHUD.oxo (copied) * code/trunk/src/orxonox/gametypes/CMakeLists.txt (modified) * code/trunk/src/orxonox/gametypes/StoryMode.cc (copied) * code/trunk/src/orxonox/gametypes/StoryMode.h (copied) story mode map merged Thu, 09 Mar 2017 15:22:19 GMT patricwi [11358] * code/trunk (modified) * code/trunk/data/levels/Spacerace2.oxw (deleted) * code/trunk/data/levels/SurfaceRacePresentation.oxw (deleted) * code/trunk/data/levels/newnewnewspacerace.oxw (copied) * code/trunk/data/levels/spaceRace.oxw (deleted) * code/trunk/data/levels/surfaceRace.oxw (deleted) * code/trunk/data/levels/templates/fastship.oxt (copied) * code/trunk/src/modules/gametypes/CMakeLists.txt (modified) * code/trunk/src/modules/gametypes/OldRaceCheckPoint.cc (deleted) * code/trunk/src/modules/gametypes/OldRaceCheckPoint.h (deleted) * code/trunk/src/modules/gametypes/OldSpaceRace.cc (deleted) * code/trunk/src/modules/gametypes/OldSpaceRace.h (deleted) * code/trunk/src/modules/gametypes/SpaceRace.cc (modified) * code/trunk/src/modules/gametypes/SpaceRace.h (modified) * code/trunk/src/modules/gametypes/SpaceRaceBot.cc (modified) * code/trunk/src/modules/gametypes/SpaceRaceBot.h (modified) * code/trunk/src/modules/gametypes/SpaceRaceController.cc (modified) * code/trunk/src/orxonox/controllers/HumanController.h (modified) * code/trunk/src/orxonox/gametypes/Gametype.cc (modified) * code/trunk/src/orxonox/infos/Bot.cc (modified) * code/trunk/src/orxonox/infos/GametypeInfo.h (modified) * code/trunk/src/orxonox/sound/WorldAmbientSound.cc (modified) space race merged Thu, 09 Mar 2017 15:09:27 GMT patricwi [11357] * code/trunk (modified) * code/trunk/data/levels/Endurancefinal.oxw (copied) * code/trunk/data/levels/HeavyCruiser.oxw (modified) * code/trunk/data/levels/emptyLevel.oxw (modified) * code/trunk/data/levels/templates/endurancetest_template.oxt (copied) * code/trunk/data/levels/templates/test11.oxt (copied) * code/trunk/src/test.txt (copied) big ship merged Thu, 09 Mar 2017 14:38:58 GMT patricwi [11356] * code/trunk (modified) * code/trunk/data/gui/layouts/HighscoreMenu.layout (copied) * code/trunk/data/gui/layouts/MainMenu.layout (modified) * code/trunk/data/gui/scripts/HighscoreMenu.lua (copied) * code/trunk/data/gui/scripts/MainMenu.lua (modified) * code/trunk/data/gui/scripts/MiscConfigMenu.lua (modified) * code/trunk/src/modules/dodgerace/DodgeRace.cc (modified) * code/trunk/src/modules/invader/Invader.cc (modified) * code/trunk/src/modules/jump/Jump.cc (modified) * code/trunk/src/modules/tetris/Tetris.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefense.cc (modified) * code/trunk/src/orxonox/CMakeLists.txt (modified) * code/trunk/src/orxonox/Highscore.cc (copied) * code/trunk/src/orxonox/Highscore.h (copied) * code/trunk/src/orxonox/LevelInfo.cc (modified) * code/trunk/src/orxonox/LevelInfo.h (modified) merged space race with trunk Thu, 09 Mar 2017 14:02:38 GMT patricwi [11355] * code/trunk/src/orxonox/gamestates/GSLevel.cc (modified) * code/trunk/src/orxonox/gamestates/GSLevel.h (modified) deleted comments Thu, 09 Mar 2017 13:50:27 GMT patricwi [11354] * code/trunk (modified) * code/trunk/data/levels/pickups.oxw (modified) * code/trunk/data/overlays/HUDPickupTemplate.oxo (copied) * code/trunk/data/overlays/HUDTemplates3.oxo (modified) * code/trunk/src/modules/overlays/hud/HUDPickupSystem.cc (modified) * code/trunk/src/modules/overlays/hud/HUDPickupSystem.h (modified) merged updated HUD branch to trunk Thu, 09 Mar 2017 13:46:20 GMT patricwi [11353] * code/trunk (modified) * code/trunk/README (modified) * code/trunk/data/defaultConfig/keybindings.ini (modified) * code/trunk/data/gui/scripts/KeyBindMenu.lua (modified) * code/trunk/data/overlays/HUDTemplates3.oxo (modified) * code/trunk/data/overlays/HUDTemplatesFPS.oxo (modified) * code/trunk/src/modules/overlays/OverlaysPrereqs.h (modified) * code/trunk/src/modules/overlays/hud/CMakeLists.txt (modified) * code/trunk/src/modules/overlays/hud/HUDPickupItem.cc (copied) * code/trunk/src/modules/overlays/hud/HUDPickupItem.h (copied) * code/trunk/src/modules/overlays/hud/HUDPickupSystem.cc (copied) * code/trunk/src/modules/overlays/hud/HUDPickupSystem.h (copied) * code/trunk/src/modules/pickup/CMakeLists.txt (modified) * code/trunk/src/modules/pickup/PickupManager.cc (modified) * code/trunk/src/modules/pickup/PickupManager.h (modified) * code/trunk/src/modules/pickup/items/SpeedPickup.h (modified) * code/trunk/src/orxonox/CMakeLists.txt (modified) * code/trunk/src/orxonox/controllers/HumanController.h (modified) * code/trunk/src/orxonox/gamestates/GSLevel.cc (modified) * code/trunk/src/orxonox/gamestates/GSLevel.h (modified) * code/trunk/src/orxonox/interfaces/Pickupable.h (modified) merged HUD branch to trunk 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