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

10516 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frank
9fa16c6385 Update FlightControl.lua 2023-09-18 16:52:13 +02:00
Frank
a0ee957493 Update FlightControl.lua 2023-09-17 23:07:59 +02:00
Frank
f32c303c0a pathline 2023-09-17 22:58:53 +02:00
Frank
6febbbc8e6 FC 2023-09-17 21:55:29 +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
d5aa9eaf0f Merge branch 'FF/Ops' into FF/OpsDev 2023-09-17 16:26:23 +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
Frank
321b2d761d FLIGHTCONTROL 
- Improved Taxi comms
 2023-09-17 16:10:59 +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
Frank
18581e4a78 Merge branch 'FF/OpsDev' of https://github.com/FlightControl-Master/MOOSE into FF/OpsDev 2023-09-14 17:40:11 +02:00
Frank
b03905154d ASTAR Pathlines 2023-09-14 17:40:02 +02:00
Frank
2fda1709bc Update FlightControl.lua 2023-09-14 16:46:08 +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
39f626390a Merge branch 'FF/Ops' into FF/OpsDev 2023-09-13 11:14:55 +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
aa1e12163d ASTAR/PATHLINE 2023-09-12 23:57:50 +02:00
Frank
abb7f860ae Update Astar.lua 2023-09-12 03:21:23 +02:00
Frank
cffada1a1e AIRBASE 
- Taxiways
 2023-09-11 16:54:10 +02:00
Frank
f8d91798e3 Update FlightControl.lua 2023-09-10 23:55:40 +02:00
Frank
548aa8d5a9 Merge branch 'FF/Ops' into FF/OpsDev 2023-09-10 22:43:13 +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
Frank
1e929d1d19 ASTAR Taxi 2023-09-10 22:38:00 +02:00
Applevangelist
ae7f27ed6f Cleanup 2023-09-10 15:58:35 +02:00