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 'refs/remotes/origin/master' into New-Cargo-Handling

Browse Source 
# Conflicts:
#	Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua
#	Moose Mission Setup/Moose.lua
This commit is contained in:
Sven Van de Velde 2016-08-12 08:00:28 +02:00
commit 619efb5c08
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,9 @@
env.info( '*** MOOSE STATIC INCLUDE START *** ' ) env.info( '*** MOOSE STATIC INCLUDE START *** ' )
<<<<<<< HEAD
env.info( 'Moose Generation Timestamp: 20160811_0937' ) env.info( 'Moose Generation Timestamp: 20160811_0937' )
=======
env.info( 'Moose Generation Timestamp: 20160810_0820' )
>>>>>>> refs/remotes/origin/master
local base = _G local base = _G
Include = {} Include = {}
@ -21944,7 +21948,11 @@ function SPAWN:_RandomizeRoute( SpawnIndex )
SpawnTemplate.route.points[t].y = SpawnTemplate.route.points[t].y + math.random( self.SpawnRandomizeRouteRadius * -1, self.SpawnRandomizeRouteRadius ) SpawnTemplate.route.points[t].y = SpawnTemplate.route.points[t].y + math.random( self.SpawnRandomizeRouteRadius * -1, self.SpawnRandomizeRouteRadius )
-- Manage randomization of altitude for airborne units ... -- Manage randomization of altitude for airborne units ...
<<<<<<< HEAD
if SpawnTemplate.CategoryID == Group.Category.AIRPLANE or SpawnTemplate.CategoryID == Group.Category.HELICOPTER then if SpawnTemplate.CategoryID == Group.Category.AIRPLANE or SpawnTemplate.CategoryID == Group.Category.HELICOPTER then
=======
if SpawnTemplate.SpawnCategoryID == Group.Category.AIRPLANE or SpawnTemplate.SpawnCategoryID == Group.Category.HELICOPTER then
>>>>>>> refs/remotes/origin/master
if SpawnTemplate.route.points[t].alt and self.SpawnRandomizeRouteHeight then if SpawnTemplate.route.points[t].alt and self.SpawnRandomizeRouteHeight then
SpawnTemplate.route.points[t].alt = SpawnTemplate.route.points[t].alt + math.random( 1, self.SpawnRandomizeRouteHeight ) SpawnTemplate.route.points[t].alt = SpawnTemplate.route.points[t].alt + math.random( 1, self.SpawnRandomizeRouteHeight )
end end

4
Moose Mission Setup/Moose.lua
View File

@ -1,5 +1,9 @@
env.info( '*** MOOSE STATIC INCLUDE START *** ' ) env.info( '*** MOOSE STATIC INCLUDE START *** ' )
<<<<<<< HEAD
env.info( 'Moose Generation Timestamp: 20160811_0937' ) env.info( 'Moose Generation Timestamp: 20160811_0937' )
=======
env.info( 'Moose Generation Timestamp: 20160810_0820' )
>>>>>>> refs/remotes/origin/master
local base = _G local base = _G
Include = {} Include = {}