Changeset 11776 for code/branches/Presentation_HS17_merge/src
- Timestamp:
- Feb 19, 2018, 12:34:42 AM (7 years ago)
- Location:
- code/branches/Presentation_HS17_merge/src
- Files:
-
- 8 deleted
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/Presentation_HS17_merge/src/modules/overlays/hud/CMakeLists.txt
r11774 r11776 11 11 HUDEnemyHealthBar.cc 12 12 HUDEnemyShieldBar.cc 13 HUDWaypoints.cc14 13 HUDWeaponMode.cc 15 14 HUDWeapon.cc -
code/branches/Presentation_HS17_merge/src/modules/questsystem/Quest.cc
r11774 r11776 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);83 82 84 83 QuestManager::getInstance().registerQuest(this); // Registers the Quest with the QuestManager. 85 84 } 86 87 88 /*bool Quest::addArrowTarget(Quest* quest){89 90 assert(quest);91 92 93 }*/94 95 96 85 97 86 /** -
code/branches/Presentation_HS17_merge/src/orxonox/controllers/CMakeLists.txt
r11774 r11776 19 19 FightingController.cc 20 20 MasterController.cc 21 AutonomousDroneController.cc22 21 ArrowController.cc 23 22 ) -
code/branches/Presentation_HS17_merge/src/orxonox/graphics/Model.cc
r11774 r11776 71 71 72 72 XMLPortParam(Model, "lodLevel", setLodLevel, getLodLevel, xmlelement, mode); 73 73 74 XMLPortParam(Model, "mesh", setMeshSource, getMeshSource, xmlelement, mode); 74 75 XMLPortParam(Model, "renderQueueGroup", setRenderQueueGroup, getRenderQueueGroup, xmlelement, mode); -
code/branches/Presentation_HS17_merge/src/orxonox/worldentities/CMakeLists.txt
r11774 r11776 14 14 Actionpoint.cc 15 15 NameableStaticEntity.cc 16 AutonomousDrone.cc17 16 Arrow.cc 18 17 )
Note: See TracChangeset
for help on using the changeset viewer.