Commit Graph

9552 Commits

Author SHA1 Message Date
Applevangelist e0e4ba7db3 xx 2024-09-23 13:43:05 +02:00
Applevangelist 1f3df107bf xxx 2024-09-23 12:43:51 +02:00
Applevangelist 6887289466 xx 2024-09-23 10:19:58 +02:00
Applevangelist 9ef7a8aa3c Merge remote-tracking branch 'origin/develop' into branch 2024-09-15 19:25:46 +02:00
Applevangelist 900b0049bc Merge remote-tracking branch 'origin/master' into branch 2024-09-15 19:25:42 +02:00
Applevangelist ddc5e0f86e Merge remote-tracking branch 'origin/master' into develop 2024-09-15 19:25:08 +02:00
Applevangelist cadf46ded2 xx 2024-09-15 19:24:34 +02:00
Applevangelist ae08c87822 #CTLD 2024-09-15 19:24:24 +02:00
Thomas ae880e9d1c Merge pull request #2176 from Maintenance-Partnership-Systems/Minor-Doco-Fixes
Minor doco fixes
2024-09-15 11:16:08 +02:00
Michael Barnes 101d2e1de5 More incorrect AIRBASE constants in examples. 2024-09-15 18:48:42 +10:00
Michael Barnes f6b7708567 Fixed some outdated references to AIRBASE constants in examples. 2024-09-15 18:34:18 +10:00
Applevangelist b1fd5970d0 Merge remote-tracking branch 'origin/develop' into branch 2024-09-08 13:25:18 +02:00
Applevangelist a4a4b2e6b1 Merge remote-tracking branch 'origin/master' into branch 2024-09-08 13:25:14 +02:00
Applevangelist 051286acd1 #SPAWN - Tuning measures from DEVELOP encorporated 2024-09-08 13:24:09 +02:00
Applevangelist d6d9c9d8cf Merge remote-tracking branch 'origin/master' into develop 2.9.9 2024-09-08 13:22:34 +02:00
Applevangelist 7f572a1a9b Small changes
#CSAR - add option for IR strobe
2024-09-08 13:22:10 +02:00
Applevangelist d58edf7c38 xx 2024-09-08 13:18:32 +02:00
Applevangelist 1f0781f19a Merge remote-tracking branch 'origin/develop' into branch 2024-09-08 11:45:35 +02:00
Applevangelist f53488e8b0 Merge remote-tracking branch 'origin/master' into branch 2024-09-08 11:45:22 +02:00
Applevangelist 232547a0fb xxx 2024-09-08 11:44:59 +02:00
Applevangelist 68007306b3 Merge remote-tracking branch 'origin/develop' into develop 2024-09-08 11:44:47 +02:00
Applevangelist 0c3f97370c Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Wrapper/Group.lua
2024-09-08 11:44:44 +02:00
Applevangelist d62025dfe0 Small fixes 2024-09-08 11:43:33 +02:00
Thomas 6bc766e95f Merge pull request #2175 from FlightControl-Master/master
Update CSAR.lua
2024-09-07 09:03:00 +02:00
Thomas 07009630c6 Update CSAR.lua
Small fix
2024-09-07 09:01:58 +02:00
Applevangelist f3be326b5e Merge remote-tracking branch 'origin/develop' into branch 2024-09-06 16:42:02 +02:00
Applevangelist 9703d10f03 Merge remote-tracking branch 'origin/master' into branch 2024-09-06 16:41:55 +02:00
Applevangelist c2aeb1ebcd Merge remote-tracking branch 'origin/master' into develop 2024-09-06 16:41:11 +02:00
Applevangelist 865042a843 #CTLD #CSAR Function to add own SET_GROUP for pilots 2024-09-06 16:40:41 +02:00
Applevangelist d6ecde96f8 #CTLD #CSAR Function to add own SET_GROUP for pilots 2024-09-06 16:40:18 +02:00
Applevangelist 8153052eed Merge remote-tracking branch 'origin/develop' into branch
# Conflicts:
#	Moose Development/Moose/Wrapper/Group.lua
2024-09-06 13:43:19 +02:00
Applevangelist 6243137d4c QoL 2024-09-06 13:42:14 +02:00
Applevangelist 7d3a0568a9 Qol 2024-09-06 13:40:41 +02:00
Applevangelist f00d0dc871 QoL 2024-09-06 13:40:27 +02:00
Applevangelist 8695953d5a #SPAWN - performance tuning for event workaround 2024-09-03 16:47:17 +02:00
Applevangelist 4bafdf9408 #SPAWN - relax checks on SpawnScheduled, ensure count is only done on event 2024-09-03 12:36:50 +02:00
Thomas efe3571120 Update Spawn.lua
Remove T2 calls
2024-09-02 13:42:10 +02:00
Applevangelist bd1fd6f469 Merge remote-tracking branch 'origin/develop' into branch 2024-09-01 15:38:14 +02:00
Applevangelist 69b962b934 Merge remote-tracking branch 'origin/master' into branch 2024-09-01 15:38:07 +02:00
Applevangelist 6afb68390b Merge remote-tracking branch 'origin/master' into develop 2024-09-01 15:37:31 +02:00
Applevangelist d6adcdf8bd #CONTROLLABLE - Added IR Marker Beacons for UNIT and GROUP objects 2024-09-01 15:36:41 +02:00
Applevangelist 1a7117c20d #CONTROLLABLE - Added IR Marker Beacons for UNIT and GROUP objects 2024-09-01 15:36:20 +02:00
Applevangelist c8b0e9e5d2 Merge remote-tracking branch 'origin/develop' into branch 2024-09-01 13:38:22 +02:00
Applevangelist 4b3e361a28 xx 2024-09-01 13:38:15 +02:00
Applevangelist 8151700ad7 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Ops/CTLD.lua
2024-09-01 13:37:34 +02:00
Applevangelist 2c192fba30 #SET - include checking functional filters in all sub-classes 2024-09-01 13:36:47 +02:00
Applevangelist 1965e45737 Merge remote-tracking branch 'origin/master' into branch
# Conflicts:
#	Moose Development/Moose/Ops/CTLD.lua
2024-09-01 12:42:29 +02:00
Applevangelist a9ecef4f01 Merge remote-tracking branch 'origin/develop' into branch 2024-09-01 12:42:06 +02:00
Applevangelist 97f11c93bb #CTLD 2024-09-01 12:41:36 +02:00
Thomas a3102a7381 Merge pull request #2172 from DarthZyll/patch-5
Update CTLD.lua for missing self.ChinookTroopCircleRadius
2024-09-01 08:55:18 +02:00