Applevangelist
eacc43cb5a
Merge remote-tracking branch 'origin/develop' into develop
2025-05-04 12:54:33 +02:00
Applevangelist
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
Thomas
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
leka1986
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
Thomas
615afb7cc4
Merge pull request #2300 from FlightControl-Master/master
...
Merge from master
2025-05-03 20:33:49 +02:00
Thomas
36c9f551d9
Merge pull request #2299 from leka1986/patch-3
...
Update CTLD.lua
2025-05-03 20:32:40 +02:00
leka1986
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
Applevangelist
e9d812f315
Merge remote-tracking branch 'origin/develop' into branch
2025-05-03 17:03:30 +02:00
Applevangelist
f95d27bf80
Merge remote-tracking branch 'origin/master' into branch
2025-05-03 17:03:14 +02:00
Applevangelist
6791a0e704
Merge remote-tracking branch 'origin/master' into develop
2025-05-03 17:02:29 +02:00
Applevangelist
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
Applevangelist
be98ee52b7
xxx
2025-05-03 16:59:07 +02:00
Frank
f1af3a50b8
Update Unit.lua
...
- GetAmmo HE shells can also be named "HESH"
2025-05-02 21:36:03 +02:00
Applevangelist
f999e45323
Merge remote-tracking branch 'origin/master' into develop
2025-05-02 10:53:29 +02:00
Applevangelist
0c90e90c18
#CSAR - fixed design issue that prevented usage of ZONE objects as MASHes
2025-05-02 10:53:02 +02:00
Applevangelist
4c9210586c
#CSAR - fix design issue that prevented usage of ZONE objects as MASHes
2025-05-02 10:52:34 +02:00
Applevangelist
dc51f83249
Merge remote-tracking branch 'origin/develop' into branch
2025-05-02 09:35:22 +02:00
Applevangelist
23ed39a708
Merge remote-tracking branch 'origin/master' into branch
2025-05-02 09:35:14 +02:00
Applevangelist
44c59b97e8
CSAR
2025-05-02 09:34:43 +02:00
Frank
4747f3f48f
Merge branch 'master' into develop
2025-05-01 22:11:54 +02:00
Frank
f97ef25104
Update Unit.lua
2025-05-01 22:11:43 +02:00
Thomas
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
Thomas
069c0aa03f
Merge pull request #2297 from FlightControl-Master/Applevangelist-patch-1
...
Update CTLD.lua
2025-04-28 09:20:58 +02:00
Thomas
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
Applevangelist
9721f743a0
Merge remote-tracking branch 'origin/develop' into branch
2025-04-27 11:27:59 +02:00
Applevangelist
63899923fb
Merge remote-tracking branch 'origin/master' into branch
2025-04-27 11:27:40 +02:00
Applevangelist
b678e2cde1
Merge remote-tracking branch 'origin/master' into develop
2025-04-27 11:26:51 +02:00
Applevangelist
db23a0bf2b
#FlightGroup - added nil check for name
2025-04-27 11:26:22 +02:00
Applevangelist
3ad60a95ce
#MANTIS - Adde Gepard data, made Roland Short
2025-04-27 11:25:46 +02:00
Applevangelist
4fbbf70b8e
xx
2025-04-27 11:23:16 +02:00
Frank
5c3b7312c0
Update Range.lua
...
- Reduced smoke duration at impact coordinate to 30 seconds
2025-04-26 23:55:13 +02:00
Frank
f177d0a257
Merge branch 'master' into develop
2025-04-26 23:39:34 +02:00
Frank
ac4b620f16
COORDINATE
...
- Improved Smoke and Fire and Smoke functions by adding delay and duration parameters
2025-04-26 23:39:22 +02:00
Thomas
c49b56eefc
Merge pull request #2296 from FlightControl-Master/master
...
Merge from master
2025-04-26 07:53:01 +02:00
Thomas
ccada18a6a
Merge pull request #2295 from leka1986/patch-2
...
Update CTLD.lua
2025-04-26 07:52:01 +02:00
leka1986
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
Applevangelist
e38dc77c4b
Merge remote-tracking branch 'origin/develop' into branch
2025-04-24 14:49:44 +02:00
Applevangelist
f283e68a63
Merge remote-tracking branch 'origin/master' into branch
2025-04-24 14:49:33 +02:00
Applevangelist
e21236655a
Merge remote-tracking branch 'origin/develop' into develop
2025-04-24 14:48:17 +02:00
Applevangelist
cdad3bd058
#PLAYERTASK - make an existing marker move with the group if the group is moving around
2025-04-24 14:48:12 +02:00
Applevangelist
96d52ea393
xxx
2025-04-24 14:47:02 +02:00
Thomas
0db9c27f7e
Merge pull request #2294 from FlightControl-Master/master
...
Merge from master
2025-04-23 14:23:04 +02:00
Thomas
8042e8bfaf
Merge pull request #2293 from shaji-Dev/master
...
[ADDED] AIRBOSS:SetMaxSectionDistance
2025-04-23 14:21:31 +02:00
shaji
dd7b87e9cd
[ADDED] AIRBOSS:SetMaxSectionDistance
2025-04-23 13:39:55 +02:00
Thomas
68a539923f
Merge pull request #2292 from FlightControl-Master/master
...
Range os.date fix
2025-04-23 09:24:02 +02:00
Thomas
460d2768ff
Merge pull request #2291 from FlightControl-Master/Applevangelist-patch-1
...
Update Range.lua
2025-04-23 09:03:54 +02:00
Thomas
3c74272749
Update Range.lua
...
#RANGE log an error if os/os.date() are not available
2025-04-23 09:00:05 +02:00
Thomas
3442725525
Merge pull request #2290 from FlightControl-Master/master
...
Merge from master
2025-04-23 06:29:32 +02:00
Thomas
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
shaji
195aac4504
[ADDED] IsAlive condition for Unit and Group out message
2025-04-22 20:57:06 +02:00
