10235 Commits

Author SHA1 Message Date
Applevangelist
869339150a Merge remote-tracking branch 'origin/develop' into branch
# Conflicts:
#	Moose Development/Moose/Ops/Awacs.lua
2025-01-15 15:36:08 +01:00
Applevangelist
9b5a653940 Merge remote-tracking branch 'origin/master' into branch 2025-01-15 15:35:36 +01:00
Thomas
646a2aec66
Merge pull request #2221 from FlightControl-Master/Applevangelist-awacs-1
Update Awacs.lua
2025-01-15 15:34:36 +01:00
Thomas
7392cb9bf3
Update Awacs.lua
#AWACS - clarify use of escort parameters and template
2025-01-15 12:14:14 +01:00
Frank
2e77988473 Merge branch 'master' into develop 2025-01-14 10:36:27 +01:00
Frank
b2dc7bc232 ARTY v1.3.2
- Fixed bug that MLRS does not fire (ammo count if weapon type is auto)
2025-01-14 10:36:12 +01:00
Applevangelist
083bf13fe4 xx 2025-01-13 18:01:31 +01:00
Applevangelist
1b25220729 #AWACS - make # of escorts required assets 2025-01-13 12:38:53 +01:00
Applevangelist
50436b8ced #AWACS - make # of escorts required assets 2025-01-13 12:38:39 +01:00
Applevangelist
b82e15b2ce Merge remote-tracking branch 'origin/develop' into branch 2025-01-13 11:49:54 +01:00
Applevangelist
4953000565 Merge remote-tracking branch 'origin/develop' into develop 2025-01-13 11:46:56 +01:00
Applevangelist
01b7575bca #AWACS
- Fix a logic error: cancel the Escort mission when the replacement has arrived
- Workaround for a situation where a player has a checkin-entry in the menu and a managed group entry at the same time - which should not be the case.
- Added Escort options for formation and relative position behind the AWACS
2025-01-13 11:46:51 +01:00
Applevangelist
8ffa1bd692 #AWACS
- Fix a logic error: cancel the Escort mission when the replacement has arrived
- Workaround for a situation where a player has a checkin-entry in the menu and a managed group entry at the same time - which should not be the case.
2025-01-13 11:46:07 +01:00
Frank
f6e6dcac9a OPSGROUP ARTY
- Fixed bug in surface type for coord in range
- Improved search for coord in range
- Added option to set mission waypoint
2025-01-12 23:54:44 +01:00
Applevangelist
c855198634 Merge remote-tracking branch 'origin/develop' into branch 2025-01-12 17:12:09 +01:00
Applevangelist
8aa8acdad0 Merge remote-tracking branch 'origin/master' into branch 2025-01-12 17:11:50 +01:00
Applevangelist
93c307d9dd Merge remote-tracking branch 'origin/develop' into develop 2025-01-12 17:10:32 +01:00
Applevangelist
852c18cef8 Merge remote-tracking branch 'origin/master' into develop 2025-01-12 17:10:27 +01:00
Applevangelist
def622a02c #CTLD - InjectTroops - if precision coords is true, do also not randomize unit positions. 2025-01-12 17:09:31 +01:00
Applevangelist
382ad6ecd8 xx 2025-01-12 17:02:40 +01:00
Frank
acfe1a856e Update OpsGroup.lua
- Added surface type check for ARTY mission
- Improved search for coordinate in range
- Added option to specify distance conversion for weapon ranges
2025-01-11 23:38:15 +01:00
Thomas
9f1f6af647
Merge pull request #2220 from FlightControl-Master/master
Merge master
2025-01-11 10:17:39 +01:00
Thomas
30bedb39f1
Merge pull request #2219 from FlightControl-Master/Applevangelist-patch-1
Update Unit.lua
2025-01-11 10:14:44 +01:00
Thomas
fbcc4ee32b
Update Unit.lua
GetSTN fix if template os nil
2025-01-11 10:14:03 +01:00
Thomas
27571cc22f
Merge pull request #2217 from shaji-Dev/develop
Develop
2025-01-11 10:04:44 +01:00
Shafik
1182a5eb1e [FIXED] attempt to index field 'IniDCSGroup' (a nil value) 2025-01-10 21:40:03 +02:00
Applevangelist
f009370e07 xx 2025-01-09 14:15:09 +01:00
Applevangelist
0e91a658b3 Merge remote-tracking branch 'origin/develop' into branch 2025-01-08 13:06:10 +01:00
Applevangelist
774317f2c5 Merge remote-tracking branch 'origin/master' into branch 2025-01-08 13:06:06 +01:00
Applevangelist
5f57c71c62 Merge remote-tracking branch 'origin/develop' into develop 2025-01-08 13:05:28 +01:00
Applevangelist
c0d60b1bcf Merge remote-tracking branch 'origin/master' into develop 2025-01-08 13:05:24 +01:00
Applevangelist
a33e542df5 xx 2025-01-08 13:04:54 +01:00
Applevangelist
63c68d729b #SET_GROUP - fix for lost event if IniDCSGroup isn't filled 2025-01-08 13:04:30 +01:00
Thomas
5fe29e2ba1
Merge pull request #2214 from FlightControl-Master/Applevangelist-patch-3
Update Auftrag.lua
2025-01-07 09:22:12 +01:00
Thomas
16ff1ac3e7
Update Auftrag.lua
#AUFTRAG Added some options for weapontype setting
2025-01-07 09:21:26 +01:00
Applevangelist
0e4f805e1c Merge remote-tracking branch 'origin/develop' into develop 2025-01-06 17:33:09 +01:00
Applevangelist
5f29bdc7a7 Merge remote-tracking branch 'origin/master' into develop 2025-01-06 17:33:04 +01:00
Applevangelist
04f8f6d512 xx 2025-01-06 17:32:29 +01:00
Applevangelist
6adb9f0839 xx 2025-01-06 17:31:03 +01:00
Thomas
f4768aff07
Merge pull request #2213 from FlightControl-Master/master
Master merge
2025-01-06 14:21:42 +01:00
Thomas
b74d46f762
Merge pull request #2211 from FlightControl-Master/Applevangelist-spawn-1
Update Spawn.lua
2025-01-06 14:20:23 +01:00
Thomas
02decc3901
Merge pull request #2212 from Rolln-dev/rolln/range
#RANGE - Changed parameter naming to fix docs
2025-01-06 14:19:02 +01:00
Rolln
dcdea16624 #RANGE - Changed parameter naming to fix docs 2025-01-06 06:15:35 -07:00
Thomas
2635cf6345
Update Spawn.lua
#SPAWN Added option to use the center of the zone rather than a random postion when using InitRandomizeZone
2025-01-06 14:08:05 +01:00
Applevangelist
44a433eadf Merge remote-tracking branch 'origin/develop' into branch 2025-01-05 17:45:54 +01:00
Applevangelist
40cd58aa1c Merge remote-tracking branch 'origin/master' into branch 2025-01-05 17:45:47 +01:00
Applevangelist
578c65196c Merge remote-tracking branch 'origin/master' into develop 2025-01-05 17:45:08 +01:00
Applevangelist
64fb24ce96 Merge remote-tracking branch 'origin/develop' into develop 2025-01-05 17:44:37 +01:00
Applevangelist
45dd7117c7 #CLIENTMENUMANAGER Add a retry loop if possibly client not yet exists in Database 2025-01-05 17:44:32 +01:00
Applevangelist
a2c241da43 xx 2025-01-05 17:43:21 +01:00