Commit Graph

11726 Commits

Author SHA1 Message Date
Applevangelist 7259038b1c xx 2026-01-08 13:10:48 +01:00
Applevangelist 3886351490 xx 2026-01-08 13:10:37 +01:00
Applevangelist 59b15930a3 Merge remote-tracking branch 'origin/develop' into branch 2026-01-08 13:03:43 +01:00
Applevangelist f06daedb0c Merge remote-tracking branch 'origin/master' into branch 2026-01-08 13:03:36 +01:00
Applevangelist c2b8a71000 xx 2026-01-08 13:03:15 +01:00
Thomas 30f0eca0f4 Merge pull request #2488 from FlightControl-Master/master
Merge
2026-01-05 07:38:54 +01:00
Thomas 3aedf8e5d0 Merge pull request #2487 from leka1986/patch-14
Update CTLD.lua
2026-01-05 06:58:07 +01:00
leka1986 aed2f1d8a9 Enhance troop loading logic and messaging
noticed a bug, I could load troops outside the zone when choosing amount. I could also load without the door was even checked.

Combined the troop drop to one message instead of multiple messages for each dropped group.
2026-01-05 04:18:57 +01:00
leka1986 3504797147 Update CTLD.lua
Fixed so the Engineer can remove all the items when he is building from an airdrop.

Added a function that I use, CanGetCrates, it's a check before getting it if the conditions are met.

Added small fixes where calling FindCratesNearBy would remove the units when it's called by the function RemoveCratesNearBy when it was checking the surroundings and it should ignore what is inside. In the case of C-130 and the CH-47.

Added how many crates are dropped when getting statics.

Expanded OnAfterTroopsRTB to accept chunk, ie the number of units which is returned.
2026-01-05 03:43:28 +01:00
Applevangelist 87082de9c4 Merge remote-tracking branch 'origin/master' into develop 2026-01-04 17:53:36 +01:00
Applevangelist 3cfaa60ebb #VARIOUS fixes 2026-01-04 17:52:55 +01:00
Applevangelist b29f485e15 xx 2026-01-04 17:51:48 +01:00
Applevangelist e821fa1100 xx 2026-01-04 17:51:36 +01:00
Applevangelist e5c919700a Merge remote-tracking branch 'origin/develop' into branch 2026-01-03 17:27:37 +01:00
Applevangelist b9b947fa3d Merge remote-tracking branch 'origin/master' into branch 2026-01-03 17:27:30 +01:00
Applevangelist e51c1d0b85 Merge remote-tracking branch 'origin/develop' into develop 2026-01-03 17:26:39 +01:00
Applevangelist ca540bfd90 Merge remote-tracking branch 'origin/master' into develop 2026-01-03 17:26:37 +01:00
Applevangelist 2d930ff2dd #SCORING - missed data for saving in format() 2026-01-03 17:26:17 +01:00
Applevangelist 07714d160c xx 2026-01-03 17:25:45 +01:00
Frank e29f545c1e Merge branch 'master' into develop 2025-12-31 13:17:27 +01:00
Frank 11a8792398 Update Warehouse.lua
- fixed bug that assets cannot be found in DB and therefore are not added to the requesting warehouse
2025-12-31 13:17:13 +01:00
Applevangelist e413ca5b62 Merge remote-tracking branch 'origin/master' into branch 2025-12-30 10:41:10 +01:00
Applevangelist bf155a0beb Merge remote-tracking branch 'origin/master' into develop 2025-12-30 10:40:50 +01:00
Applevangelist f7556fac0e #UNIT - Added GetFuelMassMax() and GetCurrentFileKgs() 2025-12-30 10:40:27 +01:00
Applevangelist a96c617b01 Merge remote-tracking branch 'origin/develop' into branch 2025-12-30 09:43:45 +01:00
Applevangelist da0ba49a14 Merge remote-tracking branch 'origin/master' into branch 2025-12-30 09:43:39 +01:00
Applevangelist a3d77a5a71 Merge remote-tracking branch 'origin/master' into develop 2.9.15a 2025-12-30 09:26:48 +01:00
Applevangelist 394f3ffd88 #AIRBASE - Small fix for #ParkingSpots == 0 2025-12-30 09:26:07 +01:00
Applevangelist c4ad52a456 Merge remote-tracking branch 'origin/develop' into branch 2025-12-29 18:20:08 +01:00
Applevangelist de2c6bec85 Merge remote-tracking branch 'origin/master' into branch
# Conflicts:
#	Moose Development/Moose/Ops/AirWing.lua
2025-12-29 18:20:01 +01:00
Applevangelist bff5f79282 Merge remote-tracking branch 'origin/master' into develop 2025-12-29 18:09:16 +01:00
Applevangelist a3d7b4eba9 #AIRWING - Check if STORAGE object has NO warehouse! 2025-12-29 18:08:53 +01:00
Applevangelist a49288200e Merge remote-tracking branch 'origin/master' into develop 2.9.15 2025-12-29 14:01:43 +01:00
Applevangelist b94f36dfdf #AIRBASE - Added AIRBASE:GetMinimumBoundingCircleFromParkingSpots(mark)
#CSAR - Use `AIRBASE:GetMinimumBoundingCircleFromParkingSpots()` to determine if we're actually standing on an airbase somewhere
2025-12-29 14:01:10 +01:00
Applevangelist 3eef63b75c xx 2025-12-29 13:59:23 +01:00
Applevangelist 8eae7ac26b #UTILS - Added functions to get a (minimum) bounding circle from a table of VEC2s 2025-12-29 13:43:45 +01:00
Applevangelist 9df694e12e xx 2025-12-29 12:48:35 +01:00
Applevangelist 7bac1d3b92 #UTILS - Added CALLSIGN.Intruder enumeration for the A-6E 2025-12-29 12:36:30 +01:00
Applevangelist b31b11cda8 #CSAR - Enforce pilot names on AI for saving
#SPAWN - Added use of CALLSIGN.Intruder for random callsigns of the A-6E
2025-12-29 12:35:59 +01:00
Applevangelist a3754b7031 xx 2025-12-29 12:34:42 +01:00
Applevangelist fc809964c7 Merge remote-tracking branch 'origin/master' into develop 2025-12-29 10:48:57 +01:00
Applevangelist d000ad76f8 #CSAR - Corrected Airbase dist finding solution 2025-12-29 10:48:23 +01:00
Applevangelist ca19352ace xx 2025-12-29 10:47:06 +01:00
Applevangelist 3f5936bceb Merge remote-tracking branch 'origin/master' into develop 2025-12-28 17:56:48 +01:00
Applevangelist 29b244d843 #AIRWING - make airwing fill airbase storage with aircraft types when adding a Squadron and if necessary, ie not unlimited storage and storage lower than squadron assets number 2025-12-28 17:53:49 +01:00
Applevangelist e3b405ad2d xx 2025-12-28 17:51:25 +01:00
Applevangelist fef1976a6f Merge remote-tracking branch 'origin/master' into develop 2025-12-28 16:52:14 +01:00
Applevangelist fb8cc4bfeb xx 2025-12-28 16:51:52 +01:00
Applevangelist 1eb6dbc7f2 xx 2025-12-28 16:51:41 +01:00
Applevangelist d16eb74e1b Merge remote-tracking branch 'origin/master' into develop 2025-12-28 14:06:38 +01:00