mirror of
https://github.com/FlightControl-Master/MOOSE.git
synced 2025-10-29 16:58:06 +00:00
Merge remote-tracking branch 'origin/master' into develop
# Conflicts: # Moose Development/Moose/Core/Event.lua # Moose Development/Moose/Ops/CTLD.lua # Moose Development/Moose/Wrapper/DynamicCargo.lua
This commit is contained in:
@@ -528,6 +528,7 @@ function NET:SendChatToPlayer(Message, ToPlayer, FromPlayer)
|
||||
return self
|
||||
end
|
||||
|
||||
--[[ not in 2.97 MSE any longer
|
||||
--- Load a specific mission.
|
||||
-- @param #NET self
|
||||
-- @param #string Path and Mission
|
||||
@@ -550,6 +551,7 @@ function NET:LoadNextMission()
|
||||
outcome = net.load_next_mission()
|
||||
return outcome
|
||||
end
|
||||
--]]
|
||||
|
||||
--- Return a table of players currently connected to the server.
|
||||
-- @param #NET self
|
||||
|
||||
@@ -1500,7 +1500,7 @@ function UNIT:InAir(NoHeloCheck)
|
||||
local UnitCategory = DCSUnit:getDesc().category
|
||||
|
||||
-- If DCS says that it is in air, check if this is really the case, since we might have landed on a building where inAir()=true but actually is not.
|
||||
-- This is a workaround since DCS currently does not acknoledge that helos land on buildings.
|
||||
-- This is a workaround since DCS currently does not acknowledge that helos land on buildings.
|
||||
-- Note however, that the velocity check will fail if the ground is moving, e.g. on an aircraft carrier!
|
||||
if UnitInAir==true and UnitCategory == Unit.Category.HELICOPTER and (not NoHeloCheck) then
|
||||
local VelocityVec3 = DCSUnit:getVelocity()
|
||||
|
||||
Reference in New Issue
Block a user