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

7629 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Applevangelist
9c7e42ed1e Merge remote-tracking branch 'origin/develop' into develop 2023-07-29 16:47:16 +02:00
Applevangelist
83aefc416a Merge remote-tracking branch 'origin/master' into develop 2023-07-29 16:47:10 +02:00
Thomas
f87a676e4b
Update Scoring.lua (#1976) 
Add report Spaces
 2023-07-29 16:45:00 +02:00
Applevangelist
4ed2b0610d #AWACS 
* ensure tactical frequencies are handed back

#PlayerTask
* Add'l check for stale tasks to rebuild menu
 2023-07-29 16:44:25 +02:00
Applevangelist
29947d69c3 Changes 2023-07-29 16:40:46 +02:00
Applevangelist
3b2850e042 changes 2023-07-29 16:02:42 +02:00
Applevangelist
5c2b77cf76 #Chmages 2023-07-29 15:56:28 +02:00
Applevangelist
9c95b91086 #changes 2023-07-29 15:56:20 +02:00
phr0gz
cbd371b40f
Chief zone removal Tanker, AWACS (#1975) 
Add the ability to remove a zone for Tanker and AWACS.
 2023-07-29 15:44:13 +02:00
phr0gz
80e9cb692c
Add FSM OnAfter and OnBefore (#1974) 
Add FSM Function OnAfter and OnBefore in FlightGroup.
 2023-07-29 13:37:07 +02:00
Applevangelist
27fd726ce3 Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	Moose Development/Moose/Ops/Airboss.lua
 2023-07-26 17:45:25 +02:00
Applevangelist
d58e93e2a4 Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Ops/Airboss.lua
 2023-07-26 17:43:16 +02:00
Frank
3c74aef378 Merge branch 'master' into develop 2023-07-26 17:23:34 +02:00
Frank
8bf56b8b1a Update Airboss.lua 
- Fixed AI handling (got lost in some merge with develop branch and was using FLIGHTGROUPS)
2.7.21 		2023-07-26 16:36:44 +02:00
Frank
7e2233d8c7 Merge branch 'develop' into FF/Ops 2023-07-26 16:11:27 +02:00
Thomas
065717b2f5
Update FlightGroup.lua 
coord might be nil in GetParking(airbase)
 2023-07-26 15:36:09 +02:00
Applevangelist
9a695ef5bf #AWACS 2023-07-26 07:49:52 +02:00
Applevangelist
63a524f25c #AWACS 
* Remove tactical subscription when client logs out or dies
 2023-07-26 07:49:35 +02:00
Applevangelist
838e11de05 #AWACS 
* Added tactical radio option
 2023-07-25 14:50:29 +02:00
Applevangelist
b9828f3cd1 #AWACS 
* Tactical Radioi Option added
 2023-07-25 14:49:28 +02:00
Applevangelist
53952b1636 Merge remote-tracking branch 'origin/develop' into develop 2023-07-25 12:03:06 +02:00
Applevangelist
13ac4c386a Merge remote-tracking branch 'origin/master' into develop 2023-07-25 12:03:02 +02:00
Applevangelist
6fa90c7f39 #AWACS 2023-07-25 12:02:42 +02:00
Applevangelist
6fcaccdfb1 * fixes 2023-07-25 12:02:09 +02:00
Applevangelist
2a56da4bb3 Merge remote-tracking branch 'origin/master' into develop 2023-07-25 12:01:48 +02:00
Applevangelist
f31741f934 #AI_ESCORT 
* Improve documentation
 2023-07-25 12:01:18 +02:00
Applevangelist
070cd6e7c6 Merge remote-tracking branch 'origin/develop' into develop 2023-07-23 12:43:35 +02:00
Applevangelist
64e87a906f Merge remote-tracking branch 'origin/master' into develop 2023-07-23 12:43:31 +02:00
Applevangelist
f84d02d8a1 Merge remote-tracking branch 'origin/master' into develop 2023-07-23 12:42:59 +02:00
Applevangelist
7d3a08cde2 #CLIENTMENU, #PLAYERTASK 
* Fixes for "No current task" not being deleted later on
 2023-07-23 12:42:36 +02:00
Applevangelist
1fbadd02f9 #Updates 2023-07-23 12:41:46 +02:00
Applevangelist
02fadaf17e #AIRBASE, #ATIS 2023-07-23 12:38:21 +02:00
Applevangelist
46258492bd #AIRBASE, #ATIS 
* Additions
 2023-07-23 12:37:57 +02:00
Frank
a7857670d3 Merge branch 'develop' into FF/Ops 2023-07-22 10:16:40 +02:00
Frank
c41b256775 Update SRS.lua 2023-07-22 10:16:31 +02:00
Applevangelist
c4a13f985e Merge remote-tracking branch 'origin/develop' into develop 2023-07-19 16:08:21 +02:00
Applevangelist
e2929a78c4 #AICSAR - correct code version 2023-07-19 16:06:44 +02:00
Applevangelist
15bf379cdc #AICSAR 
* Added FSM Event "HeloOnDuty"
 2023-07-19 09:56:27 +02:00
Applevangelist
7367e15121 #AICSAR 
* Added FSM Event "HeloOnDuty"
 2023-07-19 09:56:09 +02:00
Applevangelist
07cdc36181 Merge remote-tracking branch 'origin/develop' into develop 2023-07-17 16:28:35 +02:00
Applevangelist
69fc2dca42 Merge remote-tracking branch 'origin/master' into develop 2023-07-17 16:28:29 +02:00
Applevangelist
8a8e40e810 #PLAYERTASK 
* Refactored menubuilds to use new CLIENTMENU/CLIENTMENUCONTROLLER classes
 2023-07-17 16:27:54 +02:00
Applevangelist
2c8adf58cb #CLIENTMENU 
* Rewrite with a different data approach
 2023-07-17 16:26:53 +02:00
Applevangelist
e8432db26e #ClientMenu 2023-07-17 16:26:06 +02:00
Applevangelist
bb579fff5b Merge remote-tracking branch 'origin/master' into develop 2023-07-16 11:28:24 +02:00
Applevangelist
6481f66e27 #MANTIS 
* Added IDs for Current Hill Assets, keyword "CHM" for group names
 2023-07-16 11:27:34 +02:00
Applevangelist
e8ad649770 #PT 2023-07-16 11:26:47 +02:00
Applevangelist
63770fdf79 Merge remote-tracking branch 'origin/develop' into develop 2023-07-15 18:02:45 +02:00
Applevangelist
b48d713fda Merge remote-tracking branch 'origin/master' into develop 2023-07-15 18:02:39 +02:00
Applevangelist
77955bc03c #changes 2023-07-15 18:02:12 +02:00