weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2026-07-29 14:10:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,086 Commits 15 Branches 93 Tags
99a55a3c8a0fce6175ef67dbc3fd3c94de5c50c9
Commit Graph

8086 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Applevangelist b4d5650cb0 Merge remote-tracking branch 'origin/master' into develop 2023-02-06 08:18:08 +01:00
Applevangelist 9ea831a0f2 added weapon 2023-02-06 08:17:43 +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
Applevangelist f44893e4c1 Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	Moose Development/Moose/Modules.lua
 2023-02-05 13:51:22 +01:00
Applevangelist 10dd7eff78 Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Modules.lua
 2023-02-05 13:50:25 +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
Applevangelist 02d63e244d Merge remote-tracking branch 'origin/develop' into develop 2023-02-04 21:51:05 +01:00
Applevangelist dd10a49519 Merge remote-tracking branch 'origin/master' into develop 2023-02-04 21:50:59 +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
Thomas b250111d57 Scoring credits a kill to player who hit the same unit before it spawned (#1905) (#1906) 
Co-authored-by: Mr.Alien <124381209+MrAlien753@users.noreply.github.com>
 2023-02-04 21:48:23 +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 2dce134d15 Merge remote-tracking branch 'origin/develop' into develop 2023-02-04 17:22:43 +01:00
Applevangelist b4793811a4 Merge remote-tracking branch 'origin/master' into develop 2023-02-04 17:22:37 +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 8a45f78251 fix 2023-02-04 17:20:05 +01:00
Applevangelist 7fec084227 Merge remote-tracking branch 'origin/develop' into develop 2023-02-04 17:16:57 +01:00
Applevangelist 3a120c0a3c Merge remote-tracking branch 'origin/master' into develop 2023-02-04 17:16:52 +01:00
Applevangelist 5571b49b4f Merge remote-tracking branch 'origin/master' into develop 2023-02-04 17:16:10 +01:00
Applevangelist c08b39f148 #NET 
* Added logic to get player ID from client object
 2023-02-04 17:15:19 +01:00
Applevangelist 036b6b77b1 #CTLD 
* Added preload crates
 2023-02-04 17:14:52 +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
Applevangelist a4dd15013d #changes 2023-02-03 16:41:11 +01:00
Applevangelist 2c411736e5 #NET - initial version 2023-02-03 16:41:01 +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 b81bf447a9 fix 2023-02-02 09:47:05 +01:00
Applevangelist 09a2a79a78 Merge remote-tracking branch 'origin/develop' into develop 2023-02-02 09:38:59 +01:00
Applevangelist 35da50b67a Merge remote-tracking branch 'origin/develop' into develop-2 2023-02-02 09:38:32 +01:00
Applevangelist 69ba31b44d Merge remote-tracking branch 'origin/develop' into develop 2023-02-02 09:38:15 +01:00
Applevangelist 710b488663 Merge remote-tracking branch 'origin/master' into develop 2023-02-02 09:38:06 +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