weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2026-08-22 16:05:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'FF/Ops' into FF/Fox2

Browse Source
This commit is contained in:
Frank
2020-06-29 20:58:15 +02:00
parent 50305f3d6f 2392c9dc8e
commit c287a96c7f
3 changed files with 568 additions and 553 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Moose Development/Moose/Core/Database.lua
+1 -3
View File
@@ -258,7 +258,7 @@ function DATABASE:AddAirbase( AirbaseName )
-- Register airbase. -- Register airbase.
local airbase = AIRBASE:Register( AirbaseName ) --Wrapper.Airbase#AIRBASE local airbase = AIRBASE:Register( AirbaseName ) --Wrapper.Airbase#AIRBASE
-- Add to airbase. -- Add to airbase.
self.AIRBASES[AirbaseName]=airbase self.AIRBASES[AirbaseName]=airbase
@@ -1263,8 +1263,6 @@ function DATABASE:SetPlayerSettings( PlayerName, Settings )
self.PLAYERSETTINGS[PlayerName] = Settings self.PLAYERSETTINGS[PlayerName] = Settings
end end
--- Add a flight group to the data base. --- Add a flight group to the data base.
-- @param #DATABASE self -- @param #DATABASE self
-- @param Ops.FlightGroup#FLIGHTGROUP flightgroup -- @param Ops.FlightGroup#FLIGHTGROUP flightgroup
Moose Development/Moose/Ops/FlightGroup.lua
+566 -549
View File
File diff suppressed because it is too large Load Diff
Moose Development/Moose/Wrapper/Controllable.lua
+1 -1
View File
@@ -803,7 +803,7 @@ function CONTROLLABLE:CommandSetFrequency(Frequency, Modulation, Delay)
local CommandSetFrequency = { local CommandSetFrequency = {
id = 'SetFrequency', id = 'SetFrequency',
params = { params = {
frequency = Frequency, frequency = Frequency*1000000,
modulation = Modulation or radio.modulation.AM, modulation = Modulation or radio.modulation.AM,
} }
} }