Commit Graph

11231 Commits

Author SHA1 Message Date
Thomas fa951838d2 Merge pull request #2319 from FlightControl-Master/master
Merge from master
2025-06-19 09:16:30 +02:00
Thomas 2594c5bbf0 Merge pull request #2318 from shaji-Dev/master
[FIXED] Error: attempt to index local 'Schedule' (a nil value)
2025-06-19 09:15:42 +02:00
shaji db70fa341c Merge remote-tracking branch 'origin/master' 2025-06-19 07:42:52 +02:00
shaji 763e3852ac [FIXED] Error: attempt to index local 'Schedule' (a nil value) 2025-06-19 07:42:29 +02:00
Applevangelist 5d976266c3 Merge remote-tracking branch 'origin/develop' into branch 2025-06-18 17:47:43 +02:00
Applevangelist e03a397d46 Merge remote-tracking branch 'origin/master' into branch 2025-06-18 17:47:34 +02:00
Applevangelist f08783f800 xx 2025-06-18 17:46:50 +02:00
Applevangelist eea75c669f xx 2025-06-18 17:46:44 +02:00
Thomas 66157d0596 Merge pull request #2316 from FlightControl-Master/master
Fixes from Master
2025-06-18 14:34:04 +02:00
Thomas 8ec86973c6 Update SpawnStatic.lua
Fix SpawnFromZone()
2025-06-18 14:29:34 +02:00
Thomas eb2c6ac6f2 Update SRS.lua
#MSRS Voice mapping correction
2025-06-18 14:19:50 +02:00
Applevangelist 93a8d8bc2d Merge remote-tracking branch 'origin/master' into develop 2025-06-15 17:02:35 +02:00
Applevangelist cbcc893ce5 #CTLD - avoid smoking runways on airbase zones 2025-06-15 17:01:58 +02:00
Applevangelist 2e31c62efb Merge remote-tracking branch 'origin/develop' into branch 2025-06-15 15:43:48 +02:00
Applevangelist e7f953df6d Merge remote-tracking branch 'origin/master' into branch 2025-06-15 15:43:37 +02:00
Applevangelist c19713949d Merge remote-tracking branch 'origin/master' into develop 2025-06-15 15:42:57 +02:00
Applevangelist 54450935a1 Merge remote-tracking branch 'origin/develop' into develop 2025-06-15 15:42:37 +02:00
Applevangelist d0f5712ca8 #AUFTRAG - Allow CAP Auftrag w/o Zone 2025-06-15 15:42:33 +02:00
Applevangelist 382b049c5f #AIRBASE - Syria and Sinai few names corrected 2025-06-15 15:38:12 +02:00
Applevangelist b62b39e9e8 xx 2025-06-15 15:37:34 +02:00
Thomas 6c2cc37abe Merge pull request #2315 from FlightControl-Master/master
Update Airbase.lua
2025-06-15 13:15:30 +02:00
Thomas a53763221c Update Airbase.lua
Correct afb name gor Borg al arab on Sinai
2025-06-15 13:14:05 +02:00
Thomas 83447a3fb4 Merge pull request #2314 from FlightControl-Master/master
Csar
2025-06-15 10:19:19 +02:00
Thomas b7bac28113 Merge pull request #2313 from FlightControl-Master/Applevangelist-patch-1
Update CSAR.lua
2025-06-15 10:18:01 +02:00
Thomas a9edb16554 Update CSAR.lua
Make static and zone mash SETs dynamic
2025-06-15 10:17:32 +02:00
Applevangelist 8717faf7a1 xx 2025-06-12 09:10:07 +02:00
Applevangelist 52cbb7202c #EASYGCICAP - more noob catches 2025-06-12 09:09:38 +02:00
Frank 1d04f7c945 Merge branch 'develop' into FF/Ops 2025-06-10 21:58:38 +02:00
Frank f6a8317c42 Merge branch 'develop' of https://github.com/FlightControl-Master/MOOSE into develop 2025-06-10 21:58:21 +02:00
Frank 2a9a7db9b8 OPSGROUP
- Improved behaviour when mission is unpaused and groups are teleported
2025-06-10 21:58:19 +02:00
Applevangelist 3aeec78f79 Merge remote-tracking branch 'origin/master' into develop 2025-06-10 18:05:58 +02:00
Applevangelist 14300229fb #UTILS - Small fix for GetReportingName to distinguish Shark from Mainstay 2025-06-10 18:05:19 +02:00
Applevangelist 0aeb1fc6af #UTILS - Small fix for GetReportingName to distinguish Shark from Mainstay 2025-06-10 18:05:02 +02:00
Applevangelist 2c15d7ed00 xx 2025-06-10 10:02:37 +02:00
Applevangelist 26565d7549 #EASYGCICAP - Added noob/fatfinger checks for airbase static warehouses and CAP point airwing names 2025-06-10 09:25:00 +02:00
Applevangelist 6ac17fa999 Merge remote-tracking branch 'origin/develop' into branch 2025-06-08 18:44:42 +02:00
Applevangelist 768a380b32 Merge remote-tracking branch 'origin/master' into branch 2025-06-08 18:44:36 +02:00
Applevangelist 62816f217b Merge remote-tracking branch 'origin/master' into develop 2025-06-08 18:43:35 +02:00
Applevangelist eeeeda4e5e #POINT - Offset options for smoke 2025-06-08 18:43:01 +02:00
Applevangelist 0233fef475 xx 2025-06-08 18:41:25 +02:00
Applevangelist 95767c5ef4 AIRBOSS - Remove useless E Messages for non-debug 2025-06-01 12:20:08 +02:00
Applevangelist f5881eda53 AIRBOSS - Remove useless E Messages for non-debug 2025-06-01 12:19:42 +02:00
Applevangelist fca6faa3a8 xx 2025-05-30 20:51:04 +02:00
Applevangelist a4aa78ac35 xx 2025-05-30 20:50:55 +02:00
Applevangelist ca3fb4e479 Merge remote-tracking branch 'origin/develop' into branch 2025-05-30 19:39:58 +02:00
Applevangelist 40d4dc14ab Merge remote-tracking branch 'origin/master' into branch 2025-05-30 19:39:49 +02:00
Applevangelist 618a5ca9be xx 2025-05-30 19:39:08 +02:00
Thomas c1997d9f70 Merge pull request #2311 from FlightControl-Master/Applevangelist-patch-1
Update CSAR.lua
2025-05-30 18:37:50 +02:00
Thomas bb1caa6642 Update CSAR.lua 2025-05-30 18:37:38 +02:00
Thomas 638f083729 Merge pull request #2310 from shaji-Dev/develop
CSAR Downed Pilot Queue
2025-05-30 18:36:33 +02:00