[Orxonox-commit 568] r2197 - in media: levels overlay

landauf at orxonox.net landauf at orxonox.net
Thu May 28 05:39:27 CEST 2009


Author: landauf
Date: 2009-05-28 05:39:27 +0200 (Thu, 28 May 2009)
New Revision: 2197

Added:
   media/overlay/teambasematchhud.oxo
   media/overlay/underattackhud.oxo
Modified:
   media/levels/gametype_underattack.oxw
   media/levels/teambasematchlevel.oxw
   media/overlay/debug.oxo
Log:
added HUDs for TeamBaseMatch and UnderAttack

Modified: media/levels/gametype_underattack.oxw
===================================================================
--- media/levels/gametype_underattack.oxw	2009-05-28 03:14:53 UTC (rev 2196)
+++ media/levels/gametype_underattack.oxw	2009-05-28 03:39:27 UTC (rev 2197)
@@ -1,6 +1,7 @@
 <?lua
   include("overlay/hudtemplates3.oxo")
   include("overlay/stats.oxo")
+  include("overlay/underattackhud.oxo")
   include("levels/templates/spaceship_assff.oxt")
 ?>
 

Modified: media/levels/teambasematchlevel.oxw
===================================================================
--- media/levels/teambasematchlevel.oxw	2009-05-28 03:14:53 UTC (rev 2196)
+++ media/levels/teambasematchlevel.oxw	2009-05-28 03:39:27 UTC (rev 2197)
@@ -1,6 +1,7 @@
 <?lua
   include("overlay/hudtemplates3.oxo")
   include("overlay/stats.oxo")
+  include("overlay/teambasematchhud.oxo")
   include("levels/templates/spaceship_assff.oxt")
   include("levels/templates/spaceship_pirate.oxt")
 ?>

Modified: media/overlay/debug.oxo
===================================================================
--- media/overlay/debug.oxo	2009-05-28 03:14:53 UTC (rev 2196)
+++ media/overlay/debug.oxo	2009-05-28 03:39:27 UTC (rev 2197)
@@ -11,7 +11,6 @@
    font     = "Monofur"
    caption  = "Frames per second:"
    textsize = 0.03
-   textSize = 0.03
   />
 
   <DebugFPSText
@@ -19,7 +18,6 @@
    position = "0.3, 0.05"
    font     = "Monofur"
    textsize = 0.03
-   textSize = 0.03
   />
 
   <OverlayText
@@ -28,7 +26,6 @@
    font     = "Monofur"
    caption  = "Tick time in ms: "
    textsize = 0.03
-   textSize = 0.03
   />
 
   <DebugRTRText
@@ -36,7 +33,6 @@
    position = "0.3, 0.09"
    font     = "Monofur"
    textsize = 0.03
-   textSize = 0.03
   />
   
 </OverlayGroup>
@@ -45,7 +41,7 @@
   <OverlayGroup name = "defaultHUD" scale = "1, 1">
     <ChatOverlay
      name     = "chat"
-     position = "0.03, 0.03"
+     position = "0.03, 0.08"
      font     = "VeraMono"
      caption  = ""
      textsize = 0.025

Added: media/overlay/teambasematchhud.oxo
===================================================================
--- media/overlay/teambasematchhud.oxo	                        (rev 0)
+++ media/overlay/teambasematchhud.oxo	2009-05-28 03:39:27 UTC (rev 2197)
@@ -0,0 +1,90 @@
+<Template name="TeamBaseMatchHUD">
+  <OverlayGroup name="TeamBaseMatchHUD" scale = "1, 1">
+    <OverlayText
+     position  = "0.2, 0.05"
+     pickpoint = "0.0, 0.0"
+     font      = "ShareTechMono"
+     textsize  = 0.04
+     colour    = "1.0, 0.5, 0.5, 1.0"
+     align     = "left"
+     caption   = "Red team"
+    />
+
+    <TeamBaseMatchScore
+     position  = "0.37, 0.05"
+     pickpoint = "0.0, 0.0"
+     font      = "ShareTechMono"
+     textsize  = 0.04
+     colour    = "1.0, 0.8, 0.8, 1.0"
+     align     = "left"
+
+     showleftteam  = true
+     showrightteam = false
+     showbases     = true
+     showscore     = false
+    />
+
+    <TeamBaseMatchScore
+     position  = "0.49, 0.05"
+     pickpoint = "0.0, 0.0"
+     font      = "ShareTechMono"
+     textsize  = 0.04
+     colour    = "1.0, 0.8, 0.8, 1.0"
+     align     = "right"
+
+     showleftteam  = true
+     showrightteam = false
+     showbases     = false
+     showscore     = true
+    />
+
+    <OverlayText
+     position  = "0.505, 0.05"
+     pickpoint = "0.0, 0.0"
+     font      = "ShareTechMono"
+     textsize  = 0.04
+     colour    = "0.8, 0.8, 0.8, 1.0"
+     align     = "center"
+
+     caption   = ":"
+    />
+
+    <TeamBaseMatchScore
+     position  = "0.51, 0.05"
+     pickpoint = "0.0, 0.0"
+     font      = "ShareTechMono"
+     textsize  = 0.04
+     colour    = "0.8, 0.8, 1.0, 1.0"
+     align     = "left"
+
+     showleftteam  = false
+     showrightteam = true
+     showbases     = false
+     showscore     = true
+    />
+
+    <TeamBaseMatchScore
+     position  = "0.63, 0.05"
+     pickpoint = "0.0, 0.0"
+     font      = "ShareTechMono"
+     textsize  = 0.04
+     colour    = "0.8, 0.8, 1.0, 1.0"
+     align     = "right"
+
+     showleftteam  = false
+     showrightteam = true
+     showbases     = true
+     showscore     = false
+    />
+
+    <OverlayText
+     position  = "0.8, 0.05"
+     pickpoint = "0.0, 0.0"
+     font      = "ShareTechMono"
+     textsize  = 0.04
+     colour    = "0.5, 0.5, 1.0, 1.0"
+     align     = "right"
+     caption   = "Blue team"
+    />
+  </OverlayGroup>
+</Template>


Property changes on: media/overlay/teambasematchhud.oxo
___________________________________________________________________
Added: svn:eol-style
   + native

Added: media/overlay/underattackhud.oxo
===================================================================
--- media/overlay/underattackhud.oxo	                        (rev 0)
+++ media/overlay/underattackhud.oxo	2009-05-28 03:39:27 UTC (rev 2197)
@@ -0,0 +1,26 @@
+<Template name="UnderAttackHUD">
+  <OverlayGroup name="UnderAttackHUD" scale = "1, 1">
+    <UnderAttackHealthBar
+     name                 = "HealthBar"
+     background           = "Orxonox/HealthBarBackground"
+     size                 = "0.45, 0.0875"
+     position             = "0.99 , 0.01"
+     pickpoint            = "1, 0"
+     bartexture           = "healthbar_bar.tga"
+     textfont             = "VeraMono"
+     textusebarcolour     = true
+     textsize             = 0.039
+     textoffset           = "0.315, 0.05"
+     textpickpoint        = "0, 0"
+     textalign            = "right"
+     correctaspect        = false
+     textcorrectaspect    = false
+     descriptionpickpoint = "0, 0"
+     descriptionoffset    = "0.5, 1"
+    >
+      <BarColour position = 0.0 colour = "0.7,0.2,0.2" />
+      <BarColour position = 0.5 colour = "0.7,0.7,0.2" />
+      <BarColour position = 1.0 colour = "0.2,0.7,0.2" />
+    </UnderAttackHealthBar>
+  </OverlayGroup>
+</Template>


Property changes on: media/overlay/underattackhud.oxo
___________________________________________________________________
Added: svn:eol-style
   + native




More information about the Orxonox-commit mailing list