3fa3644e1e
ARMYGROUP
...
- on road fix
2024-04-21 10:58:13 +02:00
28411d2093
Revert "Adding SHAPES ( #2110 )" ( #2112 )
...
This reverts commit 26deaca166
2024-04-21 10:12:51 +02:00
26deaca166
Adding SHAPES ( #2110 )
...
* Adding a new TerminalType (100)that seems to be introduced in the update that brought Muwaffaq Salti. The base has a couple of spots (like 04, 05, 06) that can only accommodate smaller type fixed wing aircraft, like the F-16, but not bigger types like the Warthog of the Strike Eagle.
Because we weren't checking for this new type, spawning in these particular spots always resulted in an airstart, because `_CheckTerminalType` would always return `false`
* Adding Shapes over from old MOOSE branch
* cleanup
* adding HEXtoRGBA
2024-04-21 10:08:06 +02:00
9b26ed7042
xxx
2024-04-20 16:21:19 +02:00
1346317ad9
#STRATEGO - add functions to set weight, baseweight manually#
2024-04-20 16:21:02 +02:00
05b547b640
Merge remote-tracking branch 'origin/develop' into develop
2024-04-19 15:59:46 +02:00
afa8d9c4d1
Merge remote-tracking branch 'origin/master' into develop
...
# Conflicts:
# Moose Development/Moose/Core/Spawn.lua
2024-04-19 15:59:41 +02:00
e11bb71c2d
Merge remote-tracking branch 'origin/master' into develop
2024-04-19 15:58:17 +02:00
95baed1aac
#GROUP - make GetCoordinate a bit more robust
2024-04-19 15:57:43 +02:00
3b364c7650
#SPAWN - less noise
2024-04-19 15:57:21 +02:00
672f1ae2d6
xxx
2024-04-19 15:57:02 +02:00
0b607eb751
xx
2024-04-19 15:55:08 +02:00
89d945037d
xxx
2024-04-19 15:54:30 +02:00
2a4e242eb2
#AI* minor fixes
2024-04-19 15:54:21 +02:00
39471212d3
Merge remote-tracking branch 'origin/master' into develop
2024-04-19 15:45:33 +02:00
8b2237d183
#CTLD small G fix
2024-04-19 15:45:11 +02:00
6c1a4f1e0d
Merge remote-tracking branch 'origin/master' into develop
2024-04-19 11:33:41 +02:00
abc26b1e5c
#CSAR Add'l logging
2024-04-19 11:33:15 +02:00
235cbbe23a
#CSAR - add'l logging
2024-04-19 11:32:35 +02:00
f771607f40
Merge remote-tracking branch 'origin/develop' into develop
2024-04-18 18:42:04 +02:00
2cf7047617
Merge remote-tracking branch 'origin/master' into develop
2024-04-18 18:41:58 +02:00
b338f486e5
Merge remote-tracking branch 'origin/master' into develop
2024-04-18 18:41:29 +02:00
b761078c18
XXX
2024-04-18 18:40:59 +02:00
202d649085
Merge remote-tracking branch 'origin/master' into develop
2024-04-18 14:52:21 +02:00
1beb5934c2
xxx
2024-04-18 14:51:53 +02:00
616690391c
SADL/STN conversion fix
2024-04-18 14:51:41 +02:00
e1e0095d9b
Merge remote-tracking branch 'origin/master' into develop
2024-04-18 14:42:12 +02:00
5d00a2d806
xxx
2024-04-18 14:41:44 +02:00
465c395294
SPAWN - Allow setting of "hidden" options
2024-04-18 14:41:29 +02:00
5adb943939
SPAWN
2024-04-18 13:52:10 +02:00
a8cbf81851
Merge branch 'FF/Ops' into FF/OpsRat
2024-04-18 10:36:42 +02:00
0e78e9c92b
Merge branch 'develop' into FF/Ops
2024-04-18 10:36:28 +02:00
13309663fb
Merge remote-tracking branch 'origin/develop' into develop
2024-04-18 09:33:16 +02:00
4baa593fde
Merge remote-tracking branch 'origin/master' into develop
2024-04-18 09:33:11 +02:00
186b64ea81
#CTLD
2024-04-18 09:32:27 +02:00
7c4d640690
Merge remote-tracking branch 'origin/master' into develop
2024-04-18 09:30:56 +02:00
73bddddba4
#CTLD - ensure extracting troops are not diverted
2024-04-18 09:30:35 +02:00
833206a3b5
RAT
...
- Uncontrolled
2024-04-16 16:42:26 +02:00
743baac945
Small fix for callsign not traversing from Squadron to Flightgroup
2024-04-16 16:01:43 +02:00
0764d076db
Housekeeping
2024-04-16 08:46:06 +02:00
c9fd56116e
Housekeeping
2024-04-16 08:45:53 +02:00
e21240e711
Merge remote-tracking branch 'origin/develop' into develop
2024-04-15 18:56:07 +02:00
99d32a7854
Merge remote-tracking branch 'origin/master' into develop
2024-04-15 18:56:03 +02:00
620df5ad3e
xx
2024-04-15 18:54:59 +02:00
504aa19c03
Merge remote-tracking branch 'origin/master' into develop
2024-04-15 18:54:46 +02:00
9a3effd063
Docu
2024-04-15 18:54:22 +02:00
d4a49ae68b
#CLIENTMENU/MANAGER
...
* Attempt to avoid dual menu builds for multi-seated aircraft
2024-04-15 12:52:19 +02:00
b9cb6dbffb
xxx
2024-04-15 12:50:15 +02:00
be85aab755
Merge remote-tracking branch 'origin/develop' into develop
2024-04-15 08:59:15 +02:00
fcb7a2c3e7
Merge remote-tracking branch 'origin/master' into develop
2024-04-15 08:59:11 +02:00
Frank