Changeset 11685

Timestamp:

Dec 17, 2017, 2:35:52 PM (6 years ago)

Author:

patricwi

Message:

files missing are ArrowController.cc and .h

Location:

code/branches/Presentation_HS17

Files:

• . (modified) (1 prop)
• data/levels/ArrowLevel.oxw (copied) (copied from code/branches/Waypoints_HS17/data/levels/ArrowLevel.oxw)
• data/overlays/HUDTemplates3.oxo (modified) (1 diff)
• 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)

code/branches/Presentation_HS17/data/overlays/HUDTemplates3.oxo

@@ -190 +190 @@
      position               = "0.32, 0.81"
      pickpoint              = "0.0, 0.0"
-     visible                = "false"
+     visible                = "true"
     />
 

code/branches/Presentation_HS17/src/modules/overlays/hud/CMakeLists.txt

@@ -11 +11 @@
   HUDEnemyHealthBar.cc
   HUDEnemyShieldBar.cc
+  HUDWaypoints.cc
   HUDWeaponMode.cc
   HUDWeapon.cc

code/branches/Presentation_HS17/src/orxonox/controllers/CMakeLists.txt

@@ -19 +19 @@
   FightingController.cc
   MasterController.cc
+  AutonomousDroneController.cc
+  ArrowController.cc
 )

code/branches/Presentation_HS17/src/orxonox/graphics/Model.cc

@@ -73 +73 @@
 
         XMLPortParam(Model, "lodLevel", setLodLevel, getLodLevel, xmlelement, mode);
-
         XMLPortParam(Model, "mesh", setMeshSource, getMeshSource, xmlelement, mode);
         XMLPortParam(Model, "renderQueueGroup", setRenderQueueGroup, getRenderQueueGroup, xmlelement, mode);

code/branches/Presentation_HS17/src/orxonox/worldentities/CMakeLists.txt

@@ -13 +13 @@
   ExplosionPart.cc
   Actionpoint.cc
+  AutonomousDrone.cc
+  Arrow.cc
   NameableStaticEntity.cc
 )