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

8753 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Applevangelist
fa3a805172 Merge remote-tracking branch 'origin/develop' into develop 2024-03-10 16:53:34 +01:00
Applevangelist
b7ef0e57ab Merge remote-tracking branch 'origin/master' into develop 2024-03-10 16:53:31 +01:00
Applevangelist
408321decf Merge remote-tracking branch 'origin/master' into develop 2024-03-10 16:53:05 +01:00
Applevangelist
11acb578f6 #SPAWN 
* Fix an issue for SPAWN:NewFromTemplate when re-using same template over and again
 2024-03-10 16:52:46 +01:00
Applevangelist
5881aa0ad3 #SPAWN 
* Fix an issue for SPAWN:NewFromTemplate when re-using same template over and again
 2024-03-10 16:52:03 +01:00
Applevangelist
755dde8e10 Merge remote-tracking branch 'origin/develop' into develop 2024-03-10 16:20:59 +01:00
Applevangelist
1856f89cf9 Merge remote-tracking branch 'origin/master' into develop 2024-03-10 16:20:56 +01:00
Applevangelist
383eff4cd6 Merge remote-tracking branch 'origin/develop' into develop 2024-03-10 16:20:32 +01:00
Applevangelist
6cda61c9dd Merge remote-tracking branch 'origin/master' into develop 2024-03-10 16:20:29 +01:00
Applevangelist
4d8abe7f57 #MARKEROPS_BASE 
* Fix event coalition
 2024-03-10 16:20:06 +01:00
Applevangelist
fc5d540ec6 #MARKEROPS 
* Coalition in events fix
 2024-03-10 16:19:29 +01:00
Applevangelist
032e73d382 Merge remote-tracking branch 'origin/develop' into develop 2024-03-09 17:24:58 +01:00
Applevangelist
c6bb7c8bbd Merge remote-tracking branch 'origin/develop' into develop-2 2024-03-09 17:24:47 +01:00
Applevangelist
bd3042410b ccc 2024-03-09 17:24:32 +01:00
Applevangelist
7c9cf96d2e OPSGROUP extra check 2024-03-09 17:24:15 +01:00
Applevangelist
5bf70d9950 Merge remote-tracking branch 'origin/develop' into develop 2024-03-08 10:07:30 +01:00
Applevangelist
94ca67feb9 Merge remote-tracking branch 'origin/master' into develop 2024-03-08 10:07:26 +01:00
Applevangelist
ef30bd36a5 Merge remote-tracking branch 'origin/master' into develop 2024-03-08 10:06:51 +01:00
Applevangelist
5286926609 xx 2024-03-08 10:06:31 +01:00
Applevangelist
ab14fbd11c #MARKEROPS - Added Coalition on FSM events 2024-03-08 10:06:16 +01:00
Applevangelist
1ef50f45f1 Merge remote-tracking branch 'origin/develop' into develop 2024-03-07 10:21:23 +01:00
Applevangelist
d76cd91d50 Merge remote-tracking branch 'origin/master' into develop 2024-03-07 10:21:19 +01:00
Applevangelist
5bde0c7605 Merge remote-tracking branch 'origin/develop' into develop 2024-03-07 10:20:56 +01:00
Applevangelist
4f2d8144e9 Merge remote-tracking branch 'origin/master' into develop 2024-03-07 10:20:53 +01:00
Applevangelist
cb61177252 CSAR/CTLD basic support for MH-60R 2024-03-07 10:20:31 +01:00
Applevangelist
d7fd9d0968 xxx 2024-03-07 10:20:02 +01:00
kaltokri
736204d163 Merge branch 'master' into develop 2024-03-05 22:29:36 +01:00
kaltokri
1e15509001 Fixed broken link to demo mission 2024-03-05 22:29:28 +01:00
kaltokri
cca6b0cf55 Merge branch 'master' into develop 2024-03-05 22:11:34 +01:00
kaltokri
bfa8719ec3 Updated versions of all GitHub actions 2024-03-05 22:11:20 +01:00
Applevangelist
9e112e6f2c Merge remote-tracking branch 'origin/develop' into develop 2024-03-05 16:39:32 +01:00
Applevangelist
a51329d3e7 xxx 2024-03-05 16:39:08 +01:00
Applevangelist
fd0e6053ee #COMMANDER - remove dual AltToKIAS calc for TankerZone etc 2024-03-05 16:38:45 +01:00
Applevangelist
f99eac0de4 Merge remote-tracking branch 'origin/develop' into develop 2024-03-05 10:35:23 +01:00
Applevangelist
89b06fb7a6 Merge remote-tracking branch 'origin/master' into develop 2024-03-05 10:35:18 +01:00
Applevangelist
7a19a81985 Merge remote-tracking branch 'origin/develop' into develop 2024-03-05 10:34:50 +01:00
Applevangelist
e359640bfd Merge remote-tracking branch 'origin/master' into develop 2024-03-05 10:34:46 +01:00
Applevangelist
b3f7991269 xxx 2024-03-05 10:34:27 +01:00
Applevangelist
3652376d42 #CTLD - Slight position spawn variation in case you drop > 1 troop groups 2024-03-05 10:34:15 +01:00
kaltokri
3d1207a079 Merge branch 'master' into develop 2024-03-02 15:07:53 +01:00
kaltokri
3953f0e7fc Moved demo missions of Wrapper.Weapon to new repo 2024-03-02 15:07:45 +01:00
Applevangelist
1f18b6e2a9 Merge remote-tracking branch 'origin/develop' into develop 2024-03-02 14:27:02 +01:00
Applevangelist
43bc4ba681 Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Core/SpawnStatic.lua
 2024-03-02 14:26:58 +01:00
Applevangelist
b34597d732 xxx 2024-03-02 14:25:56 +01:00
Applevangelist
3e727f7777 Merge remote-tracking branch 'origin/develop' into develop 2024-03-02 14:25:42 +01:00
Applevangelist
5621579b5e fix 2024-03-02 14:24:55 +01:00
Applevangelist
091083b5aa #AWACS 
* Fix tac radios when using an AWACS plane
* AWACS info shows STN set
 2024-03-02 14:24:39 +01:00
kaltokri
b0d0fb9ae1 Merge branch 'master' into develop 2024-03-01 17:22:33 +01:00
kaltokri
57ce6bcec2 Switched demo mission link in Core/SpawnStatic and Wrapper/Storage 2024-03-01 17:22:22 +01:00
Applevangelist
503ca091f9 Merge remote-tracking branch 'origin/develop' into develop 2024-03-01 08:35:48 +01:00