2495 Commits

Author SHA1 Message Date
Applevangelist
72ac957806 Merge remote-tracking branch 'origin/master' into branch
# Conflicts:
#	Moose Development/Moose/Functional/ATC_Ground.lua
2025-02-17 08:36:15 +01:00
leka1986
fd2d8a5119
Update CTLD.lua
Now in the listcargo, (cargo onboard) I will display CargoName and a number / number instead of listing each crate, 5 lines for 5 crates. 

Now 1 line for each CargoName and 2/2 or 3/3, etc.

"Rescan" have been moved to only show up if it detects lesser then what it's needed when loading.
2025-02-16 17:16:05 +01:00
leka1986
31aa604fc4
Update CTLD.lua
Added _LoadSingleCrateSet Function
Added _refreshLoadCratesMenu Function
Added Event for Takeoff, Land.

Changes to the RefreshF10menus function
the menus does not gets deleted, and rebuild, but only what is inside them. 
So they will remain at the same position. 

tested multiple times
2025-02-14 00:20:23 +01:00
leka1986
cad8f15b61
Update CTLD.lua
Reworked the logic of the menu.
Now it will Show be shown :
1. Ammo truck
2. Humvee
3. Ammo truck 1/2 -- 1/2 due to incomplete set.

And for the troops

Squad 8 (2) -- 2 set of squad 8, Selecting this will only deploy 1 set.
Squad 16

Changed so when loading troops, it will state 
Squad 8 boarded. same for the extraction.

I have tested it and it works
Heart8reaker also tested it and no issues so far.
2025-02-09 23:41:16 +01:00
Applevangelist
a91c76a0be Merge remote-tracking branch 'origin/master' into branch 2025-02-09 12:25:18 +01:00
Applevangelist
1d08bcf2e0 #CTLD docu 2025-02-09 12:24:16 +01:00
Applevangelist
999d67b7af Merge remote-tracking branch 'origin/master' into branch 2025-02-09 12:06:38 +01:00
Applevangelist
9487a5ae91 #CTLD 2025-02-09 12:05:18 +01:00
Applevangelist
f75c464bcd Merge remote-tracking branch 'origin/master' into branch
# Conflicts:
#	Moose Development/Moose/Ops/CTLD.lua
2025-02-09 12:03:16 +01:00
Applevangelist
a4ae0d88e1 xx 2025-02-09 12:02:22 +01:00
Applevangelist
96337cc5df #CTLD 2025-02-09 11:48:22 +01:00
Applevangelist
5c5b1383be Merge remote-tracking branch 'origin/develop' into branch 2025-02-09 11:47:15 +01:00
Applevangelist
a5e75bf485 Merge remote-tracking branch 'origin/master' into branch 2025-02-09 11:47:08 +01:00
leka1986
693c2a730f
Update CTLD.lua
Added  self:_RefreshDropCratesMenu(Group, Unit) to  function CTLD:_LoadCratesNearby(Group, Unit)
2025-02-09 11:26:38 +01:00
Thomas
0d438a9452
Merge pull request #2246 from FlightControl-Master/master
Ctd changes
2025-02-09 09:23:25 +01:00
Thomas
f74d25b31c
Update CTLD.lua
Option to unload single cargo items by @lekaa
2025-02-08 14:29:35 +01:00
Applevangelist
a5a0d8ab8a Merge remote-tracking branch 'origin/develop' into branch
# Conflicts:
#	Moose Development/Moose/Functional/Tiresias.lua
2025-02-02 12:56:35 +01:00
Thomas
84e85dd0b5
Merge pull request #2239 from shaji-Dev/develop
Develop
2025-02-02 12:53:25 +01:00
Applevangelist
d1e31a3652 #PLAYERRECCE - add parameter for SRS Backend option 2025-02-01 18:40:26 +01:00
Applevangelist
32e538a27d xx 2025-02-01 18:39:30 +01:00
shaji-Dev
0ffcdf2f66
Merge branch 'FlightControl-Master:develop' into develop 2025-01-31 10:21:37 +02:00
Applevangelist
fe0edeb011 Merge remote-tracking branch 'origin/master' into develop 2025-01-30 18:33:06 +01:00
Applevangelist
d06e44d37b #CTLD small additions 2025-01-30 18:32:39 +01:00
Applevangelist
8f5e519d0a xxx 2025-01-30 18:32:01 +01:00
Applevangelist
85e4a6cbd6 Merge remote-tracking branch 'origin/master' into branch 2025-01-30 13:21:10 +01:00
Applevangelist
d06a618582 Merge remote-tracking branch 'origin/master' into develop 2025-01-30 13:20:35 +01:00
Applevangelist
4b16e94eaf #CTLD - Added function for the game designer to get an overview of stock and alive groups, if they want to manage the stock: CTLD:_CountStockPlusInHeloPlusAliveGroups() 2025-01-30 13:19:11 +01:00
Applevangelist
0f9742aeb4 xx 2025-01-30 13:14:47 +01:00
Applevangelist
2d49745215 Merge remote-tracking branch 'origin/develop' into branch 2025-01-30 09:06:11 +01:00
Applevangelist
2b6a039368 Merge remote-tracking branch 'origin/master' into branch
# Conflicts:
#	Moose Development/Moose/Core/Base.lua
2025-01-30 09:05:56 +01:00
Thomas
4530b74367
Merge pull request #2235 from FlightControl-Master/master
merge from master
2025-01-29 15:31:29 +01:00
Thomas
09d53f7d8c
Update CTLD.lua
#CTLD - Added HelicopterLost Event
2025-01-29 13:24:04 +01:00
Shafik
161bdc0413 [FIXED] attempt to concatenate field 'IniGroupName' (a nil value) ?? 2025-01-29 10:13:34 +02:00
Applevangelist
fb276cf812 Merge remote-tracking branch 'origin/master' into develop 2025-01-27 18:49:01 +01:00
Applevangelist
41dfaab82a xx 2025-01-27 18:48:39 +01:00
Applevangelist
83e146f207 xx 2025-01-27 18:46:52 +01:00
Thomas
6af836c118
Update CTLD.lua 2025-01-27 18:45:39 +01:00
Thomas
bfb60b318e
Update CTLD.lua
update
2025-01-27 13:27:13 +01:00
Thomas
4d24eb82be
Update CTLD.lua
#CTLD - Add the group name of the extracted group to TroopsExtracted FSM event
2025-01-27 08:51:17 +01:00
Applevangelist
c19d20c3f7 xxx 2025-01-26 17:35:30 +01:00
Applevangelist
86b76ba216 Merge remote-tracking branch 'origin/master' into develop 2025-01-26 17:35:06 +01:00
Applevangelist
e26caa2f74 smaller fixes 2025-01-26 17:34:22 +01:00
Applevangelist
c7bc55d851 Merge remote-tracking branch 'origin/develop' into branch 2025-01-26 14:55:59 +01:00
Applevangelist
245dd6bb27 Merge remote-tracking branch 'origin/master' into branch 2025-01-26 14:55:47 +01:00
Applevangelist
3433ebd665 Merge remote-tracking branch 'origin/master' into develop 2025-01-26 14:54:53 +01:00
Applevangelist
b75fff60c8 xx 2025-01-26 14:54:19 +01:00
Applevangelist
a47fa3f9fc Merge remote-tracking branch 'origin/master' into develop 2025-01-26 13:54:59 +01:00
Applevangelist
4ac57fce7a #CTLD - Added CTLD:GetGenericCargoObjectFromGroupName(GroupName) to get the generic CTLD_CARGO entry from a group name. 2025-01-26 13:54:28 +01:00
Applevangelist
6218b94c99 Merge remote-tracking branch 'origin/develop' into develop 2025-01-26 13:29:57 +01:00
Applevangelist
74a6c89801 Merge remote-tracking branch 'origin/master' into develop 2025-01-26 13:29:53 +01:00