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
9,432 Commits 10 Branches 87 Tags
Commit Graph

9432 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Applevangelist
3595afe0cc #DATABASE- stage 1 fix for dynamic client slots 2024-07-14 17:49:25 +02:00
Applevangelist
cfc0cc66b2 xxx 2024-07-14 17:48:48 +02:00
Applevangelist
2442adfd2f Merge remote-tracking branch 'origin/master' into develop 2024-07-13 15:22:18 +02:00
Applevangelist
a833703731 xx 2024-07-13 15:21:51 +02:00
Applevangelist
0b21cb687e Various fixes 2024-07-13 15:21:35 +02:00
Applevangelist
af85745433 CONTROLLABLE:TaskLandAtVec2( Vec2, Duration , CombatLanding, DirectionAfterLand) 2024-07-12 19:33:35 +02:00
Applevangelist
ef58cae59f Merge remote-tracking branch 'origin/master' into develop 2024-07-12 19:33:17 +02:00
Applevangelist
8a21fe80de #CONTROLLABLE - Added combat and direction options in CONTROLLABLE:TaskLandAtVec2( Vec2, Duration , CombatLanding, DirectionAfterLand) 2024-07-12 19:32:55 +02:00
Applevangelist
86fc8db9e6 #AUFTRAG LANDATCOORDINATE - added combat land options 2024-07-12 19:32:24 +02:00
Applevangelist
7bc7fee6d7 Merge remote-tracking branch 'origin/develop' into develop 2024-07-12 13:38:35 +02:00
Applevangelist
46c5b50077 Merge remote-tracking branch 'origin/master' into develop 2024-07-12 13:38:30 +02:00
Applevangelist
5c54f47527 Merge remote-tracking branch 'origin/master' into develop 2024-07-12 13:37:46 +02:00
Applevangelist
51eb3a2e82 #AIRBASE - corrections for South Atlantic/Falklands 2024-07-12 13:37:04 +02:00
Applevangelist
d9aad161b0 Merge remote-tracking branch 'origin/develop' into develop 2024-07-12 13:31:21 +02:00
Applevangelist
fea2098c40 Merge remote-tracking branch 'origin/master' into develop 2024-07-12 13:31:17 +02:00
Applevangelist
03f8b1e301 Merge remote-tracking branch 'origin/master' into develop 2024-07-12 13:30:51 +02:00
Applevangelist
ec8bfb32b4 events 2024-07-12 13:30:29 +02:00
Applevangelist
d298ed2a83 Merge remote-tracking branch 'origin/develop' into develop 2024-07-12 12:20:53 +02:00
Applevangelist
515ac2c060 Merge remote-tracking branch 'origin/master' into develop 2024-07-12 12:20:50 +02:00
Applevangelist
6a31e47705 Merge remote-tracking branch 'origin/master' into develop 2024-07-12 12:20:16 +02:00
Applevangelist
e6dda35f3d Typos 2024-07-12 12:19:58 +02:00
Applevangelist
70e4454fa9 Merge remote-tracking branch 'origin/develop' into develop 2024-07-12 11:46:38 +02:00
Applevangelist
82b4f4ee58 Merge remote-tracking branch 'origin/master' into develop 2024-07-12 11:46:35 +02:00
Applevangelist
925233709b xx 2024-07-12 11:46:12 +02:00
Applevangelist
0af15699f3 Merge remote-tracking branch 'origin/master' into develop 2024-07-12 11:45:53 +02:00
Applevangelist
9d2896d088 EVENTS - additional events from last release 2024-07-12 11:44:24 +02:00
Applevangelist
5b596516fe Merge remote-tracking branch 'origin/master' into develop 2024-07-12 11:37:27 +02:00
Applevangelist
036cc9d211 #Afghanistan additions 2024-07-12 11:36:43 +02:00
Applevangelist
df6c97bec8 #EASYGCICAP - avoid launching intercepts if airwing conquered by other coalition 2024-07-12 09:36:29 +02:00
Applevangelist
c7e73f3b1a #EASYGCICAP - fix launching interceptors from conquered, wrong coalition wings 2024-07-12 08:38:42 +02:00
Applevangelist
ccc7b431dc Merge remote-tracking branch 'origin/develop' into develop 2024-07-12 08:10:24 +02:00
Applevangelist
079e60163d Merge remote-tracking branch 'origin/master' into develop 2024-07-12 08:10:20 +02:00
Applevangelist
29fb03e903 xx 2024-07-12 08:09:59 +02:00
Applevangelist
6e917049af Merge remote-tracking branch 'origin/master' into develop 2024-07-12 08:09:39 +02:00
Applevangelist
e6484c1598 various 2024-07-12 08:08:57 +02:00
Applevangelist
c8d49916df #RAT - dimensions workaround for Saab 340 2024-07-12 08:08:32 +02:00
Applevangelist
32297da2b0 #AWACS - MS TTS - fix spelling out B-R-A in Threat call 2024-07-11 08:35:32 +02:00
Applevangelist
336ac9eddb #AWACS - MS TTS - fix spelling out B-R-A in Threat call 2024-07-11 08:35:16 +02:00
Applevangelist
1d64ac3469 Merge remote-tracking branch 'origin/develop' into develop 2024-07-09 11:32:28 +02:00
Applevangelist
26adb7934e Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Core/Message.lua
 2024-07-09 11:32:23 +02:00
Applevangelist
c51a6da5ff Merge remote-tracking branch 'origin/develop' into develop 2024-07-09 11:31:33 +02:00
Applevangelist
5629a8fcd6 Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Core/Message.lua
 2024-07-09 11:31:29 +02:00
Applevangelist
65c7b0d12f Docu fixes 2024-07-09 11:30:41 +02:00
Frank
1a0e2e0ea1 OPS 
- Added method to reduce asset count for cohorts #2103
- Added tacview on legion level
 2024-07-07 23:15:20 +02:00
Frank
f74c0e29a5 Merge branch 'master' into develop 2024-07-07 11:32:08 +02:00
Frank
9f8e7f4f3c
Merge pull request #2144 from FlightControl-Master/FF/MasterDevel 
RANGE
 2024-07-07 11:05:05 +02:00
Frank
b215d0e7d4 Update Range.lua 
- reduced initial status update
 2024-07-07 11:03:03 +02:00
Frank
6f3d9a497a Update Chief.lua 
- Added unsupported mission type for OPSZONE to error log output
 2024-07-06 21:51:20 +02:00
Frank
13b272b6e5 Update Range.lua 
Allow zone to be a string in RANGE:SetRangeZone
 2024-07-06 21:48:07 +02:00
Frank
f9031dba42 Merge branch 'master' into FF/MasterDevel 2024-07-06 19:15:05 +02:00