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

5823 Commits

Author SHA1 Message Date
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
4471ec9b96 DCS Warehouse 2023-08-17 18:46:09 +02:00
Frank
32e1d4f8fa DCS Warehouse 2023-08-16 23:58:32 +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
Frank
747e5d801a
Merge pull request #1986 from FlightControl-Master/FF/MasterDevel 
COORDINATE
 2023-08-13 18:19:16 +02:00
Frank
29ed630536 COORDINATE 
- Generalized MarkupToAllFreeForm

UTILS
- Added some functions from MIST
 2023-08-13 17:40:28 +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
cd7d307fc4 Merge remote-tracking branch 'origin/develop' into develop 2023-08-01 16:27:33 +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
6aa4683080 #PLAYERTASK 2023-08-01 16:19:03 +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
2ccb4c128a Zone 2023-08-01 16:16:20 +02:00
Thomas
7c4dd8160d
Update Set.lua (#1982) 
Intellisense updates
 2023-08-01 11:53:00 +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
phr0gz
56fcd8f37f
Add RemoveGciCapZone in Chief (#1973) 
This will add the ability to remove CGI CAP zone from chief.
 2023-08-01 10:00:17 +02:00
Applevangelist
090de85388 joa 2023-07-31 18:03:54 +02:00
Thomas
09d4e155de
Update PlayerTask.lua (#1977) 
Prevent Events being available before the menu structure has been created
 2023-07-31 14:24:47 +02:00
Applevangelist
9d4b5cfc0b Debugs 2023-07-29 17:20:06 +02:00
Applevangelist
65703d1092 Debugs 2023-07-29 17:19:51 +02:00
Applevangelist
2afd09b878 Merge remote-tracking branch 'origin/master' into develop 2023-07-29 16:48:08 +02:00
Thomas
f87a676e4b
Update Scoring.lua (#1976) 
Add report Spaces
 2023-07-29 16:45:00 +02:00
Applevangelist
4ed2b0610d #AWACS 
* ensure tactical frequencies are handed back

#PlayerTask
* Add'l check for stale tasks to rebuild menu
 2023-07-29 16:44:25 +02:00
Applevangelist
29947d69c3 Changes 2023-07-29 16:40:46 +02:00
Applevangelist
3b2850e042 changes 2023-07-29 16:02:42 +02:00
Applevangelist
5c2b77cf76 #Chmages 2023-07-29 15:56:28 +02:00
Applevangelist
9c95b91086 #changes 2023-07-29 15:56:20 +02:00
phr0gz
cbd371b40f
Chief zone removal Tanker, AWACS (#1975) 
Add the ability to remove a zone for Tanker and AWACS.
 2023-07-29 15:44:13 +02:00
phr0gz
80e9cb692c
Add FSM OnAfter and OnBefore (#1974) 
Add FSM Function OnAfter and OnBefore in FlightGroup.
 2023-07-29 13:37:07 +02:00
Applevangelist
27fd726ce3 Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	Moose Development/Moose/Ops/Airboss.lua
 2023-07-26 17:45:25 +02:00
Applevangelist
d58e93e2a4 Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Ops/Airboss.lua
 2023-07-26 17:43:16 +02:00