FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into funkyfranky

Browse Source
This commit is contained in:
funkyfranky
2017-10-27 22:02:09 +02:00
parent c66117464a 6f0a254929
commit 86c7e64018
108 changed files with 1632 additions and 438 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Moose Mission Setup/Moose.files
View File

@@ -41,7 +41,7 @@ Functional/Movement.lua
Functional/Sead.lua
Functional/Escort.lua
Functional/MissileTrainer.lua
Functional/AirbasePolice.lua
Functional/ATC_Ground.lua
Functional/Detection.lua
Functional/Designate.lua
Functional/RAT.lua

6
Moose Mission Setup/Moose.lua
View File

@@ -1,5 +1,9 @@
env.info( '*** MOOSE DYNAMIC INCLUDE START *** ' )
<<<<<<< HEAD
env.info( 'Moose Generation Timestamp: 20171027_1946' )
=======
env.info( 'Moose Generation Timestamp: 20171026_1116' )
>>>>>>> master
local base = _G
@@ -61,7 +65,7 @@ __Moose.Include( 'Functional/Movement.lua' )
__Moose.Include( 'Functional/Sead.lua' )
__Moose.Include( 'Functional/Escort.lua' )
__Moose.Include( 'Functional/MissileTrainer.lua' )
__Moose.Include( 'Functional/AirbasePolice.lua' )
__Moose.Include( 'Functional/ATC_Ground.lua' )
__Moose.Include( 'Functional/Detection.lua' )
__Moose.Include( 'Functional/Designate.lua' )
__Moose.Include( 'Functional/RAT.lua' )

4
Moose Mission Setup/Moose_.lua
View File

@@ -1,5 +1,5 @@
env.info('*** MOOSE DYNAMIC INCLUDE START *** ')
env.info('Moose Generation Timestamp: 20171023_1007')
env.info('Moose Generation Timestamp: 20171026_1116')
local base=_G
__Moose={}
__Moose.Include=function(IncludeFile)
@@ -56,7 +56,7 @@ __Moose.Include('Functional/Movement.lua')
__Moose.Include('Functional/Sead.lua')
__Moose.Include('Functional/Escort.lua')
__Moose.Include('Functional/MissileTrainer.lua')
__Moose.Include('Functional/AirbasePolice.lua')
__Moose.Include('Functional/ATC_Ground.lua')
__Moose.Include('Functional/Detection.lua')
__Moose.Include('Functional/Designate.lua')
__Moose.Include('Functional/RAT.lua')