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

6289 Commits

Author SHA1 Message Date
Applevangelist
4762b88980 AVoid for pairs error 2024-01-19 19:06:34 +01:00
Applevangelist
f5f86e9ba6 xxx 2024-01-18 14:27:09 +01:00
Applevangelist
90d825c809 xxx 2024-01-17 12:13:41 +01:00
Applevangelist
68756681fa #PLAYERTASKCONTROLLER 
* Additions for lasing unit being an ARMYGROUP
 2024-01-17 08:10:17 +01:00
Applevangelist
5c90afea76 xxx 2024-01-16 15:06:54 +01:00
Applevangelist
601c8165d8 Minor changes 2024-01-14 14:57:07 +01:00
Applevangelist
0bf1204499 Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Core/Set.lua
#	Moose Development/Moose/Functional/Artillery.lua
 2024-01-12 18:47:28 +01:00
Applevangelist
36a6d5fede xxx 2024-01-12 18:42:26 +01:00
Rolf Geuenich
bb07e1935e Downpatching changes from development to master 2024-01-12 16:05:14 +01:00
Rolf Geuenich
088436c5ce Downpatching changes from development to master in Arty.lua 2024-01-12 15:44:28 +01:00
Rolf Geuenich
797bf0047b Down patching of code enhancements from develop to master in Set.lua 2024-01-12 15:33:27 +01:00
Applevangelist
4dd6b956aa Merge remote-tracking branch 'origin/master' into develop 2024-01-11 17:32:41 +01:00
Applevangelist
f29d055ca3 Correction 2024-01-11 17:31:40 +01:00
Applevangelist
1468641563 CTLD - avoid UHT beacons between 243 and 320 mHz 2024-01-11 17:14:07 +01:00
Applevangelist
aedd2a6391 #EASYGCICAP 
* Added assignment of in-flight groups to intercepts
 2024-01-11 16:10:40 +01:00
Applevangelist
c2d5f9f428 Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	Moose Development/Moose/Modules.lua
 2024-01-11 12:53:39 +01:00
Applevangelist
54b49ff0d6 Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Modules.lua
 2024-01-11 12:53:30 +01:00
Applevangelist
4d7d34b71f Merge remote-tracking branch 'origin/master' into develop 2024-01-11 12:52:42 +01:00
Applevangelist
82bea9d5ff Merge remote-tracking branch 'origin/develop' into develop 2024-01-11 12:52:19 +01:00
Applevangelist
35d91c9c94 EASYGCICAP Additions 2024-01-11 12:52:15 +01:00
Applevangelist
8b08942c4d CONTROLLABLE - Added options for Radar Using 2024-01-11 12:52:02 +01:00
Applevangelist
5680344dfd EASYGCICAP Additions 2024-01-11 12:51:36 +01:00
kaltokri
a44ad5c755 Changed order to match master branch for better auto-merge 2024-01-11 10:05:22 +01:00
kaltokri
b7236eeb58 Merge branch 'master' into develop 2024-01-10 15:43:38 +01:00
kaltokri
eb84ad3cee Fix for Moose_Create.lua and dynamic path 2024-01-10 15:43:24 +01:00
kaltokri
21babb548c Fixed typo off manual merge and added PyCharm to gitignore 2024-01-10 15:39:23 +01:00
Applevangelist
11967bd608 Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	Moose Development/Moose/Modules.lua
 2024-01-10 15:21:16 +01:00
Applevangelist
ea6e63dc9b Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Modules.lua
#	Moose Development/Moose/Ops/Airboss.lua
 2024-01-10 15:20:29 +01:00
Applevangelist
28c8d99878 Added player name to ...PilotDown() event 2024-01-10 15:18:38 +01:00
Applevangelist
b0e0926b70 Added player name to ...PilotDown() event 2024-01-10 15:17:24 +01:00
kaltokri
547579ffb0 Merge branch 'master' into develop 
# Conflicts:
#	Moose Development/Moose/Modules.lua
#	Moose Development/Moose/Ops/Airboss.lua
 2024-01-10 14:26:55 +01:00
kaltokri
4fda8cc5fb Easy debugging for all Moosers #2093 
Enables everybody to use load Moose from an external full path.
This is needed to use PyCharm with EmmyLua Debugger.
Needs also De-Sanitize to load mission script with full path.
 2024-01-10 14:12:17 +01:00
Applevangelist
27158ee7e8 xxx 2024-01-10 13:38:59 +01:00
Applevangelist
697042eac6 EASYGCICAP - less noise 2024-01-10 13:38:48 +01:00
Applevangelist
b1be1f5f71 Merge remote-tracking branch 'origin/develop' into develop 2024-01-09 17:48:54 +01:00
Applevangelist
30d6936f1d MSRS changes 2024-01-09 17:47:14 +01:00
Applevangelist
4ac583e434 SRS changes 2024-01-09 17:28:58 +01:00
Applevangelist
7995940579 SRS changes 2024-01-09 17:27:26 +01:00
Applevangelist
3ffdb4fe4b Merge remote-tracking branch 'origin/develop' into develop 2024-01-09 08:59:47 +01:00
Applevangelist
9211770056 xx 2024-01-09 08:58:22 +01:00
Applevangelist
b315375ade xxx 2024-01-09 08:58:07 +01:00
Applevangelist
57919704be Merge remote-tracking branch 'origin/develop' into develop 2024-01-07 18:08:34 +01:00
Frank
e26647c2ca OPSTRANSPORT 
- Fixed SET not working with FilterActive
 2024-01-07 17:24:51 +01:00
Applevangelist
4ddd278471 #AWACS 
* Picture clean, correct order of callsigns
 2024-01-07 15:40:17 +01:00
Applevangelist
20f881f0a9 #AWACS 
* Picture clean, correct order of callsigns
 2024-01-07 15:40:08 +01:00
Applevangelist
7275a934a2 Merge remote-tracking branch 'origin/develop' into develop 2024-01-07 14:45:38 +01:00
Applevangelist
6a54056ec8 Merge remote-tracking branch 'origin/master' into develop 2024-01-07 14:45:34 +01:00
Applevangelist
e5658b3298 xxx 2024-01-07 14:45:10 +01:00
Applevangelist
72e31b90a9 Merge remote-tracking branch 'origin/master' into develop 2024-01-07 14:44:45 +01:00
Applevangelist
fa762fe0fc #MSRS 
* Added voice enumerator ofr gRPC using MS as provider MSRS.Voices.MicrosoftGRPC
 2024-01-07 14:44:07 +01:00