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

1711 Commits

Author SHA1 Message Date
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
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
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
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
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
Applevangelist
498b7a033f #AWACS 
* Align CallSign Generation
 2022-09-14 18:08:12 +02:00
Applevangelist
785c5e66ec bump number 2022-09-14 18:07:53 +02:00
Applevangelist
f281e5aa95 #AWACS 
* Align CallSign Generation
 2022-09-14 18:06:36 +02:00
Applevangelist
55f0f5271d #PLAYERTASKCONTROLLER 
* Clean up menu builds
 2022-09-13 17:19:44 +02:00
Applevangelist
83a7055065 #PLAYERTASKCONTROLLER 
* Clean up menu builds
 2022-09-13 17:19:29 +02:00
Applevangelist
b6fb7d94c8 'Menu changes 2022-09-13 13:13:06 +02:00
Applevangelist
4dbfef028e *options 2022-09-13 11:02:03 +02:00
Applevangelist
d2132b2e64 #PLAYERTASKCONTROLLER 
* Align creation of (player) callsigns with what is used in AWACS
 2022-09-13 10:11:10 +02:00
Applevangelist
3890375272 Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	Moose Development/Moose/Modules.lua
 2022-09-11 18:24:04 +02:00
Applevangelist
e4f1e1a57a #AWACS 
* Fix custom AWACS callsign not observed
 2022-09-11 18:22:35 +02:00
Applevangelist
eca8d6dd8d #AWACS 
* Fixed AWACS custom callsigns not observed
 2022-09-11 18:21:58 +02:00
Applevangelist
93abef86dc VArious fixes 2022-09-11 14:23:48 +02:00
Applevangelist
236b4efb9b #PLAYERTASKCONTROLLER 
* Various fixes and improvements
 2022-09-11 14:22:47 +02:00
Frank
26b91e3f66 Updates from develop 
DCS.lua
Ops/ATIS.lua
Ops/RecoveryTanker.lua
Utilities/Enums.lua
 2022-09-11 13:32:57 +02:00
Applevangelist
5d6488bfa4 #OPSGROUP 2022-09-09 17:32:00 +02:00
Applevangelist
247377e98c #OPSGROUP 
* Fix for always teleporting
 2022-09-09 15:01:00 +02:00
Applevangelist
8cceee49ea Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/AI/AI_A2A_Dispatcher.lua
#	Moose Development/Moose/AI/AI_A2G_Dispatcher.lua
#	Moose Development/Moose/AI/AI_CAP.lua
#	Moose Development/Moose/AI/AI_CAS.lua
#	Moose Development/Moose/AI/AI_Patrol.lua
#	Moose Development/Moose/Core/Base.lua
#	Moose Development/Moose/Core/Beacon.lua
#	Moose Development/Moose/Core/Database.lua
#	Moose Development/Moose/Core/Fsm.lua
#	Moose Development/Moose/Core/MarkerOps_Base.lua
#	Moose Development/Moose/Core/Menu.lua
#	Moose Development/Moose/Core/Message.lua
#	Moose Development/Moose/Core/Point.lua
#	Moose Development/Moose/Core/ScheduleDispatcher.lua
#	Moose Development/Moose/Core/Scheduler.lua
#	Moose Development/Moose/Core/Set.lua
#	Moose Development/Moose/Core/Spawn.lua
#	Moose Development/Moose/Core/Zone.lua
#	Moose Development/Moose/DCS.lua
#	Moose Development/Moose/Functional/Detection.lua
#	Moose Development/Moose/Functional/Mantis.lua
#	Moose Development/Moose/Functional/Range.lua
#	Moose Development/Moose/Functional/Scoring.lua
#	Moose Development/Moose/Functional/Sead.lua
#	Moose Development/Moose/Modules.lua
#	Moose Development/Moose/Ops/ATIS.lua
#	Moose Development/Moose/Ops/Airboss.lua
#	Moose Development/Moose/Sound/UserSound.lua
#	Moose Development/Moose/Utilities/Enums.lua
#	Moose Development/Moose/Utilities/FiFo.lua
#	Moose Development/Moose/Utilities/Profiler.lua
#	Moose Development/Moose/Utilities/Routines.lua
#	Moose Development/Moose/Utilities/STTS.lua
#	Moose Development/Moose/Utilities/Utils.lua
#	Moose Development/Moose/Wrapper/Airbase.lua
#	Moose Development/Moose/Wrapper/Controllable.lua
#	Moose Development/Moose/Wrapper/Group.lua
#	Moose Development/Moose/Wrapper/Marker.lua
#	Moose Development/Moose/Wrapper/Positionable.lua
#	Moose Development/Moose/Wrapper/Unit.lua
#	Moose Setup/Moose.files
 2022-09-06 10:27:28 +02:00
Thomas
bf3ee93c23
Update PlayerTask.lua (#1777) 2022-09-05 06:14:58 +02:00
Frank
a3260b4ce3
Merge pull request #1776 from FlightControl-Master/FF/Ops 
OPS
 2022-09-04 21:04:59 +02:00
Frank
ea8cf7b62a OPS 
**OPSZONE**
- Added `:SetTimeCapture()` function to set time interval until a zone is captured.

**FLIGHTCONTROL**
- Added coalition to tower and pilot msrs.
 2022-09-04 21:01:32 +02:00
Applevangelist
7168681918 #PLAYERTASKCONTROLLER 
* Delay auto-start between 5 to 10 secs

#ATIS
* Add label to SRS
 2022-09-04 14:48:06 +02:00
Applevangelist
233291b30c #AWACS 
* added option for AWACS to send messages on multiple frequencies
 2022-09-04 12:19:06 +02:00
Applevangelist
e53ff167ee #PLAYERTASKCONTROLLER 
* Menu build changed slightly to delayed
 2022-09-03 16:28:32 +02:00
Applevangelist
4aa3edc508 Errors 
added docu
 2022-09-02 17:01:39 +02:00
Applevangelist
4ea1b93f8d #PLAYERTASKCONTROLLER 
* All map markers to be deleteable
 2022-09-02 16:32:29 +02:00
Applevangelist
361ca2cece #MARKEROPS 
* Added option to enforce case sensitive matches on Tagname

#PLAYERTASKCONTROLLER
* Text tweaking
* Fixed "mark on map" not showing subtitles
* Revamped menu build to have less rebuilds
* Added option to show additional info menu for tasks before joining
 2022-09-02 13:12:52 +02:00
Frank
1efbce7661 Update Airboss.lua 
- Removed output
 2022-09-01 22:37:31 +02:00
Frank
375e7db449 Merge branch 'develop' into FF/Ops 2022-09-01 22:31:52 +02:00