Commit Graph

10541 Commits

Author SHA1 Message Date
Applevangelist cb08e4a577 xxx 2025-06-29 15:50:47 +02:00
Applevangelist a28ad6a7c2 Merge remote-tracking branch 'origin/develop' into branch 2025-06-26 11:52:13 +02:00
Applevangelist 7e3c33e242 Merge remote-tracking branch 'origin/master' into branch 2025-06-26 11:52:05 +02:00
Thomas 73f393c542 Merge pull request #2328 from FlightControl-Master/master
Merge
2025-06-24 19:28:33 +02:00
Thomas a467fabdc8 Merge pull request #2327 from leka1986/patch-1
Update CTLD.lua
2025-06-24 19:26:36 +02:00
leka1986 a2ab84c45a Update CTLD.lua
Added Herc fix when dropping from air.

Added CratesName in the OnAfterCratesBuildStarted parm
2025-06-24 19:24:00 +02:00
Applevangelist e8f30fc98b Merge remote-tracking branch 'origin/develop' into branch 2025-06-24 18:49:45 +02:00
Applevangelist 77b9ded23e Merge remote-tracking branch 'origin/master' into branch 2025-06-24 18:49:36 +02:00
Thomas 7ec7228cb8 Merge pull request #2326 from FlightControl-Master/master
Merge from master
2025-06-24 18:23:19 +02:00
Thomas 9fd6729967 Merge pull request #2325 from FlightControl-Master/Applevangelist-patch-1-1
Update Airbase.lua
2025-06-24 18:22:18 +02:00
Thomas f1d4f1753a Update Airbase.lua 2025-06-24 16:28:46 +02:00
Frank 1f268b3b5d Merge branch 'master' into develop 2025-06-23 22:43:13 +02:00
Frank 6d9c3fd0aa Merge pull request #2324 from FlightControl-Master/FF/MasterDevel
AIRBOSS Essex+Corsair
2025-06-23 22:41:16 +02:00
Frank 28ae63bd8d Update Airboss.lua 2025-06-23 22:39:52 +02:00
Frank 42e7e3f94f Update Airboss.lua 2025-06-23 22:28:48 +02:00
Thomas 4a5204aecb Merge pull request #2323 from FlightControl-Master/master
Merge
2025-06-23 19:09:47 +02:00
Thomas 6466c5e95e Merge pull request #2322 from leka1986/master
Merge branch 'master' of https://github.com/FlightControl-Master/MOOSE
2025-06-23 19:02:56 +02:00
leka1986 829f5af25f Merge branch 'master' of https://github.com/FlightControl-Master/MOOSE 2025-06-23 18:28:08 +02:00
leka1986 0d1147bac4 Added the missing lines to check if the droped troop is engineer, then start the engineer instance. Added missing messages when dropping single crate type, ie truck for example. Added a call to refreshdropcratesmenu in the takeoff / land event. Drop and build is only created if fixedwing is on the ground. 2025-06-23 18:28:02 +02:00
Frank 24b47b02e0 AIRBOSS
- Essex
- Corsair
2025-06-22 22:29:52 +02:00
Thomas 10262fd30b Merge pull request #2321 from FlightControl-Master/master
Merge from master
2025-06-20 14:03:40 +02:00
Thomas 3cabc07d58 Merge pull request #2320 from shaji-Dev/master
[ADDED] New Kola Airbases
2025-06-20 14:01:24 +02:00
shaji b0546b1e60 [ADDED] New Kola Airbases 2025-06-20 12:58:50 +02:00
shaji a988e67490 [ADDED] New Kola Airbases 2025-06-20 12:20:58 +02:00
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