[Orxonox-commit 7033] r11652 - in code/branches/Dialog_HS17: data/gui/layouts data/gui/scripts data/levels data/overlays src/modules
kuchlert at orxonox.net
kuchlert at orxonox.net
Mon Dec 11 14:33:45 CET 2017
Author: kuchlert
Date: 2017-12-11 14:33:45 +0100 (Mon, 11 Dec 2017)
New Revision: 11652
Added:
code/branches/Dialog_HS17/data/levels/DialogShowcase.oxw
Removed:
code/branches/Dialog_HS17/data/gui/layouts/Dialogue.layout
code/branches/Dialog_HS17/data/gui/scripts/Dialogue.lua
code/branches/Dialog_HS17/data/levels/DialogueShowcase.oxw
code/branches/Dialog_HS17/data/levels/DialogueShowcase2.oxw
code/branches/Dialog_HS17/src/modules/dialogue/
Modified:
code/branches/Dialog_HS17/data/gui/layouts/Dialog.layout
code/branches/Dialog_HS17/data/gui/scripts/Dialog.lua
code/branches/Dialog_HS17/data/overlays/HUDTemplates3.oxo
code/branches/Dialog_HS17/src/modules/CMakeLists.txt
Log:
altes Dialogue entfernt
Modified: code/branches/Dialog_HS17/data/gui/layouts/Dialog.layout
===================================================================
--- code/branches/Dialog_HS17/data/gui/layouts/Dialog.layout 2017-12-11 13:20:57 UTC (rev 11651)
+++ code/branches/Dialog_HS17/data/gui/layouts/Dialog.layout 2017-12-11 13:33:45 UTC (rev 11652)
@@ -21,18 +21,37 @@
<Property Name="VertFormatting" Value="CentreAligned" />
<Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.05,0},{0.25,0},{0.15,0}}" />
</Window>
- <Window Type="MenuWidgets/StaticText" Name="orxonox/Dialog/Question" >
- <Property Name="Alpha" Value="0.8" />
+
+ <Window Type="MenuWidgets/StaticText" Name="orxonox/QuestionWrapper" >
<Property Name="InheritsAlpha" Value="False" />
- <Property Name="HorzFormatting" Value="LeftAligned" />
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="VertFormatting" Value="CentreAligned" />
- <Property Name="UnifiedAreaRect" Value="{{0.3,0},{0.05,0},{0.95,0},{0.15,0}}" />
+ <Property Name="HorzFormatting" Value="HorzCentred" />
+ <Property Name="VertFormatting" Value="TopAligned" />
+ <Property Name="UnifiedAreaRect" Value="{{0.3,0},{0.05,0},{0.95,0},{0.45,0}}" />
+ <Window Type="MenuWidgets/ScrollablePane" Name="orxonox/QuestionPane" >
+ <Property Name="ContentArea" Value="l:0 t:0 r:0 b:0" />
+ <Property Name="HorzStepSize" Value="0.005" />
+ <Property Name="VertStepSize" Value="0.005" />
+ <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+ <Property Name="HorzOverlapSize" Value="0.01" />
+ <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{0.997,0},{0.997,0}}" />
+ <Property Name="VertOverlapSize" Value="0.01" />
+ <Property Name="HorzScrollPosition" Value="0" />
+ <Property Name="VertScrollPosition" Value="0" />
+ <Window Type="MenuWidgets/StaticText" Name="orxonox/Dialog/Question" >
+ <Property Name="Alpha" Value="0.8" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="HorzFormatting" Value="WordWrapLeftAligned" />
+ <Property Name="VertFormatting" Value="CentreAligned" />
+ <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
+ </Window>
+ </Window>
</Window>
<Window Type="MenuWidgets/Listbox" Name="orxonox/AnsListbox" >
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.225,0},{0.95,0},{0.85,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.5,0},{0.95,0},{0.85,0}}" />
<Event Name="ItemSelectionChanged" Function="Dialog.answer_changed" />
</Window>
Deleted: code/branches/Dialog_HS17/data/gui/layouts/Dialogue.layout
===================================================================
--- code/branches/Dialog_HS17/data/gui/layouts/Dialogue.layout 2017-12-11 13:20:57 UTC (rev 11651)
+++ code/branches/Dialog_HS17/data/gui/layouts/Dialogue.layout 2017-12-11 13:33:45 UTC (rev 11652)
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<GUILayout >
- <Window Type="DefaultWindow" Name="orxonox/Dialogue/Background" >
- <Property Name="InheritsAlpha" Value="False" />
- <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
- <Window Type="MenuWidgets/StaticText" Name="orxonox/Dialogue/Inventory" >
- <Property Name="Alpha" Value="0.8" />
- <Property Name="InheritsAlpha" Value="False" />
- <Property Name="HorzFormatting" Value="HorzCentred" />
- <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="VertFormatting" Value="TopAligned" />
- <Property Name="UnifiedAreaRect" Value="{{0.15,0},{0.15,0},{0.85,0},{0.8,0}}" />
- <Window Type="MenuWidgets/StaticText" Name="orxonox/Dialogue/Wrapper" >
- <Property Name="TextColours" Value="FF4444FF" />
- <Property Name="InheritsAlpha" Value="False" />
- <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="HorzFormatting" Value="HorzCentred" />
- <Property Name="VertFormatting" Value="TopAligned" />
- <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.15,0},{0.95,0},{0.92,0}}" />
- </Window>
- </Window>
-
- </Window>
-</GUILayout>
\ No newline at end of file
Modified: code/branches/Dialog_HS17/data/gui/scripts/Dialog.lua
===================================================================
--- code/branches/Dialog_HS17/data/gui/scripts/Dialog.lua 2017-12-11 13:20:57 UTC (rev 11651)
+++ code/branches/Dialog_HS17/data/gui/scripts/Dialog.lua 2017-12-11 13:33:45 UTC (rev 11652)
@@ -1,4 +1,4 @@
--- Dialogue.lua
+-- Dialog.lua
local P = createMenuSheet("Dialog")
@@ -6,6 +6,7 @@
P.detailsWindows = {}
P.showing = false
P.choice = 0
+P.scrollbarWidth = 12
function P.onLoad() --wird ausgefuert wenn Fenster geladen
P.wrapper = nil
@@ -34,9 +35,9 @@
local person = manager:getPerson()
personfield:setText(person)
- local questionfiled = winMgr:getWindow("orxonox/Dialog/Question")
+ local questionfield = winMgr:getWindow("orxonox/Dialog/Question")
local question = manager:getQuestion()
- questionfiled:setText(question)
+ questionfield:setText(question)
local listboxwindow = winMgr:getWindow("orxonox/AnsListbox")
CEGUI.toListbox(listboxwindow):resetList()
@@ -59,9 +60,9 @@
local manager = orxonox.DialogManager:getInstance()
manager:update(P.choice)
- local questionfiled = winMgr:getWindow("orxonox/Dialog/Question")
+ local questionfield = winMgr:getWindow("orxonox/Dialog/Question")
local question = manager:getQuestion()
- questionfiled:setText(question)
+ questionfield:setText(question)
local listboxwindow = winMgr:getWindow("orxonox/AnsListbox")
listboxwindow:resetList()
Deleted: code/branches/Dialog_HS17/data/gui/scripts/Dialogue.lua
===================================================================
--- code/branches/Dialog_HS17/data/gui/scripts/Dialogue.lua 2017-12-11 13:20:57 UTC (rev 11651)
+++ code/branches/Dialog_HS17/data/gui/scripts/Dialogue.lua 2017-12-11 13:33:45 UTC (rev 11652)
@@ -1,145 +0,0 @@
-
--- Dialogue.lua
-
-local P = createMenuSheet("Dialogue")
-
-P.wrapper = nil
-P.detailsWindows = {}
-P.detailPickups = {}
-P.pickupsList = {}
-
-P.showing = false
-
--- Design parameters
-P.imageHeight = 50
-P.detailImageSize = 100
-P.textHeight = 30
-P.buttonWidth = 85
-
-function P.onLoad()
- P.wrapper = nil
- P.detailsWindows = {}
- P.detailPickups = {}
- P.pickupsList = {}
-
-end
-
-function P.onShow()
- 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
-
-function P.update()
- P.updateInventory()
- if P.showing == false then
- return
- end
-
- -- Update opened detail windows.
-
-
- -- Update main inventory.
- P.cleanup(false)
- P.createInventory()
- -- TODO: Recover scrolling position
-
-end
-
-function P.createInventory()
-
- local pickupManager = orxonox.DialogueManager:getInstance()
-
- root = winMgr:getWindow("orxonox/Dialogue/Inventory")
- local question = orxonox.DialogueManager:getInstance():getquestion()
- root:setText(question)
- P.wrapper = winMgr:createWindow("MenuWidgets/ScrollablePane", "orxonox/Dialogue/Inventory/Wrapper")
- P.wrapper:setSize(CEGUI.UVector2(CEGUI.UDim(1,0),CEGUI.UDim(1,0)))
- root:addChildWindow(P.wrapper)
-
-
- detailsButton = winMgr:createWindow("MenuWidgets/Button", "/DetailsButton")
- local a1 = orxonox.DialogueManager:getInstance():getanswers1()
- detailsButton:setPosition(CEGUI.UVector2(CEGUI.UDim(0.1, 0),CEGUI.UDim(0.25, (P.imageHeight-P.textHeight)/2)))
- detailsButton:setSize(CEGUI.UVector2(CEGUI.UDim(0.8, 0), CEGUI.UDim(0, P.textHeight)))
- detailsButton:setText(a1)
- orxonox.GUIManager:subscribeEventHelper(detailsButton, "Clicked", P.name ..".a1Button_clicked")
- P.wrapper:addChildWindow(detailsButton)
-
- a2Button = winMgr:createWindow("MenuWidgets/Button", "/a2Button")
- local a2 = orxonox.DialogueManager:getInstance():getanswers2()
- a2Button:setPosition(CEGUI.UVector2(CEGUI.UDim(0.1, 0),CEGUI.UDim(0.4, (P.imageHeight-P.textHeight)/2)))
- a2Button:setSize(CEGUI.UVector2(CEGUI.UDim(0.8, 0), CEGUI.UDim(0, P.textHeight)))
- a2Button:setText(a2)
- orxonox.GUIManager:subscribeEventHelper(a2Button, "Clicked", P.name ..".a2Button_clicked")
- P.wrapper:addChildWindow(a2Button)
-
-
-end
-
-function P.updateInventory()
- local questionn = orxonox.DialogueManager:getInstance():getquestion()
- root:setText(questionn)
- local a1n = orxonox.DialogueManager:getInstance():getanswers1()
- detailsButton:setText(a1n)
- local a2n = orxonox.DialogueManager:getInstance():getanswers2()
- a2Button:setText(a2n)
-
-end
-
-
-function P.cleanup(destroyDetails)
-
- if P.wrapper ~= nil then
- winMgr:destroyWindow(P.wrapper)
- end
-
- --Destroy details windows.
- if destroyDetails == false then
- return
- end
- for k,v in pairs(P.detailsWindows) do
- if v ~= nil then
- P.destroyDetailWindow(k)
- end
- end
-
-end
-
-
-
-function P.a1Button_clicked(e)
- local ending = orxonox.DialogueManager:getInstance():theEnd()
-
- if ending then
- orxonox.CommandExecutor:execute("OrxonoxOverlay toggleVisibility Dialogue")
-
-
- else
- orxonox.DialogueManager:getInstance():a1clicked()
- P.update()
- end
-end
-
-function P.a2Button_clicked(e)
- local ending = orxonox.DialogueManager:getInstance():theEnd()
-
- if ending then
- orxonox.CommandExecutor:execute("OrxonoxOverlay toggleVisibility Dialogue")
-
-
- else
- orxonox.DialogueManager:getInstance():a2clicked()
- P.update()
- end
-
-end
-
-return P
Added: code/branches/Dialog_HS17/data/levels/DialogShowcase.oxw
===================================================================
--- code/branches/Dialog_HS17/data/levels/DialogShowcase.oxw (rev 0)
+++ code/branches/Dialog_HS17/data/levels/DialogShowcase.oxw 2017-12-11 13:33:45 UTC (rev 11652)
@@ -0,0 +1,76 @@
+<LevelInfo
+ name = "DialogShowase"
+ description = "A level to show and test the functionality of the Dialog module."
+ tags = "test"
+ screenshot = "emptylevel.png"
+/>
+
+<?lua
+ include("stats.oxo")
+ include("HUDTemplates3.oxo")
+ include("templates/lodInformation.oxt")
+ include("templates/HeavyCruiser.oxt")
+?>
+
+<?lua
+ include("templates/spaceshipEscort.oxt")
+ include("templates/endurancetest_template.oxt")
+?>
+
+<Level>
+ <templates>
+ <Template link=lodtemplate_default />
+ </templates>
+ <?lua include("includes/notifications.oxi") ?>
+
+
+ <Scene
+ ambientlight = "0.8, 0.8, 0.8"
+ skybox = "Orxonox/Starbox"
+ >
+ <DistanceTrigger name="test" position="100,0,100" target="Pawn" distance=25 stayActive="true" />
+ <Backlight position="100,0,100" visible=true frequency=0.6 amplitude=3 material="Flares/lensflare" colour="1,0,1"/>
+
+ <Dialog name="Kurt" currentQuestionId="loop1">
+ <questions>
+ <Question question="Soll ich dich einmal loopen?" Id="loop1">
+ <answerIds>
+ <AnswerId Id="ja"/>
+ <AnswerId Id="nein"/>
+ <AnswerId Id="giveItToMe"/>
+ </answerIds>
+ </Question>
+ <Question question="Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet." Id="lorem">
+ <answerIds>
+ <AnswerId Id="end"/>
+ </answerIds>
+ </Question>
+ <Question question="Soll ich dich nochmal loopen?" Id="loop2">
+ <answerIds>
+ <AnswerId Id="ja"/>
+ <AnswerId Id="nein"/>
+ <AnswerId Id="end"/>
+ </answerIds>
+ </Question>
+ <Question question="Dann eben nicht" Id="ok"/>
+ </questions>
+ <answers>
+ <Answer Id="giveItToMe" answer="Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet." nextQuestionId="lorem"/>
+ <Answer Id="ja" answer="ja loop mich" nextQuestionId="loop2"/>
+ <Answer Id="nein" answer="lieber nicht" nextQuestionId="ok"/>
+ <Answer Id="end" answer="ich geh dann mal" nextQuestionId=""/>
+ </answers>
+ <events>
+ <execute>
+ <EventListener event="test"/>
+ </execute>
+ </events>
+ </Dialog>
+
+ <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
+ <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort />
+
+
+
+ </Scene>
+</Level>
Deleted: code/branches/Dialog_HS17/data/levels/DialogueShowcase.oxw
===================================================================
--- code/branches/Dialog_HS17/data/levels/DialogueShowcase.oxw 2017-12-11 13:20:57 UTC (rev 11651)
+++ code/branches/Dialog_HS17/data/levels/DialogueShowcase.oxw 2017-12-11 13:33:45 UTC (rev 11652)
@@ -1,79 +0,0 @@
-<LevelInfo
- name = "DialogueShowcase"
- description = "A level to show and test the functionality of the Dialogue module."
- tags = "test"
- screenshot = "emptylevel.png"
-/>
-
-<?lua
- include("stats.oxo")
- include("HUDTemplates3.oxo")
- include("templates/lodInformation.oxt")
- include("templates/HeavyCruiser.oxt")
-?>
-
-<?lua
- include("templates/spaceshipEscort.oxt")
- include("templates/endurancetest_template.oxt")
-?>
-
-<Level>
- <templates>
- <Template link=lodtemplate_default />
- </templates>
- <?lua include("includes/notifications.oxi") ?>
-
-
- <Scene
- ambientlight = "0.8, 0.8, 0.8"
- skybox = "Orxonox/Starbox"
- >
- <DistanceTrigger name="test" position="100,0,100" target="Pawn" distance=25 stayActive="true" />
- <Backlight position="100,0,100" visible=true frequency=0.6 amplitude=3 material="Flares/lensflare" colour="1,0,1"/>
-
- <NextQuestion question="Unknown Spaceship Transmission: Who goes there?" a1="(say your name)" a2="None of your business I'm afraid." >
- <possibleQuestions>
- <NextQuestion question="You're not cleared for this area, turn back." a1="Doesn't look too exciting here anyways." a2="You gotta make me try...(attack)" />
- <NextQuestion question="I'll make it my business. Only military allowed in this area." a1="Whoops, didn't know that, I'll be on my way then." a2="Got an important message for Sgt Smith though." >
- <possibleQuestions>
- <NextQuestion question="Make sure I don't have to see your ugly face again." a1="...thanks, bye." a2="I'll think about it." />
- <NextQuestion question="Oh why didn't you say that in the first place? Off you go." a1="Thanks mate." a2="Just don't be so rude next time." />
- </possibleQuestions>
- </NextQuestion>
- </possibleQuestions>
- <events>
- <execute>
- <EventListener event="test" />
- </execute>
- </events>
- </NextQuestion>
-
- <DistanceTrigger name="test1" position="100,0,-100" target="Pawn" distance=25 stayActive="true" />
- <Backlight position="100,0,-100" visible=true frequency=0.6 amplitude=3 material="Flares/lensflare" colour="1,1,1"/>
-
- <NextQuestion question="Hey, sorry to bother you, could you help me with something?" a1="Yeah sure." a2="Nope get lost." >
- <possibleQuestions>
- <NextQuestion question="Do you like fish" a1="...yes?" a2="This is wasting my time." >
- <possibleQuestions>
- <NextQuestion question="Splendid! Would you like your ship to look like one?" a1="..." a2="I'm going now, okay?" />
- <NextQuestion question="Turtles then?" a1="..." a2="Im going now, okay?" />
- </possibleQuestions>
- </NextQuestion>
- <NextQuestion question="I can pay you know." a1="Got enough money." a2="...are you deaf? Bye."/>
- </possibleQuestions>
- <events>
- <execute>
- <EventListener event="test1" />
- </execute>
- </events>
- </NextQuestion>
-
-
-
- <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
- <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort />
-
-
-
- </Scene>
-</Level>
Deleted: code/branches/Dialog_HS17/data/levels/DialogueShowcase2.oxw
===================================================================
--- code/branches/Dialog_HS17/data/levels/DialogueShowcase2.oxw 2017-12-11 13:20:57 UTC (rev 11651)
+++ code/branches/Dialog_HS17/data/levels/DialogueShowcase2.oxw 2017-12-11 13:33:45 UTC (rev 11652)
@@ -1,76 +0,0 @@
-<LevelInfo
- name = "DialogShowase"
- description = "A level to show and test the functionality of the Dialogue module."
- tags = "test"
- screenshot = "emptylevel.png"
-/>
-
-<?lua
- include("stats.oxo")
- include("HUDTemplates3.oxo")
- include("templates/lodInformation.oxt")
- include("templates/HeavyCruiser.oxt")
-?>
-
-<?lua
- include("templates/spaceshipEscort.oxt")
- include("templates/endurancetest_template.oxt")
-?>
-
-<Level>
- <templates>
- <Template link=lodtemplate_default />
- </templates>
- <?lua include("includes/notifications.oxi") ?>
-
-
- <Scene
- ambientlight = "0.8, 0.8, 0.8"
- skybox = "Orxonox/Starbox"
- >
- <DistanceTrigger name="test" position="100,0,100" target="Pawn" distance=25 stayActive="true" />
- <Backlight position="100,0,100" visible=true frequency=0.6 amplitude=3 material="Flares/lensflare" colour="1,0,1"/>
-
- <Dialog name="Kurt" currentQuestionId="loop1">
- <questions>
- <Question question="Soll ich dich einmal loopen?" Id="loop1">
- <answerIds>
- <AnswerId Id="ja"/>
- <AnswerId Id="nein"/>
- <AnswerId Id="giveItToMe"/>
- </answerIds>
- </Question>
- <Question question="Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua." Id="lorem">
- <answerIds>
- <AnswerId Id="end"/>
- </answerIds>
- </Question>
- <Question question="Soll ich dich nochmal loopen?" Id="loop2">
- <answerIds>
- <AnswerId Id="ja"/>
- <AnswerId Id="nein"/>
- <AnswerId Id="end"/>
- </answerIds>
- </Question>
- <Question question="Dann eben nicht" Id="ok"/>
- </questions>
- <answers>
- <Answer Id="giveItToMe" answer="Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet." nextQuestionId="lorem"/>
- <Answer Id="ja" answer="ja loop mich" nextQuestionId="loop2"/>
- <Answer Id="nein" answer="lieber nicht" nextQuestionId="ok"/>
- <Answer Id="end" answer="ich geh dann mal" nextQuestionId=""/>
- </answers>
- <events>
- <execute>
- <EventListener event="test"/>
- </execute>
- </events>
- </Dialog>
-
- <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
- <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort />
-
-
-
- </Scene>
-</Level>
Modified: code/branches/Dialog_HS17/data/overlays/HUDTemplates3.oxo
===================================================================
--- code/branches/Dialog_HS17/data/overlays/HUDTemplates3.oxo 2017-12-11 13:20:57 UTC (rev 11651)
+++ code/branches/Dialog_HS17/data/overlays/HUDTemplates3.oxo 2017-12-11 13:33:45 UTC (rev 11652)
@@ -214,12 +214,6 @@
/>
<GUIOverlay
- name = "Dialogue"
- guiname = "Dialogue"
- visible = "false"
- />
-
- <GUIOverlay
name = "Dialog"
guiname = "Dialog"
visible = "false"
Modified: code/branches/Dialog_HS17/src/modules/CMakeLists.txt
===================================================================
--- code/branches/Dialog_HS17/src/modules/CMakeLists.txt 2017-12-11 13:20:57 UTC (rev 11651)
+++ code/branches/Dialog_HS17/src/modules/CMakeLists.txt 2017-12-11 13:33:45 UTC (rev 11652)
@@ -25,7 +25,6 @@
################ Sub Directories ################
-ADD_SUBDIRECTORY(dialogue)
ADD_SUBDIRECTORY(dialog)
ADD_SUBDIRECTORY(designtools)
ADD_SUBDIRECTORY(gametypes)
More information about the Orxonox-commit
mailing list