Commit Graph

15382 Commits

Author SHA1 Message Date
6972f02bc4 Translation - Add Missing Spanish (#10001)
Translation to Spanish

Translation to Spanish
2024-05-10 20:42:55 -05:00
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
62353a9175 Translations - Updated Italian with recent additions (#10004)
* hearing italian translations

* common italian translations
2024-05-10 20:34:34 -05:00
8e367ee80e Prepare 3.17.1 Build 85 v3.17.1-RC2 2024-05-05 15:24:45 -05:00
7b0c1c425d Merge branch 'master' into release-3.17.1 2024-05-05 15:23:29 -05:00
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
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
3987c62acc Grenades - Add missing documentation on flares and incendiaries (#9984)
Update grenades-framework.md
2024-04-29 00:34:35 -07:00
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
7c4f4cf8f8 Grenades - Fix flashbangs causing pain for invulnerable units (#9981)
Disable flashbang pain for invulnerable units
2024-04-28 09:07:15 -07:00
6e32fc1144 Hearing - Add earplugs only if not present (#9987)
Only add earplugs if not present
2024-04-28 09:04:56 -07:00
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
60b87f0b41 Medical - Add _createLitter to medical events (#9959)
Added `_createLitter` to medical events
2024-04-26 17:35:57 -05:00
872d460e6d Tools - Add missing includes for p3ds (#9974)
* Tools - Add missing includes for p3ds

* Cleanup vn?

* Update project.toml

* Update tools\.vscode
2024-04-26 17:35:30 -05:00
b513a110f5 Translations - Improve Japanese localization (3.17.1) (#9977)
Tweaks
2024-04-26 17:34:11 -05:00
a12ad9ec59 Interact menu - Fix condition in consolidated menu (#9946)
Fix condition in consolidated menu
2024-04-25 00:23:10 -05:00
1eca83db9f Common - Fix animations not playing (#9973)
Update CfgMoves.hpp
2024-04-24 23:41:27 -05:00
c17873dcad Prepare 3.17.1 Build 84 v3.17.1-RC1 2024-04-24 02:29:25 +02:00
9e6f624a68 Cargo - Fix undefined variable and config entries (#9965)
Cargo fixes
2024-04-23 14:07:16 -07:00
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
5a6d6a73df Wiki - Fix search being broken by the attach-framework page (#9969) 2024-04-22 19:08:49 +02:00
97257ca77a Documentation - minor fix (#9967)
a -> an
2024-04-21 07:15:07 -07:00
ac9ffb5276 Docs - Fix tables and inconsistencies (#9952)
Co-authored-by: LinkIsGrim <69561145+LinkIsGrim@users.noreply.github.com>
2024-04-19 20:53:33 +00:00
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
7480ae377d Scopes - Stop changing CBA setting value directly (#9954)
Update XEH_postInit.sqf
2024-04-19 10:27:04 -07:00
dda6b9d2dc Medical Treatment - Enforce bandage effectiveness variable type (#9950)
Enforce bandage effectiveness variable type
2024-04-16 13:33:40 -07:00
b637a0ea09 Update translate Hearing french (#9949)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2024-04-13 15:09:48 -05:00
32707dd860 Language Russian - Update translation (#9947)
Russian
2024-04-13 14:53:50 -05:00
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
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
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
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
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
095ce88279 Hearing - Notify restart req. for combat deafness setting (#9934) 2024-04-07 12:59:14 -03:00
Kex
0c529446ec Fix bug template (#9936) 2024-04-07 12:57:14 -03:00
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
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
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
5ca3465b8a Medical Treatment - Only create litter on empty container (#9924) 2024-04-06 22:11:51 -03:00
f5e8e06c24 Interact Menu - Add nil handling for condition (#9922)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2024-04-06 22:11:09 -03:00
04ac1d8808 Arsenal - Fix #9916 (#9932) 2024-04-06 22:04:52 -03:00
dce7da60c9 General - Change count to isEqualTo where appropriate (#9921)
count -> isEqualTo
2024-04-06 11:57:08 -07:00
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
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
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
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
e6cc5fca89 Arsenal - Handle arrays in loadout extended info (#9918) 2024-04-03 19:46:26 -03:00
a72b3a43a5 Arsenal - Fix FUNC(baseAttachment) returning non-CBA item modes (#9916)
Update fnc_baseAttachment.sqf
2024-04-03 14:53:12 -07:00
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
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