Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 11450 for code/trunk


Ignore:
Timestamp:
Oct 11, 2017, 4:07:20 PM (7 years ago)
Author:
patricwi
Message:

reverted merge Dialogue

Location:
code/trunk
Files:
6 deleted
4 edited

Legend:

Unmodified
Added
Removed

  • code/trunk

  • code/trunk/data/levels/events.oxw

    r11447 r11450  
    5757    -->
    5858
    59     <DistanceTrigger name="test" position="0,0,0" target="Pawn" distance=25 stayActive="true" />
    60     <Backlight position="0,0,0" visible=true frequency=0.6 amplitude=3 material="Flares/lensflare" colour="1,0,1"/>
    61    
    62     <NextQuestion  question="Continue?" a1="yes" a2="no" >
    63      <possibleQuestions>
    64         <NextQuestion  question="Are you sure?" a1="yep let me continue" a2="no actually not" />
    65         <NextQuestion  question="Why?" a1="Got a dentist's appointment" a2="this sucks" >
    66         <possibleQuestions>
    67           <NextQuestion  question="Are your teeth that bad mate?" a1="yep" a2="leave me alone godammit" />
    68           <NextQuestion  question="You suck" a1="..." a2="Im going now okay" />
    69         </possibleQuestions>
    70       </NextQuestion>
    71       </possibleQuestions>   
    72       <events>
    73         <execute>
    74            <EventListener event="test" />
    75         </execute>
    76       </events>
    77     </NextQuestion>
    78 
    79     <DistanceTrigger name="test1" position="100,300,0" target="Pawn" distance=25 stayActive="true" />
    80     <Backlight position="100,300,0" visible=true frequency=0.6 amplitude=3 material="Flares/lensflare" colour="1,1,1"/>
    81    
    82     <NextQuestion  question="Wazzp bud?" a1="yes" a2="no" >
    83      <possibleQuestions>
    84         <NextQuestion  question="Do you like fish" a1="yep let me continue" a2="no actually not" />
    85         <NextQuestion  question="Whats your favourite pastime?" a1="Got a dentist's appointment" a2="this sucks" >
    86         <possibleQuestions>
    87           <NextQuestion  question="Whatever?" a1="yep" a2="leave me alone godammit" />
    88           <NextQuestion  question="Turtles then?" a1="..." a2="Im going now okay" />
    89         </possibleQuestions>
    90       </NextQuestion>
    91       </possibleQuestions>   
    92       <events>
    93         <execute>
    94            <EventListener event="test1" />
    95         </execute>
    96       </events>
    97     </NextQuestion>
    98 
    9959
    10060    <!-- red -->

  • code/trunk/data/overlays/HUDTemplates3.oxo

    r11447 r11450  
    214214    />
    215215
    216     <GUIOverlay
    217       name = "Dialogue"
    218       guiname = "Dialogue"
    219       visible = "false"
    220     />
    221 
    222   </OverlayGroup>
    223 </Template>
     216  </OverlayGroup>
     217</Template>

  • code/trunk/src/modules/CMakeLists.txt

    r11449 r11450  
    2626################ Sub Directories ################
    2727
    28 ADD_SUBDIRECTORY(dialogue)
    2928ADD_SUBDIRECTORY(designtools)
    3029ADD_SUBDIRECTORY(gametypes)
Note: See TracChangeset for help on using the changeset viewer.