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

4161 Commits

Author SHA1 Message Date
Applevangelist
b6fb7d94c8 'Menu changes 2022-09-13 13:13:06 +02:00
Applevangelist
4dbfef028e *options 2022-09-13 11:02:03 +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
2f62ae4e8b Merge remote-tracking branch 'origin/master' into develop 2022-09-12 17:34:50 +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
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
93abef86dc VArious fixes 2022-09-11 14:23:48 +02:00
Applevangelist
236b4efb9b #PLAYERTASKCONTROLLER 
* Various fixes and improvements
 2022-09-11 14:22:47 +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
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
8d8bd162b3 #AmmoTruck 2022-09-10 11:34:24 +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
Applevangelist
612419e615 ZONE 
* change to distance calc for finding spots w/o buildings
 2022-09-09 15:00:42 +02:00
Thomas
35513e1e21
#GROUP (#1779) 
* changes from Dev
#UNIT
* changes from Dev
 2022-09-08 16:10:38 +02:00
Applevangelist
34b80727a2 #AMMOTRUCK 
* Initial Release
 2022-09-08 15:54:22 +02:00
Applevangelist
31cd125954 #GROUP, #UNIT 
* Improve GetAmmunition() to include artillery shells
 2022-09-08 15:51:07 +02:00
Applevangelist
3f052ef1da #GROUP 
* changes from Dev
#UNIT
* changes from Dev
 2022-09-08 15:49:58 +02:00
Applevangelist
eed41a121c #AUTOLASE 
* Added option for blacklist of attributes
* Added radar unit higher priority over launchers
* Removed the "#001-01" appendix on message output for spawned Recce
 2022-09-08 11:57:02 +02:00
Applevangelist
27408c191d #AUTOLASE 
* Added option for blacklist atttributes
* Added higher priority for radar units
* Removed the "#001-01" appendix of spawned Recce on messages
 2022-09-08 11:55:29 +02:00
Applevangelist
4b6c6717ad #Autolase 
* SetMinThreatLevel
 2022-09-08 09:11:26 +02:00
Applevangelist
c0bc3d8061 Merge remote-tracking branch 'origin/develop' into develop 2022-09-08 08:45:16 +02:00
Thomas
fe5f252bc9
Update Autolase.lua (#1778) 2022-09-07 15:22:00 +02:00
Applevangelist
e25af085fc Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/AI/AI_A2A_Dispatcher.lua
#	Moose Development/Moose/AI/AI_A2G_Dispatcher.lua
#	Moose Development/Moose/AI/AI_CAP.lua
#	Moose Development/Moose/AI/AI_CAS.lua
#	Moose Development/Moose/AI/AI_Patrol.lua
#	Moose Development/Moose/Core/Base.lua
#	Moose Development/Moose/Core/Beacon.lua
#	Moose Development/Moose/Core/Database.lua
#	Moose Development/Moose/Core/Fsm.lua
#	Moose Development/Moose/Core/MarkerOps_Base.lua
#	Moose Development/Moose/Core/Menu.lua
#	Moose Development/Moose/Core/Message.lua
#	Moose Development/Moose/Core/Point.lua
#	Moose Development/Moose/Core/ScheduleDispatcher.lua
#	Moose Development/Moose/Core/Scheduler.lua
#	Moose Development/Moose/Core/Set.lua
#	Moose Development/Moose/Core/Spawn.lua
#	Moose Development/Moose/Core/Zone.lua
#	Moose Development/Moose/DCS.lua
#	Moose Development/Moose/Functional/Detection.lua
#	Moose Development/Moose/Functional/Mantis.lua
#	Moose Development/Moose/Functional/Range.lua
#	Moose Development/Moose/Functional/Scoring.lua
#	Moose Development/Moose/Functional/Sead.lua
#	Moose Development/Moose/Modules.lua
#	Moose Development/Moose/Ops/ATIS.lua
#	Moose Development/Moose/Ops/Airboss.lua
#	Moose Development/Moose/Sound/UserSound.lua
#	Moose Development/Moose/Utilities/Enums.lua
#	Moose Development/Moose/Utilities/FiFo.lua
#	Moose Development/Moose/Utilities/Profiler.lua
#	Moose Development/Moose/Utilities/Routines.lua
#	Moose Development/Moose/Utilities/STTS.lua
#	Moose Development/Moose/Utilities/Utils.lua
#	Moose Development/Moose/Wrapper/Airbase.lua
#	Moose Development/Moose/Wrapper/Controllable.lua
#	Moose Development/Moose/Wrapper/Group.lua
#	Moose Development/Moose/Wrapper/Marker.lua
#	Moose Development/Moose/Wrapper/Positionable.lua
#	Moose Development/Moose/Wrapper/Unit.lua
#	Moose Setup/Moose.files
 2022-09-06 13:51:59 +02:00
Applevangelist
c137a4b06d Revert "#ZONE" 
This reverts commit 1207417894a369fa4a353ca0a1f6120c2fc32666.
 2022-09-06 13:18:22 +02:00
Applevangelist
6c46dafc59 Revert "Auxiliary commit to revert individual files from 1207417894a369fa4a353ca0a1f6120c2fc32666" 
This reverts commit 551d4a9c85c89e4aaad2c59ed058c84ff8c7ad6c.
 2022-09-06 13:16:40 +02:00
Applevangelist
1207417894 #ZONE 
* ZONE_ELASTIC
* Typo
 2022-09-06 11:17:50 +02:00
Applevangelist
400da676fa UTILS 2022-09-06 10:48:37 +02:00
Applevangelist
bf9f02e53a DATABASE 2022-09-06 10:47:33 +02:00