Commit Graph

11871 Commits

Author SHA1 Message Date
Shafik 2e6cc61450 Removed MARKEROPS_BASE:_MatchTag log spam 2025-12-18 10:31:45 +02:00
Shafik 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
Shafik b871f728df PULL 2025-12-18 10:03:45 +02:00
Thomas e41eec2238 Merge pull request #2473 from FlightControl-Master/master
Update Database.lua
2025-12-17 19:37:36 +01:00
Thomas 87b87fa2ca Update Database.lua 2025-12-17 19:34:06 +01:00
Applevangelist 3c996b6dd7 Merge remote-tracking branch 'origin/master' into develop 2025-12-17 11:32:28 +01:00
Applevangelist a39f39646d #MARKEROPS - Put case sensitivity switching into own functions 2025-12-17 11:31:55 +01:00
Applevangelist 41a9c22959 Merge remote-tracking branch 'origin/Apple/Develop' into branch 2025-12-17 11:31:13 +01:00
Applevangelist 49097649de xx 2025-12-17 11:31:07 +01:00
Thomas 19e94a7fb9 Merge pull request #2472 from FlightControl-Master/master
Merge
2025-12-16 08:41:03 +01:00
Thomas 2012e81acb Merge pull request #2471 from FlightControl-Master/master
Merge from master
2025-12-16 08:40:00 +01:00
Thomas 157f9a82b1 Merge pull request #2470 from leka1986/patch-10
Update CTLD.lua
2025-12-16 08:39:02 +01:00
leka1986 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
Thomas 4c841fd1d2 Merge pull request #2469 from FlightControl-Master/master
Merge from master
2025-12-15 17:41:37 +01:00
Thomas 976f92e5b1 Merge pull request #2468 from leka1986/patch-9
Update CTLD.lua
2025-12-15 17:41:06 +01:00
leka1986 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
Applevangelist ef5c7e5972 Merge remote-tracking branch 'origin/master' into develop 2025-12-15 12:13:32 +01:00
Applevangelist 33ff723bd8 Further refinement for acoustic detection and smoke 2025-12-15 12:13:04 +01:00
Applevangelist 7605c2f4f5 xx 2025-12-15 12:12:20 +01:00
Applevangelist 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
Applevangelist feb4f77ef4 Merge remote-tracking branch 'origin/master' into branch 2025-12-15 09:42:09 +01:00
Applevangelist 21c744b27a Merge remote-tracking branch 'origin/master' into develop 2025-12-15 09:41:13 +01:00
Applevangelist 34f3e24d3a #MANTIS - Fixing over-smoke and ensure helos are not attacked by long-range systems 2025-12-15 09:40:42 +01:00
Applevangelist 79654a99d9 xx 2025-12-15 09:40:08 +01:00
Applevangelist 38b36c0344 Merge remote-tracking branch 'origin/master' into develop 2025-12-14 16:05:44 +01:00
Applevangelist b6a90d4633 #GROUP Added GROUP:SetFormation(Formation) 2025-12-14 16:05:18 +01:00
Applevangelist 1d0a273ffb xx 2025-12-14 16:04:07 +01:00
Applevangelist 5145dd14ea Merge remote-tracking branch 'origin/master' into develop 2025-12-14 14:37:36 +01:00
Applevangelist 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
Applevangelist 093526f4ff #ZONE - Added optional coalition filter on GetScannedUnitSet() and GetScannedGroupSet() 2025-12-14 14:35:50 +01:00
Applevangelist 8160aad1bf #INTELLIGENCE - We can optionally detect units accousticly 2025-12-14 14:34:54 +01:00
Applevangelist 7fec25ddcd xx 2025-12-14 14:34:22 +01:00
Applevangelist 81b227fa9e Merge remote-tracking branch 'origin/master' into branch 2025-12-12 12:52:43 +01:00
Applevangelist 2eb5374b28 xx 2025-12-12 12:52:10 +01:00
Applevangelist 51f40081f3 docu header 2025-12-12 12:51:44 +01:00
Applevangelist 7e878b5702 Merge remote-tracking branch 'origin/develop' into develop 2025-12-12 10:51:58 +01:00
Applevangelist 804e0ed69d Docu fixes 2025-12-12 10:51:55 +01:00
Thomas 46c0d47175 Update build-docs.yml 2025-12-11 16:37:30 +01:00
Applevangelist 147df1498e Merge remote-tracking branch 'origin/master' into develop 2025-12-11 15:48:41 +01:00
Applevangelist f9410a9169 #EASYA2G - Initial release 2025-12-11 15:48:13 +01:00
Applevangelist 12bde81e67 xx 2025-12-11 15:47:26 +01:00
Applevangelist a88750908e #WAREHOUSE - Nil fix 2025-12-11 15:43:33 +01:00
Applevangelist 0503596414 xx 2025-12-11 15:41:55 +01:00
Thomas aca3080c9a Merge pull request #2467 from leka1986/patch-8
Update CTLD.lua
2025-12-11 15:10:01 +01:00
leka1986 948158e85a Update CTLD.lua
Fixed bugs, 

Added RemoveStockUnits.

Tested and tested, works as intended.
2025-12-11 11:27:05 +01:00
Applevangelist 65ab481432 xx 2025-12-11 09:35:29 +01:00
Applevangelist 9b3aa423aa xx 2025-12-11 09:34:19 +01:00
Applevangelist 07876cb46c Merge remote-tracking branch 'origin/develop' into develop 2025-12-10 11:30:59 +01:00
Applevangelist de48701d15 Merge remote-tracking branch 'origin/master' into develop 2025-12-10 11:30:55 +01:00
Applevangelist c5678404d5 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Functional/PseudoATC.lua
2025-12-10 11:29:39 +01:00