Changeset 11774 for code/branches/Presentation_HS17_merge/src
- Timestamp:
- Feb 18, 2018, 6:42:50 PM (6 years ago)
- Location:
- code/branches/Presentation_HS17_merge
- Files:
-
- 6 edited
- 12 copied
Legend:
- Unmodified
- Added
- Removed
-
code/branches/Presentation_HS17_merge
- Property svn:mergeinfo changed
/code/branches/Waypoints_HS17 (added) merged: 11496,11523,11539,11559,11582,11603,11633,11655,11657,11659,11661,11687
- Property svn:mergeinfo changed
-
code/branches/Presentation_HS17_merge/src/modules/overlays/hud/CMakeLists.txt
r11743 r11774 11 11 HUDEnemyHealthBar.cc 12 12 HUDEnemyShieldBar.cc 13 HUDWaypoints.cc 13 14 HUDWeaponMode.cc 14 15 HUDWeapon.cc -
code/branches/Presentation_HS17_merge/src/modules/questsystem/Quest.cc
r11071 r11774 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 /** -
code/branches/Presentation_HS17_merge/src/orxonox/controllers/CMakeLists.txt
r11052 r11774 19 19 FightingController.cc 20 20 MasterController.cc 21 AutonomousDroneController.cc 22 ArrowController.cc 21 23 ) -
code/branches/Presentation_HS17_merge/src/orxonox/graphics/Model.cc
r11770 r11774 71 71 72 72 XMLPortParam(Model, "lodLevel", setLodLevel, getLodLevel, xmlelement, mode); 73 74 73 XMLPortParam(Model, "mesh", setMeshSource, getMeshSource, xmlelement, mode); 75 74 XMLPortParam(Model, "renderQueueGroup", setRenderQueueGroup, getRenderQueueGroup, xmlelement, mode); -
code/branches/Presentation_HS17_merge/src/orxonox/worldentities/CMakeLists.txt
r11743 r11774 14 14 Actionpoint.cc 15 15 NameableStaticEntity.cc 16 AutonomousDrone.cc 17 Arrow.cc 16 18 ) 17 19
Note: See TracChangeset
for help on using the changeset viewer.