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 FlightControl

Browse Source 
# Conflicts:
#	Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua
#	Moose Mission Setup/Moose.lua
This commit is contained in:
FlightControl 2017-03-05 10:28:54 +01:00
commit 6710bfba26
3 changed files with 65458 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Moose Development/Moose/Core/Zone.lua
View File

@ -434,8 +434,6 @@ function ZONE_RADIUS:BoundZone( Points )
["heading"] = 0,
} -- end of ["group"]
self:E( Tire )
coalition.addStaticObject( country.id.USA, Tire )
end
@ -900,8 +898,6 @@ function ZONE_POLYGON_BASE:BoundZone( )
["heading"] = 0,
} -- end of ["group"]
self:E( Tire )
coalition.addStaticObject( country.id.USA, Tire )
end

32729
Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua
View File

File diff suppressed because it is too large Load Diff

32729
Moose Mission Setup/Moose.lua
View File

File diff suppressed because it is too large Load Diff