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
7,042 Commits 10 Branches 87 Tags
Commit Graph

1627 Commits

Author SHA1 Message Date
Applevangelist
9cfed56847 #CTLD logic correction for loading 2023-02-21 11:38:40 +01:00
Applevangelist
0b692d045f #CTLD logic correction for loading 2023-02-21 11:38:24 +01:00
Frank
91e80bf1a6 Merge branch 'FF/Ops' into FF/OpsDev 2023-02-16 17:30:47 +01:00
Frank
e6464dc5cb Merge branch 'develop' into FF/Ops 2023-02-16 17:30:15 +01:00
Applevangelist
44b6315361 #NET 
* Added event management for clients and block/unblock functions
 2023-02-16 11:42:10 +01:00
Frank
baa1dcbf8f OPSGROUP 
- mission nothing is cancelled if transport is due
 2023-02-15 23:06:34 +01:00
Applevangelist
ef0ddddb46 #PLAYERTASK 
* added group/unit check for UseTypeNames
 2023-02-15 10:32:30 +01:00
Applevangelist
b649ad73a8 Fixes 2023-02-15 10:31:40 +01:00
Applevangelist
bf50adaa22 #PLAYERTASKCONTROLLER 
* Added ship detail types
 2023-02-14 12:58:39 +01:00
Applevangelist
77a39364f4 #PLAYERTASKCONTROLLER 
* Added ship detail types
 2023-02-14 12:58:23 +01:00
Applevangelist
6d9e2fbfe1 Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Core/Database.lua
#	Moose Development/Moose/Modules.lua
#	Moose Setup/Moose.files
 2023-02-13 16:41:32 +01:00
Frank
dc0a2bccd6 Update Legion.lua 
- Increase score for nearby ground groups
 2023-02-12 15:19:34 +01:00
Frank
4e280f02b6 Merge branch 'FF/Ops' into FF/OpsDev 2023-02-12 11:53:42 +01:00
Frank
854f6ae6ae Merge branch 'develop' into FF/Ops 2023-02-12 11:52:13 +01:00
Frank
0487487e7c Merge branch 'master' into develop 2023-02-12 11:51:16 +01:00
Frank
f11dbfa367 Merge branch 'FF/MasterDevel' 2023-02-12 11:49:13 +01:00
Frank
9ec66912c8 Update OpsGroup.lua 
- Added SetCargoBayLimit function
 2023-02-12 09:36:35 +01:00
Frank
e55f96f393 OPSTRANSPORT 2023-02-11 00:21:15 +01:00
Applevangelist
713a5b067f #PLAYERTASKCONTROLLER 
* Added `AddAgentSet()`
 2023-02-10 11:40:15 +01:00
Applevangelist
0ec039bb39 #PLAYERTASKCONTROLLER 
* Added `AddAgentSet()`
 2023-02-10 11:38:45 +01:00
Frank
709fccd96c OSPTRANSPORT 2023-02-09 01:06:36 +01:00
Frank
2c24e56aa5 Merge branch 'FF/MasterDevel' into FF/OpsDev 2023-02-08 16:35:49 +01:00
Frank
ffc86bf046 Unwanted changes 2023-02-08 16:28:04 +01:00
Frank
bbd8ceb8c0 Merge branch 'develop' into FF/Ops 2023-02-08 16:15:06 +01:00
Frank
b8498fa58f Merge branch 'FF/MasterDevel' into FF/OpsDev 2023-02-08 16:14:45 +01:00
Frank
34c26c44bc Merge branch 'develop' into FF/OpsDev 2023-02-07 22:53:19 +01:00
Applevangelist
afa17f95f9 Merge remote-tracking branch 'origin/master' into develop 2023-02-07 08:02:05 +01:00
Applevangelist
c97f1791b0 Merge remote-tracking branch 'origin/master' into develop 2023-02-07 08:01:34 +01:00
Thomas
5b044cc036
Update CSAR.lua (#1917) 2023-02-07 07:28:00 +01:00
Frank
d3d60757c1 Merge branch 'develop' into FF/Ops 2023-02-05 00:23:25 +01:00
Applevangelist
23091ff851 #CTLD 
* Added method `CTLD:PreloadCrates(Unit,Cratesname,NumberOfCrates)`
 2023-02-04 17:21:52 +01:00
Applevangelist
4748c66d9c #CTLD 
* Added method `CTLD:PreloadCrates(Unit,Cratesname,NumberOfCrates)`
 2023-02-04 17:21:16 +01:00
Applevangelist
8a45f78251 fix 2023-02-04 17:20:05 +01:00
Applevangelist
036b6b77b1 #CTLD 
* Added preload crates
 2023-02-04 17:14:52 +01:00
Applevangelist
3775053609 PLAYERRECCE - bug fix 2023-02-02 09:47:25 +01:00
Applevangelist
b81bf447a9 fix 2023-02-02 09:47:05 +01:00
Applevangelist
69ba31b44d Merge remote-tracking branch 'origin/develop' into develop 2023-02-02 09:38:15 +01:00
Applevangelist
710b488663 Merge remote-tracking branch 'origin/master' into develop 2023-02-02 09:38:06 +01:00
Applevangelist
6510cca837 Merge remote-tracking branch 'origin/develop' into develop 2023-02-02 09:36:48 +01:00
Applevangelist
08b8dfbe0e Merge remote-tracking branch 'origin/master' into develop 2023-02-02 09:36:44 +01:00
Applevangelist
f9aa392c6d #CTLD_HERCULES 
* Fixed an issue spawning 90 paratroopers instead of 30
 2023-02-02 09:35:53 +01:00
ttrebuchon
fec496f154 Fix missing check for b.unlimited~=true in sortpayloads function. 2023-02-01 12:30:52 -05:00
Thomas
28fd35ad7e
PlayerRecce - Added Shark_3 as type 2023-02-01 12:17:54 +01:00
Applevangelist
9dac61cbb6 #CTLD 
* Added Subcategories for static cargo objects
 2023-01-31 11:28:14 +01:00
Applevangelist
ee6d34a9bd #CTLD 
* Added Subcategories for static cargo objects
 2023-01-31 11:28:00 +01:00
Applevangelist
48721859fa #CTLD 
* Added Subcategories for static cargo objects
 2023-01-31 11:27:12 +01:00
Applevangelist
fdf2d936f9 Merge remote-tracking branch 'origin/master' into develop 2023-01-29 18:37:57 +01:00
Applevangelist
5b8f840d6e Merge remote-tracking branch 'origin/master' into develop 2023-01-29 18:37:19 +01:00
Applevangelist
2f4f98cfe0 #CTLD - nobuildmenu option 2023-01-29 18:36:44 +01:00
Applevangelist
ab4bf1f0a8 Merge remote-tracking branch 'origin/develop' into develop 2023-01-29 17:21:30 +01:00