10487 Commits

Author SHA1 Message Date
Thomas
81a403f02d
Merge pull request #2204 from FlightControl-Master/master
Update Mantis.lua
2025-01-01 08:32:57 +01:00
Thomas
6144a61a2e
Update Mantis.lua
Fix for zones count on possible empty variables
2025-01-01 08:31:06 +01:00
Applevangelist
3090100265 Merge remote-tracking branch 'origin/develop' into branch 2024-12-31 15:36:14 +01:00
Applevangelist
87356291f7 Merge remote-tracking branch 'origin/master' into branch 2024-12-31 15:36:05 +01:00
Applevangelist
df102fba6c Merge remote-tracking branch 'origin/master' into develop 2024-12-31 15:35:23 +01:00
Applevangelist
5d192abd25 #SEAD - Add AGM_65 2024-12-31 15:34:46 +01:00
Applevangelist
633186ca8a xx 2024-12-31 15:34:28 +01:00
Applevangelist
411d20ba26 #SEAD - Add AGM_65 2024-12-31 15:33:28 +01:00
Applevangelist
902f6dae11 Merge remote-tracking branch 'origin/master' into develop 2024-12-31 14:05:41 +01:00
Applevangelist
62337f445a #CTLD - Save and load special static shapes, if they are set 2024-12-31 14:04:46 +01:00
Applevangelist
6eac89c038 #CTLD - also save and load static special shapes if they are set 2024-12-31 14:04:16 +01:00
Applevangelist
08b6fa520d Merge remote-tracking branch 'origin/develop' into branch 2024-12-30 14:43:02 +01:00
Applevangelist
b69cea999e Merge remote-tracking branch 'origin/master' into branch 2024-12-30 14:42:56 +01:00
Applevangelist
b38c1c5827 xx 2024-12-30 14:42:03 +01:00
Thomas
8309768735
Merge pull request #2203 from shaji-Dev/Heartbreaker
Mankind saved.
2024-12-30 13:40:54 +01:00
Shafik
42e6b57296 Mankind saved. 2024-12-30 14:09:25 +02:00
Shafik
2835ec812f Mankind saved. 2024-12-30 14:08:04 +02:00
Applevangelist
91db9127da Merge remote-tracking branch 'origin/develop' into branch 2024-12-30 12:05:17 +01:00
Applevangelist
c4512651cf Merge remote-tracking branch 'origin/master' into branch 2024-12-30 12:05:10 +01:00
Applevangelist
990161729b Merge remote-tracking branch 'origin/master' into develop 2024-12-30 11:47:11 +01:00
Applevangelist
c08cee2317 #STORAGE Documentation for persistence 2024-12-30 11:45:31 +01:00
Applevangelist
26530f25fb Merge remote-tracking branch 'origin/develop' into branch 2024-12-29 18:10:12 +01:00
Applevangelist
d51961ac8c Merge remote-tracking branch 'origin/master' into branch
# Conflicts:
#	Moose Development/Moose/Wrapper/Storage.lua
2024-12-29 18:10:05 +01:00
Applevangelist
e1ea4322a1 Merge remote-tracking branch 'origin/master' into develop 2024-12-29 18:08:45 +01:00
Applevangelist
0f7759d070 #STORAGE - Added StartAutoSave and StopAutoSave() 2024-12-29 18:04:42 +01:00
Applevangelist
6523c4473f Merge remote-tracking branch 'origin/master' into develop 2024-12-29 12:53:35 +01:00
Applevangelist
4a0842bea6 #STORAGE - Added persistence options 2024-12-29 12:52:51 +01:00
Applevangelist
80e20e59ec #STORAGE - Added persistence options 2024-12-29 12:52:21 +01:00
Applevangelist
80906ded28 Merge remote-tracking branch 'origin/develop' into branch 2024-12-28 14:53:42 +01:00
Applevangelist
7cb04e65ca Merge remote-tracking branch 'origin/master' into branch 2024-12-28 14:53:38 +01:00
Applevangelist
3745e6a8d8 Merge remote-tracking branch 'origin/master' into develop 2024-12-28 14:52:54 +01:00
Applevangelist
3b3666c5f7 #AIRBASE add 2 Kola bases, correct #ENUM for OH-58D weps in STORAGE 2024-12-28 14:52:09 +01:00
Thomas
9e1a28f7ca
Merge pull request #2202 from Fedge7/personal/fedge/enums-weapons-oh58-dec2024
Corrects the table values for OH58 weapon enums for patch `2.9.11.4686.`
2024-12-28 09:26:46 +01:00
Fedge
82c7e921eb Corrects the table values for OH58 weapon enums for patch 2.9.11.4686. 2024-12-27 18:48:30 -07:00
Applevangelist
67ccf532ea Merge remote-tracking branch 'origin/master' into develop 2024-12-27 14:41:15 +01:00
Applevangelist
45912911ee #MSRS Google 2025 voice catalog 2024-12-27 14:40:32 +01:00
Applevangelist
8cd625b6f9 #MSRS Google 2025 voice catalog 2024-12-27 14:40:23 +01:00
Applevangelist
152a8cf9da Merge remote-tracking branch 'origin/develop' into branch 2024-12-27 12:27:42 +01:00
Applevangelist
bb648b4396 Merge remote-tracking branch 'origin/master' into branch 2024-12-27 12:27:21 +01:00
Applevangelist
c7fe42d919 Merge remote-tracking branch 'origin/master' into develop 2024-12-27 12:26:31 +01:00
Applevangelist
9916afaa49 #COORDINATE Adding names to smoke to be able to switch them off earlier 2024-12-27 12:25:25 +01:00
Applevangelist
55c5a23616 #CTLD Bugfix in selecting correct helo distance when hover/ground for the Chinook 2024-12-27 12:25:00 +01:00
Applevangelist
7b6df08268 #AUTOLASE - Somewhat nicer report display 2024-12-27 12:24:26 +01:00
Applevangelist
ecdca9919e xx 2024-12-27 12:24:02 +01:00
Applevangelist
9bf2a013d5 Merge remote-tracking branch 'origin/develop' into branch 2024-12-26 17:20:56 +01:00
Applevangelist
4b2bc909e6 Merge remote-tracking branch 'origin/master' into branch 2024-12-26 17:20:51 +01:00
Applevangelist
b3ed0681a8 xx 2024-12-26 17:19:14 +01:00
Applevangelist
9300050573 Merge remote-tracking branch 'origin/master' into develop 2024-12-26 17:18:28 +01:00
Applevangelist
6bee1cc88e Small additions 2024-12-26 17:16:43 +01:00
Applevangelist
0e75f64217 Merge remote-tracking branch 'origin/develop' into branch 2024-12-22 13:01:34 +01:00