Commit Graph

15319 Commits

Author SHA1 Message Date
jokoho482
1b420cf66c Remove some parts of Old the Cargo UI Interaction 2024-04-21 11:14:13 +02:00
jokoho482
74d31e3ba7 Fix Issue with action Gear sometimes not correctly triggering the onInventoryOpened event when triggered at the same time the Loading bar closes 2024-04-21 01:26:01 +02:00
jokoho482
15b01acd72 Readd Deploy to Inventory Cargo UI 2024-04-21 01:22:15 +02:00
jokoho482
b49960d058 Match Update times with Old Menu 2024-04-21 01:07:14 +02:00
jokoho482
7c3713a03f Remove Old Cargo Menu
Update to match Old Cargo Menu
Fix some Merge issues that happend
2024-04-21 01:01:55 +02:00
jokoho482
0959735400 Merge branch 'master' into cargo-inventory-ui
# Conflicts:
#	addons/cargo/CfgEventHandlers.hpp
#	addons/cargo/functions/fnc_initVehicle.sqf
#	addons/cargo/functions/fnc_setSpace.sqf
#	addons/cargo/functions/fnc_startUnload.sqf
2024-04-20 23:33:12 +02:00
Dart
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
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
Kex
0c529446ec
Fix bug template (#9936) 2024-04-07 12:57: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
8165201565 Documentation - Fix news post link 2024-04-01 19:47:09 +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
64e16a2136 Merge branch 'acerep-12' into release-3.17 2024-04-01 15:49:35 +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