Merge remote-tracking branch 'refs/remotes/origin/master' into flightcontrol-nillification

# Conflicts:
#	Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua
#	Moose Mission Setup/Moose.lua
This commit is contained in:
FlightControl 2017-03-15 05:06:23 +01:00
commit 65c15281fd

View File

@ -1607,7 +1607,7 @@ function CONTROLLABLE:TaskRouteToZone( Zone, Randomize, Speed, Formation )
PointFrom.x = ControllablePoint.x
PointFrom.y = ControllablePoint.y
PointFrom.type = "Turning Point"
PointFrom.action = "Cone"
PointFrom.action = Formation or "Cone"
PointFrom.speed = 20 / 1.6