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

This commit is contained in:
FlightControl 2016-07-05 06:25:19 +02:00
commit d39f38b524
28 changed files with 5 additions and 5 deletions

View File

@ -416,7 +416,7 @@ function SPAWN:ReSpawn( SpawnIndex )
-- TODO: This logic makes DCS crash and i don't know why (yet).
local SpawnGroup = self:GetGroupFromIndex( SpawnIndex )
if SpawnGroup then
local SpawnDCSGroup = SpawnGroup:GetDCSGroup()
local SpawnDCSGroup = SpawnGroup:GetDCSObject()
if SpawnDCSGroup then
SpawnGroup:Destroy()
end

View File

@ -1,5 +1,5 @@
env.info( '*** MOOSE STATIC INCLUDE START *** ' )
env.info( 'Moose Generation Timestamp: 20160703_0754' )
env.info( 'Moose Generation Timestamp: 20160704_1648' )
local base = _G
Include = {}
@ -18236,7 +18236,7 @@ function SPAWN:ReSpawn( SpawnIndex )
-- TODO: This logic makes DCS crash and i don't know why (yet).
local SpawnGroup = self:GetGroupFromIndex( SpawnIndex )
if SpawnGroup then
local SpawnDCSGroup = SpawnGroup:GetDCSGroup()
local SpawnDCSGroup = SpawnGroup:GetDCSObject()
if SpawnDCSGroup then
SpawnGroup:Destroy()
end

View File

@ -1,5 +1,5 @@
env.info( '*** MOOSE STATIC INCLUDE START *** ' )
env.info( 'Moose Generation Timestamp: 20160703_0754' )
env.info( 'Moose Generation Timestamp: 20160704_1648' )
local base = _G
Include = {}
@ -18236,7 +18236,7 @@ function SPAWN:ReSpawn( SpawnIndex )
-- TODO: This logic makes DCS crash and i don't know why (yet).
local SpawnGroup = self:GetGroupFromIndex( SpawnIndex )
if SpawnGroup then
local SpawnDCSGroup = SpawnGroup:GetDCSGroup()
local SpawnDCSGroup = SpawnGroup:GetDCSObject()
if SpawnDCSGroup then
SpawnGroup:Destroy()
end