Commit Graph

12743 Commits

Author SHA1 Message Date
johnb432
c44a1e7ea7
Cookoff - Mini-Rewrite (#9758)
* Cook-off improvements

* More changes

* Update fnc_getVehicleAmmo.sqf

* Better engine fire placement

* Update fnc_detonateAmmunition.sqf

* Update XEH_postInit.sqf

* Update fnc_getVehicleAmmo.sqf

* Update events-framework.md

* Various improvements

* Separate effect handling

* Tweaks

* Update XEH_postInit.sqf

* Prevent double ammo detonation

* Fixed objects not being able to cook-off again

* Added incendiary rounds as source of box cookoff

* Converted enable setting to bool

* Fixed brackets

* Update fnc_cookOff.sqf

* Update CfgEden.hpp

* Removed GVAR(enable), added GVAR(enableFire) back

* Update initSettings.inc.sqf

* Update events-framework.md

* Update addons/cookoff/functions/fnc_cookOffEffect.sqf

* Restructured, redid API events

* Fix effect for JIP, minor optimisations

* Removed `cbaSettings_settingChanged`

* Renamed variables, tweaked string table entries

* Update fire damage #9991

* Capitalize comments again

* Fix cookoff for very short durations and fix effect removal being too quick
2024-06-05 12:36:39 -07:00
johnb432
738a32dba9
Gunbag - Optimise weapon taking/storing code (#10053)
Optimise gunbag code
2024-06-05 06:22:19 -07:00
johnb432
06f47e600d
Cookoff - Change cook-off fire damage (#9991)
Increase cookoff fire damage
2024-06-05 06:22:09 -07:00
johnb432
29728352e2
Rearm - Optimise getting magazine names (#10052)
* Optimise getting rearm magazine names

* Replace using regex and localize CSW entries

* Added comments about prefix
2024-06-04 23:32:41 -07:00
Mike-MF
7c689bdff7
Compat WS - Update realistic names (#10014)
* Compat WS - Update realistic names

* Fix duplicate class

* WS 1.1.3

* alter SLR para barrel length

* RPG-32
2024-06-03 05:52:59 -07:00
PabstMirror
fe9f59bed7
Refuel - Fix for SOG/SPE (#10049)
* Refuel - Fix SOG/SPE Compats

* fix export

* Added missing fuel sources, improved some existing hook positions

* Removed outdated todo

* Add default code if refuel isn't loaded

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-06-03 02:00:12 -07:00
johnb432
60eabda47e
Vehicle Damage - Add API to prevent AI from dismounting from immobile vehicles (#9990)
* Add API to prevent AI from dismounting from immobile vehicles

* Update vehicledamage-framework.md
2024-06-01 09:55:56 -07:00
johnb432
99bb6983bb
Common - Improve addWeapon (#10051)
Improve `addWeapon`
2024-06-01 09:52:18 -07:00
johnb432
1cca2db964
General - Cleaned up cbaSettings_settingChanged (#10050)
Adapted `cbaSettings_settingChanged`
2024-05-31 13:20:21 -07:00
johnb432
dc56cdbd8b
Vehicle Damage - Fix applying medical damage to non-local and invulnerable units (#9988)
* Make medical damage apply to non-local units

* Update addons/vehicle_damage/functions/fnc_medicalDamage.sqf

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

* Update addons/vehicle_damage/functions/fnc_medicalDamage.sqf

* Update fnc_medicalDamage.sqf

* Specify reason for death

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2024-05-31 13:15:46 -07:00
johnb432
9f2ee9fb6f
Common - Add setDead API (#10045)
* Added `setDead` API

* Update XEH_PREP.hpp

* Update fnc_setDead.sqf

* Update addons/common/functions/fnc_disableUserInput.sqf

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* Update fnc_setDead.sqf

* Added warning for non-local units

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2024-05-31 13:07:50 -07:00
PabstMirror
5a1e3bc585
Zeus - Add a translation (#10047) 2024-05-30 07:58:46 -05:00
PabstMirror
d30c01aee9
Hearing - prevent audio from stacking when tabbed out (#10048) 2024-05-30 01:34:19 -07:00
johnb432
98f4b51c52
Hearing - Fix deafness reducing when game is paused (#10039)
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2024-05-29 18:55:17 +00:00
Mike-MF
d9a2aa01a4
Realistic Names - Add missing classes (#10013)
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-05-29 15:51:18 -03:00
Fabio Schick
8c0d0944c6
Parachute - Make Jet Ejection Seats use Non-Steerable Parachutes (#9963) 2024-05-29 15:50:18 -03:00
johnb432
120589512e
Headless - Improve group transfer and add API (#9874) 2024-05-29 15:49:59 -03:00
mharis001
440b9d5721
Zeus - Add spectator module (#6202)
Co-authored-by: Ozan Eğitmen <ozan@egitmen.net>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-05-29 15:48:34 -03:00
johnb432
0034f4b9cc
Arsenal - Fix insignia not reapplying after switching vests & backpacks (#10046)
Fix insignia not reapplying
2024-05-29 11:40:41 -07:00
johnb432
e535988479
Hearing - Code cleanup (#10041)
* Hearing cleanup

* Update fnc_updateHearingProtection.sqf

* Fixes + tweaks

* Update initSettings.inc.sqf

* Update fnc_removeEarplugs.sqf
2024-05-29 10:01:39 -07:00
johnb432
be61424fed
Hearing - Fix volume being force updated when loadouts are set on AI (#10044)
* Update XEH_preInit.sqf

* Update XEH_preInit.sqf
2024-05-29 08:40:32 -07:00
johnb432
be9797d11d
Grenades - Add grenade rolling (#10005)
* Add grenade rolling

* Added some safeguards

* Use `setVectorDirAndUp` instead of rotation

* Don't allow players to roll grenades when in vehicles

* Grenades - Rolling only add PFEH when needed (#10015)

* Grenades - Rolling only add PFEH when needed

* Corrected minor typo, moved variable init in preInit, fixed bugs

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Don't switch modes if grenade can't be thrown

* Minor tweaks

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2024-05-27 02:19:52 -07:00
JonBons
be77ef233e
Cookoff - Delay full vehicle destruction (#9061)
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2024-05-24 20:06:33 -03:00
johnb432
d7c1984a5a
Grenades - Fix not being able to switch throw modes in FFV (#10012) 2024-05-24 20:06:13 -03:00
johnb432
dc3753893f
Hearing - Improve and cleanup code (#9933)
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2024-05-24 20:05:19 -03:00
PabstMirror
22c6621878
Refuel - Cleanup compats (#10011)
* Refuel - Cleanup compats

* add `XEH_INHERITED`
2024-05-24 17:59:59 -05:00
PabstMirror
05ebe1f48f
Medical Treatment - Allow diagnosing cardiac arrest with clear language (#9997) 2024-05-23 17:25:59 -05:00
johnb432
c634bbe1ab
CSW - Force QGVAR(handleExtraMagazinesType) to be respected (#9903)
Force QGVAR(handleExtraMagazinesType) to be respected
2024-05-23 21:56:28 +02:00
johnb432
c0d74ba703
Refuel - Fix fuel source disabling (#9995)
* Add enable setting

* Exclude man class init

* Fix multiplayer terrain pump fuel sync

* Add terrain pumps positions

* Add vanilla fuel cargo restoring before destroying

* Add Livonia positions by bux

* Fix terrain pumps destruction

* Improve settings init

* Fix double settings category

* Check enabled var in public functions

* Fix fnc_makeSource

* Handle recent CUP Terrains changes

* Update includes

* Fix issues introduced in #9133

* Change warning

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Optimisations and cleanup

- Use hashmaps wherever possible
- Reduced pump search radius by ~30%
- Sorted pumps alphabetically and sorted positions by "smallest" first, for consistency

* Add init debug trace

* compileScript in dev

* yoda conditions & DFUNC macro

* Wait until CBA settings are ready

* Update Chernarus 2020 and add more maps configs

* Remove vanilla fuel cargo restoring before destroying

* Update fnc_makeSource.sqf

---------

Co-authored-by: Dystopian <sddex@ya.ru>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2024-05-23 21:56:08 +02:00
Dystopian
7c65f8503d
Refuel - Add enable setting (#7613)
* Add enable setting

* Exclude man class init

* Fix multiplayer terrain pump fuel sync

* Add terrain pumps positions

* Add vanilla fuel cargo restoring before destroying

* Add Livonia positions by bux

* Fix terrain pumps destruction

* Improve settings init

* Fix double settings category

* Check enabled var in public functions

* Fix fnc_makeSource

* Handle recent CUP Terrains changes

* Update includes

* Fix issues introduced in #9133

* Change warning

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Optimisations and cleanup

- Use hashmaps wherever possible
- Reduced pump search radius by ~30%
- Sorted pumps alphabetically and sorted positions by "smallest" first, for consistency

* Add init debug trace

* compileScript in dev

* yoda conditions & DFUNC macro

* Wait until CBA settings are ready

* Update Chernarus 2020 and add more maps configs

* Remove vanilla fuel cargo restoring before destroying

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2024-05-23 21:47:19 +02:00
PabstMirror
f97f11d224
AdvThrowing - Fix showing wind info when no grenades in inventory (#10008)
AdvThrowing - Fix showing wind info if no grenades in inventory
2024-05-22 21:19:40 -05:00
johnb432
67fe22a5a6
Grenades - Make flashbang detonation sound configurable via config (#9985)
* Added configurable flashbang detonation sound

Updated documentation by filling missing information in

* Update grenades-framework.md

* Update grenades-framework.md
2024-05-22 13:38:59 -07:00
johnb432
e1137ac903
Fire - Remove unused plant integration (#9993)
Removed unused plant integration in fire
2024-05-22 13:37:24 -07:00
johnb432
c03e08e51b
Grenades - Change damage from M14 incendiary grenade (#9992)
Doubled damage from M14 incendiary grenade
2024-05-22 13:08:09 -07:00
johnb432
052f1c95a3
Cargo - Add checks for adding cargo via config (#9999)
* Add checks for cargo via config

* Update fnc_initVehicle.sqf

* Use loaded number instead of intended number
2024-05-22 01:32:46 -05:00
johnb432
99d7e4d57b
Grenades - Add 3 more sounds to flashbang detonations (#9982)
* Add 3 more sounds to flashbang detonations

* Update addons/grenades/functions/fnc_flashbangThrownFuze.sqf

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2024-05-21 20:24:50 -05:00
PabstMirror
52762c1e62
Arsenal - Changes for CBA Disposable hashs (#9998)
* Arsenal - Changes for CBA Disposable hashs

* Update addons/arsenal/functions/fnc_onSelChangedRight.sqf

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Update addons/arsenal/functions/fnc_onSelChangedRight.sqf

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-05-21 20:23:46 -05:00
johnb432
4cf61a026b
Interact Menu - Use hashmaps for interactions (#9920)
* Use hashmaps for interactions

* Update addons/interact_menu/functions/fnc_splitPath.sqf

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* Account for case sensitivity

* Update addons/interact_menu/functions/fnc_compileMenu.sqf

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

* Update addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2024-05-21 20:18:32 -05:00
johnb432
db2bf60c28
Cargo - Add documentation on adding cargo via config (#9994)
* Fix bag of holdings in cargo

* Update CfgVehicles.hpp

* Update CfgVehicles.hpp

* Revert space changes
2024-05-21 20:16:05 -05:00
PabstMirror
a31608073e
Maptools - Fix gps detection (#10007)
* Maptools - Fix gps detection

* Use `infoPanelComponents`

Co-Authored-By: johnb432 <58661205+johnb432@users.noreply.github.com>

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-05-21 18:25:59 -05:00
PabstMirror
b26d6543a6 Prepare 3.17.1 Build 86 2024-05-11 22:15:02 -05:00
PabstMirror
9efd60d798 Merge branch 'master' into release-3.17.1 2024-05-11 22:14:36 -05:00
Abogado
6972f02bc4
Translation - Add Missing Spanish (#10001)
Translation to Spanish

Translation to Spanish
2024-05-10 20:42:55 -05:00
johnb432
2a3ff8e185
Medical Treatment - Fix low SpO2 making units go into cardiac arrest again (#10003)
* Set SpO2 after successful CPR

* Update fnc_cprLocal.sqf

* Add API

* Update fnc_cprLocal.sqf
2024-05-10 20:39:41 -05:00
Fabio Schick
62353a9175
Translations - Updated Italian with recent additions (#10004)
* hearing italian translations

* common italian translations
2024-05-10 20:34:34 -05:00
PabstMirror
8e367ee80e Prepare 3.17.1 Build 85 2024-05-05 15:24:45 -05:00
PabstMirror
7b0c1c425d Merge branch 'master' into release-3.17.1 2024-05-05 15:23:29 -05:00
PabstMirror
9d168756df
CUP Compat - Fix NVG Black/Green translations (#9976)
* cup compat - fix nvg black/green

* Capitalize some colors
2024-04-30 00:55:59 -05:00
johnb432
4f1c2fa8d7
Common - Fix adding unusable throwables (#9980)
* Prevent adding unusable grenades

* Update fnc_addToInventory.sqf

* Update addons/common/functions/fnc_addToInventory.sqf

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* Update fnc_addToInventory.sqf

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2024-04-29 12:13:47 -05:00
johnb432
0f5b7c8762
Grenades - Fix unconscious AI being affected by flashbangs (#9978)
* Stop players being affected by AI flashbang code

* Stop affecting unconscious AI

* Update fnc_flashbangExplosionEH.sqf
2024-04-28 21:49:36 -05:00
johnb432
7c4f4cf8f8
Grenades - Fix flashbangs causing pain for invulnerable units (#9981)
Disable flashbang pain for invulnerable units
2024-04-28 09:07:15 -07:00
johnb432
6e32fc1144
Hearing - Add earplugs only if not present (#9987)
Only add earplugs if not present
2024-04-28 09:04:56 -07:00
johnb432
3b806295f7
Hearing - Use class EH instead of extended EH (#9986)
Use class EH instead of extended EH
2024-04-28 09:02:50 -07:00
johnb432
60b87f0b41
Medical - Add _createLitter to medical events (#9959)
Added `_createLitter` to medical events
2024-04-26 17:35:57 -05:00
Apricot
b513a110f5
Translations - Improve Japanese localization (3.17.1) (#9977)
Tweaks
2024-04-26 17:34:11 -05:00
Dystopian
a12ad9ec59
Interact menu - Fix condition in consolidated menu (#9946)
Fix condition in consolidated menu
2024-04-25 00:23:10 -05:00
johnb432
1eca83db9f
Common - Fix animations not playing (#9973)
Update CfgMoves.hpp
2024-04-24 23:41:27 -05:00
jonpas
c17873dcad Prepare 3.17.1 Build 84 2024-04-24 02:29:25 +02:00
johnb432
9e6f624a68
Cargo - Fix undefined variable and config entries (#9965)
Cargo fixes
2024-04-23 14:07:16 -07:00
Hexo
a0e4f09555
Translations - French (Map tools) (#9953)
* Update translate Hearing french

* update map tools

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2024-04-22 17:15:05 -05:00
Tim Beswick
23842aab39
Medical - Fix script error when bandaging (#9956)
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-04-19 16:57:41 -03:00
johnb432
7480ae377d
Scopes - Stop changing CBA setting value directly (#9954)
Update XEH_postInit.sqf
2024-04-19 10:27:04 -07:00
johnb432
dda6b9d2dc
Medical Treatment - Enforce bandage effectiveness variable type (#9950)
Enforce bandage effectiveness variable type
2024-04-16 13:33:40 -07:00
Hexo
b637a0ea09
Update translate Hearing french (#9949)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2024-04-13 15:09:48 -05:00
V1nsyara
32707dd860
Language Russian - Update translation (#9947)
Russian
2024-04-13 14:53:50 -05:00
PlayerBotPro
6165b46ab6
Medical Treatment - Fix Painkiller has no effect when Advanced Medication is off (#9942)
* fix: Painkiller has no effect when Advanced Medication is off

* Change PainKillers_PAIN_SUPPRESSION to uppercase

* Update addons/medical_treatment/functions/fnc_medicationLocal.sqf

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-04-11 12:58:50 -03:00
johnb432
bcf1133477
Scopes - Notify restart req. for enable & pressure settings (#9944)
* Moved keybinds, made settings require restart

* Move keybinds
2024-04-11 17:43:19 +02:00
OverlordZorn
2b5ea1628f
Weather - Winter Terrain Temperatures (#9943)
* a -> an

* Added last resort catch for winter maps to define suitable temps

* removed debug line

* purge 🧼

* added check for "snow" in raintexture

* cleaned up conditions

* Update arma-3-scheduler-and-our-practices.md

* isNull && {}

* Update fnc_getMapData.sqf

* Update fnc_getMapData.sqf

* Update fnc_getMapData.sqf

* changed order in condition checks and indentation

* not so lazy

* deep config lookup -> _cfg

* comment

* removed accidental empty line

* 🎢

* Update fnc_getMapData.sqf

* Revert "Update fnc_getMapData.sqf"

This reverts commit a57d114182.

* Update addons/weather/functions/fnc_getMapData.sqf

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Update addons/weather/functions/fnc_getMapData.sqf

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Update addons/weather/functions/fnc_getMapData.sqf

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* then -> exitWith

---------

Co-authored-by: Mr. Zorn <56258612+PulsarNeutronStar@users.noreply.github.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-04-10 08:26:30 -03:00
lambdatiger
3255dbef36
Compats - Add/Fix Adv, Vehicle Damage ERA and SLAT arrays (#9925)
* added missing hitpoints and new classes

* added CUP compats

* Fixed missing base class and missing comma
2024-04-10 08:25:46 -03:00
johnb432
5130a22008
Hearing - Add setting to add earplugs to all units (#9935)
Add option to add earplugs to all units
2024-04-10 08:23:50 -03:00
johnb432
095ce88279
Hearing - Notify restart req. for combat deafness setting (#9934) 2024-04-07 12:59:14 -03:00
Grim
6a2f3a21f2
Medical - Fix broken AI ragdolls if AI unconsciousness is disabled (#9917)
Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2024-04-06 22:20:51 -03:00
BrettMayson
f3f7f2c492
Medical Status - API to modify getBloodLoss (#9926)
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2024-04-06 22:18:07 -03:00
PabstMirror
431c4d616e
Casing - Move model lookup to cartridge config (#9893)
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2024-04-06 22:12:06 -03:00
PabstMirror
5ca3465b8a
Medical Treatment - Only create litter on empty container (#9924) 2024-04-06 22:11:51 -03:00
johnb432
f5e8e06c24
Interact Menu - Add nil handling for condition (#9922)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2024-04-06 22:11:09 -03:00
johnb432
04ac1d8808
Arsenal - Fix #9916 (#9932) 2024-04-06 22:04:52 -03:00
johnb432
dce7da60c9
General - Change count to isEqualTo where appropriate (#9921)
count -> isEqualTo
2024-04-06 11:57:08 -07:00
johnb432
8f46ffd8d5
General - Change count to forEach where appropriate (#9890)
count -> forEach

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2024-04-04 08:15:26 -03:00
Fabio Schick
ccb3e65734
Map Tools - Show GPS on Map when equipped with UAV Terminal (#9885)
* Show Map GPS when equipped with UAV Terminal

* Update Maptools Documentation

* Reword documentation

* Reword docs, remove dash

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* Allow GPS when terminal slot is not empty

* Allow GPS on map when GPS sidepanel is available

* Reword docs

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* Return statement - remove ; and add comment

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

---------

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2024-04-04 08:09:02 -03:00
Hexo
d312792631
Translation - French (#9919)
* Translate French

* Update stringtable.xml

Translate - FR

* Translate - French

* Translate - French - overheating

* Translate -French - compat_sog

* Update stringtable.xml

* Translate - French

* Fix - Translate French

Minor correction

* Update Translate French

* Update French

* Update - french

* Transalte French fieldmanual

* Translate French compat_cup_weapons_cws

* Update translate
2024-04-04 08:01:24 -03:00
johnb432
0d401b2664
Headless - Code optimisation (#9873)
* Headless optimisations

* Swapped blacklist for unitIsUAV check

* Moved UAV check

* Update addons/headless/functions/fnc_transferGroups.sqf

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* Update addons/headless/functions/fnc_transferGroups.sqf

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* Update fnc_transferGroups.sqf

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2024-04-04 08:01:12 -03:00
Grim
e6cc5fca89
Arsenal - Handle arrays in loadout extended info (#9918) 2024-04-03 19:46:26 -03:00
johnb432
a72b3a43a5
Arsenal - Fix FUNC(baseAttachment) returning non-CBA item modes (#9916)
Update fnc_baseAttachment.sqf
2024-04-03 14:53:12 -07:00
Sotirios Pupakis
558849b91c
Interaction - Add door events (#9910)
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
2024-04-03 17:47:51 -03:00
Hexo
020d21d562
Translate - French (#9908)
* Translate - French

* Translate - French - overheating

* Translate -French - compat_sog

* Update stringtable.xml

* Translate - French

* Fix - Translate French

Minor correction
2024-04-02 23:04:56 -05:00
BrettMayson
19e0064730
Medical - Fix typo caridac to cardiac (#9900) 2024-04-02 21:07:03 -03:00
johnb432
613fc36385
Common - Use existing weapon holders for FUNC(addToInventory) (#9895)
* Reuse existing weapon holders

* Update fnc_addToInventory.sqf

* Return correct weapon holder
2024-04-02 14:07:45 -07:00
johnb432
cc3fbc5f3f
Cargo - Fix undefined variable (#9909)
Update fnc_initVehicle.sqf
2024-04-02 13:46:14 -07:00
johnb432
0375d0dae6
CSW - Fix CUP CSW (#9907)
* Update CfgWeapons.hpp

* Update other CUP weapons

* Update addons/compat_cup_weapons/compat_cup_weapons_csw/CfgWeapons.hpp
2024-04-02 12:37:30 -07:00
johnb432
316bb355ad
CSW - Minor code cleanup (#9902)
CSW minor code cleanup
2024-04-02 08:22:45 -07:00
johnb432
a5a3fe4232
CSW - Deploy & pickup CSW parts only if they are not destroyed (#9905)
Deploy & pickup CSW parts only if they are not destroyed
2024-04-02 08:15:06 -07:00
johnb432
7171ca7947
CSW - Remove unused 3den attributes (#9898)
Remove unused 3den attributes
2024-04-02 06:27:10 -07:00
johnb432
35d40e614c
Yardage - Make macros uppercase (#9894)
* Renamed macros in yardage

* Update fnc_turnOn.sqf
2024-04-02 06:26:42 -07:00
PabstMirror
8805414669
Common - Cleanup strange texture (#9897) 2024-04-02 01:52:45 +02:00
jonpas
16411f0a5c Prepare 3.17.0 Build 83 2024-04-01 18:10:30 +02:00
jonpas
3a232bbfa8 Fix release build type 2024-04-01 18:10:30 +02:00
jonpas
ac09cea0d0 Prepare 3.17.0 Build 82 2024-04-01 15:49:54 +02:00
jonpas
c8eebf461b Merge branch 'master' into release-3.17 2024-04-01 15:48:07 +02:00
BaerMitUmlaut
7ddd62f4d3 Documentation - Fix typo (#9608) 2024-04-01 15:43:24 +02:00
PabstMirror
0c589c2346
Interaction - Check canInteractWith before taking dropped weapons (#9783)
* Interaction - Block interaction on carried ground weapon holders

* Don't check if cargo container is claimed
2024-04-01 09:11:14 -03:00
jonpas
d9f6beacc5 Prepare 3.17.0 Build 81 2024-04-01 13:34:39 +02:00
jonpas
dd256bfb18 Merge branch 'master' into release-3.17 2024-04-01 13:32:48 +02:00
PabstMirror
0365565efc
Yardage - Fix broken display in 2.16 (#9892) 2024-04-01 13:28:08 +02:00
Mike-MF
0d45a85db6
Casings - Add CUP Casings (#9888) 2024-04-01 13:27:15 +02:00
jonpas
b919da797b Merge branch 'master' into release-3.17 2024-04-01 02:42:18 +02:00
PabstMirror
9293623d9e
CUP Compats - Cleanup temp __has_include (#9832) 2024-03-30 20:33:28 +01:00
PabstMirror
a4dbff3ff8
Common - Add word weapon to sway setting (#9887)
* Common - Add word `weapon` to sway setting

* Update stringtable.xml
2024-03-28 17:12:27 -05:00
PabstMirror
9daf71edd0
Options Menu - Fix main-menu news setting not working (#9886) 2024-03-28 14:55:07 -05:00
Psycool
cbb160c1e0
Korean translation updated (#9883)
* KoreanTranslation

Someone has returned all the translations in Korean to English. there is no need to return them.

* koreantranslation

* Korean Typo Fix

* Korean Translation

* Update stringtable.xml

* Korean Translation Added

Added Korean translation related to Cargo Refuel

* Merge branch 'master' of https://github.com/Psycool3695/ACE3

* Korean translation Add/Updated

* Fixed wrong strings

* Korean translation improved

* Korean translation updated

* Korean translation updated

* Fix Merge

* Update stringtable.xml

* Update stringtable.xml

* Korean translation updated

* Korean translation minor fix

* Korean translation fixed

* Korean translation updated

* Update stringtable.xml

* Spacing fixed

* Korean translation updated

* Spacing fixed

* Korean translation updated

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2024-03-28 13:58:02 -05:00
johnb432
415d2f685c
General - Change FUNC to LINKFUNC where appropriate (#9882)
FUNC -> LINKFUNC
2024-03-28 13:57:23 -05:00
johnb432
48bdc6fbcd
Repair/UI - Minor code cleanup (#9879) 2024-03-28 14:11:26 +01:00
johnb432
3bba9735c7
Mk6mortar - Remove return values from FUNC(handleFired) (#9880)
Update fnc_handleFired.sqf
2024-03-27 22:37:59 -05:00
johnb432
512ceaa1a1
Missile Guidance - Rename preInit and postInit files (#9881)
Renamed preInit and postInit files
2024-03-27 22:37:36 -05:00
jonpas
dc7d7b1429 Prepare 3.17.0 Build 80 2024-03-27 23:01:47 +01:00
Apricot
4952c09f41
Translations - Improve Japanese localization part 4 (sway factor) (#9877) 2024-03-26 19:58:19 +01:00
Fabio Schick
c88e1abd0e
Weather - More permissive wind info indicator + auto-enabling when throwing grenades (#9820)
* More permissive displaying of Wind Info

* Temporary Wind Info while throwing Grenades

* Add Temporary Wind Info Setting

* Safer reading of EGVAR from addon that may not be loaded

* Show Wind Info only in Static Vehicles

* Improve Exclusion Check

Co-Authored-By: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* Improve Abort Checks on Keybind Statements

Co-Authored-By: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* Raise eyePos when inside Static Weapon

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2024-03-26 09:59:48 -03:00
Mike-MF
cee187adac
General - Convert vehicle to objectParent (#9801)
Convert vehicle to objectParent
2024-03-26 09:54:06 -03:00
johnb432
a8ed533004
Dragging - Minor code cleanup (#9859)
* Dragging minor code cleanup

* Update fnc_startCarryPFH.sqf

* Revert UAV changes
2024-03-26 09:50:21 -03:00
ZluskeN
5ca81b7ef3
Interaction - Make magazine passing animation optional (#9875)
* Update fnc_passMagazine.sqf

* Update fnc_passMagazine.sqf

* Update fnc_passMagazine.sqf

* Update addons/interaction/functions/fnc_passMagazine.sqf

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-03-26 09:50:04 -03:00
Dart
31217ae5d0
Fortify - Add onDeployStop event for cancelling before confirming (#9854)
* onDeployStop event

* Updated wiki with new event

* Fixed params

* Revert "onDeployStop event"

This reverts commit c3dae82915.

* Uses deployCanceled

* Re-added fortify stop event

* Update fnc_deployObject.sqf

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-03-25 09:08:06 -07:00
johnb432
80417b114d
Advanced Fatigue - Move sway to common and add enable sway setting (#9872)
* Move sway from fatigue to common

* Added enable sway setting

* Update addons/common/stringtable.xml

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* Update addons/common/stringtable.xml

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* Update addons/common/stringtable.xml

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2024-03-24 14:28:14 -07:00
PabstMirror
86f1b6b142
AB/Scopes - Fix script errors on profiling branch (#9869)
* AB/Scopes - Fix script errors on profiling branch

* Update addons/scopes/functions/fnc_calculateZeroAngleCorrection.sqf

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-03-24 09:32:28 -07:00
johnb432
58f6430bb6
Arsenal - Revert unicode support for sorting (#9871)
Revert unicode sorting
2024-03-23 06:29:26 -07:00
Mike-MF
2456c445b2
Compat CUP Weapons - Fix Metis UBC (#9870) 2024-03-23 14:28:20 +01:00
PabstMirror
9a5cb8bd91
Maverick - Cleanup config (#9868) 2024-03-21 22:56:44 +01:00
BrettMayson
3c5b46c42d
Medical - Support Magazine Treatment Items (#9816)
* count treatment items

* getCountofItem

Co-Authored-By: Blue <itzblueman@gmail.com>

* getCountofItem fix

Co-Authored-By: Blue <itzblueman@gmail.com>

* convert painkillers to magazine

* use isclass

Co-Authored-By: johnb432 <58661205+johnb432@users.noreply.github.com>

* forget to change variable

* Update addons/medical_treatment/functions/fnc_hasItem.sqf

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* better magazine adjustment

* Update addons/common/functions/fnc_adjustMagazineAmmo.sqf

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Update addons/medical_treatment/functions/fnc_medication.sqf

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Update addons/medical_treatment/functions/fnc_treatmentFailure.sqf

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Update docs/wiki/framework/arsenal-framework.md

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* Update addons/common/functions/fnc_adjustMagazineAmmo.sqf

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Header

* use switch statement in fnc_useItem

* Update addons/common/functions/fnc_adjustMagazineAmmo.sqf

* Update addons/common/functions/fnc_adjustMagazineAmmo.sqf

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* only check adding to mags that are not full

Co-Authored-By: LinkIsGrim <salluci.lovi@gmail.com>

* Update addons/common/functions/fnc_adjustMagazineAmmo.sqf

* Update fnc_getCountOfItem.sqf

* Optimisations & header fix

* Update addons/common/functions/fnc_adjustMagazineAmmo.sqf

* Fixed vehicle implementation

---------

Co-authored-by: Blue <itzblueman@gmail.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
2024-03-21 22:56:24 +01:00
johnb432
50978efa46
Hearing - Removed remoteExec & added microoptimisations (#9853)
* Removed remoteExec. added microoptimisations

* Update addons/hearing/XEH_preInit.sqf

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

* move EH to after !hasInterface

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2024-03-21 20:26:46 +01:00
johnb432
b4eaa1e270
Advanced Fatigue - Disable sway when Advanced Fatigue is off (#9867)
Disabled sway when advanced fatigue is off
2024-03-21 20:24:49 +01:00
Dart
af3c95a5a6
Fire - Add ability to disable screams for individual units (#9863)
* Disable screams for individual units

* Update addons/fire/XEH_postInit.sqf

* Changed wording

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* isGlobal instead of true

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-03-21 20:20:23 +01:00
Cyruz
8c69bd25ea
Rearm - Show distance to target on actions (#9866)
* Show rearm distance in action

* Update addons/rearm/functions/fnc_addRearmActions.sqf

---------

Co-authored-by: Cyruz143 <root.cyruz@gmail.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-03-20 05:06:45 -07:00
johnb432
017d47f8c9
Fortify - Skip placement animation for no cost fortifications (#9861)
Skip placement animation for no cost fortifications
2024-03-19 08:57:09 +01:00
BrettMayson
c5b54c65a8
Medical Treatment - Fix bandage effectiveness (#9865)
* fix broken bandages

* update params
2024-03-19 08:56:05 +01:00
Apricot
e7827813ee
Translations - Improve Japanese localization 3 (#9864)
Japanese
2024-03-18 21:59:54 -05:00
johnb432
11844ef05e
Dragging - Fix dropping incorrect object when carrying fails (#9860)
Update fnc_startCarryPFH.sqf
2024-03-18 14:17:05 -03:00
johnb432
0856e58ae9
Dragging - Release ownership when target is too heavy to drag/carry (#9858)
Release ownership when target is too heavy to drag/carry
2024-03-18 14:16:34 -03:00
johnb432
3cafac2f67
Common - Fix players sliding when holstering weapons (#9846)
Update CfgMoves.hpp
2024-03-17 04:47:46 -07:00
Mike-MF
de106c3418
Grenades - Fix Flashbang in epilepsy mode (#9855)
Fix Flashbang in epilepsy mode
2024-03-17 04:47:24 -07:00
Mr. Zorn
a332ad7095
Repair - Wheel Patching - Tooltip rephrasing (#9851)
* Update stringtable.xml

* Add PL Translation

* added FR

* added japanese

---------

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
2024-03-17 03:33:12 -07:00
prisonerMO
5e1771aecd
General - Don't add keybinds to headless client/dedicated server (#9842)
* Do not need to register keybinds on machines that don't have interfaces.

* add newline

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2024-03-12 14:33:08 -07:00
johnb432
0dabc678f6
Arsenal - Fix faces & voices for JIP (#9847)
Update fnc_onArsenalClose.sqf
2024-03-11 03:18:02 -07:00
PabstMirror
e5145ba4f7
Cup Weapon Compat - Fix NVG classnames (#9845) 2024-03-10 11:49:53 -03:00
Fabio Schick
dd32190dfa
Parachute - Add Seconds Indicator to Altimeter Watch (#9834) 2024-03-10 11:48:43 -03:00
Fabio Schick
d54ba4ddcf
Translations - Complete Italian (#9844)
* Arsenal Italian Translations

* Cargo Italian Translations

* Hearing Italian Translations

* Killtracker Italian Translations

* Map Tools Italian Translations

* Markers Italian Translations

* Medical GUI Italian Translations

* Medical Treatment Italian Translations

* Medical Vitals Italian Translations

* Overheating Italian Translations
2024-03-09 17:58:15 -06:00
PabstMirror
9bb9fae85c
Arsenal - Show load stat's actual value (#9833)
* Arsenal - Show load stat's actual value

* Update addons/arsenal/functions/fnc_statTextStatement_load.sqf

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-03-09 17:17:13 -06:00
V1nsyara
a3b9c53fd8
Translations - Russian - Fix (#9841)
Russian Translate - Fix
2024-03-09 16:56:33 -06:00
Grim
8e975a6b91
Medical Treatment - Add hook to modify bandaging treatment (#9814)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-03-09 14:15:24 -03:00
johnb432
d7e5ea4898
Rearm - Fix actions not being added immeditately (#9843) 2024-03-09 14:11:27 -03:00
Grim
e06c6f7835
General - Replace toLower with toLowerANSI where applicable (#9790)
* General - Replace toLower with toLowerANSI where applicable

* whoops

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

* Update addons/repair/functions/fnc_setHitPointDamage.sqf

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Update addons/repair/dev/draw_showRepairInfo.sqf

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Update addons/tagging/XEH_preStart.sqf

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Update addons/vehicle_damage/functions/fnc_handleCookoff.sqf

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Update addons/tagging/XEH_preStart.sqf

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* comparment -> compartment

* Update fnc_showHud.sqf

* Update fnc_registerObjects.sqf

* Update addons/common/functions/fnc_cbaSettings_settingChanged.sqf

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-03-07 22:08:13 +01:00
Drofseh
6ea0312770
Overheating - Increase cooling for open bolt guns and spare barrels (#9827)
* open bolt and spare barrel cooling boost

* change magic number to macro
2024-03-06 09:45:41 -08:00
johnb432
78334e2be4
Refuel - Add ownership concept to nozzles & jerry cans (#9826)
Add ownership concept to nozzles & jerry cans
2024-03-05 11:55:59 -08:00
Apricot
61ca55f268
Translations - Improve Japanese localization 2 (#9829)
Update stringtable.xml
2024-03-05 12:42:38 -06:00
johnb432
86580f3d6f
Fortify - Fix invalid object filtering (#9825)
Actually filter object
2024-03-04 14:01:40 -08:00
BrettMayson
f76485ff3a
Common - Fix addToInventory for magazines (#9823)
fix addToInventory for magazines
2024-03-04 14:00:31 -08:00
PabstMirror
f63704911e
CUP Compats - Don't load if cup's compats present (temporary) (#9824)
* CUP Compats - Don't load if cup's compats present (temporary)

* cup veh and ter
2024-03-04 15:20:59 -06:00
BrettMayson
67fa53fd2c
General - Events for Mods (#9813)
* full heal local

* update body image

* log list

* better _enable in categories

* update injury list

* cardiac output internal variable

* typo

* remove duplicate event

* rename event

* add docs

* Update docs/wiki/framework/events-framework.md

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2024-03-04 15:08:12 -06:00
BrettMayson
a85a65331f
Medical GUI - Show Bleeding Rate (#9815)
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2024-03-03 22:47:37 +00:00
BrettMayson
fd22ff04c5
Medical GUI - Display IV Type (#9817)
Co-authored-by: MisczczuZPolski <71414303+MiszczuZPolski@users.noreply.github.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2024-03-03 19:45:12 -03:00
Fabio Schick
22deb3af79
Artillery - Add Rangetable Keybind, Fix remembering last charge (#9818) 2024-03-03 19:43:31 -03:00
Grim
64538f2ad0
Arsenal - Native baseWeapon support for CBA items (#9799)
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-03-02 14:29:20 -03:00
Mike-MF
2036c83dc8
CUP Weapons Compat - Add WP NVGs (#9810)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2024-03-02 14:26:33 -03:00
Apricot
b828a14afa
Translations - Improve Japanese localization (#9812)
* update japanese

* update

* Update stringtable.xml

* dogtag wording to ID tag
2024-03-01 19:23:33 -06:00
prisonerMO
8a67744cd4
Hearing - Keybind for putting or taking out earplugs (#9804)
* Added keybind put or take out earplugs

* Update addons/hearing/XEH_postInit.sqf

Don't need to register keybinds on machines that don't have interfaces.

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Update addons/hearing/initKeybinds.inc.sqf

Removed default keybind, added new line at the end of the file and changed some code formatting, as well as some functions:

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Update addons/hearing/stringtable.xml

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-02-28 13:44:27 -06:00
kerckasha
bfbfc66d1c
SPE Compat - Fix flamethrower magazines not showing in arsenal / 50 Cal deafness (#9803)
* Fixed old invalid type on SPE flamethrower magazines

* Added ACE_caliber to SPE 50 cal ammo as it was causing extreme deafness

* Update addons/compat_spe/CfgAmmo/bullets.hpp

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

* Fixed duplicate base classes

* Update addons/compat_spe/CfgAmmo/bullets.hpp

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Update addons/compat_spe/CfgMagazines/flamethrower.hpp

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-02-28 17:09:02 +01:00
Drofseh
c4688f2ae5
Compat WS - Add barrel swap to WS machine guns (#9808)
Add barrel swap to WS machine guns
2024-02-28 17:05:11 +01:00
Mike-MF
5111062e6d
Add CUP Vehicles Compatibility (#9602)
Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2024-02-28 16:50:07 +01:00
Mike-MF
147f28d443
Add CUP Weapons Compatibility (#9599)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2024-02-28 16:47:53 +01:00
V1nsyara
4d487dc33e
Translations - Russian (#9802)
Update Russian Translate
2024-02-20 19:22:38 -06:00
Sotirios Pupakis
fd7a5004f0
KillTracker - Add option to filter out AI unit kills (#9800)
* Add option to disable AI kills tracking in Kill Tracker

Add an option to disable tracking of kills of AI units when using ACE Kill Tracker. Configurable through Addon Settings

* Made setting global

* Requested changes

* Omitted optional default params

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* Added missing dot

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Added missing dot in Czech translation

* Update addons/killtracker/XEH_preInit.sqf

* Update addons/killtracker/XEH_preInit.sqf

---------

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-02-19 17:53:47 -06:00
johnb432
fd5e56ffbc
Arsenal - Improved sorting, insignia detection, identity info verification and minor cleanup (#9795)
* Changed sorting + minor cleanup

* Update addons/arsenal/functions/fnc_fillLeftPanel.sqf

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* check and log missing extended info

* fix extended loadout logging

* Made voice stuff config case

* use lowercase voice everywhere

* check loadout voice against configCase

* Update fnc_verifyLoadout.sqf

* Update addons/arsenal/functions/fnc_verifyLoadout.sqf

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* Update addons/arsenal/functions/fnc_verifyLoadout.sqf

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* Update addons/arsenal/functions/fnc_verifyLoadout.sqf

---------

Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2024-02-13 11:22:27 -08:00
BAXENdev
a0f3933bf0
Medical - Change max medication dosage behavior (#9746)
* Consistentency Update with Overdosing

* Added Description to Condition Cases

* Updated to CASE 2

Overdose behavior:
ODs on uses `_maxDose + {1 or 2 or 3}` from `_maxDose + {0 or 1 or 2}`

* Update fnc_onMedicationUsage.sqf

* Update fnc_onMedicationUsage.sqf

* Added riskDose range and updated medications

* maxDose -> maxSafeDose | riskDose -> chanceDoses

* Fixed maxDose reference in trace

* Added chanceDoses to trace

* Fixed use of TRACE macro

* Updated comments and variable maxSafeDose -> maxDose

* Updated comment and overdose formula

* chanceDoses -> maxDoseDeviation

* Update addons/medical_treatment/functions/fnc_onMedicationUsage.sqf

* Update addons/medical_treatment/functions/fnc_onMedicationUsage.sqf

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Update addons/medical_treatment/ACE_Medical_Treatment.hpp

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2024-02-13 02:45:04 -08:00
johnb432
05a5ccd140
Arsenal - Add mod icons to editor arsenal attribute (#9797) 2024-02-12 15:15:48 -03:00
BrettMayson
1002dfe31b
Grenades - Flashbang events (#9796) 2024-02-12 14:01:24 -03:00
Grim
d6eb6b981c
Common - Allow multiple events to clear a cached call (#9770) 2024-02-11 22:13:37 -03:00
Grim
1e1d1d63f2
Arsenal - Add ace_arsenal_loadoutVerified event (#9792)
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-02-11 20:25:12 -03:00
Grim
b2849aaa29
Fix filling loadouts list during preInit (#9794) 2024-02-11 20:21:29 -03:00
Grim
f3f9d18f55
Arsenal - Fill loadouts list over multiple frames (#9789) 2024-02-11 19:35:42 -03:00
Grim
bb7b05fd0d
Arsenal - Left panel code improvements (#9787)
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-02-11 19:34:24 -03:00
Grim
95ec6eb765
Arsenal - Cleanup action UI code (#9784)
* Arsenal - Cleanup action UI code

* derp
2024-02-11 19:23:44 -03:00
Grim
a47ae27080
Nightvision - Register effects during preInit (#9788) 2024-02-11 13:55:48 -03:00
johnb432
cdc51643bb
Inventory - Remove duplicate code (#9791)
Update XEH_preStart.sqf
2024-02-11 07:33:58 -08:00
PabstMirror
e75ef3de06
General - Cleanup remaining HEMTT warnings/suggestions (#9786)
* General - Cleanup remaining HEMTT warnings/suggestions

* Update addons/medical_engine/script_macros_medical.hpp
2024-02-10 16:58:14 +01:00
Grim
6928adfc72
Arsenal - Improve performance of loadout verification (#9316)
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-02-10 12:58:02 -03:00
Grim
ee79decb45
CSW - Code cleanup (#9777)
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-02-07 20:36:13 -03:00
Grim
802560da8a
CSW - Delay init for CSW with simulation disabled (#9778)
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-02-07 20:25:49 -03:00
BrettMayson
1649422cbd
Medical Vitals - Add SPO2 (#9360)
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
2024-02-07 17:50:18 -03:00
Fabio Schick
2f9b7002c3
Explosives - Add Cellphone/Detonator Keybinds (#9687)
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-02-07 17:47:01 -03:00
johnb432
28e45c2979
Laser - Public getter and setter for laser codes (#9772)
* Getter and setter for laser codes

* Documentation

* Sanitising input
2024-02-07 08:49:36 -08:00
Grim
ae532c72f7
Medical - Prevent uncon AI from talking (#9776) 2024-02-07 12:56:24 -03:00
Smith
8731bcc8b5
Cargo - Add alternative unloading item from vehicle cargo (#8827)
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2024-02-07 09:16:18 -03:00
Grim
e69ffb6f21
Arsenal Actions - Add support for multiline text & updating on cargo event (#9771)
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-02-06 20:34:52 -03:00
johnb432
8de0740e94
Reload - Add manual reload for vehicle weapons - continued (#9398)
* Add manual reload to turrets

* Added reload via reload keybind

* Update fnc_canSwapTurretMagazine.sqf

* Update fnc_canSwapTurretMagazine.sqf

* Update fnc_canSwapTurretMagazine.sqf

* Engine based reloading, added more checks

* Update addons/reload/functions/fnc_canSwapTurretMagazine.sqf

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

---------

Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2024-02-06 15:14:25 -08:00
Grim
244bee4a61
Medical Engine - Prevent uncon units from ragdolling on death (#9762) 2024-02-06 20:11:47 -03:00
Grim
77a49a081a
Small Arms - Fix magazineReloadTime for vehicle FN Minimi SPW (#9774) 2024-02-06 20:06:49 -03:00
johnb432
907758385c
Common - Cleanup define.hpp (#9773)
Update define.hpp
2024-02-06 09:29:24 -08:00
Mike-MF
5a3f3d3b82
Add CUP Terrains Compatibility (#9627)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
2024-02-05 15:58:15 -03:00
Dystopian
b54992b8fc
Towing - Fix some issues (#9007)
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
2024-02-05 15:54:51 -03:00
PabstMirror
a3aef6a066
General - Cleanup spaces in macros (#9769)
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
2024-02-05 14:04:24 -03:00
Grim
6c60b67494
Arsenal - Exit refresh early if no display is found (#9754)
Co-authored-by: Mike-MF <TyroneMF@hotmail.com>
2024-02-05 10:57:22 -03:00
Grim
4bb9d6c42c
Medical - Add Painkillers (#9720)
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-02-05 10:56:25 -03:00