 Frank
|
b2b258cff0
|
Merge branch 'FF/Ops' into FF/OpsDev
|
2024-03-30 22:32:42 +01:00 |
|
|
Frank
|
2c749bf5c9
|
Merge branch 'develop' into FF/Ops
|
2024-03-27 22:25:54 +01:00 |
|
|
Applevangelist
|
523375c765
|
Merge remote-tracking branch 'origin/master' into develop
|
2024-03-27 14:41:11 +01:00 |
|
|
Applevangelist
|
ac42b56b8e
|
nil check
|
2024-03-27 14:40:34 +01:00 |
|
|
Applevangelist
|
5b8416d5fd
|
Merge remote-tracking branch 'origin/master' into develop
|
2024-03-25 18:26:17 +01:00 |
|
|
Niels Vaes
|
874fa7ad69
|
Fixing a bug where on a rare condition, an A10CII could be spawned and the SpawnInitSADL of the Spawn object wouldn't be set correctly (#2108)
|
2024-03-25 17:26:44 +01:00 |
|
|
Frank
|
d7ee243a00
|
Merge branch 'develop' into FF/Ops
|
2024-03-24 17:59:06 +01:00 |
|
|
Frank
|
a105ddba3d
|
Merge branch 'master' into develop
|
2024-03-24 17:58:13 +01:00 |
|
|
Frank
|
70c29de695
|
Update Airbase.lua
- Fixed docs of airbase enumerators for SouthAtlantic (was Falklands) and Sinai (was SinaiMap)
|
2024-03-24 17:58:02 +01:00 |
|
|
Frank
|
75068a2a26
|
Merge branch 'FF/Ops' into FF/OpsDev
|
2024-03-24 17:25:02 +01:00 |
|
|
Frank
|
d5ceabadb0
|
Merge branch 'develop' into FF/Ops
|
2024-03-24 17:23:02 +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
|
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
|
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
|
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
|
244abe2bbb
|
#Minor Fixes
|
2024-03-15 10:25:40 +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
|
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
|
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
|
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
|
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
|
408321decf
|
Merge remote-tracking branch 'origin/master' into develop
|
2024-03-10 16:53:05 +01:00 |
|
|
Applevangelist
|
11acb578f6
|
#SPAWN
* Fix an issue for SPAWN:NewFromTemplate when re-using same template over and again
|
2024-03-10 16:52:46 +01:00 |
|
|
Applevangelist
|
383eff4cd6
|
Merge remote-tracking branch 'origin/develop' into develop
|
2024-03-10 16:20:32 +01:00 |
|
|
Applevangelist
|
6cda61c9dd
|
Merge remote-tracking branch 'origin/master' into develop
|
2024-03-10 16:20:29 +01:00 |
|
|
Applevangelist
|
4d8abe7f57
|
#MARKEROPS_BASE
* Fix event coalition
|
2024-03-10 16:20:06 +01:00 |
|
|
Applevangelist
|
c6bb7c8bbd
|
Merge remote-tracking branch 'origin/develop' into develop-2
|
2024-03-09 17:24:47 +01:00 |
|
|
Applevangelist
|
bd3042410b
|
ccc
|
2024-03-09 17:24:32 +01:00 |
|
|
Applevangelist
|
7c9cf96d2e
|
OPSGROUP extra check
|
2024-03-09 17:24:15 +01:00 |
|
|
Applevangelist
|
ef30bd36a5
|
Merge remote-tracking branch 'origin/master' into develop
|
2024-03-08 10:06:51 +01:00 |
|
|
Applevangelist
|
5286926609
|
xx
|
2024-03-08 10:06:31 +01:00 |
|
|
Applevangelist
|
ab14fbd11c
|
#MARKEROPS - Added Coalition on FSM events
|
2024-03-08 10:06:16 +01:00 |
|
|
Applevangelist
|
5bde0c7605
|
Merge remote-tracking branch 'origin/develop' into develop
|
2024-03-07 10:20:56 +01:00 |
|