Changeset 9334
- Timestamp:
- Jul 22, 2012, 10:21:36 PM (12 years ago)
- Location:
- code/branches/presentation2012merge
- Files:
-
- 3 deleted
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation2012merge/data/levels/underAttack.oxw
r9316 r9334 12 12 include("templates/lodInformation.oxt") 13 13 ?> 14 <!--OUTDATED: include("underAttackHUD.oxo") -->15 14 16 15 <Level -
code/branches/presentation2012merge/src/modules/overlays/OverlaysPrereqs.h
r8706 r9334 95 95 class PauseNotice; 96 96 class TeamBaseMatchScore; 97 class UnderAttackHealthBar;98 97 99 98 // stats -
code/branches/presentation2012merge/src/modules/overlays/hud/CMakeLists.txt
r9016 r9334 12 12 KillMessage.cc 13 13 DeathMessage.cc 14 UnderAttackHealthBar.cc15 14 TeamBaseMatchScore.cc 16 15 GametypeStaticMessage.cc -
code/branches/presentation2012merge/src/orxonox/gametypes/UnderAttack.cc
r9016 r9334 49 49 this->gameEnded_ = false; 50 50 51 //this->setHUDTemplate("UnderAttackHUD");52 //This HUD is in conflict with the HUDEnemyHealthBar53 51 this->setConfigValues(); 54 52 this->timesequence_ = static_cast<int>(this->gameTime_);
Note: See TracChangeset
for help on using the changeset viewer.