daa2b7da4d
xxx
2025-05-16 13:58:55 +02:00
5351c4f093
xx
2025-05-16 13:43:39 +02:00
5ff314d8e0
Merge remote-tracking branch 'origin/master' into branch
...
# Conflicts:
# Moose Development/Moose/AI/AI_A2A_Cap.lua
# Moose Development/Moose/AI/AI_A2A_Dispatcher.lua
# Moose Development/Moose/AI/AI_A2A_Gci.lua
# Moose Development/Moose/AI/AI_A2A_Patrol.lua
# Moose Development/Moose/AI/AI_A2G_BAI.lua
# Moose Development/Moose/AI/AI_A2G_CAS.lua
# Moose Development/Moose/AI/AI_A2G_Dispatcher.lua
# Moose Development/Moose/AI/AI_A2G_SEAD.lua
# Moose Development/Moose/AI/AI_Air.lua
# Moose Development/Moose/AI/AI_Air_Dispatcher.lua
# Moose Development/Moose/AI/AI_Air_Engage.lua
# Moose Development/Moose/AI/AI_Air_Patrol.lua
# Moose Development/Moose/AI/AI_Air_Squadron.lua
# Moose Development/Moose/AI/AI_BAI.lua
# Moose Development/Moose/AI/AI_Balancer.lua
# Moose Development/Moose/AI/AI_CAP.lua
# Moose Development/Moose/AI/AI_CAS.lua
# Moose Development/Moose/AI/AI_Cargo.lua
# Moose Development/Moose/AI/AI_Cargo_APC.lua
# Moose Development/Moose/AI/AI_Cargo_Airplane.lua
# Moose Development/Moose/AI/AI_Cargo_Dispatcher.lua
# Moose Development/Moose/AI/AI_Cargo_Dispatcher_APC.lua
# Moose Development/Moose/AI/AI_Cargo_Dispatcher_Airplane.lua
# Moose Development/Moose/AI/AI_Cargo_Dispatcher_Helicopter.lua
# Moose Development/Moose/AI/AI_Cargo_Dispatcher_Ship.lua
# Moose Development/Moose/AI/AI_Cargo_Helicopter.lua
# Moose Development/Moose/AI/AI_Cargo_Ship.lua
# Moose Development/Moose/AI/AI_Escort.lua
# Moose Development/Moose/AI/AI_Escort_Dispatcher.lua
# Moose Development/Moose/AI/AI_Escort_Dispatcher_Request.lua
# Moose Development/Moose/AI/AI_Escort_Request.lua
# Moose Development/Moose/AI/AI_Formation.lua
# Moose Development/Moose/AI/AI_Patrol.lua
# Moose Development/Moose/Actions/Act_Account.lua
# Moose Development/Moose/Actions/Act_Assign.lua
# Moose Development/Moose/Actions/Act_Assist.lua
# Moose Development/Moose/Actions/Act_Route.lua
# Moose Development/Moose/Cargo/Cargo.lua
# Moose Development/Moose/Cargo/CargoCrate.lua
# Moose Development/Moose/Cargo/CargoGroup.lua
# Moose Development/Moose/Cargo/CargoSlingload.lua
# Moose Development/Moose/Cargo/CargoUnit.lua
# Moose Development/Moose/Tasking/CommandCenter.lua
# Moose Development/Moose/Tasking/DetectionManager.lua
# Moose Development/Moose/Tasking/Mission.lua
# Moose Development/Moose/Tasking/Task.lua
# Moose Development/Moose/Tasking/TaskInfo.lua
# Moose Development/Moose/Tasking/Task_A2A.lua
# Moose Development/Moose/Tasking/Task_A2A_Dispatcher.lua
# Moose Development/Moose/Tasking/Task_A2G.lua
# Moose Development/Moose/Tasking/Task_A2G_Dispatcher.lua
# Moose Development/Moose/Tasking/Task_CARGO.lua
# Moose Development/Moose/Tasking/Task_Capture_Dispatcher.lua
# Moose Development/Moose/Tasking/Task_Capture_Zone.lua
# Moose Development/Moose/Tasking/Task_Cargo_CSAR.lua
# Moose Development/Moose/Tasking/Task_Cargo_Dispatcher.lua
# Moose Development/Moose/Tasking/Task_Cargo_Transport.lua
# Moose Development/Moose/Tasking/Task_Manager.lua
2025-05-16 11:56:23 +02:00
45bb0fff8a
xx
2025-05-16 11:48:14 +02:00
9a10b34933
xxx
2025-05-15 18:24:45 +02:00
7a5b9a75f3
#AIRBASE - added Syria Marka AFB
2025-05-15 17:07:55 +02:00
4bab2ee1de
Add deprecated banner
2025-05-15 13:19:42 +02:00
d7defe6f7f
xx
2025-05-15 11:42:05 +02:00
1231541053
xx
2025-05-15 11:39:42 +02:00
5e45e4a8ec
xxx
2025-05-15 10:05:25 +02:00
5a96a6078a
Merge remote-tracking branch 'origin/develop' into branch
2025-05-15 08:53:09 +02:00
8fdeca99be
Merge remote-tracking branch 'origin/master' into branch
2025-05-15 08:53:03 +02:00
f4cdbec376
Merge remote-tracking branch 'origin/develop' into develop
2025-05-15 08:52:18 +02:00
21d5a5dfac
Merge remote-tracking branch 'origin/master' into develop
2025-05-15 08:52:14 +02:00
f8947aab9c
#MANTIS - Make DLINK caching (DEV version) configureable
2025-05-15 08:51:44 +02:00
db869bcb6d
#MANTIS - Make DLINK caching (DEV version) configureable
2025-05-15 08:51:30 +02:00
6ff2725a1d
#MANTIS - Make DLINK cache time configureable
2025-05-15 08:50:56 +02:00
36a0cfd635
Merge pull request #2306 from FlightControl-Master/master
...
Merge
2025-05-15 06:52:23 +02:00
ea4a1f9ff9
Merge pull request #2305 from shaji-Dev/master
...
[FIXED] Kola Airbase name "Alakourtti" to "Alakurtti"
2025-05-15 06:42:07 +02:00
20406e40ca
[FIXED] Kola Airbase name "Alakourtti" to "Alakurtti"
2025-05-15 01:17:55 +02:00
acbcb14cba
Merge remote-tracking branch 'origin/master' into develop
2025-05-12 17:51:12 +02:00
3b50fee5a0
#CTLD - extract troops, check for groupname in task properties of PLAYERTASKs, so the right people rescue the correct group
2025-05-12 17:50:37 +02:00
804004198b
#MANTIS - Update docu
2025-05-12 17:49:25 +02:00
2b83d516d5
xxx
2025-05-12 17:48:50 +02:00
c5ec17a473
Merge remote-tracking branch 'origin/develop' into branch
...
# Conflicts:
# Moose Development/Moose/AI/AI_Formation.lua
2025-05-12 08:32:24 +02:00
a81de5e23f
Merge remote-tracking branch 'origin/master' into branch
...
# Conflicts:
# Moose Development/Moose/AI/AI_Formation.lua
# Moose Development/Moose/Actions/Act_Account.lua
# Moose Development/Moose/Functional/Fox.lua
# Moose Development/Moose/Tasking/Task_CARGO.lua
2025-05-12 08:31:17 +02:00
c1855cefd3
CTLD
2025-05-12 08:30:35 +02:00
67ef6c6e7b
Merge pull request #2304 from FlightControl-Master/master
...
Nil check
2025-05-12 07:01:15 +02:00
5b8b8a5566
Merge pull request #2303 from leka1986/master
...
Fix Line 77390: attempt to index local 'zonecoord' (a nil value)
2025-05-12 07:00:19 +02:00
0468bacc0b
Fix Line 77390: attempt to index local 'zonecoord' (a nil value)
2025-05-11 21:15:31 +02:00
eacc43cb5a
Merge remote-tracking branch 'origin/develop' into develop
2025-05-04 12:54:33 +02:00
f3dcde075c
Merge remote-tracking branch 'origin/master' into develop
...
# Conflicts:
# Moose Development/Moose/AI/AI_Formation.lua
# Moose Development/Moose/Functional/Fox.lua
2025-05-04 12:54:27 +02:00
7eba1349ae
Merge pull request #2301 from leka1986/master
...
VS Code pointed out some errors, like duplicated values in tables. This is first time I do changes through VS Code, Hope for the best
2025-05-04 10:47:28 +02:00
b6074a4795
VS Code pointed out some errors, like duplicated values in tables. This is first time I do changes through VS Code, Hope for the best
2025-05-04 10:38:44 +02:00
615afb7cc4
Merge pull request #2300 from FlightControl-Master/master
...
Merge from master
2025-05-03 20:33:49 +02:00
36c9f551d9
Merge pull request #2299 from leka1986/patch-3
...
Update CTLD.lua
2025-05-03 20:32:40 +02:00
89c3f7310b
Update CTLD.lua
...
Changed the naming from Get only to Get
and the order is Get, Get and load
Instead of Get and load, and Get only.
Changed the order on Pack and load, Pack and remove, pack only to
Pack, Pack and load, Pack and remove.
Same goes for Drop and build, Drop only to Drop, Drop and build.
It purely subjective what one would like, so I leave it up to you. If you like it this way or the first version, you decide, then disregard this change.
2025-05-03 19:22:59 +02:00
e9d812f315
Merge remote-tracking branch 'origin/develop' into branch
2025-05-03 17:03:30 +02:00
f95d27bf80
Merge remote-tracking branch 'origin/master' into branch
2025-05-03 17:03:14 +02:00
6791a0e704
Merge remote-tracking branch 'origin/master' into develop
2025-05-03 17:02:29 +02:00
a6b622ed31
#CTLD - Additional features by Lekaa to drop and build one/many in one go and pack/load or get/load in one go
2025-05-03 17:01:02 +02:00
be98ee52b7
xxx
2025-05-03 16:59:07 +02:00
f1af3a50b8
Update Unit.lua
...
- GetAmmo HE shells can also be named "HESH"
2025-05-02 21:36:03 +02:00
f999e45323
Merge remote-tracking branch 'origin/master' into develop
2025-05-02 10:53:29 +02:00
0c90e90c18
#CSAR - fixed design issue that prevented usage of ZONE objects as MASHes
2025-05-02 10:53:02 +02:00
4c9210586c
#CSAR - fix design issue that prevented usage of ZONE objects as MASHes
2025-05-02 10:52:34 +02:00
dc51f83249
Merge remote-tracking branch 'origin/develop' into branch
2025-05-02 09:35:22 +02:00
23ed39a708
Merge remote-tracking branch 'origin/master' into branch
2025-05-02 09:35:14 +02:00
44c59b97e8
CSAR
2025-05-02 09:34:43 +02:00
4747f3f48f
Merge branch 'master' into develop
2025-05-01 22:11:54 +02:00
Applevangelist