6688 Commits

Author SHA1 Message Date
Frank
a1a258f48e
Merge pull request #1838 from FlightControl-Master/FF/Ops
OPS
2022-11-10 00:40:15 +01:00
Frank
4a0040a12f Merge branch 'develop' into FF/Ops 2022-11-10 00:36:14 +01:00
Frank
ab13b5f198 Update Intelligence.lua
- Added check for filter categories.
2022-11-10 00:36:02 +01:00
Applevangelist
788d2d49b9 Merge remote-tracking branch 'origin/master' into develop 2022-11-09 16:11:44 +01:00
Applevangelist
54247d17c1 Merge remote-tracking branch 'origin/master' into develop 2022-11-09 16:11:02 +01:00
Applevangelist
326733a312 AWACS 2022-11-09 16:10:34 +01:00
Applevangelist
08c5c38c7b Changes from last FF push 2022-11-09 16:09:05 +01:00
Applevangelist
fb203df364 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Moose Development/Moose/Ops/Awacs.lua
2022-11-09 16:06:40 +01:00
Applevangelist
8d5fe02105 Merge remote-tracking branch 'origin/master' into develop 2022-11-09 16:06:01 +01:00
Thomas
dda96d8f05
AWACS - Speak task info
Feature request
2022-11-09 13:08:06 +01:00
Frank
6c342ef910
Merge pull request #1834 from FlightControl-Master/FF/Ops
OPS
2022-11-08 22:11:21 +01:00
Frank
a4b5362347 Update Cohort.lua
- Added functions to get and set attributes
- Added function to get category and properties
2022-11-08 22:01:44 +01:00
Frank
0e78be86e4 CHIEF
- Added resource.carrierProperties for LEGION.AssignAssetsForTransport
- Ensure table for carrier categories, attributes and properties
2022-11-08 20:29:51 +01:00
Applevangelist
e348bbc344 #AWACS
* Minor Enhancements
2022-11-08 17:24:32 +01:00
Applevangelist
e2bae31e55 #AWACS
* Minor Enhancements
2022-11-08 17:24:11 +01:00
Applevangelist
dcaaa11608 #AWACS
* Minor Enhancements
2022-11-08 16:59:29 +01:00
Applevangelist
bad17c39d1 * POINT/PLAYERTASK
* Added option to get BR/BRA with add'l magnetic heading
2022-11-08 15:43:46 +01:00
Applevangelist
8ed30da473 * POINT/PLAYERTASK
* Added option to get BR/BRA with add'l magnetic heading
2022-11-08 15:43:14 +01:00
Applevangelist
b057e83898 * POINT/PLAYERTASK
* Added option to get BR/BRA with add'l magnetic heading
2022-11-08 15:43:00 +01:00
Applevangelist
0c9238651a * POINT
* Added option to get BR/BRA with add'l magnetic heading
2022-11-08 15:33:09 +01:00
Applevangelist
af1083d0f1 #MSRS
* Docu corrections
* Added `AddFrequencies()` and `AddModulations()`
2022-11-08 10:11:28 +01:00
Applevangelist
17f2a3e79a #MSRS
* Docu corrections
* Added `AddFrequencies()` and `AddModulations()`
2022-11-08 10:10:57 +01:00
Applevangelist
10a9b062b6 #MSRS
* Docu corrections
* Added `AddFrequencies()` and `AddModulations()`
2022-11-08 10:10:11 +01:00
Applevangelist
4fff842c90 #CTLD Fix Ship Zones 2022-11-07 19:14:09 +01:00
Applevangelist
071b72e3fd Merge remote-tracking branch 'origin/master' into develop 2022-11-07 19:13:21 +01:00
Applevangelist
63aff9dcd1 #CTLD Fix Ship Zones 2022-11-07 19:12:36 +01:00
Thomas
53c6a17ccb
Fix CTLD Ship Zones
Fixes #1830
2022-11-07 19:11:08 +01:00
Applevangelist
7f81039f46 #CTLD - Added Bronco support 2022-11-07 18:21:36 +01:00
Applevangelist
b63be6dd28 #PLAYERTASK
* Fix #1826 CTLD/CSAR closing immediately
2022-11-07 17:39:11 +01:00
Applevangelist
1bc7e5d6cd Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Ops/CTLD.lua
2022-11-07 17:37:18 +01:00
Applevangelist
c10617e1b0 #CTLD
* Fix for Bronco #1827
* Fix for Ship Zones
2022-11-07 17:37:02 +01:00
Applevangelist
565a5294e2 Merge remote-tracking branch 'origin/master' into develop 2022-11-07 16:09:00 +01:00
Thomas
c08d54c16b
CTLD - Fix Ship Zones
CTLD - Fix Ship Zones
2022-11-07 14:11:16 +01:00
Thomas
2eea8520d8
Merge CTLD Bronco update into master (#1829)
* Update Range.lua (#1825)

Add meter text to RANGE bombing result.

* CTLD - added Bronco (#1828)

Added data for the Bronco-OV-10A - needs further additions to ensure to work, as this is a plane, not a chopper #1827

Co-authored-by: TommyC81 <tommyc81@gmail.com>
2022-11-07 11:23:39 +01:00
Thomas
be01567a1b
CTLD - added Bronco (#1828)
Added data for the Bronco-OV-10A - needs further additions to ensure to work, as this is a plane, not a chopper #1827
2022-11-07 11:19:52 +01:00
TommyC81
88fc501c24
Update Range.lua (#1825)
Add meter text to RANGE bombing result.
2022-11-06 19:33:44 +01:00
Frank
254d43fef1 AIRWING/WAREHOUSE
- Improved parking spot check if explicitly given for an airwing or squadron
- Improved parking check if airstart is requested.
2022-11-06 12:17:07 +01:00
Applevangelist
6f254b06b0 #SCORING
* Added option to switch AutoSave
2022-11-06 11:28:20 +01:00
Applevangelist
e93bb5ceba Merge remote-tracking branch 'origin/master' 2022-11-06 11:28:03 +01:00
Applevangelist
7983621f8e #SCORING
* Added option to switch AutoSave
2022-11-06 11:27:59 +01:00
Applevangelist
5819884c98 #SCORING
* Added option to switch AutoSave
2022-11-06 11:27:27 +01:00
Applevangelist
6c79d6b01f #SCORING
* Added option to switch AutoSave
2022-11-06 11:26:16 +01:00
Frank
cb43f9c392 CHIEF
- cleaned up resources
2022-11-05 23:48:42 +01:00
Applevangelist
e512569d5c Merge remote-tracking branch 'origin/develop' into develop 2022-11-05 14:05:16 +01:00
Applevangelist
d805352a97 Merge remote-tracking branch 'origin/master' into develop 2022-11-05 14:04:39 +01:00
Applevangelist
ed677b7682 Merge remote-tracking branch 'origin/master' into develop 2022-11-05 14:04:06 +01:00
Applevangelist
b2a351e67d UTILS 2022-11-05 14:03:38 +01:00
Frank
ead8411454
Merge pull request #1824 from FlightControl-Master/FF/Ops
OPS
2022-11-04 22:55:24 +01:00
Frank
1fc9f13919 Version 2022-11-04 22:36:20 +01:00
Frank
6bf077e0aa Merge branch 'develop' into FF/Ops 2022-11-04 19:47:52 +01:00