Changeset 10842 for code/branches
- Timestamp:
- Nov 23, 2015, 5:45:13 PM (9 years ago)
- Location:
- code/branches/fabienHS15
- Files:
-
- 2 added
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/fabienHS15/data/levels/templates/spaceshipAssff2.oxt
r10814 r10842 37 37 linearDamping = 0.7 38 38 angularDamping = 0.9999999 39 40 explosionSound = "sounds/Explosion2.ogg" 39 41 > 40 42 <engines> -
code/branches/fabienHS15/data/overlays/HUDTemplates3.oxo
r10814 r10842 132 132 <BarColour position = 1.0 colour = "0.2,0.7,0.2" /> 133 133 </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> 134 148 135 149 <HUDNavigation -
code/branches/fabienHS15/src/modules/overlays/OverlaysPrereqs.h
r10814 r10842 93 93 class HUDBoostBar; 94 94 class HUDRocketFuelBar; 95 class HUDEnemyHealthBar; 96 class HUDEnemyShieldBar; 97 class HUDWeaponSystem; 98 class HUDWeapon; 99 class HUDWeaponMode; 95 100 class HUDTimer; 96 101 class HUDAimAssistant; -
code/branches/fabienHS15/src/modules/overlays/hud/CMakeLists.txt
r10814 r10842 10 10 HUDTimer.cc 11 11 HUDEnemyHealthBar.cc 12 HUDEnemyShieldBar.cc 12 13 HUDWeaponMode.cc 13 14 HUDWeapon.cc -
code/branches/fabienHS15/src/modules/overlays/hud/HUDShieldBar.cc
r10746 r10842 54 54 if (this->owner_) 55 55 { 56 float maxShieldHealth = this->owner_->get ShieldHealth();56 float maxShieldHealth = this->owner_->getMaxShieldHealth(); 57 57 float shieldHealth = this->owner_->getShieldHealth(); 58 58 … … 66 66 } 67 67 } 68 else 69 { 70 this->setValue(0.0f); 71 } 68 72 } 69 73 -
code/branches/fabienHS15/src/modules/overlays/hud/HUDShieldBar.h
r10746 r10842 52 52 virtual void changedOwner(); 53 53 54 inline void setShieldBarOwner(Pawn* owner) 55 { this->owner_ = owner; } 54 56 private: 55 57 Pawn* owner_;
Note: See TracChangeset
for help on using the changeset viewer.