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

5352 Commits

Author SHA1 Message Date
Applevangelist
27011f3ce6 Merge remote-tracking branch 'origin/develop' into develop 2023-06-14 17:25:33 +02:00
Applevangelist
cd5ac59c40 Merge remote-tracking branch 'origin/master' into develop 2023-06-14 17:25:28 +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
e2e2b44fb8 Merge remote-tracking branch 'origin/develop' into develop 2023-06-13 18:01:46 +02:00
Applevangelist
a8be273479 FIXES 2023-06-13 18:01:13 +02: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
Applevangelist
9e84c6af1b Merge remote-tracking branch 'origin/develop' into develop 2023-06-13 08:35:53 +02:00
Applevangelist
84e7460a67 Merge remote-tracking branch 'origin/master' into develop 2023-06-13 08:35:48 +02:00
Applevangelist
8802709d3c Merge remote-tracking branch 'origin/Apple/Develop' into develop 2023-06-13 08:35:30 +02:00
Applevangelist
253ed62d46 Fixes 2023-06-13 08:35:27 +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
4d247e75f2
Airbase fixes (#1958) 
* Update Airbase.lua

Corrected enumerator for Ben-Gurion (Ben_Gurion)

* Update Airbase.lua (#1957)

Deleted raj al … airbases #1955
 2023-06-12 06:29:24 +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
ttrebuchon
163273096c Set life0 based on itself, rather than off of life 2023-06-10 18:08:29 -04:00
Applevangelist
5006d01932 Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Utilities/Utils.lua
 2023-06-10 19:11:59 +02: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
Applevangelist
ccc11623c3 #UTILS 
* Sinai Time
 2023-06-10 19:04:18 +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
9da6b2a4f5 Merge remote-tracking branch 'origin/master' into develop 2023-06-09 15:17:12 +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
23e71e991f #AIRBASE 
* Sinai airfield enumerator
 2023-06-09 15:13:20 +02:00
Applevangelist
8658804c82 Merge remote-tracking branch 'origin/develop' into develop 2023-06-09 13:25:54 +02:00
Applevangelist
fd51ec6932 #FIX 2023-06-09 13:25:29 +02:00
Frank
1b6648996c OPSGROUP 
- Improved CAPTUREZONE for FLIGHTGROUP
 2023-06-08 19:51:09 +02:00
Frank
f45a22fe78 Merge branch 'develop' into FF/Ops 2023-06-08 15:52:25 +02:00
Applevangelist
afe2b675e5 #RAT 
* Fixes from dev
 2023-06-08 13:59:59 +02:00
Applevangelist
77c4eb0d54 Merge remote-tracking branch 'origin/develop' into develop 2023-06-08 13:59:05 +02:00
Applevangelist
238640ec91 Merge remote-tracking branch 'origin/master' into develop 2023-06-08 13:58:58 +02:00
Applevangelist
2c14ee74b0 #SCORING 
* Can leave text empty on some instances
 2023-06-08 13:58:26 +02:00