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

9829 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Applevangelist dfe2ed2a98 #EVENT - Fix for TgtUnit Name being unobtainable 2024-10-29 13:57:21 +01:00
Applevangelist 20b0902768 xxx 2024-10-29 13:56:28 +01:00
Applevangelist 6a219ab547 Merge remote-tracking branch 'origin/develop' into branch 2024-10-29 13:20:25 +01:00
Applevangelist fd06ce8967 Merge remote-tracking branch 'origin/master' into branch 2024-10-29 13:20:17 +01:00
Applevangelist bb5c044a25 Merge remote-tracking branch 'origin/master' into develop 2024-10-29 13:19:40 +01:00
Applevangelist be87103b53 #CTLD - fixed a collision when extracting on a possible distance key duplication 2024-10-29 13:18:55 +01:00
Applevangelist 9d46968103 xxx 2024-10-29 13:18:00 +01:00
Applevangelist a012184dfe Merge remote-tracking branch 'origin/develop' into branch 2024-10-29 11:39:02 +01:00
Applevangelist 972e3550f6 Merge remote-tracking branch 'origin/master' into branch 
# Conflicts:
#	Moose Development/Moose/Functional/ATC_Ground.lua
 2024-10-29 11:38:53 +01:00
Applevangelist 8a83f69e9c xxx 2024-10-29 11:38:06 +01:00
Applevangelist 54f7627f9c Merge remote-tracking branch 'origin/master' into develop 2024-10-29 11:37:44 +01:00
Applevangelist 2fb460c4bb #ATC_Ground - stop kicking players immediately for speeding 2024-10-29 11:37:06 +01:00
Applevangelist 1b3c94cc57 Merge remote-tracking branch 'origin/master' into develop 2024-10-27 13:25:41 +01:00
Applevangelist 216ea230a8 #BASE - Roll back to "old" serialize method for Trace 2024-10-27 13:25:13 +01:00
Applevangelist 98a82c5959 xx 2024-10-27 13:24:45 +01:00
Applevangelist ebc7902775 Merge remote-tracking branch 'origin/develop' into branch 2024-10-26 18:46:39 +02:00
Applevangelist 7e727620a4 Merge remote-tracking branch 'origin/develop' into develop 2024-10-26 18:45:45 +02:00
Applevangelist 13ec9bcdd4 Merge remote-tracking branch 'origin/master' into develop 2024-10-26 18:45:40 +02:00
Applevangelist 90096163ee EPLRS - give group ID only if ground 2024-10-26 18:45:01 +02:00
Thomas d2564d4a54 Merge pull request #2183 from FlightControl-Master/master 
Merge from master
 2024-10-21 11:35:35 +02:00
Thomas cd178d6a8c Merge pull request #2182 from FlightControl-Master/Applevangelist-patch-1 
Update MarkerOps_Base.lua
 2024-10-21 11:33:14 +02:00
Thomas 2aa0b5ddfb Update MarkerOps_Base.lua 
Added data to FSM events
 2024-10-21 11:32:47 +02:00
Applevangelist 0473276c88 Merge remote-tracking branch 'origin/develop' into branch 2024-10-11 08:07:15 +02:00
Applevangelist 0b30ec7436 Merge remote-tracking branch 'origin/master' into branch 2024-10-11 08:07:05 +02:00
Applevangelist cf6e026392 Merge remote-tracking branch 'origin/master' into develop 2024-10-11 08:06:29 +02:00
Applevangelist 37f819458a #AIRBOSS - Change event Land to event RunwayTouch 2024-10-11 08:06:05 +02:00
Applevangelist 84e7efc939 Merge remote-tracking branch 'origin/develop' into branch 2024-10-08 10:06:27 +02:00
Applevangelist 8bdf57d7cb Merge remote-tracking branch 'origin/master' into branch 2024-10-08 10:06:23 +02:00
Applevangelist 16fb0c3081 Merge remote-tracking branch 'origin/master' into develop 2024-10-08 10:05:56 +02:00
Applevangelist 168f4301d2 #GROUP - extended options to create callsigns for TTS with own function 2024-10-08 10:05:31 +02:00
Applevangelist 9fb03d9d8a xx 2024-10-08 10:04:05 +02:00
Applevangelist d613f59ca8 #AWACS Added an option to set own function to create player callsigns from group or playernames 2024-10-08 10:03:45 +02:00
Applevangelist 508decd91b Merge remote-tracking branch 'origin/develop' into branch 2024-10-03 14:08:32 +02:00
Applevangelist ff366fde74 Merge remote-tracking branch 'origin/master' into branch 
# Conflicts:
#	Moose Development/Moose/Sound/SRS.lua
 2024-10-03 14:08:26 +02:00
Applevangelist d89ed535b7 Merge remote-tracking branch 'origin/master' into develop 2024-10-03 14:06:42 +02:00
Applevangelist 08b4b890ce #AWACS - added option to increase mission range from 100nm as default 2024-10-03 14:06:26 +02:00
Applevangelist d5a406c60f #MSRS experimental - option to use PowerShell to execute SRS-TTS - set MSRS.UsePowerShell = true to test it. Known issue - PS window does not close until everything is executed. 2024-10-03 14:05:51 +02:00
Applevangelist cb16210577 #SEAD - better event management of weapons, return earlier if no (H)ARM, return if SEAD Plane is nil 2024-10-03 14:03:06 +02:00
Applevangelist 2dce709db1 Some fixes 2024-10-03 14:02:14 +02:00
Applevangelist cc99a5ba2a Merge remote-tracking branch 'origin/master' into branch 2024-10-01 12:10:47 +02:00
Applevangelist 8c0e0de45f xx 2024-10-01 12:10:21 +02:00
Applevangelist e0bf137d70 Merge remote-tracking branch 'origin/develop' into branch 2024-10-01 12:09:46 +02:00
Applevangelist ef4f1a87da Merge remote-tracking branch 'origin/master' into branch 2024-10-01 12:09:30 +02:00
Applevangelist 3524cba4ef xx 2024-10-01 12:08:51 +02:00
Applevangelist df6a37a972 Merge remote-tracking branch 'origin/develop' into develop 2024-10-01 12:06:24 +02:00
Applevangelist 13600ff6fd Merge remote-tracking branch 'origin/master' into develop 2024-10-01 12:06:17 +02:00
Applevangelist 8ede1fb351 #DCS 2.9.8.1107 airbase updates 2024-10-01 12:03:00 +02:00
Frank a957bb4968 Merge branch 'master' into develop 2024-10-01 09:08:03 +02:00
Frank 5f8d1cf5b0 Update Warehouse.lua 
- Added check for incorrect plane attribute
 2024-10-01 09:07:51 +02:00
Thomas a115267e08 Merge pull request #2181 from DarthZyll/patch-6 
Update CSAR.lua - Updated correct type name for Kiowa to OH58D
 2024-10-01 06:19:29 +02:00