Changeset 8994 for code/branches

Timestamp:

Dec 17, 2011, 1:03:45 AM (13 years ago)

Author:

jo

Message:

Removing tansporter's healthbar.

Location:

code/branches/presentation2011

Files:

• data/levels/missionOne.oxw (modified) (1 diff)
• data/levels/underAttack.oxw (modified) (1 diff)
• data/overlays/underAttackHUD.oxo (modified) (1 diff)
• src/orxonox/gametypes/UnderAttack.cc (modified) (1 diff)

code/branches/presentation2011/data/levels/missionOne.oxw

@@ -1 +1 @@
 <LevelInfo
  name = "Mission One"
- description = "First guided steps in the orxonoxian universe."
+ description = "First Guided Steps in the Orxonoxian Universe."
  screenshot = "missionOne.png"
  tags = "mission"

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

@@ -9 +9 @@
   include("HUDTemplates3.oxo")
   include("stats.oxo")
-  include("underAttackHUD.oxo")
   include("templates/spaceshipAssff.oxt")
   include("templates/lodInformation.oxt")
 ?>
+<!--OUTDATED: include("underAttackHUD.oxo") -->
 
 <Level

code/branches/presentation2011/data/overlays/underAttackHUD.oxo

@@ -1 @@
-<Template name="UnderAttackHUD">
+< Template name="UnderAttackHUD">
   <OverlayGroup name="UnderAttackHUD" scale = "1, 1">
-    <UnderAttackHealthBar
+    <OUTDATED-- UnderAttackHealthBar
      name                 = "HealthBar"
      background           = "Orxonox/HealthBarBackground"

code/branches/presentation2011/src/orxonox/gametypes/UnderAttack.cc

@@ -49 +49 @@
         this->gameEnded_ = false;
 
-        this->setHUDTemplate("UnderAttackHUD");
-
+        //this->setHUDTemplate("UnderAttackHUD"); 
+        //This HUD is in conflict with the HUDEnemyHealthBar
         this->setConfigValues();
         this->timesequence_ = static_cast<int>(this->gameTime_);