Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8994 for code/branches


Ignore:
Timestamp:
Dec 17, 2011, 1:03:45 AM (13 years ago)
Author:
jo
Message:

Removing tansporter's healthbar.

Location:
code/branches/presentation2011
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • code/branches/presentation2011/data/levels/missionOne.oxw

    r8981 r8994  
    11<LevelInfo
    22 name = "Mission One"
    3  description = "First guided steps in the orxonoxian universe."
     3 description = "First Guided Steps in the Orxonoxian Universe."
    44 screenshot = "missionOne.png"
    55 tags = "mission"
  • code/branches/presentation2011/data/levels/underAttack.oxw

    r8988 r8994  
    99  include("HUDTemplates3.oxo")
    1010  include("stats.oxo")
    11   include("underAttackHUD.oxo")
    1211  include("templates/spaceshipAssff.oxt")
    1312  include("templates/lodInformation.oxt")
    1413?>
     14<!--OUTDATED: include("underAttackHUD.oxo") -->
    1515
    1616<Level
  • code/branches/presentation2011/data/overlays/underAttackHUD.oxo

    r7679 r8994  
    1 <Template name="UnderAttackHUD">
     1< Template name="UnderAttackHUD">
    22  <OverlayGroup name="UnderAttackHUD" scale = "1, 1">
    3     <UnderAttackHealthBar
     3    <OUTDATED-- UnderAttackHealthBar
    44     name                 = "HealthBar"
    55     background           = "Orxonox/HealthBarBackground"
  • code/branches/presentation2011/src/orxonox/gametypes/UnderAttack.cc

    r8858 r8994  
    4949        this->gameEnded_ = false;
    5050
    51         this->setHUDTemplate("UnderAttackHUD");
    52 
     51        //this->setHUDTemplate("UnderAttackHUD");
     52        //This HUD is in conflict with the HUDEnemyHealthBar
    5353        this->setConfigValues();
    5454        this->timesequence_ = static_cast<int>(this->gameTime_);
Note: See TracChangeset for help on using the changeset viewer.