FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,397 Commits 10 Branches 87 Tags
Commit Graph

7846 Commits

Author SHA1 Message Date
Applevangelist
f95d27bf80 Merge remote-tracking branch 'origin/master' into branch 2025-05-03 17:03:14 +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
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
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
f97ef25104 Update Unit.lua 2025-05-01 22:11:43 +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
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
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
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
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
shaji
195aac4504 [ADDED] IsAlive condition for Unit and Group out message 2025-04-22 20:57:06 +02:00
Thomas
326e27327d
Merge pull request #2286 from FlightControl-Master/master 
Kola airbase additions
 2025-04-21 19:38:24 +02:00
shaji
6f72697e26 [ADDED] New Kola airbases 
-- * AIRBASE.Kola.Alta
-- * AIRBASE.Kola.Sodankyla
-- * AIRBASE.Kola.Enontekio
-- * AIRBASE.Kola.Evenes
-- * AIRBASE.Kola.Hosio
 2025-04-21 19:11:22 +02:00
Applevangelist
46f9cf46e4 xxx 2025-04-20 17:50:16 +02:00
Applevangelist
296d4b1e93 Merge remote-tracking branch 'origin/master' into develop 2025-04-20 17:49:54 +02:00
Applevangelist
0f6439cf9f #MANTIS - added C-RAM Point Defense 2025-04-20 17:49:25 +02:00
Applevangelist
9705b49dbe #PLAYERTASKMANAGER - Surfaced some functions for conflict zones 2025-04-20 15:52:30 +02:00
Applevangelist
1c24786723 xx 2025-04-20 15:51:44 +02:00
Applevangelist
9364579a18 #EASYGCICAP - fixed some wrongly used self.values 
#OPSZONE - make check time schedule configureable
 2025-04-19 17:53:07 +02:00
Applevangelist
7ded993c49 xx 2025-04-19 17:52:17 +02:00
Applevangelist
2636ca166f xx 2025-04-19 17:49:03 +02:00
Applevangelist
ec2a89fa48 Merge remote-tracking branch 'origin/master' into branch 
# Conflicts:
#	Moose Development/Moose/Wrapper/Airbase.lua
 2025-04-18 19:46:12 +02:00
Frank
02a6d8f2c0 Merge branch 'master' into develop 2025-04-18 17:50:11 +02:00
Frank
2c10943cb1 Update Airbase.lua 
Germany map Umlaute
 2025-04-18 17:50:01 +02:00
Frank
a293c59d6d Merge branch 'master' into develop 2025-04-18 17:46:00 +02:00
Frank
544db963ea Update Airbase.lua 2025-04-18 17:45:43 +02:00
Frank
d3fd21e6da Merge branch 'master' into develop 2025-04-18 17:41:07 +02:00
Frank
207698a2dd Update Airbase.lua 
- Germany map readded Umlaute in keys
 2025-04-18 17:40:55 +02:00
Applevangelist
27cd90a0ce Merge remote-tracking branch 'origin/master' into develop 2025-04-18 16:02:56 +02:00
Applevangelist
d1ae2c0f5e xx 2025-04-18 16:01:55 +02:00