Commit Graph

161 Commits

Author SHA1 Message Date
Thomas 62e8302753 Update SRS.lua (#2047)
Fix for config load when not desanitized
2023-11-24 06:35:32 +01:00
Thomas cac7b39823 Update SRS.lua
Fix for config load when not desanitized
2023-11-24 06:32:44 +01:00
Frank af3c579a03 Update SRS.lua 2023-11-23 22:22:59 +01:00
Applevangelist a89c96e3c4 fixes 2023-11-23 17:00:38 +01:00
Frank 52c2401d93 Update SRS.lua 2023-11-22 22:53:54 +01:00
Applevangelist f071c674d0 fix 2023-11-22 18:35:23 +01:00
Applevangelist 02a87d9fe0 fix 2023-11-22 18:35:12 +01:00
Applevangelist fc32252db7 xx 2023-11-22 18:35:04 +01:00
Applevangelist 3c53f627c2 Merge remote-tracking branch 'origin/master' into develop 2023-11-22 17:57:51 +01:00
Applevangelist 12d68a41ca #MSRS
* Added option to explicitly set/switch the TTS provider between Google and MS (the default)
* Added this option to the config file, so you can set up both but switch
2023-11-22 17:54:52 +01:00
Applevangelist ed851ebc86 SRS 2023-11-22 17:52:37 +01:00
Applevangelist c011d38313 Merge remote-tracking branch 'origin/master' into develop 2023-11-21 13:21:48 +01:00
Applevangelist 6c4a64601f MSRS
Docu fix
2023-11-21 13:21:22 +01:00
Applevangelist 9014e27edc xxx 2023-11-21 13:21:02 +01:00
Applevangelist f922b94eb1 xx 2023-11-21 10:13:29 +01:00
Applevangelist 68350d6824 Merge remote-tracking branch 'origin/master' into develop 2023-11-21 10:13:08 +01:00
Applevangelist 434f985e77 #MSRS
* Cleaner config loading strategy
2023-11-21 10:12:46 +01:00
Applevangelist 8b20f6cab2 xx 2023-11-16 18:12:17 +01:00
Applevangelist ca20e059a6 #PLAYERRECCE
* Fixes for new Gazelle models
2023-11-16 14:08:33 +01:00
Applevangelist 2044068393 Merge remote-tracking branch 'origin/master' into develop 2023-11-15 18:17:23 +01:00
Applevangelist 5f734a0d17 #MESSAGE
* Fixes for ToSRS() for MS Desktop
2023-11-15 18:16:46 +01:00
Applevangelist 078ffc9baf #MESSAGE
* Fixes for ToSRS via MS Desktop
2023-11-15 18:15:23 +01:00
Applevangelist 4eb0f8e9ca Merge remote-tracking branch 'origin/master' into develop 2023-11-03 13:39:02 +01:00
Applevangelist 7b9d8d375d #SRS Improvements 2023-11-03 13:37:59 +01:00
Applevangelist b1823824c2 #SRS Improvements 2023-11-03 13:37:37 +01:00
Applevangelist 1e015fd988 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/AI/AI_Escort_Request.lua
#	Moose Development/Moose/AI/AI_Formation.lua
2023-11-02 18:22:30 +01:00
Applevangelist 56d4143a05 Merge remote-tracking branch 'origin/master' into develop 2023-11-02 18:20:45 +01:00
kaltokri 018830b539 Merge branch 'master' of github.com:FlightControl-Master/MOOSE
# Conflicts:
#	Moose Development/Moose/AI/AI_Air_Engage.lua
2023-10-31 15:23:26 +01:00
kaltokri d92d2d07c5 Fixed broken links 2023-10-31 15:21:15 +01:00
Frank 52e66ae969 Broken Links
- AI_A2A_Gci Removed reference to SetEngageZone
- Fixed link to #AI_A2G_SEAD.SetEngageRange #2025
- AI_Air_Engage removed reference to SetEngageZone. Does not seem to exist any more.
- AI_Air_Patrol removed reference to SetEngageZone. Does not seem to exist any more or is passed as argument now.
- AI_FORMATION Fixed DCSTypes#AI.Option.Air.val.ROE OptionROE #2029
- SETTINGS Fixed link to Message #2021
- Fixed wrong indent of "Developer Note" in various classes
2023-10-31 13:33:45 +01:00
Applevangelist 0f7c3533ba Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/AI/AI_A2A_Gci.lua
#	Moose Development/Moose/AI/AI_A2A_Patrol.lua
#	Moose Development/Moose/AI/AI_A2G_BAI.lua
#	Moose Development/Moose/AI/AI_A2G_CAS.lua
#	Moose Development/Moose/AI/AI_A2G_SEAD.lua
#	Moose Development/Moose/AI/AI_Air_Engage.lua
#	Moose Development/Moose/Tasking/Task_Cargo_CSAR.lua
2023-10-31 12:49:03 +01:00
kaltokri 261a389ca5 Merge branch 'master' into develop 2023-10-31 10:25:38 +01:00
kaltokri b05683d384 Fixed some broken links 2023-10-31 10:25:00 +01:00
kaltokri 708838c404 Merge branch 'master' into develop 2023-10-30 18:02:27 +01:00
kaltokri d7df08d754 Fixed broken links in documentation 2023-10-30 18:01:57 +01:00
kaltokri 974a56b135 Merge branch 'master' into develop 2023-10-30 14:56:32 +01:00
kaltokri 92b21aa5c1 Fixed broken links in documentation 2023-10-30 14:48:49 +01:00
Applevangelist 26f3a8cf64 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Modules.lua
2023-10-20 12:39:35 +02:00
kaltokri 4fced3416a Merge branch 'master' into develop 2023-10-19 18:17:12 +02:00
Applevangelist 49fd78abe7 #SRS
* Typo
2023-10-19 15:22:13 +02:00
Applevangelist 73464a09f1 srs 2023-10-17 16:06:11 +02:00
Applevangelist e578a673d9 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Sound/SRS.lua
2023-10-17 11:08:13 +02:00
Applevangelist 65f9db8efa #MSRS
* Added loading of a config file
2023-10-17 11:05:09 +02:00
Applevangelist d8bb2fe1f1 #MSRS 2023-10-17 11:01:18 +02:00
Applevangelist 7558b7ee1d #MSRS
* Added loading config file
2023-10-17 09:28:20 +02:00
Applevangelist 9451956914 #MSRS
* Added config file loading
2023-10-14 16:49:55 +02:00
Applevangelist 3f04249d07 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Sound/SRS.lua
2023-10-13 16:15:23 +02:00
Applevangelist 2ebad9ce96 #MSRS
* Fixes for alternative backend
2023-10-13 16:13:12 +02:00
Applevangelist c9cad84419 #SRS 2023-10-13 16:12:38 +02:00
Applevangelist 0e3d4205c9 Merge remote-tracking branch 'origin/develop' into develop 2023-09-13 15:31:55 +02:00