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
7,042 Commits 10 Branches 87 Tags
Commit Graph

5174 Commits

Author SHA1 Message Date
Applevangelist
b6358933b2 Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Ops/CTLD.lua
 2022-09-22 17:31:47 +02:00
Applevangelist
276805ab28 CTLD 
* make troops mass count
 2022-09-22 17:30:44 +02:00
Applevangelist
4483d3231a #CTLD 
* Added: troop mass also checked when loading
 2022-09-22 17:30:01 +02:00
Applevangelist
9780a65f09 #AIRBOSS, #UTILS 
* Alitude to Altitude
* Deck height Nimitz class to 18.30m
 2022-09-22 15:51:28 +02:00
Applevangelist
31882458dc Merge remote-tracking branch 'origin/master' into develop 2022-09-22 15:50:26 +02:00
Applevangelist
481ee186aa #AIRBOSS, #UTILS 
* Alitude to Altitude
 2022-09-22 15:49:31 +02:00
Thomas
8820b8a41c
Nimitz deck height (#1787) 
Corrected deck height of Nimitz class to 18.3m/60ft
 2022-09-22 15:46:55 +02:00
Applevangelist
34dd864c8b #SPAWN 
* Fix for InitCleanup()
 2022-09-22 10:58:50 +02:00
Applevangelist
0971f8ffa7 #SPAWN 
* Fix for InitCleanup()
 2022-09-22 10:57:43 +02:00
Applevangelist
22a5f05e32 #SPAWN 
* Fix for InitCleanup()
 2022-09-22 10:57:26 +02:00
Thomas
69b70bfed6
Update Spawn.lua (#1786) 
Update function SPAWN:_SpawnCleanUpScheduler() to better cater for Helos
 2022-09-21 11:43:54 +02:00
Applevangelist
9b16519a7e #ATIS 
* Added MSRSQueue to avoid overlapping speech
 2022-09-20 17:18:00 +02:00
Applevangelist
13d9562bcd #ATIS 
* Added MSRSQueue to avoid overlaps
 2022-09-20 17:16:20 +02:00
Applevangelist
9739f94428 #ATIS 
* Add MSRSQUEUE to avoid overlaps
 2022-09-20 17:15:57 +02:00
Applevangelist
76321343c2 #AIRBASE, ATIS 
* less noise in log

#SRS
* Added enumerator for voices MSRS.Voices.Microsoft... and MSRS.Voices.Google...

#RANGE
* Added SRS support, some bug fixing
 2022-09-20 15:53:09 +02:00
Applevangelist
a908e159e2 Merge remote-tracking branch 'origin/master' into develop 2022-09-20 15:52:17 +02:00
Applevangelist
9f7729fa0f #AIRBASE, ATIS 
* less noise in log

#SRS
* Added enumerator for voices MSRS.Voices.Microsoft... and MSRS.Voices.Google...

#RANGE
* Added SRS support, some bug fixing
 2022-09-20 15:51:36 +02:00
Applevangelist
450f4eaec0 #AIRBASE, ATIS 
* less noise in log

#SRS
* Added enumerator for voices MSRS.Voices.Microsoft... and MSRS.Voices.Google...

#RANGE
* Added SRS support, some bug fixing
 2022-09-20 15:51:16 +02:00
Applevangelist
b5186fa328 #SETTINGS 
* Fix IsImperial()
 2022-09-20 15:26:34 +02:00
Applevangelist
9ebc4fd5fe Merge remote-tracking branch 'origin/master' into develop 2022-09-20 10:48:47 +02:00
Applevangelist
4f4182f574 #RANGE 
* Add using SRS
 2022-09-20 10:48:13 +02:00
Applevangelist
0159ce5b1d Merge remote-tracking branch 'origin/master' into develop 2022-09-20 10:27:06 +02:00
Applevangelist
526dc8363d #DESIGNATE 
* Remove useless summary autolase report, restored single lines when lasing
 2022-09-20 10:26:19 +02:00
Applevangelist
242d735d8c #DETECTION 
* Make designate refer A2G coordinate system as set by user
 2022-09-20 09:27:19 +02:00
Applevangelist
5abec25c58 #UTILS 
* Fix for loading back set of groups. Thanks to @BlueEcko!
 2022-09-20 08:24:50 +02:00
Applevangelist
9fedd32e78 #UTILS 
* Fix for group set reloading - thanks @BlueEcko!
 2022-09-20 08:23:49 +02:00
Applevangelist
d9de1e866f Merge remote-tracking branch 'origin/master' into develop 2022-09-19 18:26:56 +02:00
Applevangelist
3585a40d56 Merge remote-tracking branch 'origin/master' into develop 2022-09-19 18:26:26 +02:00
Applevangelist
a146003a6a #DESIGNATE 
* Some documentation clarifications
 2022-09-19 18:25:54 +02:00
Applevangelist
1ae8e7d55e Merge remote-tracking branch 'origin/master' into develop 2022-09-19 13:22:18 +02:00
Applevangelist
273858a34a Merge remote-tracking branch 'origin/master' into develop 2022-09-19 13:21:43 +02:00
Applevangelist
d17df74191 ATIS 
* Remove dupe inheritance of BASE
 2022-09-19 13:20:45 +02:00
Applevangelist
d8b0c1903f Changes 2022-09-19 11:45:29 +02:00
Applevangelist
67dc4521e9 Merge remote-tracking branch 'origin/master' into develop 2022-09-19 11:44:59 +02:00
Applevangelist
d23403383f #CSAR 
* Added option to use the OV-10A Bronco
* Slight changes to SRS approach
* Added door check in UTILS for Bronco
 2022-09-19 11:43:50 +02:00
Applevangelist
852ebba530 #AUTOLASE 
* also show A2G BR Settings
 2022-09-19 11:42:50 +02:00
Applevangelist
0df1e58e16 Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	Moose Development/Moose/Ops/OpsGroup.lua
 2022-09-19 08:48:14 +02:00
jojom4n
79669d9a69
Make AWACS SRS talk as own coalition; Typo (#1784) 
* Make AWACS SRS talk as own coalition

Set MSRS coalition to make AWACS talk only to its coalition, not to spectators

* Typo

SetModernEraAgressive() function should be SetModernEraAggressive() (two 'g')
 2022-09-18 19:04:40 +02:00
Applevangelist
11d37bcb93 #CSAR 
- triple try to get coordinate for beacon
 2022-09-15 19:54:36 +02:00
Applevangelist
282b199754 #CSAR 
- triple try to get coordinate for beacon
 2022-09-15 19:54:00 +02:00
Applevangelist
877b36f8a8 #CSAR 
* overcome error cannot get Vec3
 2022-09-15 19:51:15 +02:00
Applevangelist
c95d5dc320 #PLAYERTASK 
* coord text fix
 2022-09-15 19:50:45 +02:00
Applevangelist
c461c1e2e3 * coordtext fix 2022-09-15 19:50:19 +02:00
Applevangelist
92044c7797 Merge remote-tracking branch 'origin/master' into develop 2022-09-15 14:02:09 +02:00
Applevangelist
299820162b #ATIS 
* No old-style radioqueue when using SRS
 2022-09-15 14:01:23 +02:00
Applevangelist
7084d9e084 #OPSGROUP 
* Allow for customized CallSigns

#PLAYERTASK
* SRS output finetuning
 2022-09-15 13:59:16 +02:00
Applevangelist
af96e2f143 Merge remote-tracking branch 'origin/master' into develop 2022-09-15 13:52:20 +02:00
Applevangelist
255a28cdf8 Merge remote-tracking branch 'origin/master' into develop 2022-09-15 13:51:45 +02:00
Applevangelist
ab0a722f2c #OPSGROUP 
* Allow for customized CallSigns

#PLAYERTASK
* SRS output finetuning
 2022-09-15 13:51:01 +02:00
Applevangelist
6226a2a2d7 #ATIS 
* No radio queue when using SRS

#FLIGHTCONTROL
* Allow for multiple frequencies, modulations to be used
* Use same callsign logic as AWACS and PLAYERTASK

#FLIGHTGROUP
* Nicefy message output
 2022-09-15 13:49:40 +02:00