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

6452 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Applevangelist
498b7a033f #AWACS 
* Align CallSign Generation
 2022-09-14 18:08:12 +02:00
Applevangelist
785c5e66ec bump number 2022-09-14 18:07:53 +02:00
Applevangelist
f281e5aa95 #AWACS 
* Align CallSign Generation
 2022-09-14 18:06:36 +02:00
Applevangelist
55f0f5271d #PLAYERTASKCONTROLLER 
* Clean up menu builds
 2022-09-13 17:19:44 +02:00
Applevangelist
83a7055065 #PLAYERTASKCONTROLLER 
* Clean up menu builds
 2022-09-13 17:19:29 +02:00
Applevangelist
b6fb7d94c8 'Menu changes 2022-09-13 13:13:06 +02:00
Applevangelist
4dbfef028e *options 2022-09-13 11:02:03 +02:00
Applevangelist
b60d3a771d Merge remote-tracking branch 'origin/master' into develop 2022-09-13 10:55:57 +02:00
Applevangelist
439f858a82 Merge remote-tracking branch 'origin/master' into develop 2022-09-13 10:55:14 +02:00
Applevangelist
0076130483 #GROUP 
* Docu clarifications
 2022-09-13 10:51:25 +02:00
Applevangelist
d2132b2e64 #PLAYERTASKCONTROLLER 
* Align creation of (player) callsigns with what is used in AWACS
 2022-09-13 10:11:10 +02:00
Applevangelist
2f62ae4e8b Merge remote-tracking branch 'origin/master' into develop 2022-09-12 17:34:50 +02:00
Applevangelist
95494c0d03 Merge remote-tracking branch 'origin/master' into develop 2022-09-12 17:34:21 +02:00
Applevangelist
a5194b1999 #GROUP 
-- remove log output
 2022-09-12 17:33:40 +02:00
Applevangelist
acab17a21f Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Wrapper/Group.lua
 2022-09-12 17:32:18 +02:00
Applevangelist
76a8286c04 Merge remote-tracking branch 'origin/master' into develop 2022-09-12 17:29:47 +02:00
Applevangelist
b53b1f083f #GROUP 
* Fix IsPlayer
* Added `GROUP:GetCustomCallSign()`
 2022-09-12 17:28:49 +02:00
Thomas
53380409de
GROUP / customizes, TTS Callsigns 
Added function to get customized TTS friendly callsigns from the GROUP
 2022-09-12 14:38:44 +02:00
Applevangelist
3890375272 Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	Moose Development/Moose/Modules.lua
 2022-09-11 18:24:04 +02:00
Applevangelist
e4f1e1a57a #AWACS 
* Fix custom AWACS callsign not observed
 2022-09-11 18:22:35 +02:00
Applevangelist
eca8d6dd8d #AWACS 
* Fixed AWACS custom callsigns not observed
 2022-09-11 18:21:58 +02:00
Applevangelist
04abebfa10 Merge remote-tracking branch 'origin/master' into develop 2022-09-11 14:27:12 +02:00
Applevangelist
93abef86dc VArious fixes 2022-09-11 14:23:48 +02:00
Applevangelist
e6ae034f7e Merge remote-tracking branch 'origin/develop' into develop 2022-09-11 14:22:52 +02:00
Applevangelist
236b4efb9b #PLAYERTASKCONTROLLER 
* Various fixes and improvements
 2022-09-11 14:22:47 +02:00
Frank
4b4c9ba959 Merge branch 'master' into develop 2022-09-11 13:38:40 +02:00
Frank
994a36001f
Merge pull request #1782 from FlightControl-Master/FF/MasterDevel 
Updates from develop
 2022-09-11 13:38:00 +02:00
Frank
26b91e3f66 Updates from develop 
DCS.lua
Ops/ATIS.lua
Ops/RecoveryTanker.lua
Utilities/Enums.lua
 2022-09-11 13:32:57 +02:00
Applevangelist
6bf05741a9 Merge remote-tracking branch 'origin/master' into develop 2022-09-10 15:16:47 +02:00
Applevangelist
5d1998accb #CONTROLLABLE 
*Foreign class definiton removed
 2022-09-10 15:14:41 +02:00
Applevangelist
f42aedd485 #CONTROLLABLE 
*Foreign class definiton removed
 2022-09-10 15:14:28 +02:00
Applevangelist
2d2f901545 Foreign class definition 2022-09-10 15:13:55 +02:00
Applevangelist
24df7c02f6 Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	Moose Setup/Moose.files
 2022-09-10 12:56:06 +02:00
Applevangelist
3aa9ffc241 #MODULES 
* ordered list
 2022-09-10 12:54:37 +02:00
Applevangelist
e97c294849 Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Modules.lua
#	Moose Setup/Moose.files
 2022-09-10 12:23:33 +02:00
Applevangelist
8ab5575e0a Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Modules.lua
#	Moose Setup/Moose.files
 2022-09-10 12:19:23 +02:00
Applevangelist
a73818a615 #BUILD files 2022-09-10 12:08:30 +02:00
Applevangelist
7c22e9fe69 #Changes from Develop 2022-09-10 11:56:03 +02:00
Applevangelist
c58e91b956 #TASKING 
* Merge changes from Develop
 2022-09-10 11:41:41 +02:00
Applevangelist
a61059242c #AI 
* Merge changes from DEV
 2022-09-10 11:38:50 +02:00
Applevangelist
3980b8a9c8 Merge remote-tracking branch 'origin/master' into develop 2022-09-10 11:34:56 +02:00
Applevangelist
8d8bd162b3 #AmmoTruck 2022-09-10 11:34:24 +02:00
Applevangelist
3dc7e458e1 Merge remote-tracking branch 'origin/develop' into develop 2022-09-09 17:52:23 +02:00
Thomas
27550d7ec9
Merge changes from master into dev for GROUP (#1781) 
* #GROUP
* changes from Dev
#UNIT
* changes from Dev

* #GROUP
Fix GetSpeedMax() always returns zero
 2022-09-09 17:50:18 +02:00
Applevangelist
91d2e43671 Merge remote-tracking branch 'origin/master' into develop 2022-09-09 17:36:07 +02:00
Applevangelist
cea9437e66 #GROUP 
Fix GetSpeedMax() always returns zero
 2022-09-09 17:33:23 +02:00
Applevangelist
5d6488bfa4 #OPSGROUP 2022-09-09 17:32:00 +02:00
Applevangelist
f8fa6acc60 #AMMOTRUCK 2022-09-09 15:30:39 +02:00
Applevangelist
9ad4ce7a49 #AMMOTRUCK 
* optionally use ARMYGROUP (but routing there sucks)
 2022-09-09 15:01:34 +02:00
Applevangelist
247377e98c #OPSGROUP 
* Fix for always teleporting
 2022-09-09 15:01:00 +02:00