Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10842 for code/branches


Ignore:
Timestamp:
Nov 23, 2015, 5:45:13 PM (9 years ago)
Author:
fvultier
Message:
 
Location:
code/branches/fabienHS15
Files:
2 added
6 edited

Legend:

Unmodified
Added
Removed
  • code/branches/fabienHS15/data/levels/templates/spaceshipAssff2.oxt

    r10814 r10842  
    3737   linearDamping     = 0.7
    3838   angularDamping    = 0.9999999
     39
     40   explosionSound = "sounds/Explosion2.ogg"
    3941  >
    4042    <engines>
  • code/branches/fabienHS15/data/overlays/HUDTemplates3.oxo

    r10814 r10842  
    132132      <BarColour position = 1.0 colour = "0.2,0.7,0.2" />
    133133    </HUDEnemyHealthBar>
     134
     135    <HUDEnemyShieldBar
     136     name          = "EnemyShieldBar1"
     137     background    = "Orxonox/BarBackground"
     138     size          = "0.40, 0.04"
     139     position      = "1.0 , 0.1 "
     140     pickpoint     = "1, 0"
     141     correctaspect = true
     142     iconmaterial  = "Orxonox/BarIconShield"
     143    >
     144      <BarColour position = 0.0 colour = "0.7,0.2,0.2" />
     145      <BarColour position = 0.5 colour = "0.7,0.7,0.2" />
     146      <BarColour position = 1.0 colour = "0.2,0.7,0.2" />
     147    </HUDEnemyShieldBar>   
    134148
    135149    <HUDNavigation
  • code/branches/fabienHS15/src/modules/overlays/OverlaysPrereqs.h

    r10814 r10842  
    9393    class HUDBoostBar;
    9494    class HUDRocketFuelBar;
     95    class HUDEnemyHealthBar;
     96    class HUDEnemyShieldBar;
     97    class HUDWeaponSystem;
     98    class HUDWeapon;
     99    class HUDWeaponMode;
    95100    class HUDTimer;
    96101    class HUDAimAssistant;
  • code/branches/fabienHS15/src/modules/overlays/hud/CMakeLists.txt

    r10814 r10842  
    1010  HUDTimer.cc
    1111  HUDEnemyHealthBar.cc
     12  HUDEnemyShieldBar.cc
    1213  HUDWeaponMode.cc
    1314  HUDWeapon.cc
  • code/branches/fabienHS15/src/modules/overlays/hud/HUDShieldBar.cc

    r10746 r10842  
    5454        if (this->owner_)
    5555        {
    56             float maxShieldHealth = this->owner_->getShieldHealth();
     56            float maxShieldHealth = this->owner_->getMaxShieldHealth();
    5757            float shieldHealth = this->owner_->getShieldHealth();
    5858
     
    6666            }
    6767        }
     68        else
     69        {
     70            this->setValue(0.0f);
     71        }
    6872    }
    6973
  • code/branches/fabienHS15/src/modules/overlays/hud/HUDShieldBar.h

    r10746 r10842  
    5252        virtual void changedOwner();
    5353
     54        inline void setShieldBarOwner(Pawn* owner)
     55            { this->owner_ = owner; }
    5456    private:
    5557        Pawn* owner_;
Note: See TracChangeset for help on using the changeset viewer.