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

9284 Commits

This Branch
This Branch
All Branches
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
10088879ce Merge remote-tracking branch 'origin/develop' into develop 2024-07-20 12:17:06 +02:00
Applevangelist
42a9333c53 Merge remote-tracking branch 'origin/master' into develop 2024-07-20 12:17:02 +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
5596fab8e0 Merge remote-tracking branch 'origin/develop' into develop 2024-07-18 16:09:34 +02:00
Applevangelist
c3193fd6df Merge remote-tracking branch 'origin/master' into develop 2024-07-18 16:09:31 +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
bb90ac58ba xx 2024-07-18 16:07:08 +02:00
Applevangelist
e32d6138b3 Merge remote-tracking branch 'origin/develop' into develop 2024-07-18 14:36:14 +02:00
Applevangelist
90a6b6216e Merge remote-tracking branch 'origin/master' into develop 2024-07-18 14:36:11 +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
a813f8299f Range 2024-07-18 14:32:22 +02:00
Applevangelist
de2bba63a5 Merge remote-tracking branch 'origin/develop' into develop 2024-07-16 16:04:05 +02:00
Applevangelist
e758a0418a Merge remote-tracking branch 'origin/master' into develop 2024-07-16 16:04:02 +02:00
Applevangelist
31b76da69d Merge remote-tracking branch 'origin/master' into develop 2024-07-16 16:03:16 +02:00
Applevangelist
e5bf7f104d xx 2024-07-16 16:02:47 +02:00
Applevangelist
c4738b24eb fixes and additions 2024-07-16 16:02:33 +02:00
Applevangelist
b47ba61762 Merge remote-tracking branch 'origin/develop' into develop 2024-07-16 13:39:35 +02:00
Applevangelist
0aff4bf98c Merge remote-tracking branch 'origin/master' into develop 2024-07-16 13:39:32 +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
b6b99a2e99 xx 2024-07-16 13:38:14 +02:00
Applevangelist
d35c941748 Merge remote-tracking branch 'origin/develop' into develop 2024-07-16 11:55:21 +02:00
Applevangelist
cfc8312b21 Merge remote-tracking branch 'origin/master' into develop 2024-07-16 11:54:58 +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
f6b4e81111 Merge remote-tracking branch 'origin/develop' into develop 2024-07-15 17:24:42 +02:00
Applevangelist
c8da1277de Merge remote-tracking branch 'origin/master' into develop 2024-07-15 17:24:39 +02:00
Applevangelist
91a0e992cd Merge remote-tracking branch 'origin/master' into develop 2024-07-15 17:24:13 +02:00
Applevangelist
b890dc22a3 xx 2024-07-15 17:23:45 +02:00
Applevangelist
214cd3748c #SET - dynamic slot fixes for SET_CLIENT and SET_PLAYER 2024-07-15 17:23:30 +02:00
Applevangelist
703589d8e4 xx 2024-07-15 14:32:38 +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
87b866eca1 xx 2024-07-14 19:15:33 +02:00
Applevangelist
b5d1cee96b #documentation 2024-07-14 19:15:19 +02:00
Applevangelist
6557a6cf0b Merge remote-tracking branch 'origin/develop' into develop 2024-07-14 18:49:23 +02:00
Applevangelist
0128381f4f Merge remote-tracking branch 'origin/master' into develop 2024-07-14 18:49:17 +02:00
Applevangelist
4511a68a2b Merge remote-tracking branch 'origin/master' into develop 2024-07-14 18:48:44 +02:00
Applevangelist
9ecaca365f xx 2024-07-14 18:48:23 +02:00