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

6864 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frank
9f02232589 Update settings.json 2023-02-08 16:29:25 +01:00
Frank
ffc86bf046 Unwanted changes 2023-02-08 16:28:04 +01:00
Frank
f104ddbe64 Merge branch 'FF/Ops' into FF/OpsDev 2023-02-08 16:15:22 +01:00
Frank
bbd8ceb8c0 Merge branch 'develop' into FF/Ops 2023-02-08 16:15:06 +01:00
Frank
b8498fa58f Merge branch 'FF/MasterDevel' into FF/OpsDev 2023-02-08 16:14:45 +01:00
Frank
e4c8ca34ed Update Pathline.lua 2023-02-08 16:11:47 +01:00
Frank
f02b7036a9 PATHLINE 2023-02-08 12:37:18 +01:00
Frank
34c26c44bc Merge branch 'develop' into FF/OpsDev 2023-02-07 22:53:19 +01:00
Frank
6adef47340 PATHLINE 
Added new class PATHLINE
 2023-02-07 22:47:55 +01:00
Applevangelist
c97f1791b0 Merge remote-tracking branch 'origin/master' into develop 2023-02-07 08:01:34 +01:00
Thomas
5b044cc036
Update CSAR.lua (#1917) 2023-02-07 07:28:00 +01:00
Applevangelist
63b16e5bd4 Merge remote-tracking branch 'origin/master' into develop 2023-02-06 08:17:05 +01:00
dogjutsu
184f93168b
MSRS_BACKEND_DCSGRPC bug fix (#1916) 
* Add another DCS-gRPC example for MSRS docu (ATIS)

* Fixes MSRS_BACKEND_DCSGRPC bad _GetLatLongAlt call
 2023-02-06 08:16:14 +01:00
Mr.Alien
03ba7524b2
Comment out code for scoring hits (#1911) 2023-02-06 08:15:45 +01:00
Frank
0400f1a23e Merge branch 'FF/Ops' into FF/OpsDev 2023-02-05 00:23:42 +01:00
Frank
d3d60757c1 Merge branch 'develop' into FF/Ops 2023-02-05 00:23:25 +01:00
Frank
57079e5104 Merge branch 'master' into develop 2023-02-04 23:34:14 +01:00
Frank
772921c6b8 WEAPON 
- Added new class WEAPON
 2023-02-04 23:31:55 +01:00
Frank
6d967358da WEAPON v0.1.0 
**WEAPON**
- Improments of class
- ARTY works
- FOX works
- RANGE should work, not tested.
 2023-02-04 23:28:45 +01:00
Mr.Alien
d4d305d53b
Fix confusing hit and kill messages with incorrect math (#1913) 2023-02-04 23:02:36 +01:00
Mr.Alien
c58918e002
Add missing part of code in previous commit (#1910) 2023-02-04 22:36:16 +01:00
Mr.Alien
dec7854476
Fix issue with getting thread level after a kill (#1908) 2023-02-04 22:01:55 +01:00
Applevangelist
095121d83c Merge remote-tracking branch 'origin/develop' into develop 2023-02-04 21:51:39 +01:00
Applevangelist
a415b131c4 Merge remote-tracking branch 'origin/master' into develop 2023-02-04 21:51:35 +01:00
Thomas
54a1ea9f56
Scoring credits a kill to player who hit the same unit before it spawned (#1905) (#1907) 
Co-authored-by: Mr.Alien <124381209+MrAlien753@users.noreply.github.com>
 2023-02-04 21:50:17 +01:00
Mr.Alien
8ca102f584
Scoring credits a kill to player who hit the same unit before it spawned (#1905) 2023-02-04 21:46:34 +01:00
Applevangelist
23091ff851 #CTLD 
* Added method `CTLD:PreloadCrates(Unit,Cratesname,NumberOfCrates)`
 2023-02-04 17:21:52 +01:00
Applevangelist
4748c66d9c #CTLD 
* Added method `CTLD:PreloadCrates(Unit,Cratesname,NumberOfCrates)`
 2023-02-04 17:21:16 +01:00
Applevangelist
5571b49b4f Merge remote-tracking branch 'origin/master' into develop 2023-02-04 17:16:10 +01:00
Frank
bf486b9f44
Merge pull request #1901 from MrAlien753/patch-1 
fix nil error message in dcs.log
 2023-02-03 22:34:01 +01:00
MrAlien753
6ff433ed7a
fix nil error message in dcs.log 
When instant killing a target in a capture zone nil error message is printed in the dcs.log. This fixes this issue.
 2023-02-03 22:14:14 +01:00
Frank
4b4708e2a8 Weapon 2023-02-02 23:50:00 +01:00
Applevangelist
789a4c4b7f Merge remote-tracking branch 'origin/develop' into develop 2023-02-02 09:47:29 +01:00
Applevangelist
3775053609 PLAYERRECCE - bug fix 2023-02-02 09:47:25 +01:00
Applevangelist
35da50b67a Merge remote-tracking branch 'origin/develop' into develop-2 2023-02-02 09:38:32 +01:00
Applevangelist
9be30338a5 Herc fix 2023-02-02 09:37:47 +01:00
Applevangelist
6510cca837 Merge remote-tracking branch 'origin/develop' into develop 2023-02-02 09:36:48 +01:00
Applevangelist
08b8dfbe0e Merge remote-tracking branch 'origin/master' into develop 2023-02-02 09:36:44 +01:00
Applevangelist
f9aa392c6d #CTLD_HERCULES 
* Fixed an issue spawning 90 paratroopers instead of 30
 2023-02-02 09:35:53 +01:00
Frank
9af242854a Weapon 2023-02-01 23:51:47 +01:00
Frank
bfe9a1888e
Merge pull request #1899 from ttrebuchon/tt/airwing-sortpayloads-fix 
Airwing sortpayloads criteria fix
 2023-02-01 19:07:46 +01:00
ttrebuchon
fec496f154 Fix missing check for b.unlimited~=true in sortpayloads function. 2023-02-01 12:30:52 -05:00
Thomas
28fd35ad7e
PlayerRecce - Added Shark_3 as type 2023-02-01 12:17:54 +01:00
Frank
c5deb09c2c WEAPON v0.0.1 
- New class
 2023-01-31 23:22:48 +01:00
Applevangelist
ee6d34a9bd #CTLD 
* Added Subcategories for static cargo objects
 2023-01-31 11:28:00 +01:00
Applevangelist
48721859fa #CTLD 
* Added Subcategories for static cargo objects
2.7.18 		2023-01-31 11:27:12 +01:00
Frank
6e6bb1e88d RANGE 2023-01-30 23:29:03 +01:00
Frank
0b3aea2bf3 Scenery 2023-01-30 21:52:22 +01:00
Applevangelist
f731ec7b2f #POINT 
* Added COORDINATE:SetAtLandheight()
 2023-01-30 18:01:04 +01:00
Applevangelist
ee59d999f5 #POINT 
* Added COORDINATE:SetAtLandheight()
 2023-01-30 18:00:16 +01:00