Commit Graph

  • 907969a8f4 Allow healer to administer morphine if out of bandages johnb432 2024-08-10 20:15:05 +0200
  • 20fb83a7a2 Merge branch 'master' into medical-ai-improve-tourniquet johnb432 2024-08-10 20:06:26 +0200
  • e181cffc83
    RHS Compats - Remove nametags related functions being called if nametags isn't loaded (#10177) johnb432 2024-08-10 19:58:43 +0200
  • f404517087
    Update docs/wiki/framework/explosives-framework.md #10182 johnb432 2024-08-10 10:57:34 -0700
  • d7c98ea366
    Medical AI - Fix specific treatment items not being removed (#10179) johnb432 2024-08-10 19:19:36 +0200
  • 389defeac1 WIP Selectable high thirst/hunger consequence mrschick 2024-08-10 18:55:33 +0200
  • 9e4bcc5d72
    Explosives - Remove delayTime for explosives, as it no longer serves any purpose (#10181) johnb432 2024-08-10 19:06:45 +0200
  • 172da2a632 Use triggerAmmo instead of setDamage johnb432 2024-08-10 17:54:44 +0200
  • bfc9617284 Remove delayTime for explosives, as it no longer serves any purpose #10181 johnb432 2024-08-10 17:21:01 +0200
  • 22c71ba80e
    CSW - Fix round count in GMG belt description (#10180) johnb432 2024-08-10 15:48:34 +0200
  • 3914a9a9c3 Fixed failing CI #10180 johnb432 2024-08-10 15:43:23 +0200
  • 6366951988 Correct round count in GMG belt johnb432 2024-08-10 15:38:19 +0200
  • 9a52511222 Use turret events, fixed invalid param johnb432 2024-08-10 15:31:08 +0200
  • 831bf92ca1 Allow water actions from within vehicle mrschick 2024-08-10 15:29:53 +0200
  • 597c167801 add medic param to remaining treatment EHs #10186 tuntematonjr 2024-08-10 15:59:36 +0300
  • 71dcfb512c Reverted changes for hostile crew (now in a separate PR) johnb432 2024-08-10 14:57:36 +0200
  • 6656aa624c Added some suggestions johnb432 2024-08-10 14:57:12 +0200
  • dc52f7a362
    Update addons/csw/functions/fnc_getAvailableAmmo.sqf johnb432 2024-08-10 05:44:45 -0700
  • 46c484e0f0
    Update addons/csw/functions/fnc_reload_handleReturnAmmo.sqf johnb432 2024-08-10 05:44:31 -0700
  • 18948e4cea
    Update addons/csw/functions/fnc_unloadMagazines.sqf johnb432 2024-08-10 05:43:59 -0700
  • 7cef8287aa Fix treatment items not being removed #10179 johnb432 2024-08-10 13:06:38 +0200
  • 3ae42a695e Fixes & tweaks johnb432 2024-08-10 13:02:56 +0200
  • 7963fa4a56 Merge branch 'master' into aiRemTq johnb432 2024-08-10 10:53:37 +0200
  • 7b6871ac8d Don't call nametags related functions if nametags isn't loaded #10177 johnb432 2024-08-10 10:45:57 +0200
  • ff4c875b49
    Update docs/wiki/framework/arsenal-framework.md #10151 johnb432 2024-08-10 01:12:59 -0700
  • 26e00c2a85 Added scripting example DartRuffian 2024-08-09 23:44:18 -0500
  • 048ccfb982 Merge branch 'master' into irlight-fixes #10119 johnb432 2024-08-09 23:58:02 +0200
  • f4572d99ab Cancel healing at vehicles johnb432 2024-08-09 23:56:55 +0200
  • b2a3fac4b6
    Medical Feedback - Add parameters to fnc_playInjuredSound (#10175) tuntematonjr 2024-08-10 00:35:35 +0300
  • 4db0f7de24
    Interaction - Improve FUNC(switchWeaponAttachment) (#10145) johnb432 2024-08-09 23:08:07 +0200
  • cf3b55c907 Add sound back, to indicate new attachment #10145 johnb432 2024-08-09 23:00:24 +0200
  • bf10a64f3c Remove sound, as it was part of the CBA attachment switching & pass missing parameter johnb432 2024-08-09 22:37:20 +0200
  • 8854b668aa Revert some unnecessary changes johnb432 2024-08-09 22:34:30 +0200
  • a019ed95f7 Fix return not happening properly johnb432 2024-08-09 22:31:09 +0200
  • 1d0aa16b73 Reverted preInit change #6144 johnb432 2024-08-09 22:12:11 +0200
  • 7c732993fc Updated header formatting + minor tweaks #10175 johnb432 2024-08-09 22:01:16 +0200
  • e36682afab Restructure interactions, improved some locations & added interaction to some missing vehicles johnb432 2024-08-09 19:55:23 +0200
  • 2d764f31ec
    Merge branch 'acemod:master' into master Hexo 2024-08-09 18:20:24 +0200
  • dccb240b66 Add text config entry for progress bar title johnb432 2024-08-09 17:34:04 +0200
  • dd7df53c3c Fix error johnb432 2024-08-09 12:05:21 +0200
  • 76937f98db Merge branch 'master' into pr/6144 johnb432 2024-08-09 11:05:08 +0200
  • 2b0faa7251 cache config lookup at preStart PabstMirror 2024-08-08 22:50:27 -0500
  • f4d5670286
    Update addons/interaction/functions/fnc_switchWeaponAttachment.sqf PabstMirror 2024-08-08 21:20:43 -0500
  • b1f6b7b106
    change interact_SWA to use common_SAM (#10176) PabstMirror 2024-08-08 21:18:28 -0500
  • 44aadb7cb0 Cleanup leftover code, use unit instead of target #10176 johnb432 2024-08-08 23:42:16 +0200
  • 4138e87537 Minor optimisations johnb432 2024-08-08 23:37:36 +0200
  • 81c1f3198e Replace heavy optics blur with CBA one johnb432 2024-08-08 23:18:53 +0200
  • d3aa02b47d Maybe this time the optics sizes will be fine... surely? johnb432 2024-08-08 23:18:24 +0200
  • beaf422534 Preemptively overwrite upcoming changes to Aegis #10173 johnb432 2024-08-08 23:12:41 +0200
  • 937592ec75 Update fnc_switchAttachmentMode.sqf PabstMirror 2024-08-08 16:10:31 -0500
  • 9539440295 exit on bad arg PabstMirror 2024-08-08 16:09:24 -0500
  • b047c3b04b Directly call PabstMirror 2024-08-08 16:09:08 -0500
  • 438f14a947
    Merge 2b58325cbe into 5afe06999f #10170 BrettMayson 2024-08-08 17:18:09 -0300
  • 6bd851410a change interact_SWA to use common_SAM PabstMirror 2024-08-08 14:04:53 -0500
  • e80789ed70 Merge branch 'master' into interaction-update-switchWeaponAttachment PabstMirror 2024-08-08 13:30:18 -0500
  • 5afe06999f
    Chemlights - Add pretty name for addon (#10174) johnb432 2024-08-08 17:27:27 +0200
  • 0b2a8f23e6
    Vehicle Damage - Let AP trigger ERA/SLAT (#10169) johnb432 2024-08-08 17:26:52 +0200
  • 39b552cb00 fix conditio tuntematonjr 2024-08-08 17:42:05 +0300
  • 56a45f9ca3 Merge branch 'master' into cba-scripted-optics johnb432 2024-08-08 11:21:06 +0200
  • 8577950986 Add pretty name for chemlights addon #10174 johnb432 2024-08-08 11:19:18 +0200
  • 412d87c44c Various fixes/tweaks johnb432 2024-08-08 10:59:59 +0200
  • 4ce9dacc1e Merge branch 'master' into irlight-fixes johnb432 2024-08-08 10:02:16 +0200
  • 7838dea543
    Common - Improve persistent lights/lasers (#10118) johnb432 2024-08-08 10:01:39 +0200
  • 8e13e99ae4 Fix undefined variables #10118 johnb432 2024-08-08 09:55:13 +0200
  • 80a310d4c6
    Vehicles - Remove unneeded magazines (#10172) johnb432 2024-08-08 09:29:41 +0200
  • b1d5487006 Overwrite some Aegis changes johnb432 2024-08-08 00:52:11 +0200
  • 5f22bfdbd3 Additional parameters tuntematonjr 2024-08-07 21:39:54 +0300
  • ee4bc85563 Remove unneeded magazines #10172 johnb432 2024-08-07 20:06:28 +0200
  • c452f94779 Fix water actions on vehicles with no waterActionOffset mrschick 2024-08-07 15:31:30 +0200
  • de9c29d869 Hunger/Thirst Faiting cooldown of 45s mrschick 2024-08-07 13:15:40 +0200
  • 4e13d227f1
    Merge branch 'acemod:master' into master Hexo 2024-08-07 07:32:50 +0200
  • 2b58325cbe some more #10170 Brett Mayson 2024-08-07 01:51:15 +0000
  • c6c5defbae fix cases using hemtt Brett Mayson 2024-08-07 01:40:43 +0000
  • 3cc3ba28d8 Merge branch 'arsenal/public-functions' of https://github.com/DartRuffian/ACE3 into arsenal/public-functions DartRuffian 2024-08-06 13:00:09 -0500
  • e279b230fc setVariable in case no loadouts are saved DartRuffian 2024-08-06 13:00:07 -0500
  • 50eea3cba2 Merge branch 'master' into vehicle-damage-fixes johnb432 2024-08-06 20:00:03 +0200
  • b9a361fd39
    Vehicle damage - Fix ERA/SLAT not being detected (#10168) johnb432 2024-08-06 18:15:01 +0200
  • 9f93e082c2
    Unicode support Dart 2024-08-06 11:03:24 -0500
  • 0638c55435
    Fix case-sensitive _loadoutIndex Dart 2024-08-06 10:56:01 -0500
  • 40d3c9d27b GitHub didn't like editing the file in the browser DartRuffian 2024-08-06 10:30:19 -0500
  • 68c8c31197
    Changed to toLower for other languages Dart 2024-08-06 10:28:56 -0500
  • 55c0f63063 Let AP trigger ERA/SLAT #10169 johnb432 2024-08-06 14:14:39 +0200
  • 535097e527 Revert "Let AP trigger ERA/SLAT" #10168 johnb432 2024-08-06 14:13:45 +0200
  • e648fcf3c7 Let AP trigger ERA/SLAT johnb432 2024-08-06 14:10:11 +0200
  • b343b54372 Fix ERA/SLAT not being detected johnb432 2024-08-06 14:09:47 +0200
  • 60d5d9cb9f Renamed states, condensed canHeal johnb432 2024-08-06 10:20:53 +0200
  • 973cfdd1c4
    Common - Move missing compats warning to pre start (#10162) johnb432 2024-08-06 09:48:10 +0200
  • 92e10bc578
    Fix overlapping CSW interaction position for SPG-9, improve positions for Mk19 and DSHKM (#10165) johnb432 2024-08-06 09:33:52 +0200
  • f4f2dbaad9
    Docs - Add missing info to Interaction Menu Framework (#10160) Fabio Schick 2024-08-06 00:33:00 +0200
  • 54dd0fe3fb ? #10162 PabstMirror 2024-08-05 17:29:46 -0500
  • 6ce2ac9b08 move to common/preStart PabstMirror 2024-08-05 17:29:12 -0500
  • 688c8bc931 Medical AI - AI will remove tourniquets PabstMirror 2024-08-05 17:08:31 -0500
  • c077155fe1
    Merge branch 'acemod:master' into master Hexo 2024-08-05 20:28:40 +0200
  • 29ff89813d Fix overlappting CSW interaction position for SPG-9, improve Mk19 and DSHKM #10165 johnb432 2024-08-05 15:11:53 +0200
  • 750f79168e Merge branch 'master' into medical-ai-stop-blocking johnb432 2024-08-05 11:42:36 +0200
  • c31ef9e16b
    Medical AI - Add command actions to heal injured units (#10164) johnb432 2024-08-05 11:39:35 +0200
  • cd678c5b90
    Medical AI - Add tourniquet support (#10158) johnb432 2024-08-05 11:39:01 +0200
  • 4226cd383e
    Interact Menu - Add inheritance support to removeActionFromClass (#8396) Grim 2024-08-05 06:38:46 -0300
  • c491b78468
    Recoil - Tweak launcher recoil to be more realistic (#9528) amsteadrayle 2024-08-05 05:38:26 -0400
  • 9408aba133
    Merge branch 'acemod:master' into master Hexo 2024-08-04 17:18:35 +0200