weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2026-07-28 22:51:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,829 Commits 15 Branches 93 Tags
9b26ed70422351e8a7bfaca0f2cabd1339ec593c
Commit Graph

8829 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Applevangelist 9b26ed7042 xxx 2024-04-20 16:21:19 +02:00
Applevangelist 05b547b640 Merge remote-tracking branch 'origin/develop' into develop 2024-04-19 15:59:46 +02:00
Applevangelist afa8d9c4d1 Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Core/Spawn.lua
 2024-04-19 15:59:41 +02:00
Applevangelist e11bb71c2d Merge remote-tracking branch 'origin/master' into develop 2024-04-19 15:58:17 +02:00
Applevangelist 95baed1aac #GROUP - make GetCoordinate a bit more robust 2024-04-19 15:57:43 +02:00
Applevangelist 3b364c7650 #SPAWN - less noise 2024-04-19 15:57:21 +02:00
Applevangelist 672f1ae2d6 xxx 2024-04-19 15:57:02 +02:00
Applevangelist 0b607eb751 xx 2024-04-19 15:55:08 +02:00
Applevangelist 89d945037d xxx 2024-04-19 15:54:30 +02:00
Applevangelist 2a4e242eb2 #AI* minor fixes 2024-04-19 15:54:21 +02:00
Applevangelist 39471212d3 Merge remote-tracking branch 'origin/master' into develop 2024-04-19 15:45:33 +02:00
Applevangelist 8b2237d183 #CTLD small G fix 2024-04-19 15:45:11 +02:00
Applevangelist 6c1a4f1e0d Merge remote-tracking branch 'origin/master' into develop 2024-04-19 11:33:41 +02:00
Applevangelist abc26b1e5c #CSAR Add'l logging 2024-04-19 11:33:15 +02:00
Applevangelist 235cbbe23a #CSAR - add'l logging 2024-04-19 11:32:35 +02:00
Applevangelist f771607f40 Merge remote-tracking branch 'origin/develop' into develop 2024-04-18 18:42:04 +02:00
Applevangelist 2cf7047617 Merge remote-tracking branch 'origin/master' into develop 2024-04-18 18:41:58 +02:00
Applevangelist b338f486e5 Merge remote-tracking branch 'origin/master' into develop 2024-04-18 18:41:29 +02:00
Applevangelist b761078c18 XXX 2024-04-18 18:40:59 +02:00
Applevangelist 202d649085 Merge remote-tracking branch 'origin/master' into develop 2024-04-18 14:52:21 +02:00
Applevangelist 1beb5934c2 xxx 2024-04-18 14:51:53 +02:00
Applevangelist 616690391c SADL/STN conversion fix 2024-04-18 14:51:41 +02:00
Applevangelist e1e0095d9b Merge remote-tracking branch 'origin/master' into develop 2024-04-18 14:42:12 +02:00
Applevangelist 5d00a2d806 xxx 2024-04-18 14:41:44 +02:00
Applevangelist 465c395294 SPAWN - Allow setting of "hidden" options 2024-04-18 14:41:29 +02:00
Applevangelist 5adb943939 SPAWN 2024-04-18 13:52:10 +02:00
Applevangelist 13309663fb Merge remote-tracking branch 'origin/develop' into develop 2024-04-18 09:33:16 +02:00
Applevangelist 4baa593fde Merge remote-tracking branch 'origin/master' into develop 2024-04-18 09:33:11 +02:00
Applevangelist 186b64ea81 #CTLD 2024-04-18 09:32:27 +02:00
Applevangelist 7c4d640690 Merge remote-tracking branch 'origin/master' into develop 2024-04-18 09:30:56 +02:00
Applevangelist 73bddddba4 #CTLD - ensure extracting troops are not diverted 2024-04-18 09:30:35 +02:00
Applevangelist 743baac945 Small fix for callsign not traversing from Squadron to Flightgroup 2024-04-16 16:01:43 +02:00
Applevangelist 0764d076db Housekeeping 2024-04-16 08:46:06 +02:00
Applevangelist c9fd56116e Housekeeping 2024-04-16 08:45:53 +02:00
Applevangelist e21240e711 Merge remote-tracking branch 'origin/develop' into develop 2024-04-15 18:56:07 +02:00
Applevangelist 99d32a7854 Merge remote-tracking branch 'origin/master' into develop 2024-04-15 18:56:03 +02:00
Applevangelist 620df5ad3e xx 2024-04-15 18:54:59 +02:00
Applevangelist 504aa19c03 Merge remote-tracking branch 'origin/master' into develop 2024-04-15 18:54:46 +02:00
Applevangelist 9a3effd063 Docu 2024-04-15 18:54:22 +02:00
Applevangelist d4a49ae68b #CLIENTMENU/MANAGER 
* Attempt to avoid dual menu builds for multi-seated aircraft
 2024-04-15 12:52:19 +02:00
Applevangelist b9cb6dbffb xxx 2024-04-15 12:50:15 +02:00
Applevangelist be85aab755 Merge remote-tracking branch 'origin/develop' into develop 2024-04-15 08:59:15 +02:00
Applevangelist fcb7a2c3e7 Merge remote-tracking branch 'origin/master' into develop 2024-04-15 08:59:11 +02:00
Applevangelist ca1018f80b Merge remote-tracking branch 'origin/master' into develop 2024-04-15 08:58:37 +02:00
Niels Vaes b9bd8d88a9 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. (#2109) 
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`
 2024-04-15 08:57:28 +02:00
Applevangelist 6b7e66efa5 Merge remote-tracking branch 'origin/master' into develop 2024-04-04 17:23:08 +02:00
Applevangelist 18fd587ab0 xx 2024-04-04 17:22:46 +02:00
Applevangelist 483cf09676 xxx 2024-04-02 13:23:36 +02:00
Applevangelist 181ed6046e Merge remote-tracking branch 'origin/master' into develop 2024-04-02 13:23:21 +02:00
Applevangelist ba14330281 Fix for counting alive target units only 2024-04-02 13:22:54 +02:00