Changeset 10260 for code/trunk/data

Timestamp:

Feb 6, 2015, 11:03:00 PM (9 years ago)

Author:

landauf

Message:

merged the latest changes from pickupsFS14 to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• data/levels/jump.oxw (modified) (2 diffs)
• data/overlays/jumpHUD.oxo (modified) (3 diffs)

code/trunk/data/levels/jump.oxw

@@ -243 +243 @@
             <Model position="0,0,-1000" mesh="JumpPlatform06.mesh" scale="1" />
             <Model position="0,0,-1000" mesh="JumpProjectile.mesh" scale="1" />
-            <Model position="0,0,-1000" mesh="JumpFigure.mesh" scale="1" />
             <Model position="0,0,-1000" mesh="JumpEnemy1.mesh" scale="1" />
             <Model position="0,0,-1000" mesh="JumpEnemy2.mesh" scale="1" />
@@ -250 +249 @@
             <Model position="0,0,-1000" mesh="JumpSpring.mesh" scale="1" />
             <Model position="0,0,-1000" mesh="JumpRocket.mesh" scale="1" />
+            <Model position="0,0,-1000" mesh="JumpPropeller.mesh" scale="1" />
+            <Model position="0,0,-1000" mesh="JumpBoots.mesh" scale="1" />
+            <Model position="0,0,-1000" mesh="JumpShield.mesh" scale="1" />
           </attached>
         </JumpCenterpoint>

code/trunk/data/overlays/jumpHUD.oxo

@@ -1 +1 @@
 <Template name="JumpHUD">
   <OverlayGroup name="JumpHUD" scale = "1, 1">
+
     <JumpScore
      position  = "0.5, 0.05"
@@ -9 +10 @@
      align     = "center"
      showScore = true
+     showFuel = false
+     showMessages = false
+    />
+
+    <JumpScore
+     position  = "0.1, 0.05"
+     pickpoint = "0.0, 0.0"
+     font      = "ShareTechMono"
+     textsize  = 0.05
+     colour    = "1.0, 0.5, 0.0, 1.0"
+     align     = "left"
+     showScore = false
+     showFuel = true
      showMessages = false
     />
@@ -21 +35 @@
      gameOverText = "GAME OVER"
      showScore = false
+     showFuel = false
      showMessages = true
     />    
 
+  <HUDBar
+     name          = "SpeedBar1"
+     background    = "Orxonox/BarBackground"
+     size          = "0.35, 0.05"
+     position      = "0.0 , 1.0 "
+     pickpoint     = "0, 1"
+     correctaspect = false
+
+     initialvalue = 50
+
+     >
+      <BarColour position = 0.0 colour = "0.7,0.5,0.2" />
+      <BarColour position = 0.5 colour = "0.2,0.7,0.2" />
+      <BarColour position = 1.0 colour = "0.7,0.2,0.2" />
+    </HUDBar>
+
   </OverlayGroup>
 </Template>