Changeset 8637 for code/branches/presentation/data/levels

Timestamp:

May 28, 2011, 5:10:01 PM (14 years ago)

Author:

dafrick

Message:

Merging tutoriallevel3 branch into presentation branch.

Location:

code/branches/presentation

Files:

• . (modified) (1 prop)
• data/levels/FPSTest.oxw (modified) (1 diff)
• data/levels/asteroids.oxw (modified) (1 diff)
• data/levels/docking.oxw (modified) (1 diff)
• data/levels/dynamicMatch.oxw (modified) (1 diff)
• data/levels/earth.oxw (modified) (1 diff)
• data/levels/emptyLevel.oxw (modified) (1 diff)
• data/levels/events.oxw (modified) (1 diff)
• data/levels/fightInOurBack.oxw (modified) (1 diff)
• data/levels/includes/notifications.oxi (copied) (copied from code/branches/tutoriallevel3/data/levels/includes/notifications.oxi)
• data/levels/lastManStanding.oxw (modified) (1 diff)
• data/levels/lastTeamStanding.oxw (modified) (2 diffs)
• data/levels/lastTeamStandingII.oxw (modified) (1 diff)
• data/levels/myTestLevel.oxw (modified) (1 diff)
• data/levels/notifications.oxw (modified) (2 diffs)
• data/levels/pickups.oxw (modified) (1 diff)
• data/levels/pirateAttack.oxw (modified) (1 diff)
• data/levels/planets.oxw (modified) (1 diff)
• data/levels/pong.oxw (modified) (1 diff)
• data/levels/portals.oxw (modified) (1 diff)
• data/levels/presentation.oxw (modified) (1 diff)
• data/levels/presentation09.oxw (modified) (1 diff)
• data/levels/presentation09b.oxw (modified) (1 diff)
• data/levels/presentationDM.oxw (modified) (1 diff)
• data/levels/presentationFS10.oxw (modified) (1 diff)
• data/levels/presentationFS102.oxw (modified) (1 diff)
• data/levels/presentationFS10Ed.oxw (modified) (1 diff)
• data/levels/presentationFS11.oxw (modified) (2 diffs)
• data/levels/presentationHS09.oxw (modified) (1 diff)
• data/levels/presentationHS09b.oxw (modified) (1 diff)
• data/levels/princessAeryn.oxw (modified) (1 diff)
• data/levels/quests.oxw (copied) (copied from code/branches/tutoriallevel3/data/levels/quests.oxw)
• data/levels/screenshot.oxw (modified) (1 diff)
• data/levels/shieldTest.oxw (modified) (2 diffs)
• data/levels/sound.oxw (modified) (1 diff)
• data/levels/spaceRace.oxw (modified) (1 diff)
• data/levels/teamBaseMatch.oxw (modified) (1 diff)
• data/levels/teamDeathMatch.oxw (modified) (1 diff)
• data/levels/testStars.oxw (modified) (1 diff)
• data/levels/testSwallow.oxw (modified) (1 diff)
• data/levels/tetris.oxw (modified) (1 diff)
• data/levels/theTimeMachine.oxw (modified) (1 diff)
• data/levels/tutorial.oxw (modified) (1 diff)
• data/levels/underAttack.oxw (modified) (1 diff)
• data/levels/waypoints.oxw (modified) (1 diff)

code/branches/presentation/data/levels/FPSTest.oxw

@@ -21 +21 @@
     <Template link=lodtemplate_default />
   </templates>
+  <?lua include("includes/notifications.oxi") ?>
 
   <Scene

code/branches/presentation/data/levels/asteroids.oxw

@@ -14 +14 @@
     <Template link=lodtemplate_default />
   </templates>
+  <?lua include("includes/notifications.oxi") ?>
 
   <Scene

code/branches/presentation/data/levels/docking.oxw

@@ -19 +19 @@
     <Template link="lodtemplate_default" />
   </templates>
+  <?lua include("includes/notifications.oxi") ?>
 
   <Scene

code/branches/presentation/data/levels/dynamicMatch.oxw

@@ -16 +16 @@
     <Template link=lodtemplate_default />
   </templates>
+  <?lua include("includes/notifications.oxi") ?>
 
   <Scene

code/branches/presentation/data/levels/earth.oxw

@@ -19 +19 @@
     <Template link="lodtemplate_default" />
   </templates>
+  <?lua include("includes/notifications.oxi") ?>
 
   <Template name=PortalDefault>

code/branches/presentation/data/levels/emptyLevel.oxw

@@ -23 +23 @@
     <Template link=lodtemplate_default />
   </templates>
+  <?lua include("includes/notifications.oxi") ?>
 
   <Scene

code/branches/presentation/data/levels/events.oxw

@@ -20 +20 @@
     <Template link=lodtemplate_default />
   </templates>
+  <?lua include("includes/notifications.oxi") ?>
 
   <Scene

code/branches/presentation/data/levels/fightInOurBack.oxw

@@ -68 +68 @@
     <Template link=lodtemplate_default />
   </templates>
+  <?lua include("includes/notifications.oxi") ?>
 
     <!-- Ausgang: Szene ===> ambientlight/skybox -->

code/branches/presentation/data/levels/lastManStanding.oxw

@@ -23 +23 @@
     <Template link=lodtemplate_default />
   </templates>
+  <?lua include("includes/notifications.oxi") ?>
 
   <Scene

code/branches/presentation/data/levels/lastTeamStanding.oxw

@@ -22 +22 @@
     <Template link=lodtemplate_default />
   </templates>
+  <?lua include("includes/notifications.oxi") ?>
 
   <Scene
@@ -27 +28 @@
     skybox       = "Orxonox/skypanoramagen1"
   >
+  <?lua include("includes/notifications.oxi") ?>
 
     <?lua

code/branches/presentation/data/levels/lastTeamStandingII.oxw

@@ -22 +22 @@
     <Template link=lodtemplate_default />
   </templates>
+  <?lua include("includes/notifications.oxi") ?>
 
   <Scene

code/branches/presentation/data/levels/myTestLevel.oxw

@@ -23 +23 @@
     <Template link=lodtemplate_default />
   </templates>
+  <?lua include("includes/notifications.oxi") ?>
 
   <Scene

code/branches/presentation/data/levels/notifications.oxw

@@ -19 +19 @@
         <Template link=lodtemplate_default />
     </templates>
+    <?lua include("includes/notifications.oxi") ?>
 
     <Scene
@@ -24 +25 @@
         skybox       = "Orxonox/skypanoramagen1"
     >
-
-    <Script code="showGUI NotificationLayer false true" needsGraphics="true" />
 
     <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" />

code/branches/presentation/data/levels/pickups.oxw

@@ -23 +23 @@
     <Template link=lodtemplate_default />
   </templates>
+  <?lua include("includes/notifications.oxi") ?>
 
   <Scene

code/branches/presentation/data/levels/pirateAttack.oxw

@@ -35 +35 @@
     <Template link=lodtemplate_default />
   </templates>
+  <?lua include("includes/notifications.oxi") ?>
 
     <Scene

code/branches/presentation/data/levels/planets.oxw

@@ -19 +19 @@
     <Template link="lodtemplate_default" />
   </templates>
+  <?lua include("includes/notifications.oxi") ?>
 
   <Scene

code/branches/presentation/data/levels/pong.oxw

@@ -56 +56 @@
     <Template link=lodtemplate_default />
   </templates>
+  <?lua include("includes/notifications.oxi") ?>
 
   <WorldAmbientSound source="mainmenu.ogg" playOnLoad=true />

code/branches/presentation/data/levels/portals.oxw

@@ -21 +21 @@
     <Template link=lodtemplate_default />
   </templates>
+  <?lua include("includes/notifications.oxi") ?>
 
   <Scene

code/branches/presentation/data/levels/presentation.oxw

@@ -19 +19 @@
     <Template link=lodtemplate_default />
   </templates>
+  <?lua include("includes/notifications.oxi") ?>
 
   <Scene

code/branches/presentation/data/levels/presentation09.oxw

@@ -21 +21 @@
     <Template link=lodtemplate_default />
   </templates>
+  <?lua include("includes/notifications.oxi") ?>
 
   <Scene

code/branches/presentation/data/levels/presentation09b.oxw

@@ -23 +23 @@
     <Template link=lodtemplate_default />
   </templates>
+  <?lua include("includes/notifications.oxi") ?>
 
   <Scene

code/branches/presentation/data/levels/presentationDM.oxw

@@ -20 +20 @@
     <Template link=lodtemplate_default />
   </templates>
+  <?lua include("includes/notifications.oxi") ?>
 
   <Scene

code/branches/presentation/data/levels/presentationFS10.oxw

@@ -26 +26 @@
     <Template link=lodtemplate_default />
   </templates>
+  <?lua include("includes/notifications.oxi") ?>
 
   <Scene

code/branches/presentation/data/levels/presentationFS102.oxw

@@ -21 +21 @@
     <Template link=lodtemplate_default />
   </templates>
+  <?lua include("includes/notifications.oxi") ?>
 
   <Scene

code/branches/presentation/data/levels/presentationFS10Ed.oxw

@@ -21 +21 @@
     <Template link=lodtemplate_default />
   </templates>
+  <?lua include("includes/notifications.oxi") ?>
 
   <Scene

code/branches/presentation/data/levels/presentationFS11.oxw

@@ -28 +28 @@
     <Template link=lodtemplate_default />
   </templates>
+  <?lua include("includes/notifications.oxi") ?>
+
+  <NotificationQueueCEGUI
+    name="narrative"
+    targets="narrative"
+    size=1
+    displayTime=30
+    position="0.2, 0, 0.8, 0"
+    fontSize="24"
+    fontColor="1, 1, 0, 0.8"
+    alignment="HorzCentred"
+    displaySize="0.6, 0, 0, 0"
+    />
 
   <Scene
@@ -39 +52 @@
 
     <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="0,0,0" lookat="-2,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
+
+    <SimpleNotification message="Welcome to Earth Orbit" >
+        <events>
+            <trigger>
+                <EventListener event=spawntrigger />
+            </trigger>
+        </events>
+    </SimpleNotification>
+    <EventMultiTrigger name=spawntrigger>
+        <events>
+            <trigger>
+                <SpawnPoint position="0,0,0" lookat="-2,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
+            </trigger>
+        </events>
+    </EventMultiTrigger>
 
 <!-- PICKUPS -->

code/branches/presentation/data/levels/presentationHS09.oxw

@@ -24 +24 @@
     <Template link=lodtemplate_default />
   </templates>
+  <?lua include("includes/notifications.oxi") ?>
 
   <Scene

code/branches/presentation/data/levels/presentationHS09b.oxw

@@ -29 +29 @@
     <Template link=lodtemplate_default />
   </templates>
+  <?lua include("includes/notifications.oxi") ?>
 
   <Scene

code/branches/presentation/data/levels/princessAeryn.oxw

@@ -24 +24 @@
     <Template link=lodtemplate_default />
   </templates>
+  <?lua include("includes/notifications.oxi") ?>
 
   <Scene

code/branches/presentation/data/levels/screenshot.oxw

@@ -22 +22 @@
     <Template link=lodtemplate_default />
   </templates>
+  <?lua include("includes/notifications.oxi") ?>
 
   <Scene

code/branches/presentation/data/levels/shieldTest.oxw

@@ -20 +20 @@
   <Template link=lodtemplate_default />
 </templates>
+<?lua include("includes/notifications.oxi") ?>
 
 <Scene
@@ -25 +26 @@
    skybox       = "Orxonox/Starbox"
 >
-
-
-
 
 <Drone name="meineDrohne"

code/branches/presentation/data/levels/sound.oxw

@@ -23 +23 @@
     <Template link=lodtemplate_default />
   </templates>
+  <?lua include("includes/notifications.oxi") ?>
 
   <Scene

code/branches/presentation/data/levels/spaceRace.oxw

@@ -31 +31 @@
     <Template link=lodtemplate_default />
   </templates>
+  <?lua include("includes/notifications.oxi") ?>
 
   <Scene

code/branches/presentation/data/levels/teamBaseMatch.oxw

@@ -23 +23 @@
     <Template link=lodtemplate_default />
   </templates>
+  <?lua include("includes/notifications.oxi") ?>
 
   <Scene

code/branches/presentation/data/levels/teamDeathMatch.oxw

@@ -22 +22 @@
     <Template link=lodtemplate_default />
   </templates>
+  <?lua include("includes/notifications.oxi") ?>
 
   <Scene

code/branches/presentation/data/levels/testStars.oxw

@@ -23 +23 @@
     <Template link=lodtemplate_default />
   </templates>
+  <?lua include("includes/notifications.oxi") ?>
 
   <Scene

code/branches/presentation/data/levels/testSwallow.oxw

@@ -22 +22 @@
     <Template link=lodtemplate_default />
   </templates>
+  <?lua include("includes/notifications.oxi") ?>
 
   <Scene

code/branches/presentation/data/levels/tetris.oxw

@@ -37 +37 @@
     <Template link=lodtemplate_default />
   </templates>
+  <?lua include("includes/notifications.oxi") ?>
 
   <Scene

code/branches/presentation/data/levels/theTimeMachine.oxw

@@ -68 +68 @@
         <Template link=lodtemplate_default />
     </templates>
+    <?lua include("includes/notifications.oxi") ?>
+    
     <Scene
         ambientlight="0.8,0.8,0.8"

code/branches/presentation/data/levels/tutorial.oxw

@@ -19 +19 @@
     <Template link=lodtemplate_default />
   </templates>
+  <?lua include("includes/notifications.oxi") ?>
 
   <Scene

code/branches/presentation/data/levels/underAttack.oxw

@@ -15 +15 @@
     <Template link=lodtemplate_default />
   </templates>
+  <?lua include("includes/notifications.oxi") ?>
 
   <Scene

code/branches/presentation/data/levels/waypoints.oxw

@@ -21 +21 @@
     <Template link=lodtemplate_default />
   </templates>
+  <?lua include("includes/notifications.oxi") ?>
 
   <Scene