weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2026-08-14 13:18:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master-ng' into develop

Browse Source
This commit is contained in:
Applevangelist
2026-04-08 14:44:20 +02:00
parent b0976d1613 51e5f53965
commit 252a1b0761
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Moose Development/Moose/Ops/Legion.lua
+1 -1
View File
@@ -2581,7 +2581,7 @@ end
-- @return #boolean Returns `true` if given cohort can meet all requirements. -- @return #boolean Returns `true` if given cohort can meet all requirements.
function LEGION._CohortCan(Cohort, MissionType, Categories, Attributes, Properties, WeaponTypes, TargetVec2, RangeMax, RefuelSystem, CargoWeight, MaxWeight, RangeMin) function LEGION._CohortCan(Cohort, MissionType, Categories, Attributes, Properties, WeaponTypes, TargetVec2, RangeMax, RefuelSystem, CargoWeight, MaxWeight, RangeMin)
RangeMin = RangeMin or 0 RangeMin = RangeMin or -1
--- Function to check category. --- Function to check category.
local function CheckCategory(_cohort) local function CheckCategory(_cohort)
Moose Development/Moose/Sound/SRS.lua
+2 -2
View File
@@ -160,7 +160,7 @@
-- For more information on setting up a cloud account, visit: https://cloud.google.com/text-to-speech -- For more information on setting up a cloud account, visit: https://cloud.google.com/text-to-speech
-- Google's supported SSML reference: https://cloud.google.com/text-to-speech/docs/ssml -- Google's supported SSML reference: https://cloud.google.com/text-to-speech/docs/ssml
-- --
-- ### Amazon Web Service [Only DCS-gRPC backend] -- ### Amazon Web Service [Only HOUDN and DCS-gRPC backend]
-- --
-- In order to use Amazon Web Service (AWS) for TTS you need to use @{#MSRS.SetProvider} and @{#MSRS.SetProviderOptionsAmazon} functions: -- In order to use Amazon Web Service (AWS) for TTS you need to use @{#MSRS.SetProvider} and @{#MSRS.SetProviderOptionsAmazon} functions:
-- --
@@ -171,7 +171,7 @@
-- --
-- You can set the voice to use with AWS via @{#MSRS.SetVoiceAmazon}. -- You can set the voice to use with AWS via @{#MSRS.SetVoiceAmazon}.
-- --
-- ### Microsoft Azure [Only DCS-gRPC backend] -- ### Microsoft Azure [Only HOUND and DCS-gRPC backend]
-- --
-- In order to use Microsoft Azure for TTS you need to use @{#MSRS.SetProvider} and @{#MSRS.SetProviderOptionsAzure} functions: -- In order to use Microsoft Azure for TTS you need to use @{#MSRS.SetProvider} and @{#MSRS.SetProviderOptionsAzure} functions:
-- --