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 Database-Rework

Browse Source 
# Conflicts:
#	Moose/Database.lua
#	Moose/Mission.lua
This commit is contained in:
FlightControl
2016-04-27 16:05:58 +02:00
parent 391408de9b fe6d94466d
commit 10177331b4
52 changed files with 4529 additions and 1138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Moose/Database.lua
View File

@@ -191,6 +191,7 @@ function DATABASE:ScanEnvironment()
end --if coa_name == 'red' or coa_name == 'blue' and type(coa_data) == 'table' then
end --for coa_name, coa_data in pairs(mission.coalition) do
return self
end
--- Instantiate new Groups within the DCSRTE.
@@ -279,4 +280,3 @@ function DATABASE:_RegisterGroup( GroupTemplate )
end