Changeset 12028 for code/branches/mergeFS18/src/orxonox/controllers

Timestamp:

Oct 10, 2018, 3:16:51 PM (6 years ago)

Author:

merholzl

Message:

added scriptable controller

Location:

code/branches/mergeFS18

Files:

• . (modified) (1 prop)
• src/orxonox/controllers/AutonomousDroneController.cc (copied) (copied from code/branches/ScriptableController_FS18/src/orxonox/controllers/AutonomousDroneController.cc)
• src/orxonox/controllers/AutonomousDroneController.h (copied) (copied from code/branches/ScriptableController_FS18/src/orxonox/controllers/AutonomousDroneController.h)
• src/orxonox/controllers/CMakeLists.txt (modified) (1 diff)
• src/orxonox/controllers/Controller.cc (modified) (1 diff)

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

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

code/branches/mergeFS18/src/orxonox/controllers/Controller.cc

@@ -26 +26 @@
  *
  */
-
+//asdf
 #include "Controller.h"
 #include "core/CoreIncludes.h"