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

6688 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ttrebuchon
e284773492 Move transport categories/etc to SetRequiredCarriers, to allow for specifying them without always needing to specify zones 2023-06-17 17:06:16 -04:00
ttrebuchon
b3d46618c2 Missed 2 spots in Legion/Commander for transport filters. 2023-06-17 16:56:46 -04:00
ttrebuchon
4e36e2011f Add categories/attributes/properties filters for AUFTRAG transports 2023-06-17 15:35:11 -04:00
Applevangelist
a3876c296e #AIRBOSS 
* Added option to set Airboss voice for SRS etc
* Nicer read out of weather info and carrier info
 2023-06-17 15:01:33 +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
d4c2de9dd1 Merge remote-tracking branch 'origin/develop' into develop 2023-06-15 14:52:09 +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
aec3eee3a5 #NET 
* Slight improvements
 2023-06-15 14:50:11 +02:00
Frank
eec7e5f8d9 Merge branch 'develop' into FF/Ops 2023-06-15 01:25:10 +02:00
Frank
a9b51cca93 Update Auftrag.lua 2023-06-15 01:24:59 +02:00
Frank
14ddba69b0
Merge pull request #1962 from ttrebuchon/tt/ops-chief-RecruitAssetsForZone-nmin-nmax-typo-fix 
Fix typo (Nmax -> Nmin) in CHIEF:RecruitAssetsForZone
 2023-06-15 00:39:45 +02:00
ttrebuchon
a7806deb76 Recruit assets using resource Nmin and Nmax, rather than Nmax and Nmax. 2023-06-14 12:41:05 -04:00
Applevangelist
0cf35b664f Merge remote-tracking branch 'origin/master' into develop 2023-06-14 17:41:13 +02:00
Applevangelist
71be4d99d6 #POSITIONABLE:GetRelativeCoordinate( x, y, z ) 2023-06-14 17:40:33 +02:00
Frank
c3ffffbb52 Merge branch 'master' into develop 2023-06-13 21:53:29 +02:00
Frank
f86fc845e7 Update Timer.lua 
- Timer stop is using protected call now because it can crash the whole script.
 2023-06-13 21:53:19 +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
ttrebuchon
83353d710d Use GetRelativeCoordinate in FLIGHTGROUP:GetParkingSpot 2023-06-13 13:04:24 -04:00
Frank
9a4c09d249 Merge branch 'master' into develop 2023-06-13 19:03:11 +02:00
Frank
cc907b9c14 Update Unit.lua 
- UNIT:IsAlive() fixed so it is consistent with GROUP:IsAlive()
 2023-06-13 19:02:55 +02:00
ttrebuchon
c825191556 Add POSITIONABLE:GetRelativeCoordinate 2023-06-13 12:54:38 -04:00
Applevangelist
27e85e921f Merge remote-tracking branch 'origin/develop' into develop 2023-06-13 18:00:18 +02:00
Applevangelist
c120a48879 #UNIT 
* Test to not return a stored DCS Object if the API doesn't think it's still there
 2023-06-13 18:00:15 +02:00
Frank
4a03074571 Merge branch 'develop' of https://github.com/FlightControl-Master/MOOSE into develop 2023-06-13 16:02:00 +02:00
Frank
8855b117a8 Update OpsGroup.lua 
- exists check for ammo and vec3
 2023-06-13 16:01:47 +02:00
Applevangelist
2cedb5e996 Merge remote-tracking branch 'origin/master' into develop 2023-06-13 08:40:21 +02:00
Applevangelist
241b2beee1 * Makes calls for GetAmmo() and GetVec3() safer with pcall() 
* Small docu fix Ben-Gurion
 2023-06-13 08:39:56 +02:00
Frank
0af68cd780 Merge branch 'master' into develop 2023-06-12 23:01:36 +02:00
Frank
12f260e857 Update Unit.lua 
- Added `UNIT:IsExist` function.
 2023-06-12 23:01:19 +02:00
Thomas
6a58748cd1
Airbase (#1954) 
* #UTILS
* Sinai TIme

* fix

* Update Airbase.lua

Corrected enumerator for Ben-Gurion (Ben_Gurion)

* Update Airbase.lua (#1957)

Deleted raj al … airbases #1955
 2023-06-12 06:27:52 +02:00
Thomas
096d145cf9
Update Airbase.lua (#1957) 
Deleted raj al … airbases #1955
 2023-06-12 06:22:51 +02:00
Frank
d31db1351a
Merge pull request #1956 from FlightControl-Master/FF/Ops 
AUFTRAG
 2023-06-11 22:52:28 +02:00
Frank
0f33603ecc AUFTRAG 
- Changed ingress waypoint of CASENHANCED
 2023-06-11 22:45:59 +02:00
Thomas
b3883301a2
Update Airbase.lua 
Corrected enumerator for Ben-Gurion (Ben_Gurion)
 2023-06-11 12:33:01 +02:00
Frank
3bbd55cfc2
Merge pull request #1953 from ttrebuchon/tt/fix-opsgroup-getlifepoints-typo 
Set life0 based on itself, rather than off of life
 2023-06-11 00:52:13 +02:00
ttrebuchon
163273096c Set life0 based on itself, rather than off of life 2023-06-10 18:08:29 -04:00
Applevangelist
3a7521c492 #UTILS 
* Sinai TIme
 2023-06-10 19:08:46 +02:00
Applevangelist
caa5a96235 fix 2023-06-10 19:06:22 +02:00
Applevangelist
cee1c592ba #UTILS 
* Sinai TIme
 2023-06-10 19:04:40 +02:00
Frank
6d1030925c Merge branch 'master' into develop 2023-06-10 10:08:35 +02:00
Frank
f1fc9f0b27 Update Utils.lua 
- Added parameters time zone and magvar for Sinai map
 2023-06-10 10:08:22 +02:00
Applevangelist
dabe8a58d1 Merge remote-tracking branch 'origin/develop' into develop 2023-06-09 15:16:41 +02:00
Applevangelist
16cf6693ab Merge remote-tracking branch 'origin/master' into develop 2023-06-09 15:16:38 +02:00
Applevangelist
e9adcb0dd5 #AIRBASE 
* Sinai airfield enumerator
 2023-06-09 15:13:45 +02:00
Applevangelist
fd51ec6932 #FIX 2023-06-09 13:25:29 +02:00