[Orxonox-commit 4675] r9346 - in code/branches/presentation2012merge/data: levels overlays

[jo at orxonox.net]

Author: jo
Date: 2012-08-30 17:11:07 +0200 (Thu, 30 Aug 2012)
New Revision: 9346

Modified:
   code/branches/presentation2012merge/data/levels/towerDefense.oxw
   code/branches/presentation2012merge/data/overlays/lastManStandingHUD.oxo
   code/branches/presentation2012merge/data/overlays/lastTeamStandingHUD.oxo
Log:
Bugfix: Previously the LastManStandingHUD wasn't displayed properly when loaded the first time. The first OverlayText 'Players' didn't appear the first time a level was loaded. This could be 'fixed' by changing the order in the concerning overlay templates.

Modified: code/branches/presentation2012merge/data/levels/towerDefense.oxw
===================================================================
--- code/branches/presentation2012merge/data/levels/towerDefense.oxw	2012-08-30 14:03:12 UTC (rev 9345)
+++ code/branches/presentation2012merge/data/levels/towerDefense.oxw	2012-08-30 15:11:07 UTC (rev 9346)
@@ -5,7 +5,7 @@
 <LevelInfo
  name = "Tower Defense"
  description = "Defend your Spacestation from incoming waves."
- tags = "gametype"
+ tags = "minigame"
  screenshot = "emptylevel.png"
 />
 

Modified: code/branches/presentation2012merge/data/overlays/lastManStandingHUD.oxo
===================================================================
--- code/branches/presentation2012merge/data/overlays/lastManStandingHUD.oxo	2012-08-30 14:03:12 UTC (rev 9345)
+++ code/branches/presentation2012merge/data/overlays/lastManStandingHUD.oxo	2012-08-30 15:11:07 UTC (rev 9346)
@@ -1,25 +1,24 @@
 <Template name="LastmanstandingHUD">
   <OverlayGroup name="LastmanstandingHUD" scale = "1, 1">
-    <OverlayText
-     position  = "0.02, 0.02"
+    <LastManStandingInfos
+     position  = "0.14, 0.02"
      pickpoint = "0.0, 0.0"
      font      = "ShareTechMono"
      textsize  = 0.04
      colour    = "1.0, 1.0, 1.0, 1.0"
      align     = "left"
-     caption   = "Lives:   "
-    />
 
-    <LastManStandingInfos
-     position  = "0.14, 0.02"
+     showlives     = true
+     showplayers     = false
+    />
+    <OverlayText
+     position  = "0.02, 0.02"
      pickpoint = "0.0, 0.0"
      font      = "ShareTechMono"
      textsize  = 0.04
      colour    = "1.0, 1.0, 1.0, 1.0"
      align     = "left"
-
-     showlives     = true
-     showplayers     = false
+     caption   = "Lives:   "
     />
 
     <OverlayText

Modified: code/branches/presentation2012merge/data/overlays/lastTeamStandingHUD.oxo
===================================================================
--- code/branches/presentation2012merge/data/overlays/lastTeamStandingHUD.oxo	2012-08-30 14:03:12 UTC (rev 9345)
+++ code/branches/presentation2012merge/data/overlays/lastTeamStandingHUD.oxo	2012-08-30 15:11:07 UTC (rev 9346)
@@ -1,25 +1,25 @@
 <Template name="lastTeamStandingHUD">
   <OverlayGroup name="lastTeamStandingHUD" scale = "1, 1">
-    <OverlayText
-     position  = "0.02, 0.02"
+    <LastTeamStandingInfos
+     position  = "0.14, 0.02"
      pickpoint = "0.0, 0.0"
      font      = "ShareTechMono"
      textsize  = 0.04
      colour    = "1.0, 1.0, 1.0, 1.0"
      align     = "left"
-     caption   = "Lives:   "
+
+     showlives     = true
+     showteams     = false
     />
 
-    <LastTeamStandingInfos
-     position  = "0.14, 0.02"
+    <OverlayText
+     position  = "0.02, 0.02"
      pickpoint = "0.0, 0.0"
      font      = "ShareTechMono"
      textsize  = 0.04
      colour    = "1.0, 1.0, 1.0, 1.0"
      align     = "left"
-
-     showlives     = true
-     showteams     = false
+     caption   = "Lives:   "
     />
 
     <OverlayText