Changeset 11034 for code/branches/presentationHS15/data

Timestamp:

Jan 4, 2016, 10:13:21 AM (8 years ago)

Author:

fvultier

Message:

Merge latest changes from fabienHS15 to presentationHS15.

Location:

code/branches/presentationHS15

Files:

• . (modified) (1 prop)
• data/levels/notifications.oxw (modified) (3 diffs)
• data/levels/templates/pickupRepresentationTemplates.oxt (modified) (2 diffs)

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

@@ -19 +19 @@
     <?lua include("includes/notifications.oxi") ?>
 
+    <NotificationQueueCEGUI
+      name="narrative"
+      targets="simpleNotification,commandNotification"
+      size=3
+      displayTime=3.9
+      position="0.2, 0, 0.1, 0"
+      fontSize="23"
+      fontColor="0.3, 1, 0.2, 0.8"
+      alignment="HorzCentred"
+      displaySize="0.6, 0, 0, 0"
+      />
+
     <Scene
         ambientlight = "0.5, 0.5, 0.5"
@@ -25 +37 @@
 
     <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=spaceshipassff />
 
-    <CommandNotification preMessage="Open the PickupInventory by pressing '" postMessage="'." command="OrxonoxOverlay toggleVisibility PickupInventory">
+    <CommandNotification preMessage="Open the PickupInventory by pressing '" postMessage="'." command="OrxonoxOverlay show PickupInventory">
         <events>
             <trigger>
@@ -44 +57 @@
     <Billboard position="0,0,100" colour="1.0,0,1.0" material="Examples/Flare" />
 
-    <?lua
-      for i = 1, 10, 1 do
-    ?>
-        <SpawnPoint position="<?lua print(math.random() * 1000 - 500) ?>,<?lua print(math.random() * 1000 - 500) ?>,<?lua print(math.random() * 1000 - 500) ?>" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
-    <?lua end ?>
-
   </Scene>
 </Level>

code/branches/presentationHS15/data/levels/templates/pickupRepresentationTemplates.oxt

@@ -326 +326 @@
         <MunitionContainer munitiontype="SplitMunition" munitionamount=8 magazinesamount=0 />
         <MunitionContainer munitiontype="RocketMunition" munitionamount=0 magazinesamount=2 />
+        <MunitionContainer munitiontype="MineMunition" munitionamount=0 magazinesamount=2 />
     </munitioncontainers>
-  </MunitionPickup></Template>
+  </MunitionPickup>
+</Template>
 
 <Template name=hugemunitionpickupRepresentation>
@@ -359 +361 @@
         <MunitionContainer munitiontype="IceMunition" munitionamount=0 magazinesamount=10 />
         <MunitionContainer munitiontype="GravityBombMunition" munitionamount=0 magazinesamount=10 />
+        <MunitionContainer munitiontype="MineMunition" munitionamount=0 magazinesamount=10 />
     </munitioncontainers>
   </MunitionPickup>