Commit Graph

9432 Commits

Author SHA1 Message Date
Applevangelist 5607aa1cf2 Merge remote-tracking branch 'origin/master' into branch 2024-08-20 10:48:33 +02:00
Applevangelist 43f1c6fcb1 xx 2024-08-20 10:48:08 +02:00
Applevangelist 504142c585 #CTLD Added self.TroopUnloadDistGround = 1.5, and self.TroopUnloadDistHover = 5,
#CSAR Added option to switch off ADF beacons
2024-08-20 10:47:28 +02:00
Applevangelist cebf21ec19 Merge remote-tracking branch 'origin/develop' into branch 2024-08-18 19:39:15 +02:00
Applevangelist f4951d09a7 Merge remote-tracking branch 'origin/master' into branch 2024-08-18 19:39:08 +02:00
Applevangelist 21ec234dd3 xx 2024-08-18 19:38:43 +02:00
Applevangelist d1a1be1a9e Merge remote-tracking branch 'origin/develop' into develop 2024-08-18 19:38:27 +02:00
Applevangelist 80011f4e4e Merge remote-tracking branch 'origin/master' into develop 2024-08-18 19:38:24 +02:00
Applevangelist 80df849d18 #SET_GROUP small enhancement for prefix filter 2024-08-18 19:37:00 +02:00
Applevangelist 43ffad02be xx 2024-08-18 19:33:24 +02:00
Frank c2933b6bed Update Legion.lua
- commented out debug info line
2024-08-18 18:19:05 +02:00
Frank fc4ba9f21d Merge branch 'master' into develop 2024-08-18 18:06:30 +02:00
Frank e74c79b5d6 Merge branch 'master' of https://github.com/FlightControl-Master/MOOSE 2024-08-18 16:56:44 +02:00
Frank f738ddfca8 Update Positionable.lua
- Added cargo bay of "MaxxPro_MRAP"
2024-08-18 16:56:42 +02:00
Applevangelist 5bbd122fa4 Merge remote-tracking branch 'origin/master' into develop 2024-08-18 14:09:10 +02:00
Applevangelist af45b0d709 #EVENT DynamicCargoRemove fix is name is empty 2024-08-18 14:08:46 +02:00
Applevangelist 4859ea2fb1 Merge remote-tracking branch 'origin/master' into branch 2024-08-18 13:59:41 +02:00
Applevangelist 928c20c867 Merge remote-tracking branch 'origin/develop' into develop 2024-08-18 13:58:58 +02:00
Applevangelist 4bd36a4786 Merge remote-tracking branch 'origin/master' into develop 2024-08-18 13:58:55 +02:00
Applevangelist e746617139 #Rap up changes 2024-08-18 13:58:18 +02:00
Thomas 3105f7407d Merge pull request #2169 from FlightControl-Master/Applevangelist-patch-1
Update ATIS.lua
2024-08-18 13:14:13 +02:00
Thomas 2f568bca17 Update ATIS.lua
#ATIS New Light Rain presets
2024-08-18 13:11:58 +02:00
Applevangelist 86ed8fe9e5 #ATIS cover "NEWRAINPRESET4" 2024-08-18 13:06:13 +02:00
Frank ad7dba6fac Merge pull request #2168 from FlightControl-Master/FF/Ops
CHIEF v0.6.1
2024-08-17 23:56:07 +02:00
Frank 9efe0fe243 CHIEF v0.6.1
- Strategic zone: If zero transports are available and min carriers is zero, cargo assets need to go by themselfs.
2024-08-17 23:50:52 +02:00
Applevangelist d0d709a410 Merge remote-tracking branch 'origin/develop' into branch 2024-08-17 14:23:25 +02:00
Applevangelist 8ecb4372b5 Merge remote-tracking branch 'origin/master' into branch 2024-08-17 14:23:16 +02:00
Thomas 2836d7a40f Merge pull request #2167 from FlightControl-Master/Applevangelist-DC-1
Update DynamicCargo.lua
2024-08-17 14:20:51 +02:00
Thomas f1bf62e3c1 Update DynamicCargo.lua
#DYNAMICCARGO
2024-08-17 14:20:31 +02:00
Applevangelist cf322c121e xx 2024-08-17 11:37:26 +02:00
Applevangelist a560d65ce7 Merge remote-tracking branch 'origin/master' into develop 2024-08-17 11:37:11 +02:00
Applevangelist 9de3cb73f7 Merge remote-tracking branch 'origin/develop' into develop 2024-08-17 11:36:17 +02:00
Applevangelist 757cc86a68 xx 2024-08-17 11:36:13 +02:00
Applevangelist aeb1664134 CTLD 2024-08-17 11:36:01 +02:00
Frank 2af1483724 Merge branch 'master' into develop 2024-08-16 23:13:22 +02:00
Frank b7702ab933 Merge pull request #2166 from FlightControl-Master/Statua-patch-1
Update ClientWatch.lua
2024-08-16 23:10:25 +02:00
Statua cc14f82e85 Update ClientWatch.lua
-Added check to verify the aircraft is controlled by a player
-Added :FilterByCoalition() and :FilterByCategory()
-Added ability to get ALL CLIENTS by leaving param1 of :New() blank
-Added more console outputs if CLIENTWATCH.Debug is true
-Minor documentation fixes
2024-08-16 15:19:26 -05:00
Applevangelist 1aca716431 Merge remote-tracking branch 'origin/develop' into branch 2024-08-16 16:24:16 +02:00
Applevangelist 83209341ee Merge remote-tracking branch 'origin/master' into branch 2024-08-16 16:24:09 +02:00
Applevangelist f23dd0a5dd Merge remote-tracking branch 'origin/master' into develop 2024-08-16 16:23:42 +02:00
Applevangelist 5aea17e20e #SET_DYNAMICCARGO Docu 2024-08-16 16:23:13 +02:00
Applevangelist a481e46017 Merge remote-tracking branch 'origin/develop' into branch 2024-08-16 15:47:12 +02:00
Applevangelist 031a0035bd Merge remote-tracking branch 'origin/master' into branch 2024-08-16 15:47:05 +02:00
Applevangelist 8336b744bb Merge remote-tracking branch 'origin/master' into develop 2024-08-16 15:46:34 +02:00
Applevangelist ad9eaea010 #SET - many less calls 2024-08-16 15:46:07 +02:00
Applevangelist 4ca4d2e211 xx 2024-08-16 15:45:43 +02:00
Applevangelist 866d4f93cc Merge remote-tracking branch 'origin/develop' into branch 2024-08-16 15:23:32 +02:00
Applevangelist 98eb362628 Merge remote-tracking branch 'origin/master' into branch 2024-08-16 15:23:18 +02:00
Applevangelist 9c47e35d54 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Wrapper/DynamicCargo.lua
2024-08-16 15:22:45 +02:00
Applevangelist 284a770daa Added #SET_DYNAMICCARGO 2024-08-16 15:21:46 +02:00