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

797 Commits

Author SHA1 Message Date
Applevangelist
0a812d8283 Merge branch 'develop-2' into develop 
# Conflicts:
#	Moose Development/Moose/Modules_local.lua
#	Moose Development/Moose/Utilities/Routines.lua
#	Moose Development/Moose/Wrapper/Group.lua
 2023-09-09 12:29:26 +02:00
Thomas
515764bb88
Update Group.lua 
Docu fix
 2023-09-09 11:56:28 +02:00
Applevangelist
e5e81dbc35 Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Modules.lua
 2023-09-08 11:20:11 +02:00
Applevangelist
e95a9525c6 #GENERAL 
* Remove dependencies from UTILS.Routines
* Remove UTILS.Routines
 2023-09-08 11:14:41 +02:00
Applevangelist
568f76b0b2 #UTILS 
* Remove utils.routines
 2023-09-07 18:01:16 +02:00
Applevangelist
eb67e938f8 Merge remote-tracking branch 'origin/master' into develop 2023-08-26 16:09:10 +02:00
Applevangelist
30cadf0d42 test 2023-08-26 16:08:45 +02:00
Frank
94dde73561 Merge branch 'master' into develop 2023-08-26 14:05:51 +02:00
Frank
ad5488784f Update Storage.lua 
**STORAGE**
- Added easier functions to add, set and remove items and liquids.
- Added checks if warehouse items are limited or unlimited.
 2023-08-26 13:56:45 +02:00
Applevangelist
3e36e5f2b2 #Controllable 
* Added Aerobtics tasks
 2023-08-22 10:25:26 +02:00
Applevangelist
cf824b912d #Controllable 
* Added Aerobtics tasks
 2023-08-22 10:24:40 +02:00
Applevangelist
fd80339431 #Controllable 
* Added Aerobtics tasks
 2023-08-22 10:24:19 +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
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
1329cd23fd Merge branch 'master' into develop 2023-08-17 19:13:47 +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
Applevangelist
ffdcfa0129 Merge remote-tracking branch 'origin/master' into develop 2023-08-02 18:03:03 +02:00
Applevangelist
c5757ffd22 #CONTROLLABLE 
* Added EnRouteTaskCAP()
 2023-08-02 18:02:34 +02:00
Applevangelist
bbae91bb6c #CONTROLLABLE 
* Added EnRouteTaskCAP()
 2023-08-02 18:02:22 +02:00
Applevangelist
5231bc8372 # 2023-08-01 16:26:51 +02:00
Applevangelist
9cc08cb088 # 2023-08-01 16:26:29 +02:00
Applevangelist
268b7ef80c Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	Moose Development/Moose/Wrapper/Scenery.lua
 2023-08-01 16:26:14 +02:00
Applevangelist
172004b822 Merge remote-tracking branch 'origin/master' into develop 2023-08-01 16:19:33 +02:00
Applevangelist
f085a5423a SCENERY 2023-08-01 16:18:41 +02:00
Applevangelist
2771e7f856 #SCENERY, SET_SCENERY 
* Reworked COORDINATE scan as this doesn't seem to work
* Added SET_SCENERY Filters, and FilterOnce() to apply them
 2023-08-01 16:18:23 +02:00
Applevangelist
9a9ac6f2e1 SCENERY 2023-08-01 11:38:02 +02:00
Thomas
677a64c3dc
Update Scenery.lua (#1980) (#1981) 
_id might be nil in :FindByZoneName()
 2023-08-01 10:38:39 +02:00
Thomas
1fdc50b0da
Update Scenery.lua (#1980) 
_id might be nil in :FindByZoneName()
 2023-08-01 10:00:42 +02:00
Applevangelist
f84d02d8a1 Merge remote-tracking branch 'origin/master' into develop 2023-07-23 12:42:59 +02:00
Applevangelist
02fadaf17e #AIRBASE, #ATIS 2023-07-23 12:38:21 +02:00
Applevangelist
46258492bd #AIRBASE, #ATIS 
* Additions
 2023-07-23 12:37:57 +02:00
Applevangelist
0326bee7a3 # 2023-07-11 15:42:14 +02:00
Applevangelist
8979097fd7 Merge remote-tracking branch 'origin/master' into develop 2023-07-03 17:06:47 +02:00
Applevangelist
0d6fe49a41 changes 2023-07-03 16:45:02 +02:00
Applevangelist
8c8ef19f01 #CONTROLLABLE 
* Added TaskGroundEscort
 2023-07-03 16:44:46 +02:00
Thomas
ffcfc448be
Update Controllable.lua 2023-07-03 13:53:59 +02:00
Applevangelist
178005346d Merge remote-tracking branch 'origin/master' into develop 2023-07-01 13:12:54 +02:00
Applevangelist
0bb16ec827 #AIRBASE 
* Fix for nil error in finding parking for a group

#MANTIS
* Added SAM type "SHORAD" as designator

#SCORING
* fix for non local problem

#UTILS
* fix for OneLineSerialize
 2023-07-01 13:11:21 +02:00
Applevangelist
b3e9a2b64d #fixes 2023-07-01 13:08:00 +02:00
Applevangelist
c7a66e0f99 #Fixes 2023-06-26 17:29:02 +02:00
Applevangelist
abf694aa81 # Docu fixes 2023-06-22 12:19:20 +02:00
Applevangelist
cdbbad809a Merge remote-tracking branch 'origin/master' into develop 2023-06-21 10:43:40 +02:00
Applevangelist
8af5a532e3 Merge remote-tracking branch 'origin/master' into develop 2023-06-21 10:43:08 +02:00
Applevangelist
7164e211f2 #AIRBASE 
- Nicosia unused atm
 2023-06-21 10:42:35 +02:00
Applevangelist
f8963b33a3 Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	Moose Development/Moose/Wrapper/Positionable.lua
#	Moose Development/Moose/Wrapper/Unit.lua
 2023-06-18 12:21:40 +02:00
Applevangelist
c80213b4cf #AIRBOSS 
* Initial SRS addition
 2023-06-16 18:18:18 +02:00
Applevangelist
ef17399128 #AIRBOSS SRS 2023-06-16 18:10:07 +02:00