Commit Graph

9504 Commits

Author SHA1 Message Date
Applevangelist a9ecef4f01 Merge remote-tracking branch 'origin/develop' into branch 2024-09-01 12:42:06 +02:00
Thomas a3102a7381 Merge pull request #2172 from DarthZyll/patch-5
Update CTLD.lua for missing self.ChinookTroopCircleRadius
2024-09-01 08:55:18 +02:00
Mike Young d41b5e8ede Update CTLD.lua for missing self.ChinookTroopCircleRadius
self.ChinookTroopCircleRadius was not being set
2024-09-01 02:52:33 -04:00
Applevangelist f11755aad3 xxx 2024-08-29 17:31:40 +02:00
Applevangelist e42e712e77 Merge remote-tracking branch 'origin/develop' into branch 2024-08-29 10:26:10 +02:00
Applevangelist 84fbd7c4b0 Merge remote-tracking branch 'origin/master' into branch 2024-08-29 10:26:06 +02:00
Applevangelist a45856c925 Merge remote-tracking branch 'origin/master' into develop 2024-08-29 10:25:40 +02:00
Applevangelist f531fdaa70 #RANGE less noise 2024-08-29 10:25:13 +02:00
Applevangelist f4b2f07656 Merge remote-tracking branch 'origin/master' into develop 2024-08-29 10:22:32 +02:00
Applevangelist 81f8e84ca4 xx 2024-08-29 10:22:14 +02:00
Applevangelist 6fb5222358 CTLD Fix for saved crate reload duplicating crates on load 2024-08-29 10:21:24 +02:00
Applevangelist 120a66819c Merge remote-tracking branch 'origin/develop' into branch 2024-08-27 18:38:26 +02:00
Applevangelist d110ef1340 Merge remote-tracking branch 'origin/master' into branch 2024-08-27 18:38:22 +02:00
Applevangelist f7e64d98bc Merge remote-tracking branch 'origin/master' into develop 2024-08-27 18:37:56 +02:00
Applevangelist d74de11b8b CTLD small fix of container shape 2024-08-27 18:37:21 +02:00
Applevangelist 6706fc0af9 xx 2024-08-27 18:37:00 +02:00
Applevangelist 4380c1be2e Merge remote-tracking branch 'origin/master' into develop 2024-08-27 13:19:24 +02:00
Applevangelist 30f2097d7a #AIRBOSS - small fix in Numer2Sound etc 2024-08-27 13:18:53 +02:00
Applevangelist dc358f9cde xx 2024-08-27 13:18:26 +02:00
Applevangelist e285b26b11 Merge remote-tracking branch 'origin/develop' into branch 2024-08-27 10:57:29 +02:00
Applevangelist a62184319f Merge remote-tracking branch 'origin/master' into branch 2024-08-27 10:57:23 +02:00
Applevangelist add0a0231a xx 2024-08-27 10:56:59 +02:00
Applevangelist db2d4e97a6 Merge remote-tracking branch 'origin/master' into develop 2024-08-27 10:56:46 +02:00
Applevangelist f903844059 #CTLD - fix for type name restrictions in other functions 2024-08-27 10:56:14 +02:00
Applevangelist d00913cb68 Merge remote-tracking branch 'origin/develop' into branch 2024-08-26 18:32:12 +02:00
Applevangelist eef24def61 Merge remote-tracking branch 'origin/master' into branch 2024-08-26 18:32:08 +02:00
Applevangelist b4653be54e Merge remote-tracking branch 'origin/master' into develop 2024-08-26 18:31:07 +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 e2b6efde7a Merge remote-tracking branch 'origin/master' into develop 2024-08-26 18:22:59 +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