1711 Commits

Author SHA1 Message Date
Applevangelist
b3e9a2b64d #fixes 2023-07-01 13:08:00 +02:00
Applevangelist
c7a66e0f99 #Fixes 2023-06-26 17:29:02 +02:00
Applevangelist
a2d3205701 #CTLD
* Added option for troops subcategories
2023-06-22 13:41:58 +02:00
Applevangelist
e8ab86ab7f #CTLD
* Added categories for Troops
2023-06-22 12:57:08 +02:00
Applevangelist
abf694aa81 # Docu fixes 2023-06-22 12:19:20 +02:00
Applevangelist
24c58acf85 #AIRBOSS
* Bugfix
2023-06-22 09:34:21 +02:00
Applevangelist
37cbafde3e Merge remote-tracking branch 'origin/develop' into develop 2023-06-21 14:05:54 +02:00
Applevangelist
1df525b9c5 #NAVY
* Min speed 4kn due to rudder effectiveness
2023-06-21 14:05:17 +02:00
Applevangelist
925ac7907b #AIRBOSS SRS 2023-06-21 10:25:30 +02:00
Applevangelist
970275e96e #AIRBOSS
* Added adjustment degrees for wind speed
2023-06-21 10:25:00 +02:00
Applevangelist
c88bb3bbdb #PLAYERTASKCONTROLLER
* Menu build lock
2023-06-18 13:29:25 +02:00
Applevangelist
5456cd04c3 #PLAYERTASKCONTROLLER
* Menu build lock
2023-06-18 13:29:07 +02:00
Applevangelist
d005064c28 #PLAYERTASK
* Menu build finetuning
2023-06-18 13:12:35 +02:00
Applevangelist
f8963b33a3 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Moose Development/Moose/Wrapper/Positionable.lua
#	Moose Development/Moose/Wrapper/Unit.lua
2023-06-18 12:21:40 +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
Applevangelist
09f0c9e069 #AIRBOSS 2023-06-18 12:18:09 +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
0d40b36613 #AIRBOSS
* Added option to set Airboss voice for SRS etc
* Nicer read out of weather info and carrier info
2023-06-17 15:01:57 +02: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
ef17399128 #AIRBOSS SRS 2023-06-16 18:10:07 +02:00
Applevangelist
cca8c31ff4 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Moose Development/Moose/Wrapper/Positionable.lua
#	Moose Development/Moose/Wrapper/Unit.lua
2023-06-16 11:08:54 +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
b2c95e37ae Merge remote-tracking branch 'origin/develop' into develop 2023-06-15 14:50:30 +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
ttrebuchon
a7806deb76 Recruit assets using resource Nmin and Nmax, rather than Nmax and Nmax. 2023-06-14 12:41:05 -04:00
Applevangelist
27011f3ce6 Merge remote-tracking branch 'origin/develop' into develop 2023-06-14 17:25:33 +02:00
ttrebuchon
83353d710d Use GetRelativeCoordinate in FLIGHTGROUP:GetParkingSpot 2023-06-13 13:04:24 -04:00
Applevangelist
e2e2b44fb8 Merge remote-tracking branch 'origin/develop' into develop 2023-06-13 18:01:46 +02:00
Frank
8855b117a8 Update OpsGroup.lua
- exists check for ammo and vec3
2023-06-13 16:01:47 +02:00
Applevangelist
9e84c6af1b Merge remote-tracking branch 'origin/develop' into develop 2023-06-13 08:35:53 +02:00
Frank
d31db1351a
Merge pull request #1956 from FlightControl-Master/FF/Ops
AUFTRAG
2023-06-11 22:52:28 +02:00
Frank
0f33603ecc AUFTRAG
- Changed ingress waypoint of CASENHANCED
2023-06-11 22:45:59 +02:00
ttrebuchon
163273096c Set life0 based on itself, rather than off of life 2023-06-10 18:08:29 -04:00
Applevangelist
8658804c82 Merge remote-tracking branch 'origin/develop' into develop 2023-06-09 13:25:54 +02:00
Applevangelist
fd51ec6932 #FIX 2023-06-09 13:25:29 +02:00
Frank
1b6648996c OPSGROUP
- Improved CAPTUREZONE for FLIGHTGROUP
2023-06-08 19:51:09 +02:00
Frank
f45a22fe78 Merge branch 'develop' into FF/Ops 2023-06-08 15:52:25 +02:00
Applevangelist
77c4eb0d54 Merge remote-tracking branch 'origin/develop' into develop 2023-06-08 13:59:05 +02:00
Applevangelist
fad85ef7ed #PLAYERTASK
* Added basic scoring
2023-06-08 13:56:59 +02:00
Applevangelist
0a0a4684f8 #PLAYERTASKCONTROLLER
* Added basic scoring
2023-06-08 13:55:52 +02:00
Applevangelist
910da86caf Merge remote-tracking branch 'origin/develop' into develop 2023-06-07 17:25:49 +02:00
ttrebuchon
73ff2c576d
Fix typo from TRANSPORT. to OPSTRANSPORT. (#1950) 2023-06-07 17:26:20 +02:00