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

737 Commits

Author SHA1 Message Date
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
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
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
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
Thomas
b3883301a2
Update Airbase.lua 
Corrected enumerator for Ben-Gurion (Ben_Gurion)
 2023-06-11 12:33:01 +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
f7e64bc9b5 #UNIT #CTLD 
* Stabilize that sometimes a unit coordinate cannot be found
 2023-06-02 08:45:35 +02:00
Applevangelist
55ed394782 #UNIT #CTLD 
* Stabilize that sometimes a unit coordinate cannot be found
 2023-06-02 08:44:14 +02:00
Applevangelist
261f79851c Merge remote-tracking branch 'origin/master' into develop 2023-06-01 10:03:34 +02:00
Applevangelist
dd7a883a33 Fixes 2023-06-01 10:02:51 +02:00
Applevangelist
2967de8f6e #CONTROLLER 
* Fix for Link4
 2023-05-25 08:57:54 +02:00
Applevangelist
0cd6a59ce4 #CONTROLLER 
* Fix for Link4
 2023-05-25 08:57:15 +02:00
Applevangelist
cae084a352 Merge remote-tracking branch 'origin/master' into develop 2023-05-17 09:41:27 +02:00
Frank
21bcd64c9d Update Controllable.lua 
Corrected parameters for enroute tasks according to hoggit for
- CONTROLLABLE:EnRouteTaskFAC
- CONTROLLABLE:EnRouteTaskFAC_EngageGroup
 2023-05-13 23:35:58 +02:00
Applevangelist
6cd56e4de4 Merge remote-tracking branch 'origin/master' into develop 2023-04-25 09:13:27 +02:00
Applevangelist
6896dc155a #SCENERY 
* Added update of Life0 value if `GetLife()`is called
#SET_SCENERY
* Added Documentation
 2023-04-25 09:12:25 +02:00
Thomas
c7d990850a
AIRBASE - add Normandy AFBs (#1937) (#1938) 
Add Normandy AFBs
 2023-04-24 11:16:45 +02:00
Thomas
88b6540f5b
AIRBASE - add Normandy AFBs (#1937) 
Add Normandy AFBs
 2023-04-24 11:09:03 +02:00
Frank
7379b8135a Merge branch 'master' into develop 2023-04-22 14:08:05 +02:00
Frank
1507cc0b42 Remove Junk 
**ZONE**
- Added `ZONE_RADIUS:RemoveJunk()` function
- Added `ZONE_POLYGON_BASE:RemoveJunk()` function (not working)

**POSITIONABLE**
- Added `Explosion`
 2023-04-22 14:02:18 +02:00
Frank
f30f32732c Merge branch 'master' into develop 2023-04-16 12:30:19 +02:00
Frank
49b702106a Update Weapon.lua 
- Decreased min possible time step to 0.00001 seconds
 2023-04-16 12:29:57 +02:00
Applevangelist
0782532763 Merge remote-tracking branch 'origin/master' into develop 2023-04-13 15:51:55 +02:00
Applevangelist
9d5da3388d smaller docu item 2023-04-13 15:28:41 +02:00
Applevangelist
c0bc9b393c #NET 
* Fix for ucid can be nil
 2023-04-03 12:16:25 +02:00
Applevangelist
cf94c4d043 #NET 
* Fix for ucid can be nil
 2023-04-03 12:15:29 +02:00
Applevangelist
53fa850d66 Add'l check in UNIT:GetLife() 2023-03-23 08:46:29 +01:00
Applevangelist
57294aeaf5 Add'l check in UNIT:GetLife() 2023-03-23 08:45:54 +01:00
Applevangelist
e08b44187e #AIRBASE 
* Added/changed:
  ["Hipico_Flying_Club"] = "Hipico Flying Club",
  ["Aeropuerto_de_Gobernador_Gregores"] = "Aeropuerto de Gobernador Gregores",
  ["Aerodromo_O_Higgins"] = "Aerodromo O'Higgins",
  ["Cullen_Airport"] = "Cullen Airport",
  ["Gull_Point"] = "Gull Point",
 2023-03-16 08:45:14 +01:00
Applevangelist
20bfb8b08f #AIRBASE 
* Added/changed South Atlantic Map:
  ["Hipico_Flying_Club"] = "Hipico Flying Club",
  ["Aeropuerto_de_Gobernador_Gregores"] = "Aeropuerto de Gobernador Gregores",
  ["Aerodromo_O_Higgins"] = "Aerodromo O'Higgins",
  ["Cullen_Airport"] = "Cullen Airport",
  ["Gull_Point"] = "Gull Point",
 2023-03-16 08:44:16 +01:00
Applevangelist
6ac1d66aae #GROUP 
* Fix for GetMaxHeight()
 2023-03-09 08:49:53 +01:00
Applevangelist
c9a91d0683 #GROUP 
* Fix for GetMaxHeight()
 2023-03-09 08:49:07 +01:00