Changeset 11685 for code/branches/Presentation_HS17
- Timestamp:
- Dec 17, 2017, 2:35:52 PM (7 years ago)
- Location:
- code/branches/Presentation_HS17
- Files:
-
- 6 edited
- 11 copied
Legend:
- Unmodified
- Added
- Removed
-
code/branches/Presentation_HS17
- Property svn:mergeinfo changed
/code/branches/Waypoints_HS17 (added) merged: 11496,11523,11539,11559,11582,11603,11633,11655,11657,11659,11661
- Property svn:mergeinfo changed
-
code/branches/Presentation_HS17/data/overlays/HUDTemplates3.oxo
r11682 r11685 190 190 position = "0.32, 0.81" 191 191 pickpoint = "0.0, 0.0" 192 visible = " false"192 visible = "true" 193 193 /> 194 194 -
code/branches/Presentation_HS17/src/modules/overlays/hud/CMakeLists.txt
r11681 r11685 11 11 HUDEnemyHealthBar.cc 12 12 HUDEnemyShieldBar.cc 13 HUDWaypoints.cc 13 14 HUDWeaponMode.cc 14 15 HUDWeapon.cc -
code/branches/Presentation_HS17/src/orxonox/controllers/CMakeLists.txt
r11052 r11685 19 19 FightingController.cc 20 20 MasterController.cc 21 AutonomousDroneController.cc 22 ArrowController.cc 21 23 ) -
code/branches/Presentation_HS17/src/orxonox/graphics/Model.cc
r11678 r11685 73 73 74 74 XMLPortParam(Model, "lodLevel", setLodLevel, getLodLevel, xmlelement, mode); 75 76 75 XMLPortParam(Model, "mesh", setMeshSource, getMeshSource, xmlelement, mode); 77 76 XMLPortParam(Model, "renderQueueGroup", setRenderQueueGroup, getRenderQueueGroup, xmlelement, mode); -
code/branches/Presentation_HS17/src/orxonox/worldentities/CMakeLists.txt
r11681 r11685 13 13 ExplosionPart.cc 14 14 Actionpoint.cc 15 AutonomousDrone.cc 16 Arrow.cc 15 17 NameableStaticEntity.cc 16 18 )
Note: See TracChangeset
for help on using the changeset viewer.