Changeset 11783 for code/trunk/src/orxonox/controllers

Timestamp:

Feb 20, 2018, 12:14:40 AM (7 years ago)

Author:

landauf

Message:

merged Presentation_HS17_merge back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/controllers/ArrowController.cc (copied) (copied from code/branches/Presentation_HS17_merge/src/orxonox/controllers/ArrowController.cc)
• src/orxonox/controllers/ArrowController.h (copied) (copied from code/branches/Presentation_HS17_merge/src/orxonox/controllers/ArrowController.h)
• src/orxonox/controllers/CMakeLists.txt (modified) (1 diff)
• src/orxonox/controllers/DroneController.cc (modified) (2 diffs)
• src/orxonox/controllers/HumanController.h (modified) (1 diff)

code/trunk/src/orxonox/controllers/CMakeLists.txt

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

code/trunk/src/orxonox/controllers/DroneController.cc

@@ -49 +49 @@
         RegisterObject(DroneController);
 
+        this->setTeam(0);
         this->owner_ = nullptr;
         this->drone_ = nullptr;
@@ -164 +165 @@
             }
         }
+        
         SUPER(AIController, tick, dt);
     }

code/trunk/src/orxonox/controllers/HumanController.h

@@ -90 +90 @@
                 { return HumanController::localController_s; }
             static Pawn* getLocalControllerEntityAsPawn();
-            //friend class, for mouselook
-            friend class Map;
 
         protected: