Changeset 11208 for code/branches/presentationFS16/src/orxonox/controllers/WaypointPatrolController.cc
- Timestamp:
- May 26, 2016, 4:53:34 PM (9 years ago)
- Location:
- code/branches/presentationFS16
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentationFS16
- Property svn:mergeinfo changed
/code/branches/sagerjFS16 (added) merged: 11138,11142,11153,11164,11166,11170,11174-11175,11185,11189,11205
- Property svn:mergeinfo changed
-
code/branches/presentationFS16/src/orxonox/controllers/WaypointPatrolController.cc
r11071 r11208 69 69 70 70 if (this->getControllableEntity() && this->isCloseAtTarget(this->attackradius_) && this->isLookingAtTarget(math::pi / 20.0f)) 71 this->getControllableEntity()-> fire(0);71 this->getControllableEntity()->push(0); 72 72 } 73 73 else
Note: See TracChangeset
for help on using the changeset viewer.