FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,799 Commits 10 Branches 87 Tags
Commit Graph

8799 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
73bddddba4 #CTLD - ensure extracting troops are not diverted 2024-04-18 09:30:35 +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
Applevangelist
8ca9c4e7b8 Merge remote-tracking branch 'origin/develop' into develop 2024-04-02 10:50:06 +02:00
Applevangelist
bd28c10492 Merge remote-tracking branch 'origin/master' into develop 2024-04-02 10:50:01 +02:00
Applevangelist
4c890d18d1 Merge remote-tracking branch 'origin/master' into develop 2024-04-02 10:48:57 +02:00
Applevangelist
2eb4118d56 xxx 2024-04-02 10:47:58 +02:00
Applevangelist
67d53034df bugfix 2024-04-01 19:11:53 +02:00
Applevangelist
355230a97f xxx 2024-04-01 19:11:33 +02:00
Applevangelist
bde5859879 Merge remote-tracking branch 'origin/develop' into develop 2024-04-01 13:30:30 +02:00
Applevangelist
630e02f1ce Merge remote-tracking branch 'origin/master' into develop 2024-04-01 13:30:26 +02:00
Applevangelist
b4d1118c88 Merge remote-tracking branch 'origin/master' into develop 2.9.5 2024-04-01 12:59:39 +02:00
Applevangelist
dcc15afb89 xxx 2024-04-01 12:59:14 +02:00
Applevangelist
1ea2f091e0 Fix 2024-04-01 12:58:20 +02:00
Applevangelist
7aa252e42f xxx 2024-03-28 11:13:13 +01:00
Applevangelist
be3db86470 Merge remote-tracking branch 'origin/master' into develop 2024-03-28 11:12:57 +01:00
Applevangelist
67b43e2c68 #CTLD - Extract troops makes troops run towards the helo 2024-03-28 11:12:23 +01:00
Applevangelist
577fefab3a Merge remote-tracking branch 'origin/master' into develop 2024-03-28 08:45:18 +01:00
Applevangelist
2ad111dd50 #CTLD - allow availability of crates restriction to one zone 2024-03-28 08:44:54 +01:00
Applevangelist
a52df9ae9a xxx 2024-03-28 08:44:12 +01:00
Applevangelist
1b072e11ad xxx 2024-03-27 18:00:50 +01:00
Applevangelist
0dec9418ca Merge remote-tracking branch 'origin/develop' into develop 2024-03-27 14:41:48 +01:00
Applevangelist
9a2174ac2b Merge remote-tracking branch 'origin/master' into develop 2024-03-27 14:41:43 +01:00
Applevangelist
523375c765 Merge remote-tracking branch 'origin/master' into develop 2024-03-27 14:41:11 +01:00
Applevangelist
371b100672 xxx 2024-03-27 14:40:47 +01:00
Applevangelist
ac42b56b8e nil check 2024-03-27 14:40:34 +01:00
Applevangelist
eac87c97af Merge remote-tracking branch 'origin/develop' into develop 2024-03-25 18:26:49 +01:00
Applevangelist
00dc9969b6 Merge remote-tracking branch 'origin/master' into develop 2024-03-25 18:26:45 +01:00
Applevangelist
5b8416d5fd Merge remote-tracking branch 'origin/master' into develop 2024-03-25 18:26:17 +01:00
Niels Vaes
874fa7ad69
Fixing a bug where on a rare condition, an A10CII could be spawned and the SpawnInitSADL of the Spawn object wouldn't be set correctly (#2108) 2024-03-25 17:26:44 +01:00
Frank
a105ddba3d Merge branch 'master' into develop 2024-03-24 17:58:13 +01:00
Frank
70c29de695 Update Airbase.lua 
- Fixed docs of airbase enumerators for SouthAtlantic (was Falklands) and Sinai (was SinaiMap)
 2024-03-24 17:58:02 +01:00
Applevangelist
f3ec69ac2a Merge remote-tracking branch 'origin/develop' into develop 2024-03-24 13:27:52 +01:00