Commit Graph

6736 Commits

Author SHA1 Message Date
Applevangelist cb00a3fa38 #DETECTION
* Docu fixes
2023-02-09 16:11:59 +01:00
Applevangelist 48aaf8179d Merge remote-tracking branch 'origin/develop' into develop 2023-02-09 13:21:25 +01:00
Applevangelist 608033f38f #AICSAR
* Docu additions
2023-02-09 13:17:49 +01:00
Applevangelist 292bc790ee #AICSAR
* Docu additions
2023-02-09 13:17:34 +01:00
Applevangelist 5a0a761c08 Merge remote-tracking branch 'origin/Apple/Develop' into develop 2023-02-09 11:57:46 +01:00
Applevangelist e44f61181a #AICSAR
* Fixed issue with underlying OpsTransport
* Added FSM Transition OnAfterPilotUnloaded()
* Added options for SRS TTS output - no sound files
* Added voice options for downed pilot and operator - these can have different voices
2023-02-09 11:57:41 +01:00
Applevangelist 28c25816a6 #AICSAR
* Fixed issue with underlying OpsTransport
* Added FSM Transition OnAfterPilotUnloaded()
* Added options for SRS TTS output - no sound files
* Added voice options for downed pilot and operator - these can have different voices
2023-02-09 11:57:28 +01:00
Applevangelist 387aef6626 fxi 2023-02-09 11:53:45 +01:00
Thomas da93126d58 Update Moose.files 2023-02-07 11:05:54 +01:00
Applevangelist 49c45f97fc Test smaller dev moose 2023-02-07 10:51:14 +01:00
Applevangelist b225e44cfa Merge remote-tracking branch 'origin/develop' into develop 2023-02-07 08:02:11 +01:00
Applevangelist afa17f95f9 Merge remote-tracking branch 'origin/master' into develop 2023-02-07 08:02:05 +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 790f8ec127 Merge remote-tracking branch 'origin/develop' into develop 2023-02-06 08:18:21 +01:00
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 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
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
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