Commit Graph

  • 7959f650d5 NET Applevangelist 2023-02-17 16:42:25 +01:00
  • 6f3fbb25cf Merge remote-tracking branch 'origin/master' into develop Applevangelist 2023-02-17 16:42:10 +01:00
  • ff86bfb91d #NET Event blocker fix Applevangelist 2023-02-17 16:41:38 +01:00
  • 05b8df0d88 Merge remote-tracking branch 'origin/master' into develop Applevangelist 2023-02-17 16:24:21 +01:00
  • 6a9e868035 Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2023-02-17 16:23:52 +01:00
  • 5da82a6b01 Merge remote-tracking branch 'origin/master' into develop Applevangelist 2023-02-17 16:23:46 +01:00
  • ffb6cbfb17 NET Applevangelist 2023-02-17 16:23:16 +01:00
  • 66494b7b5a NET Applevangelist 2023-02-17 16:23:02 +01:00
  • 973127aa8c #NET Fixes Applevangelist 2023-02-17 15:42:06 +01:00
  • a4dcb643bd #NET Fixes Applevangelist 2023-02-17 15:41:33 +01:00
  • 2b02f6659a #Net Applevangelist 2023-02-17 15:41:10 +01:00
  • 83866c3dd3 #NET Fixes Applevangelist 2023-02-17 15:02:11 +01:00
  • 6acf051539 #Net Fixes Applevangelist 2023-02-17 15:02:03 +01:00
  • 9e23cda02a #NET Fixes Applevangelist 2023-02-17 15:01:49 +01:00
  • c29b67df55 #NET small fix Applevangelist 2023-02-17 14:33:32 +01:00
  • 4797abc287 #NET Bugfix Applevangelist 2023-02-17 14:32:48 +01:00
  • 8c083cccc8 #NET - bug fix Applevangelist 2023-02-17 14:32:17 +01:00
  • bd312b86d2 Merge remote-tracking branch 'origin/master' into develop Applevangelist 2023-02-17 13:23:10 +01:00
  • d132447af8 #Net Applevangelist 2023-02-17 13:22:39 +01:00
  • 50f73f1be2 #NET extended block to UCID Applevangelist 2023-02-17 13:22:10 +01:00
  • 822b95e8aa Merge remote-tracking branch 'origin/master' into develop Applevangelist 2023-02-17 08:55:27 +01:00
  • a7e45338e3 #AICSAR - Added alt/speed options Applevangelist 2023-02-17 08:54:54 +01:00
  • 985adc0267 Fixes Applevangelist 2023-02-17 08:54:33 +01:00
  • 2ebbc8f466 #NET - added docu Applevangelist 2023-02-17 08:54:15 +01:00
  • 39b94a2ac1 Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2023-02-16 18:24:35 +01:00
  • 5f007be781 Merge remote-tracking branch 'origin/master' into develop Applevangelist 2023-02-16 18:23:18 +01:00
  • 578b68f635 #AICSAR Applevangelist 2023-02-16 18:22:26 +01:00
  • 7637f0c6ce Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2023-02-16 18:22:10 +01:00
  • 6ec43b72ce #AICSAR * Added PlayerName to OnAfterPilotRescued(From,Event,To,PilotName) if available Applevangelist 2023-02-16 18:22:06 +01:00
  • 91e80bf1a6 Merge branch 'FF/Ops' into FF/OpsDev Frank 2023-02-16 17:30:47 +01:00
  • e6464dc5cb Merge branch 'develop' into FF/Ops Frank 2023-02-16 17:30:15 +01:00
  • 34c799b668 Merge branch 'master' into develop Frank 2023-02-16 17:29:54 +01:00
  • 1a96b30a45 Merge pull request #1922 from FlightControl-Master/FF/MasterDevel Frank 2023-02-16 17:28:13 +01:00
  • 3b1b57a33e Update Positionable.lua Frank 2023-02-16 17:20:53 +01:00
  • f85c0320ec Airspeed Frank 2023-02-16 17:09:12 +01:00
  • dbd7634f0e #NET * Added event management for clients and block/unblock functions Applevangelist 2023-02-16 11:42:46 +01:00
  • 44b6315361 #NET * Added event management for clients and block/unblock functions Applevangelist 2023-02-16 11:42:06 +01:00
  • bae7edb914 #NET * Added event management for clients and block/unblock functions Applevangelist 2023-02-16 11:41:45 +01:00
  • baa1dcbf8f OPSGROUP Frank 2023-02-15 23:06:34 +01:00
  • 660ebeadfe Merge remote-tracking branch 'origin/master' into develop Applevangelist 2023-02-15 12:24:09 +01:00
  • 35322399e9 #SPOT - minor fixes Applevangelist 2023-02-15 12:23:31 +01:00
  • a3f9219460 fx Applevangelist 2023-02-15 12:19:55 +01:00
  • 65d3c3f277 #SPOT - minor fixes Applevangelist 2023-02-15 12:17:49 +01:00
  • 250b12c041 fix Applevangelist 2023-02-15 12:16:46 +01:00
  • ef0ddddb46 #PLAYERTASK * added group/unit check for UseTypeNames Applevangelist 2023-02-15 10:32:30 +01:00
  • 5d4c0f3c87 Bugfix Applevangelist 2023-02-15 10:31:52 +01:00
  • b649ad73a8 Fixes Applevangelist 2023-02-15 10:31:40 +01:00
  • bf50adaa22 #PLAYERTASKCONTROLLER * Added ship detail types Applevangelist 2023-02-14 12:58:39 +01:00
  • 77a39364f4 #PLAYERTASKCONTROLLER * Added ship detail types Applevangelist 2023-02-14 12:58:23 +01:00
  • 055cbf4f7a DB Applevangelist 2023-02-13 17:12:25 +01:00
  • 6d9e2fbfe1 Merge remote-tracking branch 'origin/master' into develop Applevangelist 2023-02-13 16:41:32 +01:00
  • 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