5969 Commits

Author SHA1 Message Date
Frank
51e703326e
Merge pull request #2151 from w3z315/patch-1
Fix ZoneCaptureCoalition on player ejects / gets killed in zone
2024-07-21 00:35:02 +02:00
Frank
273170b4f4
Merge pull request #2152 from FlightControl-Master/FF/Ops
AUFTRAG
2024-07-21 00:29:52 +02:00
Frank
61e6ffa76c AUFTRAG
- Added new type STRAFING for corresponding DCS task
2024-07-21 00:29:25 +02:00
Alex
041cd238df
Fix ZoneCaptureCoalition on player ejects / gets killed in zone
ZoneCaptureCoalition.lua:879 calls GetScannedSetUnit and will stop the scheduler if the error message for STATICs is raised. We already have a check if it is present so we can add this explicitly here.
2024-07-21 00:11:23 +02:00
Frank
d07107d937
Merge pull request #2150 from FlightControl-Master/FF/Ops
Update NavyGroup.lua
2024-07-20 17:55:54 +02:00
Frank
5172ca7536 Update NavyGroup.lua
- Added old turn into wind code `NAVYGROUP:SetIntoWindLegacy`()`
- Added option to extend duration of turn into wind `NAVYGROUP:ExtendTurnIntoWind(Duration, TurnIntoWind)`
2024-07-20 17:44:58 +02:00
Applevangelist
70622413dc Merge remote-tracking branch 'origin/master' into develop 2024-07-20 12:16:30 +02:00
Applevangelist
ccf3093fe8 #SPAWN - fix log issue when _OnCrash InitUnitName is empty 2024-07-20 12:16:08 +02:00
Applevangelist
124262667e Merge remote-tracking branch 'origin/master' into develop 2024-07-18 16:08:22 +02:00
Applevangelist
d2d0659776 #ATIS - do not say runway twice if departure and arrival is the same 2024-07-18 16:08:00 +02:00
Applevangelist
f0e01845d3 Merge remote-tracking branch 'origin/master' into develop 2024-07-18 14:35:38 +02:00
Applevangelist
8087c87027 Fixes 2024-07-18 14:34:33 +02:00
Applevangelist
31b76da69d Merge remote-tracking branch 'origin/master' into develop 2024-07-16 16:03:16 +02:00
Applevangelist
c4738b24eb fixes and additions 2024-07-16 16:02:33 +02:00
Applevangelist
15996b43e6 Merge remote-tracking branch 'origin/master' into develop 2024-07-16 13:39:05 +02:00
Applevangelist
c73d8a6339 Further fixes 2024-07-16 13:38:42 +02:00
Applevangelist
c040d2fa3f Merge remote-tracking branch 'origin/master' into develop 2024-07-16 11:54:46 +02:00
Thomas
04f2f7d34f
Update Database.lua (#2148)
Small fix
2024-07-16 08:45:56 +02:00
Thomas
5d6951ae11
Update Spawn.lua (#2149)
Small fix
2024-07-16 08:45:37 +02:00
Applevangelist
91a0e992cd Merge remote-tracking branch 'origin/master' into develop 2024-07-15 17:24:13 +02:00
Applevangelist
214cd3748c #SET - dynamic slot fixes for SET_CLIENT and SET_PLAYER 2024-07-15 17:23:30 +02:00
Applevangelist
379c31b28a Merge remote-tracking branch 'origin/master' into develop 2024-07-15 14:32:17 +02:00
Applevangelist
6fb931a055 #SPAWN - couple of fixes for SPAWN, planes scheduler 2024-07-15 14:31:54 +02:00
Applevangelist
8a89ed5857 Merge remote-tracking branch 'origin/master' into develop 2024-07-14 19:16:00 +02:00
Applevangelist
b5d1cee96b #documentation 2024-07-14 19:15:19 +02:00
Applevangelist
4511a68a2b Merge remote-tracking branch 'origin/master' into develop 2024-07-14 18:48:44 +02:00
Applevangelist
e6aa341863 Dynamic Slots - fixes for #GROUP, #UNIT, #CSAR and #CTLD 2024-07-14 18:48:07 +02:00
Applevangelist
504e56e827 Merge remote-tracking branch 'origin/master' into develop 2024-07-14 17:49:53 +02:00
Applevangelist
3595afe0cc #DATABASE- stage 1 fix for dynamic client slots 2024-07-14 17:49:25 +02:00
Applevangelist
2442adfd2f Merge remote-tracking branch 'origin/master' into develop 2024-07-13 15:22:18 +02:00
Applevangelist
0b21cb687e Various fixes 2024-07-13 15:21:35 +02:00
Applevangelist
ef58cae59f Merge remote-tracking branch 'origin/master' into develop 2024-07-12 19:33:17 +02:00
Applevangelist
8a21fe80de #CONTROLLABLE - Added combat and direction options in CONTROLLABLE:TaskLandAtVec2( Vec2, Duration , CombatLanding, DirectionAfterLand) 2024-07-12 19:32:55 +02:00
Applevangelist
86fc8db9e6 #AUFTRAG LANDATCOORDINATE - added combat land options 2024-07-12 19:32:24 +02:00
Applevangelist
5c54f47527 Merge remote-tracking branch 'origin/master' into develop 2024-07-12 13:37:46 +02:00
Applevangelist
51eb3a2e82 #AIRBASE - corrections for South Atlantic/Falklands 2024-07-12 13:37:04 +02:00
Applevangelist
03f8b1e301 Merge remote-tracking branch 'origin/master' into develop 2024-07-12 13:30:51 +02:00
Applevangelist
ec8bfb32b4 events 2024-07-12 13:30:29 +02:00
Applevangelist
6a31e47705 Merge remote-tracking branch 'origin/master' into develop 2024-07-12 12:20:16 +02:00
Applevangelist
e6dda35f3d Typos 2024-07-12 12:19:58 +02:00
Applevangelist
0af15699f3 Merge remote-tracking branch 'origin/master' into develop 2024-07-12 11:45:53 +02:00
Applevangelist
9d2896d088 EVENTS - additional events from last release 2024-07-12 11:44:24 +02:00
Applevangelist
5b596516fe Merge remote-tracking branch 'origin/master' into develop 2024-07-12 11:37:27 +02:00
Applevangelist
036cc9d211 #Afghanistan additions 2024-07-12 11:36:43 +02:00
Applevangelist
df6c97bec8 #EASYGCICAP - avoid launching intercepts if airwing conquered by other coalition 2024-07-12 09:36:29 +02:00
Applevangelist
6e917049af Merge remote-tracking branch 'origin/master' into develop 2024-07-12 08:09:39 +02:00
Applevangelist
e6484c1598 various 2024-07-12 08:08:57 +02:00
Applevangelist
c8d49916df #RAT - dimensions workaround for Saab 340 2024-07-12 08:08:32 +02:00
Applevangelist
32297da2b0 #AWACS - MS TTS - fix spelling out B-R-A in Threat call 2024-07-11 08:35:32 +02:00
Applevangelist
c51a6da5ff Merge remote-tracking branch 'origin/develop' into develop 2024-07-09 11:31:33 +02:00