[Orxonox-commit 6806] r11433 - in code/branches/Dialogue_FS17: data/gui/scripts data/levels src/modules/dialogue

[rrogge at orxonox.net]

Author: rrogge
Date: 2017-05-18 17:27:15 +0200 (Thu, 18 May 2017)
New Revision: 11433

Modified:
   code/branches/Dialogue_FS17/data/gui/scripts/Dialogue.lua
   code/branches/Dialogue_FS17/data/levels/events.oxw
   code/branches/Dialogue_FS17/src/modules/dialogue/NextQuestion.cc
Log:
Everything works

Modified: code/branches/Dialogue_FS17/data/gui/scripts/Dialogue.lua
===================================================================
--- code/branches/Dialogue_FS17/data/gui/scripts/Dialogue.lua	2017-05-18 15:05:53 UTC (rev 11432)
+++ code/branches/Dialogue_FS17/data/gui/scripts/Dialogue.lua	2017-05-18 15:27:15 UTC (rev 11433)
@@ -50,6 +50,7 @@
 P.buttonWidth = 85
 
 function P.onLoad()
+
 	orxout("loading")
     P.wrapper = nil
     P.detailsWindows = {}
@@ -59,11 +60,14 @@
 
 function P.onShow()
 	orxout("showing")
+    orxonox.CommandExecutor:execute("setTimeFactor 0")
     P.createInventory()
     P.showing = true
+
 end
 
 function P.onHide()
+    orxonox.CommandExecutor:execute("setTimeFactor 1")
     P.showing = false
     P.cleanup(true)
 end
@@ -86,6 +90,7 @@
 end
 
 function P.createInventory()
+
     local pickupManager = orxonox.DialogueManager:getInstance()
     
     root = winMgr:getWindow("orxonox/Dialogue/Inventory")

Modified: code/branches/Dialogue_FS17/data/levels/events.oxw
===================================================================
--- code/branches/Dialogue_FS17/data/levels/events.oxw	2017-05-18 15:05:53 UTC (rev 11432)
+++ code/branches/Dialogue_FS17/data/levels/events.oxw	2017-05-18 15:27:15 UTC (rev 11433)
@@ -76,6 +76,27 @@
       </events>
     </NextQuestion>
 
+    <DistanceTrigger name="test1" position="100,300,0" target="Pawn" distance=25 stayActive="true" />
+    <Backlight position="100,300,0" visible=true frequency=0.6 amplitude=3 material="Flares/lensflare" colour="1,1,1"/>
+    
+    <NextQuestion  question="Wazzp bud?" a1="yes" a2="no" >
+     <possibleQuestions> 
+        <NextQuestion  question="Do you like fish" a1="yep let me continue" a2="no actually not" />
+        <NextQuestion  question="Whats your favourite pastime?" a1="Got a dentist's appointment" a2="this sucks" >
+        <possibleQuestions>
+          <NextQuestion  question="Whatever?" a1="yep" a2="leave me alone godammit" />
+          <NextQuestion  question="Turtles then?" a1="..." a2="Im going now okay" />
+        </possibleQuestions>
+      </NextQuestion>
+      </possibleQuestions>    
+      <events>
+        <execute>
+           <EventListener event="test1" />
+        </execute>
+      </events>
+    </NextQuestion>
+
+
     <!-- red -->
     <!--
       Standard:

Modified: code/branches/Dialogue_FS17/src/modules/dialogue/NextQuestion.cc
===================================================================
--- code/branches/Dialogue_FS17/src/modules/dialogue/NextQuestion.cc	2017-05-18 15:05:53 UTC (rev 11432)
+++ code/branches/Dialogue_FS17/src/modules/dialogue/NextQuestion.cc	2017-05-18 15:27:15 UTC (rev 11433)
@@ -66,8 +66,8 @@
         //if(!bTriggered) return false;
     	
         
+    	
 
-
         orxout() << "bTriggered is " << bTriggered << endl;
 
         //for (DialogueManager* hud : ObjectList<DialogueManager>())