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
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
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
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
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
4747f3f48f
Merge branch 'master' into develop
2025-05-01 22:11:54 +02:00
f97ef25104
Update Unit.lua
2025-05-01 22:11:43 +02:00
e1a670185e
Merge pull request #2298 from FlightControl-Master/master
...
CTLD - Fix issue when a ship zone is destroyed
2025-04-28 09:22:32 +02:00
069c0aa03f
Merge pull request #2297 from FlightControl-Master/Applevangelist-patch-1
...
Update CTLD.lua
2025-04-28 09:20:58 +02:00
b145588ed5
Update CTLD.lua
...
Fix an issue when a ship is used as loading zone and the ship is destroyed
2025-04-28 09:20:04 +02:00
b678e2cde1
Merge remote-tracking branch 'origin/master' into develop
2025-04-27 11:26:51 +02:00
db23a0bf2b
#FlightGroup - added nil check for name
2025-04-27 11:26:22 +02:00
3ad60a95ce
#MANTIS - Adde Gepard data, made Roland Short
2025-04-27 11:25:46 +02:00
5c3b7312c0
Update Range.lua
...
- Reduced smoke duration at impact coordinate to 30 seconds
2025-04-26 23:55:13 +02:00
f177d0a257
Merge branch 'master' into develop
2025-04-26 23:39:34 +02:00
ac4b620f16
COORDINATE
...
- Improved Smoke and Fire and Smoke functions by adding delay and duration parameters
2025-04-26 23:39:22 +02:00
c49b56eefc
Merge pull request #2296 from FlightControl-Master/master
...
Merge from master
2025-04-26 07:53:01 +02:00
ccada18a6a
Merge pull request #2295 from leka1986/patch-2
...
Update CTLD.lua
2025-04-26 07:52:01 +02:00
1547d66327
Update CTLD.lua
...
Getting rid of this error,
bad argument #1 to 'find' (string expected, got nil)
2025-04-26 03:28:16 +02:00
e21236655a
Merge remote-tracking branch 'origin/develop' into develop
2025-04-24 14:48:17 +02:00
cdad3bd058
#PLAYERTASK - make an existing marker move with the group if the group is moving around
2025-04-24 14:48:12 +02:00
0db9c27f7e
Merge pull request #2294 from FlightControl-Master/master
...
Merge from master
2025-04-23 14:23:04 +02:00
8042e8bfaf
Merge pull request #2293 from shaji-Dev/master
...
[ADDED] AIRBOSS:SetMaxSectionDistance
2025-04-23 14:21:31 +02:00
dd7b87e9cd
[ADDED] AIRBOSS:SetMaxSectionDistance
2025-04-23 13:39:55 +02:00
68a539923f
Merge pull request #2292 from FlightControl-Master/master
...
Range os.date fix
2025-04-23 09:24:02 +02:00
460d2768ff
Merge pull request #2291 from FlightControl-Master/Applevangelist-patch-1
...
Update Range.lua
2025-04-23 09:03:54 +02:00
3c74272749
Update Range.lua
...
#RANGE log an error if os/os.date() are not available
2025-04-23 09:00:05 +02:00
3442725525
Merge pull request #2290 from FlightControl-Master/master
...
Merge from master
2025-04-23 06:29:32 +02:00
82c409d77a
Merge pull request #2289 from shaji-Dev/master
...
[ADDED] IsAlive condition for Unit and Group out message
2025-04-23 06:28:13 +02:00
195aac4504
[ADDED] IsAlive condition for Unit and Group out message
2025-04-22 20:57:06 +02:00
326e27327d
Merge pull request #2286 from FlightControl-Master/master
...
Kola airbase additions
2025-04-21 19:38:24 +02:00
08d8f3e25f
Merge pull request #2285 from shaji-Dev/master
...
[ADDED] New Kola airbases
2025-04-21 19:37:22 +02:00
Applevangelist