f59dd3e8c7
Merge remote-tracking branch 'origin/develop' into branch
2024-08-23 16:30:22 +02:00
b2ed5c56fc
Merge remote-tracking branch 'origin/master' into branch
2024-08-23 16:30:15 +02:00
dac637f360
Merge remote-tracking branch 'origin/master' into develop
2024-08-23 16:29:18 +02:00
1e5c3a3c21
#ENUMS storage AH64D weapons additions
2024-08-23 16:28:35 +02:00
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
861588205a
Merge remote-tracking branch 'origin/master' into develop
2024-08-23 13:56:58 +02:00
37d5b6a0fc
#Add'l storage items
2024-08-23 13:55:18 +02:00
4d3fb2990e
Merge remote-tracking branch 'origin/master' into develop
2024-08-23 12:47:37 +02:00
540412d115
xx
2024-08-23 12:47:08 +02:00
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
694b7afc71
xx
2024-08-23 12:42:16 +02:00
cb4a12c5ba
xx
2024-08-23 12:41:44 +02:00
733251bf06
xx
2024-08-22 18:27:15 +02:00
cce878e759
Merge remote-tracking branch 'origin/master' into develop
2024-08-22 18:27:00 +02:00
0d481afa16
#SET_GROUP - small fix for FilterPrefixes compute
2024-08-22 18:26:34 +02:00
2dbad7cb1b
Merge remote-tracking branch 'origin/master' into develop
2024-08-22 17:18:13 +02:00
42069c5bbb
xx
2024-08-22 17:17:41 +02:00
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
7a0fa629b5
Merge remote-tracking branch 'origin/master' into develop
2024-08-20 18:03:59 +02:00
82b4276b33
xx
2024-08-20 18:03:41 +02:00
5df0d60135
Smaller Fixes
2024-08-20 18:03:18 +02:00
8f3fc9cb2b
xx
2024-08-20 17:56:09 +02:00
aee7bd8bb6
Merge remote-tracking branch 'origin/master' into develop
2024-08-20 10:56:08 +02:00
e77d61c4cb
small correction
2024-08-20 10:55:41 +02:00
89c6358085
xxx
2024-08-20 10:55:22 +02:00
abb295ecc2
Merge remote-tracking branch 'origin/develop' into branch
2024-08-20 10:48:41 +02:00
5607aa1cf2
Merge remote-tracking branch 'origin/master' into branch
2024-08-20 10:48:33 +02:00
43f1c6fcb1
xx
2024-08-20 10:48:08 +02:00
b1a40407b3
Merge remote-tracking branch 'origin/master' into develop
2024-08-20 10:47:56 +02:00
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
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
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
cebf21ec19
Merge remote-tracking branch 'origin/develop' into branch
2024-08-18 19:39:15 +02:00
f4951d09a7
Merge remote-tracking branch 'origin/master' into branch
2024-08-18 19:39:08 +02:00
21ec234dd3
xx
2024-08-18 19:38:43 +02:00
d1a1be1a9e
Merge remote-tracking branch 'origin/develop' into develop
2024-08-18 19:38:27 +02:00
80011f4e4e
Merge remote-tracking branch 'origin/master' into develop
2024-08-18 19:38:24 +02:00
80df849d18
#SET_GROUP small enhancement for prefix filter
2024-08-18 19:37:00 +02:00
43ffad02be
xx
2024-08-18 19:33:24 +02:00
c2933b6bed
Update Legion.lua
...
- commented out debug info line
2024-08-18 18:19:05 +02:00
fc4ba9f21d
Merge branch 'master' into develop
2024-08-18 18:06:30 +02:00
e74c79b5d6
Merge branch 'master' of https://github.com/FlightControl-Master/MOOSE
2024-08-18 16:56:44 +02:00
f738ddfca8
Update Positionable.lua
...
- Added cargo bay of "MaxxPro_MRAP"
2024-08-18 16:56:42 +02:00
5bbd122fa4
Merge remote-tracking branch 'origin/master' into develop
2024-08-18 14:09:10 +02:00
af45b0d709
#EVENT DynamicCargoRemove fix is name is empty
2024-08-18 14:08:46 +02:00
4859ea2fb1
Merge remote-tracking branch 'origin/master' into branch
2024-08-18 13:59:41 +02:00
928c20c867
Merge remote-tracking branch 'origin/develop' into develop
2024-08-18 13:58:58 +02:00
4bd36a4786
Merge remote-tracking branch 'origin/master' into develop
2024-08-18 13:58:55 +02:00
e746617139
#Rap up changes
2024-08-18 13:58:18 +02:00
3105f7407d
Merge pull request #2169 from FlightControl-Master/Applevangelist-patch-1
...
Update ATIS.lua
2024-08-18 13:14:13 +02:00
Applevangelist