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

8182 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Applevangelist
81fd5cb605 One Typo Less 2023-09-19 11:30:46 +02:00
Applevangelist
03e1b28c97 Typo 2023-09-19 11:30:27 +02:00
Applevangelist
2a761ff8d0 Merge remote-tracking branch 'origin/develop' into develop 2023-09-19 11:11:18 +02:00
Applevangelist
ed6a388a8e Merge remote-tracking branch 'origin/master' into develop 2023-09-19 11:11:14 +02:00
Applevangelist
fc9ddae9b2 Merge remote-tracking branch 'origin/master' into develop 2023-09-19 11:10:33 +02:00
Applevangelist
b70bf3b9af #SEAD 
* Better calculation of switch-on again time
 2023-09-19 11:10:06 +02:00
Applevangelist
75529958f6 #SEAD 
* Better calculation of switch-on again time
 2023-09-19 11:09:55 +02:00
Applevangelist
2e7cbe989a Merge remote-tracking branch 'origin/develop' into develop 2023-09-17 17:17:13 +02:00
Applevangelist
b0db51fa5a Merge remote-tracking branch 'origin/master' into develop 2023-09-17 17:17:03 +02:00
Applevangelist
d0330cc696 Merge remote-tracking branch 'origin/master' into develop 2023-09-17 17:16:30 +02:00
Applevangelist
250d640e76 #SPAWN 
* Added option for Modex pre- and postfix strings
* Added string check for SpawnAtParkingSpot when Airbase is handed as string
 2023-09-17 17:15:12 +02:00
Applevangelist
5886d154ae #SPAWN 
* Added option for Modex pre- and postfix
 2023-09-17 17:13:51 +02:00
Applevangelist
f6fcf41c70 Merge remote-tracking branch 'origin/develop' into develop 2023-09-17 16:54:02 +02:00
Applevangelist
a22ad88bda Merge remote-tracking branch 'origin/master' into develop 2023-09-17 16:53:58 +02:00
Applevangelist
c173fe0cb8 Quick check on airbase being a string 2023-09-17 16:52:45 +02:00
Frank
dca70eaa05 Merge branch 'master' into develop 2023-09-17 16:13:50 +02:00
Frank
6a05789db5 Update Controllable.lua 
- Fixed wrong id of task`EnrouteTaskEngageGroup`
- Fixed wrong id of task `EnrouteTaskFAC_EngageGroup`
 2023-09-17 16:13:28 +02:00
Applevangelist
7b027c0802 Merge remote-tracking branch 'origin/develop' into develop 2023-09-15 09:13:05 +02:00
Applevangelist
df05290180 Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Utilities/Enums.lua
 2023-09-15 09:13:01 +02:00
Applevangelist
5048201771 #Startup 
* Re-instate suppression of error box.
 2023-09-15 09:12:17 +02:00
Applevangelist
5e20874dca #Startup 
* Re-instate suppression of error box.
 2023-09-15 09:11:32 +02:00
Applevangelist
dd41cd4b4f #Startup 
* Re-instate suppression of error box.
 2023-09-15 09:11:20 +02:00
Applevangelist
c4e3e4420c Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Core/Set.lua
 2023-09-14 16:34:24 +02:00
Applevangelist
5e36425058 #PLAYERTASKCONTROLLER 
* Fix a problem that sometimes the object event is called prior to the SET_CLIENT event for players joining, leading to false negatives on specifically filtered SET_CLIENT objects
 2023-09-14 12:36:51 +02:00
Applevangelist
bc16970d96 #SET_CLIENT 
* Small fix for FilterCallsign string search
 2023-09-14 12:36:15 +02:00
Applevangelist
97809cdb65 #PLAYERTASKCONTROLLER 
* Fix a problem that sometimes the object event is called prior to the SET_CLIENT event for players joining, leading to false negatives on specifically filtered SET_CLIENT objects
 2023-09-14 12:35:43 +02:00
Applevangelist
4e44d979a1 Merge remote-tracking branch 'origin/develop' into develop 2023-09-13 16:05:02 +02:00
Applevangelist
0e0d22e7ce Merge remote-tracking branch 'origin/master' into develop 2023-09-13 16:04:57 +02:00
Applevangelist
3f1ad24f6a Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Core/Database.lua
#	Moose Development/Moose/Functional/MissileTrainer.lua
 2023-09-13 16:04:23 +02:00
Applevangelist
674fef554d Intellisense docu fixes 2023-09-13 16:03:32 +02:00
Applevangelist
f8f4bac77e Intellisense docu fixes 2023-09-13 16:03:05 +02:00
Applevangelist
74f87b3f2d Intellisense 2023-09-13 16:02:38 +02:00
Applevangelist
0e3d4205c9 Merge remote-tracking branch 'origin/develop' into develop 2023-09-13 15:31:55 +02:00
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