Commit Graph

9023 Commits

Author SHA1 Message Date
Applevangelist 8a6cbeda74 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Sound/SRS.lua
2024-03-24 13:27:46 +01:00
Applevangelist 8bd39b41f4 Merge remote-tracking branch 'origin/master' into develop 2024-03-24 13:25:00 +01:00
Applevangelist b263cddc07 #MSRS - Fix for explicit Voice setting actually overwriting overall settings of a provider. 2024-03-24 13:24:38 +01:00
Applevangelist 13cdb77957 xxx 2024-03-24 13:22:54 +01:00
Applevangelist caedc314b7 xx 2024-03-23 15:12:16 +01:00
Applevangelist a712d74e2e Merge remote-tracking branch 'origin/master' into develop 2024-03-23 14:59:20 +01:00
Applevangelist 613d33d731 #SCORING - added option to give a file path for saving and an option to switch autosave off 2024-03-23 14:58:54 +01:00
Applevangelist d7963bb161 xx 2024-03-22 16:04:58 +01:00
Applevangelist e86afefe79 xxx 2024-03-22 09:27:58 +01:00
Applevangelist c7e694dfb8 #AWACS - fix for too many TAC/MELD/THREAT calls 2024-03-22 09:27:40 +01:00
Applevangelist d6c9195555 Merge remote-tracking branch 'origin/master' into develop 2024-03-22 08:56:28 +01:00
Applevangelist 50298e4109 Fix for unknown Threat Type 2024-03-22 08:56:00 +01:00
Frank 1253e241ff Merge branch 'develop' into FF/Ops 2024-03-19 18:04:03 +01:00
Applevangelist d4daa54210 Merge remote-tracking branch 'origin/develop' into develop 2024-03-16 12:37:51 +01:00
Applevangelist 5c3081a7eb Merge remote-tracking branch 'origin/master' into develop 2024-03-16 12:37:48 +01:00
Applevangelist 3389d3284a Fix self.speedmax for immobile groups 2024-03-16 12:37:11 +01:00
Applevangelist b10819220c Merge remote-tracking branch 'origin/master' into develop 2024-03-15 10:26:18 +01:00
Applevangelist b66ff35b63 #minor fixes 2024-03-15 10:25:58 +01:00
Applevangelist 244abe2bbb #Minor Fixes 2024-03-15 10:25:40 +01:00
Applevangelist 6ae2f6f105 Merge remote-tracking branch 'origin/develop' into develop 2024-03-13 09:09:32 +01:00
Applevangelist c4deb317bd Merge remote-tracking branch 'origin/master' into develop 2024-03-13 09:09:28 +01:00
Applevangelist 4b1a1cbcff Merge remote-tracking branch 'origin/master' into develop 2024-03-13 09:09:02 +01:00
Applevangelist 378e76e45b Added UTILS.ClockHeadingString(refHdg,tgtHdg) thanks to @statua 2024-03-13 09:08:39 +01:00
Applevangelist f7f28877da Fix for speed nil in ops groups 2024-03-13 07:39:56 +01:00
Applevangelist ada8629c01 Fix for speed nil 2024-03-13 07:38:56 +01:00
Applevangelist efd48c87e9 Merge remote-tracking branch 'origin/develop' into develop 2024-03-12 15:35:26 +01:00
Applevangelist 35c1a76675 Merge remote-tracking branch 'origin/master' into develop 2024-03-12 15:35:22 +01:00
Applevangelist e3d2dec91f Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Wrapper/Controllable.lua
2024-03-12 15:34:53 +01:00
Thomas 470c4ef13c Update Controllable.lua 2024-03-12 11:54:44 +01:00
Thomas 241b31fcec Update Controllable.lua 2024-03-12 11:26:59 +01:00
Thomas 3dd069d7d6 Update Controllable.lua
Docu adjustments
2024-03-12 11:25:33 +01:00
Thomas 77c4fd7696 Update Controllable.lua (#2105) (#2106)
Added setting of AI radio options
2024-03-12 11:20:57 +01:00
Thomas aca4e4d7ca Update Controllable.lua (#2105)
Added setting of AI radio options
2024-03-12 10:49:06 +01:00
Applevangelist edf445de1a Merge remote-tracking branch 'origin/develop' into develop 2024-03-11 18:20:16 +01:00
Applevangelist 5b1cc052b6 Merge remote-tracking branch 'origin/master' into develop 2024-03-11 18:20:13 +01:00
Applevangelist dcd278e2a1 Merge remote-tracking branch 'origin/master' into develop 2024-03-11 18:19:44 +01:00
Applevangelist 2f81fcb0c0 #STATIC
* Add :FindByMatching() and :FindAllByMatching()
2024-03-11 18:19:19 +01:00
Applevangelist 8cf11de774 #SPAWN
* Small change to keep unitnames when using Razbam's setting IFF via unit names
2024-03-11 18:18:50 +01:00
Applevangelist ebb58cd976 xxx 2024-03-11 18:18:00 +01:00
Applevangelist e32b393f39 Merge remote-tracking branch 'origin/develop' into develop 2024-03-11 08:31:06 +01:00
Applevangelist 3d073891bc Merge remote-tracking branch 'origin/master' into develop 2024-03-11 08:31:02 +01:00
Applevangelist b62f2afd8d Merge remote-tracking branch 'origin/master' into develop 2024-03-11 08:30:22 +01:00
Applevangelist 176bd0eb8b xx 2024-03-11 08:29:56 +01:00
Applevangelist 078137af4b Merge remote-tracking branch 'origin/develop' into develop 2024-03-10 18:00:39 +01:00
Applevangelist 0172772ead Merge remote-tracking branch 'origin/master' into develop 2024-03-10 18:00:36 +01:00
Applevangelist 70ee6a1121 Merge remote-tracking branch 'origin/master' into develop 2024-03-10 18:00:02 +01:00
Applevangelist 10edd2f9d0 xxx 2024-03-10 17:59:26 +01:00
Applevangelist fa3a805172 Merge remote-tracking branch 'origin/develop' into develop 2024-03-10 16:53:34 +01:00
Applevangelist b7ef0e57ab Merge remote-tracking branch 'origin/master' into develop 2024-03-10 16:53:31 +01:00
Applevangelist 408321decf Merge remote-tracking branch 'origin/master' into develop 2024-03-10 16:53:05 +01:00