Commit Graph

  • dc0a2bccd6 Update Legion.lua Frank 2023-02-12 15:19:34 +01:00
  • ac1b458eb4 Merge branch 'FF/Ops' into FF/OpsDev Frank 2023-02-12 13:53:47 +01:00
  • f5938bc235 Merge branch 'develop' into FF/Ops Frank 2023-02-12 13:53:25 +01:00
  • 7280c17506 Merge branch 'master' into develop Frank 2023-02-12 13:04:32 +01:00
  • 92c5c32e8c Merge pull request #1921 from FlightControl-Master/FF/MasterDevel Frank 2023-02-12 13:03:08 +01:00
  • c8780b2d5f Update Range.lua Frank 2023-02-12 13:00:19 +01:00
  • 4e280f02b6 Merge branch 'FF/Ops' into FF/OpsDev Frank 2023-02-12 11:53:42 +01:00
  • 854f6ae6ae Merge branch 'develop' into FF/Ops Frank 2023-02-12 11:52:13 +01:00
  • 0487487e7c Merge branch 'master' into develop Frank 2023-02-12 11:51:16 +01:00
  • f11dbfa367 Merge branch 'FF/MasterDevel' Frank 2023-02-12 11:49:13 +01:00
  • 54fb9deb3e Polygon and line drawings Frank 2023-02-12 11:38:46 +01:00
  • 9ec66912c8 Update OpsGroup.lua Frank 2023-02-12 09:36:35 +01:00
  • 960f261ddd Master merge (#1920) Thomas 2023-02-11 22:17:24 +01:00
  • d3c34ef04d Update MarkerOps_Base.lua (#1919) Thomas 2023-02-11 22:11:21 +01:00
  • e55f96f393 OPSTRANSPORT Frank 2023-02-11 00:21:15 +01:00
  • 713a5b067f #PLAYERTASKCONTROLLER * Added AddAgentSet() Applevangelist 2023-02-10 11:40:15 +01:00
  • 0ec039bb39 #PLAYERTASKCONTROLLER * Added AddAgentSet() Applevangelist 2023-02-10 11:38:45 +01:00
  • 0823eb1ed0 #fix Applevangelist 2023-02-10 11:37:51 +01:00
  • 3d5470eb22 #NET * Initial release Applevangelist 2023-02-10 11:00:14 +01:00
  • d6aa7ec17c #Net * Initial Release Applevangelist 2023-02-10 10:45:23 +01:00
  • c1ab696774 #NET Applevangelist 2023-02-10 10:41:59 +01:00
  • 93d61a99fa Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2023-02-09 16:13:11 +01:00
  • c2b8261133 Merge remote-tracking branch 'origin/master' into develop Applevangelist 2023-02-09 16:13:06 +01:00
  • 2da2ddb5bb #DETECTION * Docu fixes Applevangelist 2023-02-09 16:12:39 +01:00
  • cb00a3fa38 #DETECTION * Docu fixes Applevangelist 2023-02-09 16:11:59 +01:00
  • 2a3d69d0d5 #DETECTION * Docu fixes Applevangelist 2023-02-09 16:11:45 +01:00
  • 48aaf8179d Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2023-02-09 13:21:25 +01:00
  • 608033f38f #AICSAR * Docu additions Applevangelist 2023-02-09 13:17:49 +01:00
  • 292bc790ee #AICSAR * Docu additions Applevangelist 2023-02-09 13:17:34 +01:00
  • 5a0a761c08 Merge remote-tracking branch 'origin/Apple/Develop' into develop Applevangelist 2023-02-09 11:57:46 +01:00
  • 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 Applevangelist 2023-02-09 11:57:41 +01:00
  • 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 Applevangelist 2023-02-09 11:57:28 +01:00
  • 387aef6626 fxi Applevangelist 2023-02-09 11:53:45 +01:00
  • 709fccd96c OSPTRANSPORT Frank 2023-02-09 01:06:36 +01:00
  • 2c24e56aa5 Merge branch 'FF/MasterDevel' into FF/OpsDev Frank 2023-02-08 16:35:49 +01:00
  • 9862c32378 Update settings.json Frank 2023-02-08 16:30:44 +01:00
  • 9f02232589 Update settings.json Frank 2023-02-08 16:29:25 +01:00
  • ffc86bf046 Unwanted changes Frank 2023-02-08 16:28:04 +01:00
  • f104ddbe64 Merge branch 'FF/Ops' into FF/OpsDev Frank 2023-02-08 16:15:22 +01:00
  • bbd8ceb8c0 Merge branch 'develop' into FF/Ops Frank 2023-02-08 16:15:06 +01:00
  • b8498fa58f Merge branch 'FF/MasterDevel' into FF/OpsDev Frank 2023-02-08 16:14:45 +01:00
  • e4c8ca34ed Update Pathline.lua Frank 2023-02-08 16:11:47 +01:00
  • f02b7036a9 PATHLINE Frank 2023-02-08 12:37:18 +01:00
  • 34c26c44bc Merge branch 'develop' into FF/OpsDev Frank 2023-02-07 22:53:19 +01:00
  • 6adef47340 PATHLINE Frank 2023-02-07 22:47:55 +01:00
  • da93126d58 Update Moose.files Thomas 2023-02-07 11:05:54 +01:00
  • 49c45f97fc Test smaller dev moose Applevangelist 2023-02-07 10:51:14 +01:00
  • b225e44cfa Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2023-02-07 08:02:11 +01:00
  • afa17f95f9 Merge remote-tracking branch 'origin/master' into develop Applevangelist 2023-02-07 08:02:05 +01:00
  • c97f1791b0 Merge remote-tracking branch 'origin/master' into develop Applevangelist 2023-02-07 08:01:34 +01:00
  • 5b044cc036 Update CSAR.lua (#1917) Thomas 2023-02-07 07:28:00 +01:00
  • 790f8ec127 Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2023-02-06 08:18:21 +01:00
  • b4d5650cb0 Merge remote-tracking branch 'origin/master' into develop Applevangelist 2023-02-06 08:18:08 +01:00
  • 9ea831a0f2 added weapon Applevangelist 2023-02-06 08:17:43 +01:00
  • 63b16e5bd4 Merge remote-tracking branch 'origin/master' into develop Applevangelist 2023-02-06 08:17:05 +01:00
  • 184f93168b MSRS_BACKEND_DCSGRPC bug fix (#1916) dogjutsu 2023-02-05 23:16:14 -08:00
  • 03ba7524b2 Comment out code for scoring hits (#1911) Mr.Alien 2023-02-06 08:15:45 +01:00
  • f44893e4c1 Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2023-02-05 13:51:22 +01:00
  • 10dd7eff78 Merge remote-tracking branch 'origin/master' into develop Applevangelist 2023-02-05 13:50:25 +01:00
  • 0400f1a23e Merge branch 'FF/Ops' into FF/OpsDev Frank 2023-02-05 00:23:42 +01:00
  • d3d60757c1 Merge branch 'develop' into FF/Ops Frank 2023-02-05 00:23:25 +01:00
  • 57079e5104 Merge branch 'master' into develop Frank 2023-02-04 23:34:14 +01:00
  • 772921c6b8 WEAPON Frank 2023-02-04 23:31:55 +01:00
  • 6d967358da WEAPON v0.1.0 Frank 2023-02-04 23:28:45 +01:00
  • d4d305d53b Fix confusing hit and kill messages with incorrect math (#1913) Mr.Alien 2023-02-04 23:02:36 +01:00
  • c58918e002 Add missing part of code in previous commit (#1910) Mr.Alien 2023-02-04 22:36:16 +01:00
  • dec7854476 Fix issue with getting thread level after a kill (#1908) Mr.Alien 2023-02-04 22:01:55 +01:00
  • 095121d83c Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2023-02-04 21:51:39 +01:00
  • a415b131c4 Merge remote-tracking branch 'origin/master' into develop Applevangelist 2023-02-04 21:51:35 +01:00
  • 02d63e244d Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2023-02-04 21:51:05 +01:00
  • dd10a49519 Merge remote-tracking branch 'origin/master' into develop Applevangelist 2023-02-04 21:50:59 +01:00
  • 54a1ea9f56 Scoring credits a kill to player who hit the same unit before it spawned (#1905) (#1907) Thomas 2023-02-04 21:50:17 +01:00
  • b250111d57 Scoring credits a kill to player who hit the same unit before it spawned (#1905) (#1906) Thomas 2023-02-04 21:48:23 +01:00
  • 8ca102f584 Scoring credits a kill to player who hit the same unit before it spawned (#1905) Mr.Alien 2023-02-04 21:46:34 +01:00
  • 2dce134d15 Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2023-02-04 17:22:43 +01:00
  • b4793811a4 Merge remote-tracking branch 'origin/master' into develop Applevangelist 2023-02-04 17:22:37 +01:00
  • 23091ff851 #CTLD * Added method CTLD:PreloadCrates(Unit,Cratesname,NumberOfCrates) Applevangelist 2023-02-04 17:21:52 +01:00
  • 4748c66d9c #CTLD * Added method CTLD:PreloadCrates(Unit,Cratesname,NumberOfCrates) Applevangelist 2023-02-04 17:21:16 +01:00
  • 8a45f78251 fix Applevangelist 2023-02-04 17:20:05 +01:00
  • 7fec084227 Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2023-02-04 17:16:57 +01:00
  • 3a120c0a3c Merge remote-tracking branch 'origin/master' into develop Applevangelist 2023-02-04 17:16:52 +01:00
  • 5571b49b4f Merge remote-tracking branch 'origin/master' into develop Applevangelist 2023-02-04 17:16:10 +01:00
  • c08b39f148 #NET * Added logic to get player ID from client object Applevangelist 2023-02-04 17:15:19 +01:00
  • 036b6b77b1 #CTLD * Added preload crates Applevangelist 2023-02-04 17:14:52 +01:00
  • bf486b9f44 Merge pull request #1901 from MrAlien753/patch-1 Frank 2023-02-03 22:34:01 +01:00
  • 6ff433ed7a fix nil error message in dcs.log MrAlien753 2023-02-03 22:14:14 +01:00
  • a4dd15013d #changes Applevangelist 2023-02-03 16:41:11 +01:00
  • 2c411736e5 #NET - initial version Applevangelist 2023-02-03 16:41:01 +01:00
  • 4b4708e2a8 Weapon Frank 2023-02-02 23:50:00 +01:00
  • 789a4c4b7f Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2023-02-02 09:47:29 +01:00
  • 3775053609 PLAYERRECCE - bug fix Applevangelist 2023-02-02 09:47:25 +01:00
  • b81bf447a9 fix Applevangelist 2023-02-02 09:47:05 +01:00
  • 09a2a79a78 Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2023-02-02 09:38:59 +01:00
  • 35da50b67a Merge remote-tracking branch 'origin/develop' into develop-2 Applevangelist 2023-02-02 09:38:32 +01:00
  • 69ba31b44d Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2023-02-02 09:38:15 +01:00
  • 710b488663 Merge remote-tracking branch 'origin/master' into develop Applevangelist 2023-02-02 09:38:06 +01:00
  • 9be30338a5 Herc fix Applevangelist 2023-02-02 09:37:47 +01:00
  • 6510cca837 Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2023-02-02 09:36:48 +01:00
  • 08b8dfbe0e Merge remote-tracking branch 'origin/master' into develop Applevangelist 2023-02-02 09:36:44 +01:00
  • f9aa392c6d #CTLD_HERCULES * Fixed an issue spawning 90 paratroopers instead of 30 Applevangelist 2023-02-02 09:35:53 +01:00