Commit Graph

9477 Commits

Author SHA1 Message Date
Applevangelist eef24def61 Merge remote-tracking branch 'origin/master' into branch 2024-08-26 18:32:08 +02:00
Applevangelist 3813a30def xx 2024-08-26 18:30:52 +02:00
Applevangelist 68b2b452cc xx 2024-08-26 18:30:41 +02:00
Applevangelist 668d120d60 CTLD Small fix for crate removal 2024-08-26 18:22:32 +02:00
Applevangelist 13bde6f2ab xx 2024-08-26 18:21:03 +02:00
Applevangelist c38e357652 Merge remote-tracking branch 'origin/develop' into branch 2024-08-26 15:54:02 +02:00
Applevangelist 06d9564b8a Merge remote-tracking branch 'origin/master' into branch 2024-08-26 15:53:58 +02:00
Applevangelist 3eea17bc76 Merge remote-tracking branch 'origin/develop' into develop 2024-08-26 15:53:23 +02:00
Applevangelist 2894bcc833 Merge remote-tracking branch 'origin/master' into develop 2024-08-26 15:53:20 +02:00
Applevangelist 7543f31c85 #CTLD
* Added option for crates to have any static shape (per crate type option)
* Added option for crates only to be transported by defined helo type names (per crate type option)
2024-08-26 15:52:50 +02:00
Applevangelist 0372735a02 xx 2024-08-26 15:51:22 +02:00
Thomas ff52197707 Merge pull request #2171 from FlightControl-Master/master
Update Utils.lua
2024-08-25 11:23:42 +02:00
Thomas 56d84e7b25 Update Utils.lua
Small fix
2024-08-25 11:22:30 +02:00
Applevangelist b025abaa88 Merge remote-tracking branch 'origin/master' into develop 2024-08-24 18:18:36 +02:00
Applevangelist ed2d3d856b Small fix 2024-08-24 18:18:08 +02:00
Applevangelist deb913a95b xx 2024-08-24 18:10:46 +02:00
Applevangelist f59dd3e8c7 Merge remote-tracking branch 'origin/develop' into branch 2024-08-23 16:30:22 +02:00
Applevangelist b2ed5c56fc Merge remote-tracking branch 'origin/master' into branch 2024-08-23 16:30:15 +02:00
Applevangelist dac637f360 Merge remote-tracking branch 'origin/master' into develop 2024-08-23 16:29:18 +02:00
Applevangelist 1e5c3a3c21 #ENUMS storage AH64D weapons additions 2024-08-23 16:28:35 +02:00
Applevangelist 9e29384262 Merge remote-tracking branch 'origin/master' into branch
# Conflicts:
#	Moose Development/Moose/Ops/CTLD.lua
#	Moose Development/Moose/Utilities/Enums.lua
2024-08-23 14:03:21 +02:00
Applevangelist 861588205a Merge remote-tracking branch 'origin/master' into develop 2024-08-23 13:56:58 +02:00
Applevangelist 37d5b6a0fc #Add'l storage items 2024-08-23 13:55:18 +02:00
Applevangelist 4d3fb2990e Merge remote-tracking branch 'origin/master' into develop 2024-08-23 12:47:37 +02:00
Applevangelist 540412d115 xx 2024-08-23 12:47:08 +02:00
Applevangelist c58a954d18 #CTLD
* Fix for spawning the correct number of crates on inject
* Simplified example docu section 7 on how to build a FARP
* Some prep work for additional stuff
2024-08-23 12:44:17 +02:00
Applevangelist 694b7afc71 xx 2024-08-23 12:42:16 +02:00
Applevangelist cb4a12c5ba xx 2024-08-23 12:41:44 +02:00
Applevangelist 733251bf06 xx 2024-08-22 18:27:15 +02:00
Applevangelist cce878e759 Merge remote-tracking branch 'origin/master' into develop 2024-08-22 18:27:00 +02:00
Applevangelist 0d481afa16 #SET_GROUP - small fix for FilterPrefixes compute 2024-08-22 18:26:34 +02:00
Applevangelist 2dbad7cb1b Merge remote-tracking branch 'origin/master' into develop 2024-08-22 17:18:13 +02:00
Applevangelist 42069c5bbb xx 2024-08-22 17:17:41 +02:00
Applevangelist 016875d724 #ENUMS - added a couple of items to ENUMS.Storage.weapons for the Gazelle and CH-47 which do not have a name representation in the object warehouse
#UTILS Added function `UTILS.SpawnFARPAndFunctionalStatics()` to spawn a functional FARP with static items (and some options)
#UTILS Added VHF Beacon Frequencies for newer maps to avoid overlaps in `UTILS.GenerateVHFrequencies()`
2024-08-22 17:17:10 +02:00
Applevangelist 7a0fa629b5 Merge remote-tracking branch 'origin/master' into develop 2024-08-20 18:03:59 +02:00
Applevangelist 82b4276b33 xx 2024-08-20 18:03:41 +02:00
Applevangelist 5df0d60135 Smaller Fixes 2024-08-20 18:03:18 +02:00
Applevangelist 8f3fc9cb2b xx 2024-08-20 17:56:09 +02:00
Applevangelist aee7bd8bb6 Merge remote-tracking branch 'origin/master' into develop 2024-08-20 10:56:08 +02:00
Applevangelist e77d61c4cb small correction 2024-08-20 10:55:41 +02:00
Applevangelist 89c6358085 xxx 2024-08-20 10:55:22 +02:00
Applevangelist abb295ecc2 Merge remote-tracking branch 'origin/develop' into branch 2024-08-20 10:48:41 +02:00
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 b1a40407b3 Merge remote-tracking branch 'origin/master' into develop 2024-08-20 10:47:56 +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
Thomas 0496571c92 Merge pull request #2170 from DarthZyll/patch-4
Update CSAR.lua - remove luadoc param addBeacon on SpawnCASEVAC()
2024-08-20 09:35:34 +02:00
Mike Young 62a0adce5a Update CSAR.lua - remove luadoc param addBeacon on SpawnCASEVAC()
this param doesn't actually exist, purely a luadoc correction
2024-08-19 13:46:21 -04: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