Rolf Geuenich
f3bafd5803
Merge branch 'master' into develop
2024-01-12 16:05:46 +01:00
Rolf Geuenich
bb07e1935e
Downpatching changes from development to master
2024-01-12 16:05:14 +01:00
Rolf Geuenich
2946c2e225
Merge branch 'master' into develop
...
# Conflicts:
# Moose Development/Moose/Functional/Artillery.lua
2024-01-12 15:45:50 +01:00
Rolf Geuenich
088436c5ce
Downpatching changes from development to master in Arty.lua
2024-01-12 15:44:28 +01:00
Rolf Geuenich
2e386be2f6
Merge branch 'master' into develop
...
# Conflicts:
# Moose Development/Moose/Core/Set.lua
2024-01-12 15:35:17 +01:00
Rolf Geuenich
797bf0047b
Down patching of code enhancements from develop to master in Set.lua
2024-01-12 15:33:27 +01:00
Applevangelist
9c0c93507a
Merge remote-tracking branch 'origin/master' into develop
2024-01-11 17:32:04 +01:00
Applevangelist
f29d055ca3
Correction
2024-01-11 17:31:40 +01:00
Applevangelist
baf7123364
Merge remote-tracking branch 'origin/master' into develop
2024-01-11 17:14:43 +01:00
Applevangelist
1468641563
CTLD - avoid UHT beacons between 243 and 320 mHz
2024-01-11 17:14:07 +01:00
Applevangelist
f6b6a6a577
#EASYGCICAP
...
* Added assignment of in-flight groups to intercepts
2024-01-11 16:11:51 +01:00
Applevangelist
4d7d34b71f
Merge remote-tracking branch 'origin/master' into develop
2024-01-11 12:52:42 +01:00
Applevangelist
82bea9d5ff
Merge remote-tracking branch 'origin/develop' into develop
2024-01-11 12:52:19 +01:00
Applevangelist
35d91c9c94
EASYGCICAP Additions
2024-01-11 12:52:15 +01:00
Applevangelist
8b08942c4d
CONTROLLABLE - Added options for Radar Using
2024-01-11 12:52:02 +01:00
kaltokri
a44ad5c755
Changed order to match master branch for better auto-merge
2024-01-11 10:05:22 +01:00
kaltokri
b7236eeb58
Merge branch 'master' into develop
2024-01-10 15:43:38 +01:00
kaltokri
eb84ad3cee
Fix for Moose_Create.lua and dynamic path
2024-01-10 15:43:24 +01:00
kaltokri
09933b307b
Merge branch 'master' into develop
2024-01-10 15:41:02 +01:00
kaltokri
91a34ac4d8
Added PyCharm to gitignore
2024-01-10 15:40:46 +01:00
kaltokri
21babb548c
Fixed typo off manual merge and added PyCharm to gitignore
2024-01-10 15:39:23 +01:00
Applevangelist
11967bd608
Merge remote-tracking branch 'origin/develop' into develop
...
# Conflicts:
# Moose Development/Moose/Modules.lua
2024-01-10 15:21:16 +01:00
Applevangelist
ea6e63dc9b
Merge remote-tracking branch 'origin/master' into develop
...
# Conflicts:
# Moose Development/Moose/Modules.lua
# Moose Development/Moose/Ops/Airboss.lua
2024-01-10 15:20:29 +01:00
Applevangelist
28c8d99878
Added player name to ...PilotDown() event
2024-01-10 15:18:38 +01:00
kaltokri
547579ffb0
Merge branch 'master' into develop
...
# Conflicts:
# Moose Development/Moose/Modules.lua
# Moose Development/Moose/Ops/Airboss.lua
2024-01-10 14:26:55 +01:00
kaltokri
4fda8cc5fb
Easy debugging for all Moosers #2093
...
Enables everybody to use load Moose from an external full path.
This is needed to use PyCharm with EmmyLua Debugger.
Needs also De-Sanitize to load mission script with full path.
2024-01-10 14:12:17 +01:00
Applevangelist
697042eac6
EASYGCICAP - less noise
2024-01-10 13:38:48 +01:00
Applevangelist
30d6936f1d
MSRS changes
2024-01-09 17:47:14 +01:00
Applevangelist
4ac583e434
SRS changes
2024-01-09 17:28:58 +01:00
Applevangelist
b315375ade
xxx
2024-01-09 08:58:07 +01:00
Frank
e26647c2ca
OPSTRANSPORT
...
- Fixed SET not working with FilterActive
2024-01-07 17:24:51 +01:00
Applevangelist
4ddd278471
#AWACS
...
* Picture clean, correct order of callsigns
2024-01-07 15:40:17 +01:00
Applevangelist
72e31b90a9
Merge remote-tracking branch 'origin/master' into develop
2024-01-07 14:44:45 +01:00
Applevangelist
fa762fe0fc
#MSRS
...
* Added voice enumerator ofr gRPC using MS as provider MSRS.Voices.MicrosoftGRPC
2024-01-07 14:44:07 +01:00
Mr.Alien
aca5846209
Fix scoring to not het more points when not killed at once. + overridable method call on kill ( #2079 )
2024-01-07 13:28:12 +01:00
Mr.Alien
4fd7d7cba9
Spawn all unit randomly inside a zone, instead of only the first unit in zone and the other within a radius (potentially outside the zone, and in some cases in the middle of a runway) ( #2069 )
2024-01-07 13:27:23 +01:00
ttrebuchon
677d888d96
Use total cargo weight when computing asset score for transport missions ( #2065 )
...
* Optimize carrier assets for OPSTRANSPORT based on total cargo weight
* Clean up code/comments for TotalWeight scoring
* Add missing parameter documentation
2024-01-07 13:26:58 +01:00
Applevangelist
06c3ca0079
MSRS additions
2024-01-07 13:25:32 +01:00
Applevangelist
9280a1224d
MSRS additions
2024-01-07 13:23:50 +01:00
Applevangelist
406dbb707a
Merge remote-tracking branch 'origin/develop' into develop
2024-01-06 18:22:41 +01:00
Applevangelist
4758af61c2
Merge remote-tracking branch 'origin/master' into develop
2024-01-06 18:22:36 +01:00
Applevangelist
729c1f5e33
Fixes for MSRS changes
...
#STRATEGO
* fix for an AB not having a zone
2024-01-06 18:22:18 +01:00
Applevangelist
fce7b07014
Fixes for MSRS changes
2024-01-06 18:21:39 +01:00
kaltokri
8386fe5f67
Merge branch 'master' into develop
2024-01-06 12:22:25 +01:00
kaltokri
4696569f83
Added mission check for desanitized io
2024-01-06 12:22:02 +01:00
Applevangelist
2c695e187f
Merge remote-tracking branch 'origin/master' into develop
2024-01-05 16:09:22 +01:00
Applevangelist
048ab6acfe
Fixes for 4th SRS Parameter
2024-01-05 16:09:05 +01:00
Applevangelist
84230e2360
Fixes for 4th SRS Parameter
2024-01-05 16:08:46 +01:00
Applevangelist
f2783c46c2
Merge remote-tracking branch 'origin/master' into develop
2024-01-05 15:51:35 +01:00
Applevangelist
ca9913e38b
nu aber
2024-01-05 15:51:09 +01:00
