# # ChangeLog for / # # Generated by Trac 1.0.9 # Nov 20, 2024, 5:04:10 AM Thu, 01 Jun 2017 13:46:20 GMT patricwi [11445] * data/trunk/testfile.oxr (deleted) testfile removed Tue, 30 May 2017 12:58:20 GMT patricwi [11444] * code/branches/Presentation_FS17 (modified) * code/branches/Presentation_FS17/data/levels/Endurancefinal.oxw (modified) * code/branches/Presentation_FS17/data/levels/FinalBossFS17.oxw (copied) * code/branches/Presentation_FS17/data/levels/includes/BossSpawnWeaponSetting.oxi (copied) * code/branches/Presentation_FS17/data/levels/includes/weaponSettingsEscort.oxi (modified) * code/branches/Presentation_FS17/data/levels/shieldTest.oxw (modified) * code/branches/Presentation_FS17/data/levels/templates/Bossship.oxt (copied) * code/branches/Presentation_FS17/data/levels/templates/Bossspawnship.oxt (copied) * code/branches/Presentation_FS17/src/modules/weapons/weaponmodes/IceGun.cc (modified) * code/branches/Presentation_FS17/src/orxonox/items/PartDestructionEvent.cc (modified) merged Boss Level Tue, 30 May 2017 12:11:11 GMT nyogaraj [11443] * code/branches/Boss_FS17/src/orxonox/items/PartDestructionEvent.cc (modified) fixed error Tue, 30 May 2017 11:42:50 GMT maxima [11442] * data/trunk/images/levelpreviews/SOB.png (added) * data/trunk/images/textures/Alien_feet_texture.png (added) * data/trunk/images/textures/Alien_texture.png (added) * data/trunk/images/textures/Coin_texture.png (added) * data/trunk/images/textures/Dreieck_links+1_texture.png (added) * data/trunk/images/textures/Dreieck_links_texture.png (added) * data/trunk/images/textures/Fahne_texture.png (added) * data/trunk/images/textures/Fahnenstaender_texture.png (added) * data/trunk/images/textures/Fahnenstange_texture.png (added) * data/trunk/images/textures/MilleniumFalconPerf.png (added) * data/trunk/images/textures/Pliz2_feet_texture.png (added) * data/trunk/images/textures/Pliz2_texture.png (added) * data/trunk/images/textures/Pliz_texture.png (added) * data/trunk/images/textures/Rohr_texture.png (added) * data/trunk/images/textures/Schlosshohlrund_texture.png (added) * data/trunk/images/textures/Seamless_cobbleStone_texture.png (added) * data/trunk/images/textures/Seamless_marsStone_texture.png (added) * data/trunk/images/textures/antenna_bot.png (added) * data/trunk/images/textures/antenna_top.png (added) * data/trunk/images/textures/helmet_texture_pixelized.png (added) * data/trunk/images/textures/mars_ground4_bestOne.png (added) * data/trunk/images/textures/orxo_rucksack_texture.png (added) * data/trunk/images/textures/orxo_texture.png (added) * data/trunk/images/textures/questionmark_mars.png (added) * data/trunk/images/textures/questionmark_mars_used.png (added) * data/trunk/materials/Alien_body_material.material (added) * data/trunk/materials/Alien_leftFoot_material.material (added) * data/trunk/materials/Alien_rightFoot_material.material (added) * data/trunk/materials/Antenne_1_material.material (added) * data/trunk/materials/Antenne_2_material.material (added) * data/trunk/materials/Coin_material.material (added) * data/trunk/materials/Cubestyl1.1.material (added) * data/trunk/materials/Cubestyl1.1mars.material (added) * data/trunk/materials/Cubestyl1.3.material (added) * data/trunk/materials/Cubestyl1.3mars.material (added) * data/trunk/materials/Cubestyl1.6.material (added) * data/trunk/materials/Cubestyl1.6mars.material (added) * data/trunk/materials/Cubestyl2.12.material (added) * data/trunk/materials/Cubestyl2.12mars.material (added) * data/trunk/materials/Cubestyl2.2.material (added) * data/trunk/materials/Cubestyl2.2cobble.material (added) * data/trunk/materials/Cubestyl2.2mars.material (added) * data/trunk/materials/Cubestyl2.3.material (added) * data/trunk/materials/Cubestyl2.3mars.material (added) * data/trunk/materials/Cubestyl2.6.material (added) * data/trunk/materials/Cubestyl2.6mars.material (added) * data/trunk/materials/Deck.material (added) * data/trunk/materials/Dreieck1marsMaterial.material (added) * data/trunk/materials/DreieckMaterial.material (added) * data/trunk/materials/Dreieck_links+1_material.material (added) * data/trunk/materials/DreieckgrossMaterial.material (added) * data/trunk/materials/Fahnenstange_material.material (added) * data/trunk/materials/Fahnetex.material (added) * data/trunk/materials/Fundamenttex.material (added) * data/trunk/materials/Goomba_body_material.material (added) * data/trunk/materials/Goomba_leftFoot_material.material (added) * data/trunk/materials/Goomba_rightFoot_material.material (added) * data/trunk/materials/Mariostyl.material (added) * data/trunk/materials/QCube-grey-Material.material (added) * data/trunk/materials/QMaterial.material (added) * data/trunk/materials/Rohr_material.material (added) * data/trunk/materials/Rucksack_material.material (added) * data/trunk/materials/Schloss_material.material (added) * data/trunk/materials/helmet_material.material (added) * data/trunk/materials/magic_mushroom_material.material (added) * data/trunk/materials/orxo_material.material (added) * data/trunk/models/Alien.mesh (added) * data/trunk/models/Coin.mesh (added) * data/trunk/models/Cube1.1.mesh (added) * data/trunk/models/Cube1.1mars.mesh (added) * data/trunk/models/Cube1.3.mesh (added) * data/trunk/models/Cube1.3mars.mesh (added) * data/trunk/models/Cube1.6.mesh (added) * data/trunk/models/Cube1.6mars.mesh (added) * data/trunk/models/Cube2.12.mesh (added) * data/trunk/models/Cube2.12mars.mesh (added) * data/trunk/models/Cube2.2.mesh (added) * data/trunk/models/Cube2.2cobble.mesh (added) * data/trunk/models/Cube2.2mars.mesh (added) * data/trunk/models/Cube2.3.mesh (added) * data/trunk/models/Cube2.3mars.mesh (added) * data/trunk/models/Cube2.6.mesh (added) * data/trunk/models/Cube2.6mars.mesh (added) * data/trunk/models/Dreieck+1.mesh (added) * data/trunk/models/Dreieck+1mars.mesh (added) * data/trunk/models/Dreieck.mesh (added) * data/trunk/models/Dreieck_links+1.mesh (added) * data/trunk/models/Dreieckgross.mesh (added) * data/trunk/models/Fahne.mesh (added) * data/trunk/models/Fahnenstange.mesh (added) * data/trunk/models/Fundament.mesh (added) * data/trunk/models/Goomba.mesh (added) * data/trunk/models/MilleniumFalcon.mesh (added) * data/trunk/models/Orxo.mesh (added) * data/trunk/models/Pilz.mesh (added) * data/trunk/models/QCube-grey.mesh (added) * data/trunk/models/QCube.mesh (added) * data/trunk/models/Rohr.mesh (added) * data/trunk/models/Schloss.mesh (added) * data/trunk/models/orxo.mesh (added) all files of PPS Tue, 30 May 2017 10:10:37 GMT maxima [11441] * code/branches/Presentation_FS17/data/tcl/core (deleted) deleted unnecessary file Tue, 30 May 2017 08:48:26 GMT maxima [11440] * data/trunk/testfile.oxr (added) test 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 Fri, 26 May 2017 13:26:34 GMT landauf [11434] * build/dockerfiles/orxonox_jenkins-slave/Dockerfile (modified) install java 8 to run jetty slave in docker container 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:32:03 GMT jkindle [11430] * data/contentcreation/pps/SuperOrxoBros_Data/Mariostyl.material (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Alien.mesh (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Alien_body_material.material (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Alien_feet_texture.png (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Alien_leftFoot_material.material (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Alien_rightFoot_material.material (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Alien_texture.png (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Antenne_1_material.material (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Antenne_2_material.material (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Coin.mesh (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Coin_material.material (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Coin_texture.png (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Cube1.1.mesh (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Cube1.1mars.mesh (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Cube1.3.mesh (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Cube1.3mars.mesh (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Cube1.6.mesh (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Cube1.6mars.mesh (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Cube2.12.mesh (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Cube2.12mars.mesh (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Cube2.2.mesh (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Cube2.2cobble.mesh (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Cube2.2mars.mesh (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Cube2.3.mesh (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Cube2.3mars.mesh (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Cube2.6.mesh (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Cube2.6mars.mesh (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Cubestyl1.1.material (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Cubestyl1.1mars.material (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Cubestyl1.3.material (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Cubestyl1.3mars.material (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Cubestyl1.6.material (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Cubestyl1.6mars.material (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Cubestyl2.12.material (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Cubestyl2.12mars.material (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Cubestyl2.2.material (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Cubestyl2.2cobble.material (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Cubestyl2.2mars.material (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Cubestyl2.3.material (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Cubestyl2.3mars.material (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Cubestyl2.6.material (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Cubestyl2.6mars.material (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Dreieck+1.mesh (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Dreieck+1mars.mesh (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Dreieck.mesh (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Dreieck1marsMaterial.material (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/DreieckMaterial.material (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Dreieck_links+1.mesh (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Dreieck_links+1_material.material (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Dreieck_links+1_texture.png (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Dreieck_links_texture.png (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Dreieckgross.mesh (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/DreieckgrossMaterial.material (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Fahne.mesh (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Fahne_texture.png (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Fahnenstaender_texture.png (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Fahnenstange.mesh (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Fahnenstange_material.material (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Fahnenstange_texture.png (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Fahnetex.material (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Fundament.mesh (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Fundamenttex.material (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Goomba.mesh (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Goomba_body_material.material (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Goomba_leftFoot_material.material (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Goomba_rightFoot_material.material (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Orxo.mesh (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Pilz.mesh (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Pliz2_feet_texture.png (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Pliz2_texture.png (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Pliz_texture.png (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/QCube-grey-Material.material (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/QCube-grey.mesh (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/QCube.mesh (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/QMaterial.material (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Rohr.mesh (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Rohr_material.material (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Rohr_texture.png (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Rucksack_material.material (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/SOB.png (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Schloss.mesh (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Schloss_material.material (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Schlosshohlrund_texture.png (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Seamless_cobbleStone_texture.png (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/Seamless_marsStone_texture.png (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/antenna_bot.png (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/antenna_top.png (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/helmet_material.material (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/helmet_texture_pixelized.png (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/magic_mushroom_material.material (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/mars_ground4_bestOne.png (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/orxo.mesh (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/orxo_material.material (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/orxo_rucksack_texture.png (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/orxo_texture.png (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/questionmark_mars.png (added) * data/contentcreation/pps/SuperOrxoBros_Data/bla/questionmark_mars_used.png (added) Have fun Patrick :) Thu, 18 May 2017 14:12:45 GMT aungriah [11429] * data/contentcreation/pps/alejandro/Deck.material (added) * data/contentcreation/pps/alejandro/MilleniumFalcon.mesh (added) Millenium Falcon 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:48:09 GMT aungriah [11425] * data/contentcreation/pps/alejandro/MilleniumFalcon.blend (deleted) * data/contentcreation/pps/alejandro/MilleniumFalconCasaDefinitivo.blend (added) * data/contentcreation/pps/alejandro/MilleniumFalconPerf.png (added) End 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 ... Thu, 13 Apr 2017 09:33:22 GMT davidf [11399] * data/contentcreation/pps/davidf/Files/Dreieck (added) * data/contentcreation/pps/davidf/Files/Dreieck/Dreieck+1.mesh (added) * data/contentcreation/pps/davidf/Files/Dreieck/Dreieck+1.mesh.xml (added) * data/contentcreation/pps/davidf/Files/Dreieck/Dreieck.mesh (added) * data/contentcreation/pps/davidf/Files/Dreieck/Dreieck.mesh.xml (added) * data/contentcreation/pps/davidf/Files/Dreieck/DreieckBlender (added) * data/contentcreation/pps/davidf/Files/Dreieck/DreieckBlender/Dreieck_gross.blend1 (added) * data/contentcreation/pps/davidf/Files/Dreieck/DreieckBlender/Dreieck_links+1.blend (added) * data/contentcreation/pps/davidf/Files/Dreieck/DreieckBlender/Dreieck_links+1.blend1 (added) * data/contentcreation/pps/davidf/Files/Dreieck/DreieckBlender/Dreieck_links+1.blend2 (added) * data/contentcreation/pps/davidf/Files/Dreieck/DreieckBlender/Dreieck_links.blend (added) * data/contentcreation/pps/davidf/Files/Dreieck/DreieckBlender/Dreieck_links.blend1 (added) * data/contentcreation/pps/davidf/Files/Dreieck/DreieckMaterial.material (added) * data/contentcreation/pps/davidf/Files/Dreieck/Material.material (added) * data/contentcreation/pps/davidf/Files/Dreieck/OgreXMLConverter.log (added) * data/contentcreation/pps/davidf/Files/Fahne (added) * data/contentcreation/pps/davidf/Files/Fahne/BlenderFahnenTeile (added) * data/contentcreation/pps/davidf/Files/Fahne/BlenderFahnenTeile/Fahne.blend (added) * data/contentcreation/pps/davidf/Files/Fahne/BlenderFahnenTeile/Fahne.blend1 (added) * data/contentcreation/pps/davidf/Files/Fahne/BlenderFahnenTeile/Fahne.blend2 (added) * data/contentcreation/pps/davidf/Files/Fahne/BlenderFahnenTeile/Fahnenstaender.blend (added) * data/contentcreation/pps/davidf/Files/Fahne/BlenderFahnenTeile/Fahnenstaender.blend1 (added) * data/contentcreation/pps/davidf/Files/Fahne/BlenderFahnenTeile/Fahnenstaender.blend2 (added) * data/contentcreation/pps/davidf/Files/Fahne/BlenderFahnenTeile/Fahnenstange.blend (added) * data/contentcreation/pps/davidf/Files/Fahne/BlenderFahnenTeile/Fahnenstange.blend1 (added) * data/contentcreation/pps/davidf/Files/Fahne/BlenderFahnenTeile/Fahnenstange.blend2 (added) * data/contentcreation/pps/davidf/Files/Fahne/BlenderFahnenTeile/Fahnenstangeteile.blend (added) * data/contentcreation/pps/davidf/Files/Orxo (added) * data/contentcreation/pps/davidf/Files/Orxo/Orxo.mesh (added) * data/contentcreation/pps/davidf/Files/Orxo/OrxoBlender (added) * data/contentcreation/pps/davidf/Files/Orxo/OrxoBlender/orxo1.blend (added) * data/contentcreation/pps/davidf/Files/Orxo/OrxoBlender/orxo1.blend1 (added) * data/contentcreation/pps/davidf/Files/Orxo/OrxoBlender/orxo2.blend (added) * data/contentcreation/pps/davidf/Files/Orxo/OrxoBlender/orxo3.blend (added) * data/contentcreation/pps/davidf/Files/Orxo/OrxoBlender/orxo4.blend (added) * data/contentcreation/pps/davidf/Files/Orxo/OrxoBlender/orxo5.blend (added) * data/contentcreation/pps/davidf/Files/Orxo/OrxoBlender/orxo5.blend1 (added) * data/contentcreation/pps/davidf/Files/Orxo/OrxoBlender/orxo5.blend2 (added) * data/contentcreation/pps/davidf/Files/Orxo/OrxoBlender/orxo6.blend (added) * data/contentcreation/pps/davidf/Files/Orxo/OrxoBlender/orxo6.blend1 (added) * data/contentcreation/pps/davidf/Files/Orxo/OrxoBlender/orxo7.blend (added) * data/contentcreation/pps/davidf/Files/Orxo/OrxoBlender/orxo7.blend1 (added) * data/contentcreation/pps/davidf/Files/Orxo/OrxoBlender/orxo8.blend (added) * data/contentcreation/pps/davidf/Files/Orxo/orxo7.blend (added) * data/contentcreation/pps/davidf/Files/Pilz (added) * data/contentcreation/pps/davidf/Files/Pilz/PilzBlender (added) * data/contentcreation/pps/davidf/Files/Pilz/PilzBlender/Pliz.blend (added) * data/contentcreation/pps/davidf/Files/Pilz/PilzBlender/Pliz.blend1 (added) * data/contentcreation/pps/davidf/Files/Pilz/PilzBlender/Pliz.blend2 (added) * data/contentcreation/pps/davidf/Files/Pilz/PilzBlender/Pliz1.blend (added) * data/contentcreation/pps/davidf/Files/Pilz/PilzBlender/Pliz1.blend1 (added) * data/contentcreation/pps/davidf/Files/Pilz/PilzBlender/Pliz1.blend2 (added) * data/contentcreation/pps/davidf/Files/Pilz/PilzBlender/Pliz2.blend (added) * data/contentcreation/pps/davidf/Files/Rohr (added) * data/contentcreation/pps/davidf/Files/Rohr/Rohr.blend1 (added) * data/contentcreation/pps/davidf/Files/Rohr/RohrBlender (added) * data/contentcreation/pps/davidf/Files/Rohr/RohrBlender/Rohr.blend (added) * data/contentcreation/pps/davidf/Files/Rohr/RohrBlender/Rohr.blend1 (added) * data/contentcreation/pps/davidf/Files/Schloss (added) * data/contentcreation/pps/davidf/Files/Schloss/BlenderSchloss (added) * data/contentcreation/pps/davidf/Files/Schloss/BlenderSchloss/Schloss.blend (added) * data/contentcreation/pps/davidf/Files/Schloss/BlenderSchloss/Schloss.blend1 (added) * data/contentcreation/pps/davidf/Files/Schloss/BlenderSchloss/Schloss.blend2 (added) * data/contentcreation/pps/davidf/Files/Schloss/BlenderSchloss/Schlossteile.blend (added) * data/contentcreation/pps/davidf/Files/Würfel (added) * data/contentcreation/pps/davidf/Files/Würfel/BlenderCube (added) * data/contentcreation/pps/davidf/Files/Würfel/Cube1.1 (added) * data/contentcreation/pps/davidf/Files/Würfel/Cube1.1/Cube1.1.mesh (added) * data/contentcreation/pps/davidf/Files/Würfel/Cube1.1/Cube1.1.mesh.xml (added) * data/contentcreation/pps/davidf/Files/Würfel/Cube1.1/Cubestyl1.1.material (added) * data/contentcreation/pps/davidf/Files/Würfel/Cube1.1/OgreXMLConverter.log (added) * data/contentcreation/pps/davidf/Files/Würfel/Cube1.1/mars_ground4_bestOne.png (added) * data/contentcreation/pps/davidf/Files/Würfel/Cube1.3 (added) * data/contentcreation/pps/davidf/Files/Würfel/Cube1.3/Cube1.3.mesh (added) * data/contentcreation/pps/davidf/Files/Würfel/Cube1.3/Cube1.3.mesh.xml (added) * data/contentcreation/pps/davidf/Files/Würfel/Cube1.3/Cubestyl1.3.material (added) * data/contentcreation/pps/davidf/Files/Würfel/Cube1.3/OgreXMLConverter.log (added) * data/contentcreation/pps/davidf/Files/Würfel/Cube1.3/mars_ground4_bestOne.png (added) * data/contentcreation/pps/davidf/Files/Würfel/Cube1.6 (added) * data/contentcreation/pps/davidf/Files/Würfel/Cube1.6/Cube1.6.mesh (added) * data/contentcreation/pps/davidf/Files/Würfel/Cube1.6/Cube1.6.mesh.xml (added) * data/contentcreation/pps/davidf/Files/Würfel/Cube1.6/Cubestyl1.6.material (added) * data/contentcreation/pps/davidf/Files/Würfel/Cube1.6/OgreXMLConverter.log (added) * data/contentcreation/pps/davidf/Files/Würfel/Cube1.6/mars_ground4_bestOne.png (added) * data/contentcreation/pps/davidf/Files/Würfel/Cube2.12 (added) * data/contentcreation/pps/davidf/Files/Würfel/Cube2.12/Cube2.12.mesh (added) * data/contentcreation/pps/davidf/Files/Würfel/Cube2.12/Cube2.12.mesh.xml (added) * data/contentcreation/pps/davidf/Files/Würfel/Cube2.12/Cubestyl2.12.material (added) * data/contentcreation/pps/davidf/Files/Würfel/Cube2.12/OgreXMLConverter.log (added) * data/contentcreation/pps/davidf/Files/Würfel/Cube2.12/mars_ground4_bestOne.png (added) * data/contentcreation/pps/davidf/Files/Würfel/Cube2.2 (added) * data/contentcreation/pps/davidf/Files/Würfel/Cube2.2/Cube2.2.mesh (added) * data/contentcreation/pps/davidf/Files/Würfel/Cube2.2/Cube2.2.mesh.xml (added) * data/contentcreation/pps/davidf/Files/Würfel/Cube2.2/Cubestyl2.2.material (added) * data/contentcreation/pps/davidf/Files/Würfel/Cube2.2/OgreXMLConverter.log (added) * data/contentcreation/pps/davidf/Files/Würfel/Cube2.2/mars_ground4_bestOne.png (added) * data/contentcreation/pps/davidf/Files/Würfel/Cube2.3 (added) * data/contentcreation/pps/davidf/Files/Würfel/Cube2.3/Cube2.3.mesh (added) * data/contentcreation/pps/davidf/Files/Würfel/Cube2.3/Cube2.3.mesh.xml (added) * data/contentcreation/pps/davidf/Files/Würfel/Cube2.3/Cubestyl2.3.material (added) * data/contentcreation/pps/davidf/Files/Würfel/Cube2.3/OgreXMLConverter.log (added) * data/contentcreation/pps/davidf/Files/Würfel/Cube2.3/mars_ground4_bestOne.png (added) * data/contentcreation/pps/davidf/Files/Würfel/Cube2.6 (added) * data/contentcreation/pps/davidf/Files/Würfel/Cube2.6/Cube2.6.mesh (added) * data/contentcreation/pps/davidf/Files/Würfel/Cube2.6/Cube2.6.mesh.xml (added) * data/contentcreation/pps/davidf/Files/Würfel/Cube2.6/Cubestyl2.6.material (added) * data/contentcreation/pps/davidf/Files/Würfel/Cube2.6/OgreXMLConverter.log (added) * data/contentcreation/pps/davidf/Files/Würfel/Cube2.6/mars_ground4_bestOne.png (added) * data/contentcreation/pps/davidf/Files/Würfel/Mariostyl.material (added) add new models 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:03:46 GMT colbachl [11389] * data/contentcreation/pps/davidf/Files/helmet_texture.png (added) helmet texture 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 14:01:28 GMT aungriah [11387] * data/contentcreation/pps/alejandro/MilleniumFalcon.blend (added) Ausseres Thu, 30 Mar 2017 14:00:50 GMT davidf [11386] * data/contentcreation/pps/davidf/Files (added) * data/contentcreation/pps/davidf/Files/Block_text.blend (added) * data/contentcreation/pps/davidf/Files/Rohr.blend1 (added) * data/contentcreation/pps/davidf/Files/asteroid_on_fire.png (added) * data/contentcreation/pps/davidf/Files/asteroid_square_tile.png (added) * data/contentcreation/pps/davidf/Files/mars_ground4_bestOne.png (added) * data/contentcreation/pps/davidf/Files/orxo7.blend (added) blender files and textures Thu, 30 Mar 2017 13:57:41 GMT maxima [11385] * data/contentcreation/pps/davidf (added) 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:19:19 GMT maxima [11368] * data/contentcreation/pps/SuperOrxoBros_Data (added) new folder 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:49:53 GMT maxima [11363] * data/contentcreation/pps/alejandro (added) new folder for pps Thu, 16 Mar 2017 12:49:42 GMT maxima [11362] * data/contentcreation/pps/leandro (added) new folder 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