8980 Commits

Author SHA1 Message Date
Applevangelist
593f21bd3b xxx 2024-05-19 13:12:35 +02:00
Applevangelist
da8a02465e Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Core/Menu.lua
#	Moose Development/Moose/Functional/Mantis.lua
2024-05-19 12:50:41 +02:00
Applevangelist
639c5bc71a xxx 2024-05-19 12:47:54 +02:00
Niels Vaes
c985d40ca0
Fix when DCS adds duplicate points to the points table of a drawing resulting in wrong triangulation (#2128)
* 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

* removing Arrow.lua, it's part of Polygon.lua

* Fix when DCS adds duplicate points to the `points` table of a drawing, resulting in wrong triangulation
2024-05-19 12:46:17 +02:00
Applevangelist
90b588420f #UTILS - Add Kola map to GMT function
#MANTIS - with checkforfriendlies, restrict to airborne ones
2024-05-19 11:32:00 +02:00
kaltokri
3a0d2a5c51 Added link in Core.Menu to the demo missions. 2024-05-18 16:57:28 +02:00
Applevangelist
07a76ced88 #MANTIS - added an option to do a friendly check in firing range before activitaing a SAM 2024-05-16 17:56:14 +02:00
Applevangelist
f022c87f25 #MANTIS - Option to avoid friendly fire 2024-05-16 17:55:05 +02:00
Applevangelist
5d8260b28e fix 2024-05-16 11:50:35 +02:00
Applevangelist
d432ec8105 Merge remote-tracking branch 'origin/develop' into develop 2024-05-16 09:55:24 +02:00
Applevangelist
7a24b491e9 Merge remote-tracking branch 'origin/master' into develop 2024-05-16 09:55:20 +02:00
Applevangelist
ca7949d8c4 Merge remote-tracking branch 'origin/master' into develop 2024-05-16 09:54:53 +02:00
Applevangelist
a3805118a0 #SPAWN - Fix for KeepUnitNames 2024-05-16 09:54:24 +02:00
Applevangelist
efca40d481 SPAWN - Fix for KeepUnitNames 2024-05-16 09:54:00 +02:00
Applevangelist
34fde09c12 #PLAYERTASKCONTROLLER - Added target elevation to task info 2024-05-16 09:34:29 +02:00
Applevangelist
0e40dc70b2 xxx 2024-05-16 09:34:03 +02:00
Applevangelist
52452b45b1 Merge remote-tracking branch 'origin/develop' into develop 2024-05-13 09:57:45 +02:00
Applevangelist
b9bfd781d0 Merge remote-tracking branch 'origin/master' into develop 2024-05-13 09:57:41 +02:00
Applevangelist
983d518a69 Merge remote-tracking branch 'origin/develop' into develop 2024-05-13 09:57:06 +02:00
Applevangelist
c14dec7412 Too much logging 2024-05-13 09:57:02 +02:00
Applevangelist
662885aaa6 xxx 2024-05-13 09:56:48 +02:00
Frank
78ab7547f3 Merge branch 'master' into develop 2024-05-11 09:51:00 +02:00
Frank
2e6957984f Merge branch 'master' of https://github.com/FlightControl-Master/MOOSE 2024-05-11 09:50:01 +02:00
Frank
433a66d530 Airboss
- Get magnetic variation from DCS if require is available
- Added default magvar for Kola map
2024-05-11 09:49:59 +02:00
Applevangelist
5d67009b18 Merge remote-tracking branch 'origin/develop' into develop 2024-05-11 09:38:32 +02:00
Applevangelist
4ffe6a04c2 Merge remote-tracking branch 'origin/master' into develop 2024-05-11 09:38:28 +02:00
Applevangelist
7081448c40 Merge remote-tracking branch 'origin/master' into develop 2024-05-11 09:37:52 +02:00
Applevangelist
7d3ad15f39 #CTLD - Move troops to active Zones only 2024-05-11 09:37:28 +02:00
Applevangelist
dfca4d8bec xxx 2024-05-11 09:36:36 +02:00
Applevangelist
0bd245aee5 Merge remote-tracking branch 'origin/develop' into develop 2024-05-10 18:26:10 +02:00
Applevangelist
fe730da72f Merge remote-tracking branch 'origin/master' into develop 2024-05-10 18:26:06 +02:00
Frank
c7c1bcfff4 Merge branch 'master' into develop 2024-05-09 16:57:33 +02:00
Frank
d0728afee7 Update Airboss.lua
- Added C2 Greyhound radio call
2024-05-09 16:57:20 +02:00
Frank
4f25c9a408 Merge branch 'master' into develop 2024-05-09 16:03:11 +02:00
Frank
01330bf00c
Merge pull request #2125 from FlightControl-Master/FF/MasterDevel
AIRBOSS intowind
2024-05-09 16:01:27 +02:00
Frank
01de638b8e Merge branch 'master' into FF/MasterDevel 2024-05-09 12:54:28 +02:00
Frank
3e8c7ad1df AIRBOSS into wind
- Added option to use the "old" into wind calculation `:SetIntoWindLegacy()`
2024-05-09 12:54:20 +02:00
Frank
22c6a03161 Update Airboss.lua 2024-05-09 11:09:29 +02:00
Applevangelist
4179e63e30 Merge remote-tracking branch 'origin/develop' into develop 2024-05-07 14:34:33 +02:00
Applevangelist
7868a2e9de #STRATEGO - Smarter route finding 2024-05-07 14:34:02 +02:00
Applevangelist
b1f3cda7f7 #STRATEGO - Smarter route finding 2024-05-07 14:33:49 +02:00
Applevangelist
522c5e4eaa Merge remote-tracking branch 'origin/develop' into develop 2024-05-06 19:02:07 +02:00
Applevangelist
1e9608de3a Merge remote-tracking branch 'origin/master' into develop 2024-05-06 19:02:02 +02:00
Applevangelist
04b4f7cc0f XXX 2024-05-06 19:01:42 +02:00
Applevangelist
b7db198125 Merge remote-tracking branch 'origin/master' into develop 2024-05-06 19:01:24 +02:00
Applevangelist
dd8b2caa24 #CSAR Nicer TTS output for MGRS coordinates 2024-05-06 19:01:02 +02:00
Frank
1e4cfd473c Update Airboss.lua 2024-05-06 16:11:33 +02:00
Applevangelist
00b8c39455 Merge remote-tracking branch 'origin/develop' into develop 2024-05-04 14:56:50 +02:00
Applevangelist
cd0e4bfb04 Merge remote-tracking branch 'origin/master' into develop 2024-05-04 14:56:46 +02:00
Applevangelist
4364cb8e53 Merge remote-tracking branch 'origin/master' into develop 2024-05-04 14:56:07 +02:00