38fcb274a0
Merge remote-tracking branch 'origin/master' into branch
...
# Conflicts:
# Moose Development/Moose/Core/MarkerOps_Base.lua
2025-12-21 11:45:06 +01:00
3aa3942998
xx
2025-12-21 11:44:19 +01:00
1fbfc8f039
Merge remote-tracking branch 'origin/master' into develop
2025-12-21 11:44:00 +01:00
af891f3fc2
#2479 Added S-300VM/S-300V4/S-400 SAM data
2025-12-21 11:43:29 +01:00
47bb760d86
Merge pull request #2481 from FlightControl-Master/master
...
Merge
2025-12-21 09:26:19 +01:00
8e47a17c96
Merge pull request #2480 from shaji-Dev/master
...
[ADDED] Altitude AGL option for POSITIONABLE
2025-12-21 09:25:35 +01:00
c2c78dfe78
[ADDED] Altitude AGL option for POSITIONABLE
2025-12-21 09:15:44 +02:00
c24acd2681
Merge pull request #2478 from FlightControl-Master/master
...
Merge
2025-12-20 14:06:52 +01:00
26742432f5
Merge pull request #2477 from leka1986/patch-11
...
Update CTLD.lua
2025-12-20 14:06:06 +01:00
8a958df5f5
xx
2025-12-20 12:07:31 +01:00
6a13e593ec
Update CTLD.lua
...
Added:
OnAfrerGetCrates, Only triggers when player uses "Get"
Added:
OnAfterRemoveCratedNearBy, Only triggers when player actively uses Remove crates near by or remove units near by.
Added:
Partial load. currently, if a player land 3 crates (Farp) and want to partially load another farp, even though it can not fit, some want to load partially, this allows for it.
Player will be able to see what actually fits in the menu, but if they want, they can open the menu again, select the item, then it will say "Get" "Crates limit reached" and "Partially load"
Added:
AddStaticsCargo can now accept a last parms, UnitType, this parm will make the cargo only visible in the menu to that passed unitType.
Removed Get and Load from CH-47 for the statics if enableChinookGCLoading is enabled. This will make it less confusing, as it didn't allow players do load anything except Ground crew for statics.
2025-12-19 18:44:13 +01:00
b63fe40cc8
Merge pull request #2475 from FlightControl-Master/master
...
Merge from master
2025-12-18 10:20:06 +01:00
8d8b886ad6
Merge pull request #2474 from shaji-Dev/master
...
Removed MARKEROPS_BASE:_MatchTag log spam
2025-12-18 10:19:13 +01:00
2e6cc61450
Removed MARKEROPS_BASE:_MatchTag log spam
2025-12-18 10:31:45 +02:00
6859dc9142
Merge branch 'master' of https://github.com/shaji-Dev/MOOSE
...
# Conflicts:
# Moose Development/Moose/Ops/CTLD.lua
2025-12-18 10:03:54 +02:00
b871f728df
PULL
2025-12-18 10:03:45 +02:00
e41eec2238
Merge pull request #2473 from FlightControl-Master/master
...
Update Database.lua
2025-12-17 19:37:36 +01:00
87b87fa2ca
Update Database.lua
2025-12-17 19:34:06 +01:00
3c996b6dd7
Merge remote-tracking branch 'origin/master' into develop
2025-12-17 11:32:28 +01:00
a39f39646d
#MARKEROPS - Put case sensitivity switching into own functions
2025-12-17 11:31:55 +01:00
41a9c22959
Merge remote-tracking branch 'origin/Apple/Develop' into branch
2025-12-17 11:31:13 +01:00
49097649de
xx
2025-12-17 11:31:07 +01:00
19e94a7fb9
Merge pull request #2472 from FlightControl-Master/master
...
Merge
2025-12-16 08:41:03 +01:00
2012e81acb
Merge pull request #2471 from FlightControl-Master/master
...
Merge from master
2025-12-16 08:40:00 +01:00
157f9a82b1
Merge pull request #2470 from leka1986/patch-10
...
Update CTLD.lua
2025-12-16 08:39:02 +01:00
795f58dc9b
Update CTLD.lua
...
Fixing error when the savefile loads statics in the onafterLoad, it blows up.
attempt to call method 'GetStaticResourceMap' (a nil value)
2025-12-15 22:42:29 +01:00
4c841fd1d2
Merge pull request #2469 from FlightControl-Master/master
...
Merge from master
2025-12-15 17:41:37 +01:00
976f92e5b1
Merge pull request #2468 from leka1986/patch-9
...
Update CTLD.lua
2025-12-15 17:41:06 +01:00
25daa67554
Update CTLD.lua
...
Fixed error when using Dynamic cargo
"concatenate local 'gname'"
and the AddStaticCargo did not respect the template staticType.
2025-12-15 17:29:54 +01:00
ef5c7e5972
Merge remote-tracking branch 'origin/master' into develop
2025-12-15 12:13:32 +01:00
33ff723bd8
Further refinement for acoustic detection and smoke
2025-12-15 12:13:04 +01:00
7605c2f4f5
xx
2025-12-15 12:12:20 +01:00
ec41d7310b
Merge remote-tracking branch 'origin/develop' into branch
...
# Conflicts:
# Moose Development/Moose/AI/AI_A2G_BAI.lua
# Moose Development/Moose/AI/AI_CAP.lua
# Moose Development/Moose/Modules_local.lua
# Moose Development/Moose/Ops/EasyA2G.lua
2025-12-15 09:43:41 +01:00
feb4f77ef4
Merge remote-tracking branch 'origin/master' into branch
2025-12-15 09:42:09 +01:00
21c744b27a
Merge remote-tracking branch 'origin/master' into develop
2025-12-15 09:41:13 +01:00
34f3e24d3a
#MANTIS - Fixing over-smoke and ensure helos are not attacked by long-range systems
2025-12-15 09:40:42 +01:00
79654a99d9
xx
2025-12-15 09:40:08 +01:00
38b36c0344
Merge remote-tracking branch 'origin/master' into develop
2025-12-14 16:05:44 +01:00
b6a90d4633
#GROUP Added GROUP:SetFormation(Formation)
2025-12-14 16:05:18 +01:00
1d0a273ffb
xx
2025-12-14 16:04:07 +01:00
5145dd14ea
Merge remote-tracking branch 'origin/master' into develop
2025-12-14 14:37:36 +01:00
0e960b77b9
#MANTIS - Mantis can use acoustic detection, e.g. for Helos sneaking in on our position: my_mantis:SetAccousticDetectionOn(2000,{Unit.Category.HELICOPTER})
2025-12-14 14:37:00 +01:00
093526f4ff
#ZONE - Added optional coalition filter on GetScannedUnitSet() and GetScannedGroupSet()
2025-12-14 14:35:50 +01:00
8160aad1bf
#INTELLIGENCE - We can optionally detect units accousticly
2025-12-14 14:34:54 +01:00
7fec25ddcd
xx
2025-12-14 14:34:22 +01:00
81b227fa9e
Merge remote-tracking branch 'origin/master' into branch
2025-12-12 12:52:43 +01:00
2eb5374b28
xx
2025-12-12 12:52:10 +01:00
51f40081f3
docu header
2025-12-12 12:51:44 +01:00
7e878b5702
Merge remote-tracking branch 'origin/develop' into develop
2025-12-12 10:51:58 +01:00
804e0ed69d
Docu fixes
2025-12-12 10:51:55 +01:00
Applevangelist