10268 Commits

Author SHA1 Message Date
Applevangelist
428712147d Merge remote-tracking branch 'origin/develop' into branch 2025-02-19 17:34:00 +01:00
Applevangelist
20fa78bc85 Merge remote-tracking branch 'origin/master' into branch 2025-02-19 17:33:53 +01:00
Applevangelist
5e24e8658b Merge remote-tracking branch 'origin/master' into develop 2025-02-19 17:33:17 +01:00
Applevangelist
43eeaede65 #SET - Error output for Addif the ObjectName variable is empty
#UNIT - Return zero is SpeedMax is nil
2025-02-19 17:32:37 +01:00
Frank
749c5f87de
Merge pull request #2257 from leka1986/patch-2
Update Range.lua
2025-02-18 21:37:37 +01:00
leka1986
a520daeb56
Update Range.lua
attempt to index local 'target' (a nil value)

Was using this build in another mission. Added a nilcheck.
env.info('*** MOOSE GITHUB Commit Hash ID: 2025-02-14T06:13:08+01:00-24b320077721d45774acd56b25086ef6bdfb2e5a ***')
2025-02-18 21:23:58 +01:00
Applevangelist
9bb713db10 Merge remote-tracking branch 'origin/master' into develop 2025-02-18 11:14:00 +01:00
Applevangelist
f9ba96f228 #MANTIS - New 4-Tier-Approach 2025-02-18 11:13:23 +01:00
Applevangelist
d081e115c7 #MANTIS 4-Tier-Approach 2025-02-18 11:12:14 +01:00
Applevangelist
3df9b54c01 Merge remote-tracking branch 'origin/develop' into branch 2025-02-17 08:36:24 +01:00
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
Applevangelist
a49bd23a2a #ATC_GROUND 2025-02-17 08:35:30 +01:00
Thomas
913b2c6d3f
Merge pull request #2256 from FlightControl-Master/master
CTLD
2025-02-17 07:01:08 +01:00
Thomas
cea2f18228
Merge pull request #2255 from leka1986/patch-1
Update CTLD.lua
2025-02-17 07:00:18 +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
Thomas
24b3200777
Merge pull request #2254 from FlightControl-Master/master
Tld
2025-02-14 06:13:08 +01:00
Thomas
fa4e0447dd
Merge pull request #2253 from leka1986/patch-1
Update CTLD.lua
2025-02-14 06:11:49 +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
Applevangelist
3518c89791 Merge remote-tracking branch 'origin/master' into develop 2025-02-10 18:03:22 +01:00
Applevangelist
8ea746ee19 xxx 2025-02-10 18:02:57 +01:00
Applevangelist
f44db27565 #ATC_GROUND_UNIVERSAL
* Correct usage of airbase names if given
* Exclude FARPs and Ships
2025-02-10 18:02:42 +01:00
Thomas
acaab0c6a9
Merge pull request #2251 from FlightControl-Master/master
CTLD
2025-02-10 06:02:33 +01:00
Thomas
9b1abab73a
Merge pull request #2250 from leka1986/master
Update CTLD.lua
2025-02-10 06:01:30 +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
b2bc553e48 Merge remote-tracking branch 'origin/develop' into branch 2025-02-09 12:25:23 +01:00
Applevangelist
a91c76a0be Merge remote-tracking branch 'origin/master' into branch 2025-02-09 12:25:18 +01:00
Applevangelist
aafbd8c297 Merge remote-tracking branch 'origin/master' into develop 2025-02-09 12:24:41 +01:00
Applevangelist
1d08bcf2e0 #CTLD docu 2025-02-09 12:24:16 +01:00
Applevangelist
5a94be98fe Merge remote-tracking branch 'origin/develop' into branch 2025-02-09 12:06:45 +01:00
Applevangelist
999d67b7af Merge remote-tracking branch 'origin/master' into branch 2025-02-09 12:06:38 +01:00
Applevangelist
6d38346eb8 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Ops/CTLD.lua
2025-02-09 12:05:57 +01:00
Applevangelist
9487a5ae91 #CTLD 2025-02-09 12:05:18 +01:00
Thomas
d2bb6a4fc0
Merge pull request #2248 from leka1986/patch-4
Update CTLD.lua
2025-02-09 12:04:39 +01:00
Applevangelist
91e7c86ba0 Merge remote-tracking branch 'origin/develop' into branch 2025-02-09 12:03:23 +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
c3ccecdd4a #AWACS - Escort vector catch for noobs not reading the description 2025-02-09 12:01:57 +01:00
leka1986
5ad54648ab
Update CTLD.lua
Removed the block from partly drop 1. 

It's not helpful for the user to have 1 incomplete a set of crates onboard. 
With this line removed, If someone loads 2 items, and second item is not completed, due to crate limit or due weight, player can unload the uncomplete set.
2025-02-09 11:51:34 +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
Thomas
fa0ce0927b
Merge pull request #2247 from leka1986/patch-3
Update CTLD.lua
2025-02-09 11:34:58 +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
bc9eee22b7
Merge pull request #2245 from FlightControl-Master/Applevangelist-patch-1
Update CTLD.lua
2025-02-08 14:29:59 +01:00
Thomas
f74d25b31c
Update CTLD.lua
Option to unload single cargo items by @lekaa
2025-02-08 14:29:35 +01:00
Applevangelist
66af360ce6 Merge remote-tracking branch 'origin/master' into develop 2025-02-06 16:36:27 +01:00
Applevangelist
c6d79db266 Merge remote-tracking branch 'origin/develop' into branch 2025-02-06 16:35:58 +01:00
Applevangelist
b394622b92 Merge remote-tracking branch 'origin/master' into branch 2025-02-06 16:35:49 +01:00
Applevangelist
ad9893c3ab Merge remote-tracking branch 'origin/develop' into develop 2025-02-06 16:35:03 +01:00