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

8149 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Applevangelist
fc44894bc0 Merge remote-tracking branch 'origin/master' into develop 2023-09-13 15:31:50 +02:00
Applevangelist
cf34e7f165 docu 2023-09-13 15:31:07 +02:00
Frank
3e2d312202 Merge branch 'master' into develop 2023-09-13 11:11:43 +02:00
Frank
5aa8338c59 Update Airboss.lua 
- Adjust into wind angle
 2023-09-13 11:10:35 +02:00
Frank
6ccfd499c8 Update SRS.lua 
- Fixed bug in GRPC backend
 2023-09-10 22:42:39 +02:00
Frank
468a8fed8b Merge branch 'master' into develop 2023-09-10 22:40:17 +02:00
Frank
1362fe9019 Update SRS.lua 2023-09-10 22:40:05 +02:00
Applevangelist
ae7f27ed6f Cleanup 2023-09-10 15:58:35 +02:00
Applevangelist
3bbfaad77b Cleanup 2023-09-10 15:46:32 +02:00
Applevangelist
1282b03547 Merge remote-tracking branch 'origin/develop' into develop 2023-09-10 15:43:21 +02:00
Applevangelist
70a44217f5 Merge remote-tracking branch 'origin/master' into develop 2023-09-10 15:43:15 +02:00
Applevangelist
ef3127fdab Merge remote-tracking branch 'origin/master' into develop 2023-09-10 15:42:48 +02:00
Applevangelist
ba361e7eff #RAT 
* Try more than once to get coord in status loop
 2023-09-10 15:41:54 +02:00
Applevangelist
88741d943e docu 2023-09-10 15:41:16 +02:00
Applevangelist
52764cc900 #AICSAR 
* changes from OPSTRANSPORT
 2023-09-09 13:09:46 +02:00
Applevangelist
ab1e3e6c60 #AICSAR 
* Force LoadingDone, UnloadingDone since changes in OPSTRANSPORT
 2023-09-09 13:09:20 +02:00
Applevangelist
50b7fb0d5d Merge branch 'master' into develop 2023-09-09 12:29:32 +02:00
Applevangelist
0a812d8283 Merge branch 'develop-2' into develop 
# Conflicts:
#	Moose Development/Moose/Modules_local.lua
#	Moose Development/Moose/Utilities/Routines.lua
#	Moose Development/Moose/Wrapper/Group.lua
 2023-09-09 12:29:26 +02:00
Thomas
515764bb88
Update Group.lua 
Docu fix
 2023-09-09 11:56:28 +02:00
Thomas
31fb9bc169
Update Group.lua 
Docu fix
 2023-09-09 11:54:45 +02:00
Applevangelist
917f06fe04 Revert "Auxiliary commit to revert individual files from e5e81dbc35d61a32f5f6308b275eef278c970f2c" 
This reverts commit 4f771489b473634ca3c758a02fd090e0cd26a964, reversing
changes made to c5f3bfe4a9def07b09e1f3f54b47caaf7afd3163.
 2023-09-08 11:21:25 +02:00
Applevangelist
e5e81dbc35 Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Modules.lua
 2023-09-08 11:20:11 +02:00
Applevangelist
e95a9525c6 #GENERAL 
* Remove dependencies from UTILS.Routines
* Remove UTILS.Routines
 2023-09-08 11:14:41 +02:00
Applevangelist
2afde85ef0 #Remove routines 2023-09-07 18:39:07 +02:00
Applevangelist
568f76b0b2 #UTILS 
* Remove utils.routines
 2023-09-07 18:01:16 +02:00
Applevangelist
58f60dbf1b Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	Moose Development/Moose/Ops/Airboss.lua
 2023-09-07 16:17:44 +02:00
Applevangelist
559c8d763b Merge remote-tracking branch 'origin/master' into develop 2023-09-07 16:16:19 +02:00
Applevangelist
c5f3bfe4a9 Merge remote-tracking branch 'origin/master' into develop 2023-09-07 16:15:08 +02:00
Applevangelist
326d4b3135 Merge remote-tracking branch 'origin/master' 2023-09-07 16:14:45 +02:00
Applevangelist
c4fad08d58 Act 2023-09-07 16:14:42 +02:00
Applevangelist
5a57d05fd6 Deprecated flags 2023-09-07 16:14:21 +02:00
Applevangelist
5329745325 Merge remote-tracking branch 'origin/develop' into develop 2023-09-07 12:45:30 +02:00
Applevangelist
792222f567 #PLAYERTASK, #CLIENTMENU 
* Fixes
 2023-09-07 12:45:26 +02:00
Applevangelist
e6a7416acf #PLAYERTASK 2023-09-07 12:43:23 +02:00
Frank
a8f14fca70 Merge branch 'master' into develop 2023-09-06 21:33:29 +02:00
Frank
8a7fa326cd Update MissileTrainer.lua 
- Docs: Class deprecated ==> use FOX instead
 2023-09-06 21:33:05 +02:00
Frank
02105b1efc Update Airboss.lua 
Fixed bug missing end in if statement
 2023-09-05 20:53:02 +02:00
Applevangelist
93fd9e5d42 #CLIENTMENU 
* Catch error on Menu removes
 2023-09-05 10:35:12 +02:00
Applevangelist
f43924fbb0 #CLIENTMENU 2023-09-05 10:34:07 +02:00
Applevangelist
da77741dab Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	Moose Development/Moose/Ops/Airboss.lua
 2023-09-01 09:49:13 +02:00
Applevangelist
d367f85f06 Merge remote-tracking branch 'origin/master' into develop 2023-09-01 09:47:30 +02:00
Applevangelist
65c384622c #AIRBOSS 
* Suppress unnecessary SRS TTS calls with empty text
 2023-09-01 09:46:52 +02:00
Applevangelist
18afe9ad7a #AIRBOSS 
* Suppress unnecessary SRS TTS calls with empty text
 2023-09-01 09:44:12 +02:00
Applevangelist
d9c656f6d2 #Airboss 2023-09-01 09:42:24 +02:00
Applevangelist
379dd44c04 Merge remote-tracking branch 'origin/develop' into develop 2023-09-01 08:53:28 +02:00
Applevangelist
d9a11588b7 Merge remote-tracking branch 'origin/master' into develop 2023-09-01 08:53:22 +02:00
Applevangelist
d7b87b63d8 #MANTIS 
* Added zone filter option.
 2023-09-01 08:52:46 +02:00
Applevangelist
253cf0f5a5 #MANTIS 
* Added zone filter option.
 2023-09-01 08:52:13 +02:00
Applevangelist
cb6dd0d6c7 #MANTIS 2023-09-01 08:51:51 +02:00
Applevangelist
ab2e8efad5 Merge remote-tracking branch 'origin/develop' into develop 2023-08-31 15:12:41 +02:00