Commit Graph

6407 Commits

Author SHA1 Message Date
Applevangelist 33122a5bf9 Merge remote-tracking branch 'origin/master' into develop 2023-12-18 10:58:59 +01:00
Frank 9716162739 Update SRS.lua 2023-12-17 22:55:31 +01:00
Frank 4eea8fcadd Merge branch 'master' into FF/MasterDevel 2023-12-17 20:37:30 +01:00
Frank 5b7e0ce375 Merge branch 'master' into develop 2023-12-16 09:31:56 +01:00
Frank 0ae9be49da Update Range.lua
- Fixed random good by phrase
2023-12-16 09:31:44 +01:00
Applevangelist bc6c663f90 Merge remote-tracking branch 'origin/master' into develop 2023-12-14 12:44:32 +01:00
Applevangelist 566ebb67e3 Merge remote-tracking branch 'origin/master' into develop 2023-12-14 12:44:00 +01:00
Applevangelist e84e16f58b xx 2023-12-14 12:43:36 +01:00
Applevangelist 55ffe37a79 #USERSOUND
* Added USERSOUND:ToClient( Client, Delay )
2023-12-14 12:42:13 +01:00
Applevangelist 6c21dfa48c Merge branch 'master' into develop 2023-12-14 11:13:06 +01:00
Applevangelist b31fc3ed44 Limit Attacked() to have at least the capture threatlevel 2023-12-14 11:12:50 +01:00
Applevangelist 68548f4581 #COORDINATE
* Fix for NewFromMGRS for less precise coordinates (below level 5)
2023-12-14 11:12:14 +01:00
Applevangelist f948a07d44 xxx 2023-12-14 11:10:12 +01:00
Applevangelist a9e88d234b Merge remote-tracking branch 'origin/master' into develop 2023-12-14 09:25:02 +01:00
Thomas 42fd2322d2 Update Range.lua (#2066) (#2067)
MSRS config compatibility
2023-12-13 19:33:07 +01:00
Thomas 8382eb9cd8 Update Range.lua (#2066)
MSRS config compatibility
2023-12-13 19:21:28 +01:00
Applevangelist 7e080f2fb0 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Moose Development/Moose/Ops/Intelligence.lua
2023-12-12 10:56:09 +01:00
Applevangelist 0bebb791a8 Merge remote-tracking branch 'origin/master' into develop 2023-12-12 10:55:29 +01:00
Applevangelist 585901dc7d Merge remote-tracking branch 'origin/master' into develop 2023-12-12 10:54:32 +01:00
Applevangelist 2a7213c1b7 xxx 2023-12-12 10:54:16 +01:00
Applevangelist 42468f3505 xxx 2023-12-12 10:54:01 +01:00
Applevangelist f837e9dec7 #COORDINATE
* Added functions to create a COORDINATE from MGRS
2023-12-12 10:53:37 +01:00
Applevangelist 6c646dd331 Merge remote-tracking branch 'origin/master' into develop 2023-12-11 16:54:41 +01:00
Thomas 945a81b745 Update Intelligence.lua 2023-12-11 13:17:30 +01:00
Thomas b8d44643c1 Update Detection.lua (#2063) (#2064)
# RadarBlur - make burn-through limit configureable
2023-12-11 11:49:00 +01:00
Thomas 230d9d82bf Update Detection.lua (#2063)
# RadarBlur - make burn-through limit configureable
2023-12-11 11:04:35 +01:00
Applevangelist a50ee191e5 xxx 2023-12-10 14:38:19 +01:00
Applevangelist 47d01f18c1 Merge remote-tracking branch 'origin/master' into develop 2023-12-10 14:38:06 +01:00
Applevangelist c089e56060 # DETECTION
* Make the radar blur less effective when under 20km distance
2023-12-10 14:37:41 +01:00
Applevangelist 8a1c9c0e54 Merge remote-tracking branch 'origin/master' into develop 2023-12-10 11:58:55 +01:00
Applevangelist ec7dd6154d xxx 2023-12-10 11:58:34 +01:00
Applevangelist 87f1a5ed0d # DETECTION
* Option to make Radar Blue decision visible in logs (self.debug) and/or screen (self.verbose)
2023-12-10 11:58:19 +01:00
Applevangelist f2593fcecc Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Functional/Detection.lua
2023-12-09 18:17:35 +01:00
Applevangelist a4fd55e87d Merge remote-tracking branch 'origin/master' into develop 2023-12-09 18:16:52 +01:00
Applevangelist d2d6fac7df # DETECTION, logic fix 2023-12-09 18:16:29 +01:00
Applevangelist 8c57e9cb09 xxx 2023-12-09 18:16:10 +01:00
Applevangelist 5243a408cc Merge remote-tracking branch 'origin/master' into develop 2023-12-09 15:52:16 +01:00
Applevangelist bc3f9ed7c0 #SPAWN
* Added SPAWN:InitCallSign(ID,Name,Minor,Major)
2023-12-09 15:51:35 +01:00
Applevangelist e60e8b37e6 xx 2023-12-09 15:50:47 +01:00
Applevangelist b224739df3 Merge remote-tracking branch 'origin/master' into develop 2023-12-09 14:35:02 +01:00
Applevangelist 0f4162a9a9 * fixes 2023-12-09 14:34:41 +01:00
Applevangelist e9266ed01c xx 2023-12-09 14:34:21 +01:00
Applevangelist ff26e4d1dc Merge remote-tracking branch 'origin/master' into develop 2023-12-09 13:54:43 +01:00
Applevangelist 6b270916c4 # DETECTION_BASE
* Added `SetRadarBlur(minheight,thresheight,thresblur)`
2023-12-09 13:53:27 +01:00
Applevangelist af3af14d77 # DETECTION_BASE
* Added `SetRadarBlur(minheight,thresheight,thresblur)`
2023-12-09 13:51:16 +01:00
Applevangelist 691d4c771a Merge remote-tracking branch 'origin/master' into develop 2023-12-09 13:04:51 +01:00
Applevangelist 1f17fd89a4 Merge remote-tracking branch 'origin/master' into develop 2023-12-09 13:03:57 +01:00
Applevangelist b3a006096c fixes 2023-12-09 13:03:34 +01:00
Applevangelist 6fbe981ce1 xxx 2023-12-09 13:01:32 +01:00
Applevangelist a199915731 xxx 2023-12-07 16:09:57 +01:00