 Applevangelist
|
7df7a34c32
|
Merge remote-tracking branch 'origin/develop' into branch
|
2025-04-14 12:24:05 +02:00 |
|
|
Applevangelist
|
1d9ef869a7
|
Merge remote-tracking branch 'origin/master' into develop
|
2025-04-14 12:23:37 +02:00 |
|
|
Applevangelist
|
6fdf9a649f
|
#AIRBASE rescribe umlauts
|
2025-04-14 12:23:12 +02:00 |
|
|
Applevangelist
|
5d303752fe
|
Merge remote-tracking branch 'origin/develop' into branch
|
2025-04-14 12:14:03 +02:00 |
|
|
Applevangelist
|
66cb7dd9b7
|
Merge remote-tracking branch 'origin/master' into branch
# Conflicts:
# Moose Development/Moose/Wrapper/Airbase.lua
|
2025-04-14 12:13:55 +02:00 |
|
|
Applevangelist
|
e483d1bfca
|
xx
|
2025-04-14 12:13:08 +02:00 |
|
|
Applevangelist
|
90c6c57449
|
Merge remote-tracking branch 'origin/master' into develop
|
2025-04-14 12:11:56 +02:00 |
|
|
Applevangelist
|
d013bbc751
|
#STORAGE Enum, some additions
|
2025-04-14 12:11:27 +02:00 |
|
|
Applevangelist
|
e0092fdba0
|
#AIRBASE GermanCW Map airbases
|
2025-04-14 11:37:45 +02:00 |
|
|
Thomas
|
ecce2eff9b
|
Merge pull request #2281 from FlightControl-Master/master
Merge
|
2025-04-12 10:52:39 +02:00 |
|
|
Thomas
|
fbeada439f
|
Merge pull request #2278 from leka1986/patch-5
Update Group.lua
|
2025-04-12 10:51:42 +02:00 |
|
|
Thomas
|
6c8858d2f5
|
Merge pull request #2280 from leka1986/patch-7
Update Set.lua
|
2025-04-12 10:51:00 +02:00 |
|
|
Thomas
|
e2b77878df
|
Merge pull request #2279 from leka1986/patch-6
Update Event.lua
|
2025-04-12 10:50:39 +02:00 |
|
|
leka1986
|
53d7972858
|
Update Set.lua
Removed the Filter={},
|
2025-04-12 10:48:22 +02:00 |
|
|
leka1986
|
04a55e4104
|
Update Event.lua
Added nil checks which was causing nil. had this for a few weeks with no errors.
|
2025-04-12 10:44:29 +02:00 |
|
|
leka1986
|
d11acecdac
|
Update Group.lua
Fix for the error attempt to index a nil value called from suppression
|
2025-04-12 10:26:34 +02:00 |
|
|
Applevangelist
|
1456ff37d0
|
Merge remote-tracking branch 'origin/develop' into branch
|
2025-04-09 08:17:12 +02:00 |
|
|
Applevangelist
|
abc86a7e9c
|
Merge remote-tracking branch 'origin/master' into branch
# Conflicts:
# Moose Development/Moose/Cargo/CargoGroup.lua
|
2025-04-09 08:17:06 +02:00 |
|
|
Applevangelist
|
4b23c86daa
|
Merge remote-tracking branch 'origin/master' into develop
|
2025-04-09 08:16:20 +02:00 |
|
|
Applevangelist
|
49c11073e6
|
#MANTIS Mod data updates
|
2025-04-09 08:15:50 +02:00 |
|
|
Applevangelist
|
daa5caa125
|
Merge remote-tracking branch 'origin/master' into develop
|
2025-04-07 11:57:39 +02:00 |
|
|
Applevangelist
|
1a156e7e12
|
#CTLD - make menu build for CA a bit faster
|
2025-04-07 11:57:15 +02:00 |
|
|
Applevangelist
|
00c5d82590
|
xx
|
2025-04-07 11:56:54 +02:00 |
|
|
Applevangelist
|
6fe88a6319
|
Merge remote-tracking branch 'origin/master' into develop
|
2025-04-07 10:40:58 +02:00 |
|
|
Applevangelist
|
c902a1f601
|
xxx
|
2025-04-07 10:40:39 +02:00 |
|
|
Applevangelist
|
1856754614
|
#Smaller Changes
|
2025-04-07 10:40:30 +02:00 |
|
|
Thomas
|
b9f6c1b9c7
|
Merge pull request #2277 from FlightControl-Master/master
Update docs-header.py
|
2025-04-06 16:33:05 +02:00 |
|
|
Thomas
|
6ac452ff15
|
Update docs-header.py
|
2025-04-06 16:28:19 +02:00 |
|
|
Applevangelist
|
b52176a0ff
|
Merge remote-tracking branch 'origin/master' into develop
|
2025-04-06 16:19:43 +02:00 |
|
|
Applevangelist
|
d707a4775c
|
xx
|
2025-04-06 16:19:12 +02:00 |
|
|
Thomas
|
ffccc31e38
|
Update CargoGroup.lua
|
2025-04-06 16:12:13 +02:00 |
|
|
Thomas
|
0405af2bde
|
Update docs-header.py
|
2025-04-06 16:04:07 +02:00 |
|
|
Thomas
|
d09f0b1f6f
|
Update classes-core.md
|
2025-04-06 15:47:52 +02:00 |
|
|
Thomas
|
e50e572c78
|
Update classes-core.md
|
2025-04-06 15:43:09 +02:00 |
|
|
Applevangelist
|
d92a170304
|
Merge remote-tracking branch 'origin/develop' into branch
|
2025-04-06 15:39:50 +02:00 |
|
|
Applevangelist
|
41a9a1f74b
|
Merge remote-tracking branch 'origin/master' into branch
# Conflicts:
# Moose Development/Moose/Sound/RadioQueue.lua
|
2025-04-06 15:39:41 +02:00 |
|
|
Applevangelist
|
2e688e7da1
|
Merge remote-tracking branch 'origin/master' into develop
|
2025-04-06 15:38:55 +02:00 |
|
|
Applevangelist
|
3083599158
|
#CTLD - Allow CA Ground Transport
|
2025-04-06 15:38:26 +02:00 |
|
|
Applevangelist
|
9d7986e8d1
|
#CTLD - Allow CA Transport
|
2025-04-06 15:37:56 +02:00 |
|
|
Applevangelist
|
ff5adc29d9
|
xx
|
2025-04-03 14:22:53 +02:00 |
|
|
Applevangelist
|
2921f7a76b
|
Merge remote-tracking branch 'origin/master' into develop
|
2025-04-03 14:22:25 +02:00 |
|
|
Applevangelist
|
b7b6c1ea19
|
#RADIOQUEUE - small tweak for a group when a unit dies.
|
2025-04-03 14:21:58 +02:00 |
|
|
Applevangelist
|
b77ff793a3
|
Merge remote-tracking branch 'origin/develop' into branch
|
2025-04-03 11:50:12 +02:00 |
|
|
Applevangelist
|
08b95ec8c6
|
Merge remote-tracking branch 'origin/master' into branch
|
2025-04-03 11:50:06 +02:00 |
|
|
Applevangelist
|
8a185c352e
|
Merge remote-tracking branch 'origin/master' into develop
|
2025-04-03 11:49:30 +02:00 |
|
|
Applevangelist
|
5b107ce2da
|
#CONTROLLABLE:CommandSmokeOnOff(OnOff, Delay) added
|
2025-04-03 11:48:53 +02:00 |
|
|
Applevangelist
|
2c255d48c5
|
#CONTROLLABLE:CommandSmokeOnOff(OnOff, Delay) added
|
2025-04-03 11:48:37 +02:00 |
|
|
Thomas
|
5c1e342a79
|
Update classes-core.md
|
2025-04-03 09:33:49 +02:00 |
|
|
Applevangelist
|
3fc8f52796
|
Merge remote-tracking branch 'origin/master' into develop
|
2025-04-03 09:29:57 +02:00 |
|
|
Applevangelist
|
367ee31135
|
xx
|
2025-04-03 09:29:38 +02:00 |
|