Commit Graph

7995 Commits

Author SHA1 Message Date
Applevangelist 618a8744a2 #MANTIS - improve point defense behaviour if not SAM to defend is around 2025-03-16 13:06:53 +01:00
Applevangelist df9f204b7a xx 2025-03-16 13:06:19 +01:00
Applevangelist 5d07cebdc4 Merge remote-tracking branch 'origin/master' into branch 2025-03-16 11:03:49 +01:00
Applevangelist 5329da32eb Merge remote-tracking branch 'origin/develop' into develop 2025-03-16 11:02:59 +01:00
Applevangelist df86c3f2a1 #AUTOLASE - added a function to allow to set the monitoring report frequency 2025-03-16 11:02:55 +01:00
Applevangelist b59bd0d4f2 xx 2025-03-16 11:02:32 +01:00
Frank 784fcb7882 Merge branch 'master' into develop 2025-03-15 22:49:57 +01:00
Frank 23aeef7a20 Airbase
- Airbase changes for helipads that are also airdromes
- Improved SpawnAtAirbase function
2025-03-15 22:49:43 +01:00
Applevangelist dccd46367f Merge remote-tracking branch 'origin/master' into branch 2025-03-15 16:30:36 +01:00
Applevangelist 0ee24b86dc Merge remote-tracking branch 'origin/master' into develop 2025-03-15 16:30:01 +01:00
Applevangelist 9ac4f136aa #MANTIS - extend scaling for short/point systems to make them more reactive 2025-03-15 16:29:24 +01:00
Applevangelist ca9b2d79cc Merge remote-tracking branch 'origin/master' into develop 2025-03-15 10:56:34 +01:00
Applevangelist c9a09c2fc9 #SOUND/MSRS - small fix to delete the "--ssml" tag if google provider is used in conjunction with a file based sound output. 2025-03-15 10:56:13 +01:00
Applevangelist 2a6df8434a #SOUND/MSRS - small fix to delete the "--ssml" tag if google provider is used in conjunction with a file based sound output. 2025-03-15 10:55:05 +01:00
Applevangelist 8878d1a8d3 Merge remote-tracking branch 'origin/master' into branch 2025-03-14 10:41:45 +01:00
Applevangelist 813286f7f3 Merge remote-tracking branch 'origin/master' into develop 2025-03-14 10:41:13 +01:00
Applevangelist 6028c91f81 #NET small fix if PlayerSlot remains nil 2025-03-14 10:40:52 +01:00
Frank 11b6bb2638 Merge branch 'master' into develop 2025-03-13 16:41:25 +01:00
Frank 3c57928f46 Update Airbase.lua
- Fixed bug in counting the number of parking spots per terminal type
2025-03-13 16:40:57 +01:00
Applevangelist e091e659a2 Merge remote-tracking branch 'origin/master' into develop 2025-03-13 10:51:00 +01:00
Applevangelist 32f0bb33c3 #ZONE - Trigger added OnAfterZoneEmpty and OnAfterObjectDead 2025-03-13 10:50:15 +01:00
Applevangelist 8e017f2ce0 #ZONE Some Trigger Improvements, added OnAfterZoneEmpty 2025-03-13 10:49:11 +01:00
Applevangelist d16124213f xxx 2025-03-12 10:25:54 +01:00
Applevangelist 0d0cc20ebc Merge remote-tracking branch 'origin/master' into branch 2025-03-12 09:19:15 +01:00
Applevangelist dea64751c3 Merge remote-tracking branch 'origin/master' into develop 2025-03-12 09:18:43 +01:00
Applevangelist 31d0410284 #TEMPLATES remove files 2025-03-12 08:56:13 +01:00
Applevangelist 6fcb4a3184 Merge remote-tracking branch 'origin/master' into branch
# Conflicts:
#	Moose Setup/Moose.files
2025-03-12 08:46:16 +01:00
Applevangelist 9cdf550432 #PLAYERTASKMANAGER - Allow use of multiple drones for lasing of precision bombing tasks 2025-03-12 08:45:08 +01:00
Applevangelist 09525029ab Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Modules.lua
#	Moose Setup/Moose.files
2025-03-12 08:44:00 +01:00
Applevangelist 87c436ba34 #STTS - remove from tree 2025-03-12 08:42:38 +01:00
Applevangelist 2fced89dfc xx 2025-03-11 18:31:16 +01:00
Applevangelist 96ad3ff98b xx 2025-03-11 16:32:01 +01:00
Applevangelist b1002017e5 Merge remote-tracking branch 'origin/master' into develop 2025-03-11 16:30:07 +01:00
Applevangelist 6e9727e265 xx 2025-03-11 16:29:31 +01:00
Applevangelist 383e953ba1 Merge remote-tracking branch 'origin/master' into develop 2025-03-11 10:52:40 +01:00
Applevangelist 94ee76fe62 #CONTROLLABLE - Improved IR Markers 2025-03-11 10:52:16 +01:00
Applevangelist 6c8fa5585b #CONTROLLABLE - Improved IR Markers 2025-03-11 10:51:44 +01:00
Applevangelist 885b329dcb Merge remote-tracking branch 'origin/master' into branch 2025-03-11 09:36:28 +01:00
Frank 9b52b640e6 Merge branch 'master' into develop 2025-03-10 19:53:51 +01:00
Frank ea23162ca9 Update Spawn.lua
- Enabled explicit parking spots in SpawnAtAirbase
2025-03-10 19:53:24 +01:00
Thomas 68d0220912 Merge pull request #2268 from FlightControl-Master/master
merge from master
2025-03-10 15:35:08 +01:00
Thomas 702c5464aa Merge pull request #2267 from FlightControl-Master/master
merge from master
2025-03-10 15:33:52 +01:00
Thomas 56ec3920c5 Update Controllable.lua
IR Strobe . some improvements
2025-03-10 13:12:00 +01:00
Thomas 88842d1c67 Merge pull request #2265 from FlightControl-Master/master
Update CTLD.lua
2025-03-10 10:57:19 +01:00
Thomas f335ffc4ec Update CTLD.lua
Clarify hover min/max height is in meters
2025-03-10 10:55:01 +01:00
Applevangelist c679a77f9f Merge remote-tracking branch 'origin/master' into branch 2025-03-09 14:38:39 +01:00
Applevangelist 176e4f6217 xxx 2025-03-09 14:38:16 +01:00
Applevangelist f76aefa976 Merge remote-tracking branch 'origin/master' into develop 2025-03-09 14:37:56 +01:00
Applevangelist 4976cd86f2 ZONE_ELASTIC - function to remove vertices 2025-03-09 14:36:42 +01:00
Frank 2cd66ae1d4 Merge branch 'master' into develop 2025-03-08 21:37:59 +01:00