weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-08-15 10:47:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	Moose Test
Missions/Moose_Test_DETECTION/Moose_Test_DETECTION_Laser.miz
This commit is contained in:
FlightControl
2016-07-06 22:26:23 +02:00
parent e0314a4598 c26f5e2dbc
commit bba6aa8fb6
15 changed files with 800 additions and 50138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Moose Development/Moose/Moose.lua
View File

@@ -47,10 +47,11 @@ Include.File( "AirbasePolice" )
Include.File( "Detection" )
Include.File( "FAC" )
Include.File( "StateMachine" )
Include.File( "Task2" )
Include.File( "TaskSead" )
Include.File( "TaskMenu" )
Include.File( "TaskRoute" )
Include.File( "Process" )
Include.File( "Process_SEAD" )
Include.File( "Process_Route" )
Include.File( "Task" )
Include.File( "Task_SEAD" )
-- The order of the declarations is important here. Don't touch it.