Applevangelist
a52cd5612a
Merge remote-tracking branch 'origin/master'
2023-07-01 13:12:29 +02:00
Applevangelist
041c21a883
Merge remote-tracking branch 'origin/master' into develop
2023-07-01 13:12:03 +02:00
Applevangelist
e82ed762be
Merge remote-tracking branch 'origin/master'
2023-07-01 13:11:46 +02:00
Applevangelist
0bb16ec827
#AIRBASE
...
* Fix for nil error in finding parking for a group
#MANTIS
* Added SAM type "SHORAD" as designator
#SCORING
* fix for non local problem
#UTILS
* fix for OneLineSerialize
2023-07-01 13:11:21 +02:00
Applevangelist
fd946e971a
#AWACS
...
* Bugfixes
2023-07-01 13:08:27 +02:00
Thomas
0dab316514
Point - BRAANATO ( #1969 ) ( #1970 )
...
corrected Track to be direction of travel of bogey (self in this case)
2023-06-26 13:29:34 +02:00
Thomas
a978420a67
Point - BRAANATO ( #1969 )
...
corrected Track to be direction of travel of bogey (self in this case)
2023-06-26 13:25:23 +02:00
Applevangelist
248228720e
Merge remote-tracking branch 'origin/master' into develop
2023-06-24 14:04:32 +02:00
Applevangelist
f59326bf10
#ATIS
...
* Fix for airbases which have no runways, e.g. Naqoura Syria
2023-06-24 14:03:43 +02:00
Applevangelist
e9c1b6d268
Merge remote-tracking branch 'origin/master' into develop
2023-06-22 13:52:19 +02:00
Thomas
08be2d6e93
CTLD ( #1967 ) ( #1968 )
...
* Added option for troops subcategories in menu
2023-06-22 13:49:21 +02:00
Thomas
d937ab2679
CTLD ( #1967 )
...
* Added option for troops subcategories in menu
2023-06-22 13:46:11 +02:00
Applevangelist
ac386d5ebe
#AIRBOSS
...
* Bug fix
2023-06-22 09:34:02 +02:00
Frank
74c1e9d991
Merge branch 'develop' into FF/Ops
2023-06-21 22:00:14 +02:00
Frank
0e72717cdb
OPSGROUP
...
Track
2023-06-21 22:00:04 +02:00
Applevangelist
1df525b9c5
#NAVY
...
* Min speed 4kn due to rudder effectiveness
2023-06-21 14:05:17 +02:00
Applevangelist
cdbbad809a
Merge remote-tracking branch 'origin/master' into develop
2023-06-21 10:43:40 +02:00
Applevangelist
7164e211f2
#AIRBASE
...
- Nicosia unused atm
2023-06-21 10:42:35 +02:00
Applevangelist
970275e96e
#AIRBOSS
...
* Added adjustment degrees for wind speed
2023-06-21 10:25:00 +02:00
Applevangelist
5456cd04c3
#PLAYERTASKCONTROLLER
...
* Menu build lock
2023-06-18 13:29:07 +02:00
Applevangelist
1cdbe55cdd
Merge remote-tracking branch 'origin/develop' into develop
2023-06-18 12:19:37 +02:00
Applevangelist
0577e5171b
#AIRBOSS
...
* SRS: Remove lines starting with # from being spelled out
2023-06-18 12:19:28 +02:00
Frank
97376320f4
Merge pull request #1965 from ttrebuchon/tt/ops-auftrag-transport-attributes-and-properties
...
AUFTRAG Transport Attributes, Categories, and Properties Filters
2023-06-18 01:08:10 +02:00
ttrebuchon
9c1acc731a
Make Attributes parameter documentation conform to other similar descriptions
2023-06-17 17:32:49 -04:00
ttrebuchon
92f81614ba
Update/fix lua docs for new AUFTRAG transport fields
2023-06-17 17:09:50 -04:00
ttrebuchon
2a11c4c98a
Rename AUFTRAG.transportCategories/etc to carrierCategories/etc
2023-06-17 17:07:56 -04:00
ttrebuchon
e284773492
Move transport categories/etc to SetRequiredCarriers, to allow for specifying them without always needing to specify zones
2023-06-17 17:06:16 -04:00
ttrebuchon
b3d46618c2
Missed 2 spots in Legion/Commander for transport filters.
2023-06-17 16:56:46 -04:00
ttrebuchon
4e36e2011f
Add categories/attributes/properties filters for AUFTRAG transports
2023-06-17 15:35:11 -04:00
Applevangelist
a3876c296e
#AIRBOSS
...
* Added option to set Airboss voice for SRS etc
* Nicer read out of weather info and carrier info
2023-06-17 15:01:33 +02:00
Applevangelist
c80213b4cf
#AIRBOSS
...
* Initial SRS addition
2023-06-16 18:18:18 +02:00
Applevangelist
bfe7bf1af5
Merge remote-tracking branch 'origin/master' into develop
...
# Conflicts:
# Moose Development/Moose/Wrapper/Positionable.lua
# Moose Development/Moose/Wrapper/Unit.lua
2023-06-16 11:11:37 +02:00
Applevangelist
dae78d7ac1
#Positionable, Unit - remove pcall
2023-06-16 11:06:46 +02:00
Frank
f28d92e865
Merge pull request #1963 from FlightControl-Master/FF/Ops
...
OPS
2023-06-15 19:15:34 +02:00
Frank
bffb3e7778
OPS
...
UNIT and POSITIONABLE
- Removed pcall for GetVec3 and GetAmmo
CHIEF
- Deploy resources if zone is empty and owned by itself
2023-06-15 19:12:26 +02:00
Applevangelist
d4c2de9dd1
Merge remote-tracking branch 'origin/develop' into develop
2023-06-15 14:52:09 +02:00
Applevangelist
ab5425bd83
Merge remote-tracking branch 'origin/master' into develop
2023-06-15 14:52:02 +02:00
Applevangelist
254468c723
#NET
...
* Improvements
2023-06-15 14:51:36 +02:00
Applevangelist
aec3eee3a5
#NET
...
* Slight improvements
2023-06-15 14:50:11 +02:00
Frank
eec7e5f8d9
Merge branch 'develop' into FF/Ops
2023-06-15 01:25:10 +02:00
Frank
a9b51cca93
Update Auftrag.lua
2023-06-15 01:24:59 +02:00
Frank
14ddba69b0
Merge pull request #1962 from ttrebuchon/tt/ops-chief-RecruitAssetsForZone-nmin-nmax-typo-fix
...
Fix typo (Nmax -> Nmin) in CHIEF:RecruitAssetsForZone
2023-06-15 00:39:45 +02:00
ttrebuchon
a7806deb76
Recruit assets using resource Nmin and Nmax, rather than Nmax and Nmax.
2023-06-14 12:41:05 -04:00
Applevangelist
0cf35b664f
Merge remote-tracking branch 'origin/master' into develop
2023-06-14 17:41:13 +02:00
Applevangelist
71be4d99d6
#POSITIONABLE:GetRelativeCoordinate( x, y, z )
2023-06-14 17:40:33 +02:00
Frank
c3ffffbb52
Merge branch 'master' into develop
2023-06-13 21:53:29 +02:00
Frank
f86fc845e7
Update Timer.lua
...
- Timer stop is using protected call now because it can crash the whole script.
2023-06-13 21:53:19 +02:00
Frank
d96a55d83c
Merge pull request #1961 from ttrebuchon/tt/flightgroup-getparkingspot-ship-fix
...
FLIGHTGROUP:GetParkingSpot Carrier Issue Fix
2023-06-13 19:09:42 +02:00
ttrebuchon
83353d710d
Use GetRelativeCoordinate in FLIGHTGROUP:GetParkingSpot
2023-06-13 13:04:24 -04:00
Frank
9a4c09d249
Merge branch 'master' into develop
2023-06-13 19:03:11 +02:00
