Changeset 11685 for code/branches/Presentation_HS17/src
- Timestamp:
- Dec 17, 2017, 2:35:52 PM (7 years ago)
- Location:
- code/branches/Presentation_HS17
- Files:
-
- 5 edited
- 10 copied
-
. (modified) (1 prop)
-
src/modules/overlays/hud/CMakeLists.txt (modified) (1 diff)
-
src/modules/overlays/hud/HUDWaypoints.cc (copied) (copied from code/branches/Waypoints_HS17/src/modules/overlays/hud/HUDWaypoints.cc)
-
src/modules/overlays/hud/HUDWaypoints.h (copied) (copied from code/branches/Waypoints_HS17/src/modules/overlays/hud/HUDWaypoints.h)
-
src/orxonox/controllers/AutonomousDroneController.cc (copied) (copied from code/branches/Waypoints_HS17/src/orxonox/controllers/AutonomousDroneController.cc)
-
src/orxonox/controllers/AutonomousDroneController.h (copied) (copied from code/branches/Waypoints_HS17/src/orxonox/controllers/AutonomousDroneController.h)
-
src/orxonox/controllers/CMakeLists.txt (modified) (1 diff)
-
src/orxonox/controllers/WaypointArrow.cc (copied) (copied from code/branches/Waypoints_HS17/src/orxonox/controllers/WaypointArrow.cc)
-
src/orxonox/controllers/WaypointArrow.h (copied) (copied from code/branches/Waypoints_HS17/src/orxonox/controllers/WaypointArrow.h)
-
src/orxonox/graphics/Model.cc (modified) (1 diff)
-
src/orxonox/worldentities/Arrow.cc (copied) (copied from code/branches/Waypoints_HS17/src/orxonox/worldentities/Arrow.cc)
-
src/orxonox/worldentities/Arrow.h (copied) (copied from code/branches/Waypoints_HS17/src/orxonox/worldentities/Arrow.h)
-
src/orxonox/worldentities/AutonomousDrone.cc (copied) (copied from code/branches/Waypoints_HS17/src/orxonox/worldentities/AutonomousDrone.cc)
-
src/orxonox/worldentities/AutonomousDrone.h (copied) (copied from code/branches/Waypoints_HS17/src/orxonox/worldentities/AutonomousDrone.h)
-
src/orxonox/worldentities/CMakeLists.txt (modified) (1 diff)
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/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.
