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 remote-tracking branch 'origin/master' into develop

Browse Source 
# Conflicts:
#	Moose Development/Moose/Modules.lua
#	Moose Development/Moose/Ops/Airboss.lua
This commit is contained in:
Applevangelist
2024-01-10 15:20:29 +01:00
parent 697042eac6 28c8d99878
commit ea6e63dc9b
6 changed files with 197 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Moose Setup/Moose Templates/Moose_Dynamic_Loader.lua
View File

@@ -18,5 +18,7 @@ __Moose.Include = function( IncludeFile )
end
__Moose.Includes = {}
__Moose.Include( 'Scripts/Moose/Modules.lua' )
if not MOOSE_DEVELOPMENT_FOLDER then
MOOSE_DEVELOPMENT_FOLDER='Scripts'
end
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Modules.lua' )

8
Moose Setup/Moose Templates/Moose_Static_Loader.lua
View File

@@ -3,7 +3,11 @@
-- Try to load Moose as individual script files from <DcsInstallDir\Script\Moose
-- which should be a Junction link to the MOOSE repository subfolder "Moose Development\Moose".
-- This method is used by Moose developers and not mission builders.
ModuleLoader = 'Scripts/Moose/Modules.lua'
if not MOOSE_DEVELOPMENT_FOLDER then
MOOSE_DEVELOPMENT_FOLDER='Scripts'
end
ModuleLoader = MOOSE_DEVELOPMENT_FOLDER..'/Moose/Modules.lua'
if io then
local f=io.open(ModuleLoader,"r")
@@ -31,7 +35,7 @@ if io then
__Moose.Includes = {}
__Moose.Include( 'Scripts/Moose/Modules.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Modules.lua' )
BASE:TraceOnOff( true )
env.info( '*** MOOSE INCLUDE END *** ' )