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
7938b8245e Merge remote-tracking branch 'origin/develop' into develop 2023-12-27 19:29:16 +01:00
Applevangelist
8c684c2f54 Merge remote-tracking branch 'origin/master' into develop 2023-12-27 19:29:12 +01:00
Applevangelist
b488d43d78 Merge remote-tracking branch 'origin/master' into develop 2023-12-27 19:28:49 +01:00
Applevangelist
6ac46addf0 #SET 
* Added `FilterFunction()` for these SETs: UNIT, GROUP, CLIENT, STATIC
 2023-12-27 19:28:19 +01:00
Applevangelist
ec9119d1d0 xxx 2023-12-27 19:27:40 +01:00
Applevangelist
7aa150f287 Merge remote-tracking branch 'origin/develop' into develop 2023-12-26 19:19:45 +01:00
Applevangelist
853ecf9add Merge remote-tracking branch 'origin/master' into develop 2023-12-26 19:19:39 +01:00
Applevangelist
2be85fb187 CTLD 2023-12-26 19:19:10 +01:00
Applevangelist
33259be4d9 Merge remote-tracking branch 'origin/develop' into develop 2023-12-26 19:18:54 +01:00
Applevangelist
e4cea7b3c4 Merge remote-tracking branch 'origin/master' into develop 2023-12-26 19:18:36 +01:00
Applevangelist
3bdf4b4c76 #CTLD 
* Fix multi-crate requests deducting too much Stock
 2023-12-26 19:18:13 +01:00
kaltokri
6f5f89a0ee Merge branch 'master' into develop 2023-12-26 14:51:28 +01:00
kaltokri
46f70dd8a6 Fixed logic in SoundOutput.lua to play internal sound files with SRS 2023-12-26 14:50:54 +01:00
Thomas
e2e9bd7de0
Update EasyGCICAP.lua 2023-12-26 08:53:11 +01:00
Frank
1b01b89343 TARGET 
- Fixed IsAlive
 2023-12-25 23:12:55 +01:00
Applevangelist
4e36ed170b Merge remote-tracking branch 'origin/develop' into develop 2023-12-25 13:59:27 +01:00
Applevangelist
bf0ad93bf7 AICSAR Fix 2023-12-25 13:59:23 +01:00
Thomas
a51afeda14
Update build-includes.yml 2023-12-25 13:31:35 +01:00
Applevangelist
e46b148721 SRS 2023-12-25 13:28:00 +01:00
Applevangelist
8765ebe2c6 Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	.github/workflows/build-includes.yml
 2023-12-25 13:22:47 +01:00
Applevangelist
b55b11be09 Merge remote-tracking branch 'origin/master' into develop 2023-12-25 13:22:16 +01:00
Thomas
2a7dbad02a
Update build-includes.yml 2023-12-25 13:21:51 +01:00
Thomas
aeac2eb3d7
Update build-includes.yml 2023-12-25 13:20:13 +01:00
Thomas
e83c8c3ee0
Update build-includes.yml (#2078) 2023-12-25 13:14:46 +01:00
Applevangelist
d65042c640 SRS error from luacheck 2023-12-25 13:12:03 +01:00
Thomas
c72cdd8f0b
Update build-includes.yml (#2077) 2023-12-25 13:08:21 +01:00
Thomas
7e2f8771b5
Update build-includes.yml (#2076) 2023-12-25 13:01:59 +01:00
Applevangelist
3ccfcdbd0f CSAR 2023-12-25 13:00:36 +01:00
Thomas
44b3f41ae4
Update build-includes.yml (#2075) 2023-12-25 12:49:54 +01:00
Thomas
c5dec374c8
Update build-includes.yml (#2074) 2023-12-25 12:40:33 +01:00
Thomas
3f384d72ab
Update build-includes.yml (#2073) 2023-12-25 12:38:18 +01:00
Thomas
1d5952b4a5
Update build-includes.yml (#2072) 2023-12-25 12:34:57 +01:00
Thomas
8eec7fcc9e
Update build-includes.yml (#2071) 2023-12-25 12:29:40 +01:00
Applevangelist
0f57901b70 Merge remote-tracking branch 'origin/develop' into develop 2023-12-25 12:16:17 +01:00
Applevangelist
1ec5721198 Merge remote-tracking branch 'origin/master' into develop 2023-12-25 12:16:10 +01:00
Applevangelist
db7e94d879 New SRS Fixes 2023-12-25 12:14:57 +01:00
Applevangelist
16f3dcbbb4 New SRS fixes 2023-12-25 12:14:41 +01:00
Applevangelist
d010c3a9fa New SRS fixes 2023-12-25 12:14:18 +01:00
Applevangelist
c43e6f44fe Merge remote-tracking branch 'origin/develop' into develop 2023-12-25 11:44:59 +01:00
Applevangelist
c9b0632a46 Merge remote-tracking branch 'origin/master' into develop 2023-12-25 11:44:55 +01:00
kaltokri
f482dac491 Merge branch 'master' into develop 2023-12-25 11:28:19 +01:00
kaltokri
f6f3189504 MSRS enhancements 
- Added more tracing
- A check if executable exists
- Removed STTS references
 2023-12-25 11:27:48 +01:00
Applevangelist
d855788e19 Merge remote-tracking branch 'origin/develop' into develop 2023-12-25 11:08:03 +01:00
Applevangelist
e9d9578eee Merge remote-tracking branch 'origin/master' into develop 2023-12-25 11:07:59 +01:00
Applevangelist
e913e83596 xxx 2023-12-25 11:07:39 +01:00
kaltokri
73fa021476 Merge branch 'master' into develop 
# Conflicts:
#	Moose Development/Moose/Sound/SRS.lua
 2023-12-25 09:41:57 +01:00
kaltokri
071554bfc5 Fixed some small typos and removed STTS in comments 2023-12-25 09:39:21 +01:00
kaltokri
cd8abd97c5 Merge branch 'master' into develop 
# Conflicts:
#	Moose Development/Moose/Sound/SRS.lua
 2023-12-25 06:13:40 +01:00
kaltokri
1527b53c76 Fixed ASW typo in SRS.lua 2023-12-25 06:09:31 +01:00
kaltokri
e25eeee0cc Merge branch 'master' into develop 2023-12-25 06:00:55 +01:00