Changeset 11690 for code/branches/Presentation_HS17/src/modules
- Timestamp:
- Dec 18, 2017, 12:40:00 PM (7 years ago)
- Location:
- code/branches/Presentation_HS17
- Files:
-
- 2 deleted
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/Presentation_HS17
- Property svn:mergeinfo changed
/code/branches/Waypoints_HS17 reverse-merged: 11496,11523,11539,11559,11582,11603,11633,11655,11657,11659,11661,11687 /code/branches/ScriptableController_HS17 removed
- Property svn:mergeinfo changed
-
code/branches/Presentation_HS17/src/modules/overlays/hud/CMakeLists.txt
r11685 r11690 11 11 HUDEnemyHealthBar.cc 12 12 HUDEnemyShieldBar.cc 13 HUDWaypoints.cc14 13 HUDWeaponMode.cc 15 14 HUDWeapon.cc -
code/branches/Presentation_HS17/src/modules/questsystem/Quest.cc
r11071 r11690 80 80 XMLPortObject(Quest, QuestEffect, "fail-effects", addFailEffect, getFailEffect, xmlelement, mode); 81 81 XMLPortObject(Quest, QuestEffect, "complete-effects", addCompleteEffect, getCompleteEffect, xmlelement, mode); 82 //XMLPortObject(Quest, Worldentity, "arrowtarget", addArrowTarget, getArrowTarget, xmlelement, mode); 82 83 83 84 QuestManager::getInstance().registerQuest(this); // Registers the Quest with the QuestManager. 84 85 } 86 87 88 /*bool Quest::addArrowTarget(Quest* quest){ 89 90 assert(quest); 91 92 93 }*/ 94 95 85 96 86 97 /**
Note: See TracChangeset
for help on using the changeset viewer.