Applevangelist
|
92044c7797
|
Merge remote-tracking branch 'origin/master' into develop
|
2022-09-15 14:02:09 +02:00 |
|
Applevangelist
|
299820162b
|
#ATIS
* No old-style radioqueue when using SRS
|
2022-09-15 14:01:23 +02:00 |
|
Applevangelist
|
7084d9e084
|
#OPSGROUP
* Allow for customized CallSigns
#PLAYERTASK
* SRS output finetuning
|
2022-09-15 13:59:16 +02:00 |
|
Applevangelist
|
af96e2f143
|
Merge remote-tracking branch 'origin/master' into develop
|
2022-09-15 13:52:20 +02:00 |
|
Applevangelist
|
5d20a59d92
|
#GROUP
* Customized Callsigns - remove extra spaces
|
2022-09-15 13:40:37 +02:00 |
|
Applevangelist
|
f7560714e7
|
Merge remote-tracking branch 'origin/master' into develop
|
2022-09-15 08:18:19 +02:00 |
|
Applevangelist
|
c1ab3b5476
|
#GROUP
* Fix ignore leading spaces in customized callsigns
|
2022-09-15 08:17:37 +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
|
b60d3a771d
|
Merge remote-tracking branch 'origin/master' into develop
|
2022-09-13 10:55:57 +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
|
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
|
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 |
|
Applevangelist
|
eca8d6dd8d
|
#AWACS
* Fixed AWACS custom callsigns not observed
|
2022-09-11 18:21:58 +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
|
3aa9ffc241
|
#MODULES
* ordered list
|
2022-09-10 12:54:37 +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 |
|
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
|
cea9437e66
|
#GROUP
Fix GetSpeedMax() always returns zero
|
2022-09-09 17:33:23 +02:00 |
|
Thomas
|
35513e1e21
|
#GROUP (#1779)
* changes from Dev
#UNIT
* changes from Dev
|
2022-09-08 16:10:38 +02:00 |
|
Applevangelist
|
3f052ef1da
|
#GROUP
* changes from Dev
#UNIT
* changes from Dev
|
2022-09-08 15:49:58 +02:00 |
|
Applevangelist
|
15496aed44
|
Merge remote-tracking branch 'origin/Apple/Develop' into develop
# Conflicts:
# Moose Development/Moose/Functional/Autolase.lua
|
2022-09-08 11:58:29 +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 |
|
Applevangelist
|
a437da76ec
|
Merge remote-tracking branch 'origin/Apple/Develop' into develop
# Conflicts:
# Moose Development/Moose/Core/Database.lua
# Moose Development/Moose/Core/Set.lua
# Moose Development/Moose/Utilities/Profiler.lua
|
2022-09-06 10:43:48 +02:00 |
|
Applevangelist
|
8cceee49ea
|
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 10:27:28 +02:00 |
|