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

775 Commits

Author SHA1 Message Date
Frank
059d8ccfc0 Merge branch 'FF/Ops' of https://github.com/FlightControl-Master/MOOSE into FF/Ops 2023-10-31 10:45:58 +01:00
Frank
bd9022c010 ARMYGROUP 
Added parameter to delay init group
 2023-10-31 10:45:56 +01:00
Applevangelist
3a06f6314e Merge remote-tracking branch 'origin/master' into develop 2023-10-26 12:46:16 +02:00
Applevangelist
31075f7c04 #UNIT 
* Typos in IsTanker, added some typenames
 2023-10-26 12:45:45 +02:00
Applevangelist
e48a823560 #EASYGCICAP, CONTROLLABLE, OPSGROUP, AUFTRAG 
* Changed patrol race track alt to be ASL not AGL by default
 2023-10-25 08:46:52 +02:00
Applevangelist
e24acb28f7 Merge remote-tracking branch 'origin/master' into develop 2023-10-24 13:46:35 +02:00
Applevangelist
4e5b483cc0 #CONTROLLABLE 
* Added PatrolRaceTrack
 2023-10-24 13:45:43 +02:00
Applevangelist
f71d6f3f30 Merge remote-tracking branch 'origin/master' into develop 2023-10-20 18:45:02 +02:00
Applevangelist
df6d968ebe #CONTROLLABLE 
* Added `CommandSetUnlimitedFuel()`
* Added `TaskStrafing()`
 2023-10-20 18:44:28 +02:00
Frank
dca70eaa05 Merge branch 'master' into develop 2023-09-17 16:13:50 +02:00
Frank
6a05789db5 Update Controllable.lua 
- Fixed wrong id of task`EnrouteTaskEngageGroup`
- Fixed wrong id of task `EnrouteTaskFAC_EngageGroup`
 2023-09-17 16:13:28 +02:00
Thomas
515764bb88
Update Group.lua 
Docu fix
 2023-09-09 11:56:28 +02:00
Thomas
31fb9bc169
Update Group.lua 
Docu fix
 2023-09-09 11:54:45 +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
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
f40442d309 #POSITIONABLE 
* Make cargo weights an enumerator
 2023-08-18 11:07:43 +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
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
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
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
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
46258492bd #AIRBASE, #ATIS 
* Additions
 2023-07-23 12:37:57 +02:00
Applevangelist
8979097fd7 Merge remote-tracking branch 'origin/master' into develop 2023-07-03 17:06:47 +02:00
Applevangelist
8c8ef19f01 #CONTROLLABLE 
* Added TaskGroundEscort
 2023-07-03 16:44:46 +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
cdbbad809a Merge remote-tracking branch 'origin/master' into develop 2023-06-21 10:43:40 +02:00
Applevangelist
7164e211f2 #AIRBASE 
- Nicosia unused atm
 2023-06-21 10:42:35 +02:00
Applevangelist
c80213b4cf #AIRBOSS 
* Initial SRS addition
 2023-06-16 18:18:18 +02:00
Applevangelist
bfe7bf1af5 Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Wrapper/Positionable.lua
#	Moose Development/Moose/Wrapper/Unit.lua
 2023-06-16 11:11:37 +02:00
Applevangelist
dae78d7ac1 #Positionable, Unit - remove pcall 2023-06-16 11:06:46 +02:00
Frank
f28d92e865
Merge pull request #1963 from FlightControl-Master/FF/Ops 
OPS
 2023-06-15 19:15:34 +02:00
Frank
bffb3e7778 OPS 
UNIT and POSITIONABLE
- Removed pcall for GetVec3 and GetAmmo

CHIEF
- Deploy resources if zone is empty and owned by itself
 2023-06-15 19:12:26 +02:00
Applevangelist
ab5425bd83 Merge remote-tracking branch 'origin/master' into develop 2023-06-15 14:52:02 +02:00
Applevangelist
254468c723 #NET 
* Improvements
 2023-06-15 14:51:36 +02:00
Applevangelist
71be4d99d6 #POSITIONABLE:GetRelativeCoordinate( x, y, z ) 2023-06-14 17:40:33 +02:00
Frank
d96a55d83c
Merge pull request #1961 from ttrebuchon/tt/flightgroup-getparkingspot-ship-fix 
FLIGHTGROUP:GetParkingSpot Carrier Issue Fix
 2023-06-13 19:09:42 +02:00
Frank
9a4c09d249 Merge branch 'master' into develop 2023-06-13 19:03:11 +02:00