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

7456 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Applevangelist
0ddf9ff807 Merge branch 'develop-2' into develop 2023-08-21 16:44:57 +02:00
Applevangelist
c40f310e10 Merge branch 'master' into develop 2023-08-21 16:44:51 +02:00
Thomas
084b47edb7
ENUMS error (#1993) 
* Storages Enum

* Update Enums.lua

Error in ENUM
 2023-08-21 11:36:15 +02:00
Thomas
8d2e291deb
Update Enums.lua 
Error in ENUM
 2023-08-21 11:35:01 +02:00
Frank
f84e2ede66 OPSTRANSPORT 
Storage
 2023-08-21 01:02:04 +02:00
Applevangelist
13f025aee1 Merge remote-tracking branch 'origin/develop' into develop 2023-08-20 15:23:38 +02:00
Applevangelist
675b1ef962 Merge remote-tracking branch 'origin/master' into develop 2023-08-20 15:23:33 +02:00
Applevangelist
0a8782c890 Storages enum 2023-08-20 15:23:09 +02:00
Applevangelist
3a432782b2 Storages Enum 2023-08-20 15:22:49 +02:00
Applevangelist
5fff8a60ba Storages 2023-08-20 15:22:29 +02:00
Applevangelist
36ae5a6bc2 Merge remote-tracking branch 'origin/develop' into develop 2023-08-20 15:14:33 +02:00
Applevangelist
939160e8df Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Utilities/Enums.lua
 2023-08-20 15:14:29 +02:00
Applevangelist
0460cc7e3e ENUMS.Storage.weapons 2023-08-20 15:13:32 +02:00
Applevangelist
5dd32d92c0 Merge remote-tracking branch 'origin/master' into develop 2023-08-20 15:13:18 +02:00
Applevangelist
d96cc26cd8 ENUMS.Storage.weapons 2023-08-20 15:12:59 +02:00
Applevangelist
bda1fac923 #ENUMS 
* Added enumerator for ENUMS.Storage.weapons
 2023-08-20 15:12:47 +02:00
Applevangelist
be5c1bed3b #PLAYERRECCE 
* QoL Fixes for menu, smoke, reports etc
 2023-08-20 14:18:43 +02:00
Applevangelist
e0acd4fd7d Merge remote-tracking branch 'origin/develop' into develop 2023-08-20 14:18:10 +02:00
Applevangelist
caf2fa4a5a Merge remote-tracking branch 'origin/master' into develop 2023-08-20 14:18:04 +02:00
Applevangelist
a0e8f7f3a9 #PLAYERRECCE 
* QoL Fixes for menus
 2023-08-20 14:17:39 +02:00
Thomas
ef40b1c524
Range fix for #1984 (#1992) 
Range fix for #1984
 2023-08-20 13:41:20 +02:00
Applevangelist
7f4baaae4d Fix for #1984 2023-08-20 13:27:46 +02:00
Frank
a4c81736aa Update DCS.lua 2023-08-20 11:57:37 +02:00
Applevangelist
2ee8516427 Fixes 2023-08-20 11:20:07 +02:00
Applevangelist
2eafadcedf Merge remote-tracking branch 'origin/master' into develop 2023-08-20 11:19:24 +02:00
Applevangelist
045c49679d #ATIS 
* Fix explicitly set RWY not reported via SRS
 2023-08-20 11:18:58 +02:00
Applevangelist
6b4c08d53f Merge remote-tracking branch 'origin/master' into develop 2023-08-18 11:08:47 +02:00
Applevangelist
4c2f71e818 Merge remote-tracking branch 'origin/develop' into develop 2023-08-18 11:08:20 +02:00
Applevangelist
d4942ab8f8 Merge remote-tracking branch 'origin/master' into develop 2023-08-18 11:08:14 +02:00
Applevangelist
f40442d309 #POSITIONABLE 
* Make cargo weights an enumerator
 2023-08-18 11:07:43 +02:00
Applevangelist
53712b8e40 POS 2023-08-18 11:05:48 +02:00
ttrebuchon
83bae9c2f7
Make default cargo bay capacity values configurable (#1989) 
* Add POSITIONABLE.CargoBayCapacityValues for manual configuration of cargo capacities.

* Add comment documenting local variable

* Remove extraneous semicolon

* Update Positionable.lua

Updated a bit plus documentation and working enumerator

---------

Co-authored-by: Thomas <72444570+Applevangelist@users.noreply.github.com>
 2023-08-18 11:01:38 +02:00
Applevangelist
4e4bd000d4 Merge remote-tracking branch 'origin/develop' into develop 2023-08-18 08:49:56 +02:00
Applevangelist
b873b7993e Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Core/Database.lua
 2023-08-18 08:49:50 +02:00
Frank
944ef6332b Merge branch 'develop' into FF/Ops 2023-08-17 19:14:23 +02:00
Frank
1329cd23fd Merge branch 'master' into develop 2023-08-17 19:13:47 +02:00
Frank
fe7acecdd3
Merge pull request #1991 from FlightControl-Master/FF/MasterDevel 
STORAGE - DCS Warehouse
 2023-08-17 19:11:01 +02:00
Frank
4471ec9b96 DCS Warehouse 2023-08-17 18:46:09 +02:00
Frank
32e1d4f8fa DCS Warehouse 2023-08-16 23:58:32 +02:00
Frank
dbd78f35a4
Merge pull request #1987 from ttrebuchon/tt/misc-bug-fixes 
Misc Bug Fixes
 2023-08-13 22:57:06 +02:00
ttrebuchon
a2772c97d5 Merge branch 'develop' into tt/misc-bug-fixes 2023-08-13 15:34:40 -04:00
ttrebuchon
4f8e65b515 Merge branch 'tt/warehouse-asset-size-fix' into tt/misc-bug-fixes 2023-08-13 15:27:29 -04:00
ttrebuchon
1d6437f9e2 Merge branch 'tt/commander-incorrect-argument-ordering' into tt/misc-bug-fixes 2023-08-13 15:27:25 -04:00
ttrebuchon
a733b17840 Merge branch 'tt/auftrag-UpdateMarker-null-ref-check' into tt/misc-bug-fixes 2023-08-13 15:27:16 -04:00
ttrebuchon
3adf6d635a Handle OPSGROUP:MarkWaypoints() when waypoint altitude is nil 2023-08-13 15:22:05 -04:00
ttrebuchon
2e9320df03 Add check for whether targetcoord is nil in UpdateMarker() call 2023-08-13 15:18:09 -04:00
ttrebuchon
d08219f9d9 Add missing "Mission.escortMissionType" argument to call to AssignAssetsForEscort 2023-08-13 15:16:46 -04:00
ttrebuchon
f929951dbe Fix WAREHOUSE.AssetItem size calculation 2023-08-13 15:12:51 -04:00
Frank
76a36cb9f9 Merge branch 'develop' into FF/Ops 2023-08-13 18:20:23 +02:00
Frank
56aebfbee8 Merge branch 'master' into develop 2023-08-13 18:20:09 +02:00