Commit Graph

14851 Commits

Author SHA1 Message Date
0b2b4d7397 Medical - Improve keybind to open med menu for vehicle occupant under cursor (#8160)
* add lineIntersectsSurfaces to med menu key

* fix _target = nil if no intersections

* only look through player and player vehicle

* Update addons/medical_gui/XEH_postInit.sqf

Co-authored-by: commy2 <commy-2@gmx.de>

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: commy2 <commy-2@gmx.de>
2021-10-11 10:29:09 +02:00
1c921674a9 Fixed jerry can madness (#8348)
Fixed refueling vehicles with high input rates when using fuel sources with low fuel capacity.
2021-10-11 00:47:54 -05:00
128ddf2591 Nametags - Add setting to disable effect of ambient brightness on view distance (#8325)
* Add setting to disable effect of ambient brightness on view dist

* Add periods and Title Case for English localization

* Apply suggested code. Make it more readable

Co-authored-by: jonpas <jonpas33@gmail.com>

* fix spelling

* fix mistype

* one more mistype

* Implement suggestions

Settings parameter as slider.
English and Russian localization.

* Update addons/nametags/functions/fnc_getCachedFlags.sqf

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
2021-10-11 00:35:21 -05:00
0d34ac2838 add string for black P99 (#8501) 2021-10-10 18:03:41 -05:00
e92ea53385 Medical - Return tourniquets after PAK (#8419) 2021-10-11 00:34:28 +02:00
4f0fea8d67 Translations - Polish (#8497)
Add missing Polish translations
2021-10-11 00:27:06 +02:00
baff363915 Realistic Weights - Add Apex / Contact / Anti-Tank Weapons (#8357)
* Add Apex / Contact / Tanks Weapons

* Inheritance fix

* Fix UBCs

* Weight for the RPK
2021-10-10 12:54:12 -05:00
e3986f4528 Small Arms - Fix FNX-45 magazine round count (#8352)
* Change FNX-45 magazine round count

* Style pass
2021-10-10 12:02:26 -05:00
97deef5617 General - Use engine hashmaps (#8468)
Co-authored-by: Dedmen Miller <dedmen@users.noreply.github.com>
2021-10-10 18:55:14 +02:00
9479c29b42 Repair - Fix claimed object abuse (#8460) 2021-10-10 18:50:10 +02:00
1b318433a2 Common - Add settings for additional progress bar information (#8428)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-10 18:49:41 +02:00
6128b8ef06 Common - Only switch side if necessary on person loading (#6334)
Co-authored-by: Serg Vergun <1197314+severgun@users.noreply.github.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
2021-10-10 16:26:36 +02:00
0a203fdde4 Medical Feedback - Stop effects on featureCamera (#8373)
Co-authored-by: Kyle Mckay <5459452+kymckay@users.noreply.github.com>
2021-10-10 16:24:10 +02:00
755c5ea50d Hit Reactions - Add check for disabled damage (#8474) 2021-10-10 16:04:54 +02:00
7bf9f3112e Attach - Follow bone rotation for attached items (#8477) 2021-10-10 16:03:50 +02:00
94c62d8ed3 Extensions - Replace ace_parse_imagepath with SQF regexFind (#8243) 2021-10-10 15:41:47 +02:00
64decdd189 Cargo - Add Option to Reopen Menu After Unload (#8487)
Co-authored-by: jonpas <jonpas33@gmail.com>
2021-10-10 15:37:16 +02:00
2a7eb07803 Use modelToWorldVisualWorld (#8489)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-10 15:37:05 +02:00
625721ac0b No Uniform Restrictions - Update for vanilla 1.98-2.06 (#8495) 2021-10-09 22:53:36 +02:00
d780c02ef1 Misc - Adjust some functions to be more compatible with sqfvm (#8494) 2021-10-09 15:32:53 -05:00
fb2b1ceadb Explosives - Fix Dial Tone Sound Position (#8488)
* explosives - fix dial tone sound position

* Use right hand pos instead of hardcoded pos
2021-10-08 11:35:47 -05:00
4b593f85d3 Tools - Add sog compat pDumbies (#8493) 2021-10-08 17:11:36 +02:00
536ab0568f Update of Japanese translation (#8492) 2021-10-08 09:05:06 -05:00
a95e71fec8 Arsenal - Handle Weapon Items not in Box Virtual Items as Unique (#8375)
* Handle unique items that are also weapon attachments

* only flatten once
2021-10-07 12:39:55 -05:00
ce705310e3 Realistic Names - Add Contact DLC & PIP optics (#8413)
* Add Contact DLC optics

* add DMS variants

* fix bracket, add pip optics

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-07 12:39:18 -05:00
f232f84c6c Add workaround for ballistics shields (#8418) 2021-10-07 10:46:56 -05:00
78f9fc964a Common - Take container into account when replacing items (#8379)
* make registerItemReplacement add to proper container

* cleanup, fix variable in itemReplacements namespace

* add exception for not having room in original container
2021-10-07 00:10:19 -05:00
d6559f22e0 Arsenal - Fix sort running twice (#8479) 2021-10-06 22:16:42 -05:00
d836cbfe6e Fix vanilla NV Marker lifetime (#8473)
* Fix vanilla NV Marker lifetime

* Empty lines

* Fix whitespace
2021-10-06 22:16:13 -05:00
09d1284ad9 Arsenal - Fix sortPanel clearing custom item names (#8478) 2021-10-05 15:37:27 -04:00
7347d563b1 Add event property to detect temporary detach/reattach (#8476) 2021-10-05 12:32:38 -05:00
8d804cf76d Common - Add epilepsy friendly mode (#8452)
* Add epilepsy friendly mode

* Disable LSD vehicles in epilepsy friendly mode
2021-10-05 12:29:22 -05:00
5fbbb34d2d Make unrelated things not explode when repairing (#8351)
_useEffects was probably inverted. Makes ERA/SLAT not explode when repairing unrelated hitpoints. See #7452.
2021-10-05 12:27:55 -05:00
1e30e1371e [Docs] Update component dependencies
Automatically committed through CI.

[ci skip]
2021-10-05 19:26:17 +02:00
7b51e16adf use RHS loadorder for comapts (#8472) 2021-10-05 12:25:38 -05:00
6b05da7632 Coding Guidelines inconsistencies (#8481) 2021-10-05 12:20:52 -05:00
cb07e2ceba Tools - Update /includes for 2.06 and cba (#8484)
* Tools - Update /includes for 2.06 and cba

* Update required ArmA/CBA
2021-10-05 12:05:42 -05:00
d0fd45e220 UI - Infantry speed indictator (#8384)
Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-05 18:47:24 +02:00
2134f6e837 [Docs] Update component dependencies
Automatically committed through CI.

[ci skip]
2021-10-05 13:29:21 +02:00
54c9cf6c61 S.O.G. Prairie Fire Compatibility (#8284)
* Added initial compat

* Added G-Forces compatibility

* Added Reload compatibility

* Add fuel capacities to planes and helicopters

* Add fuel capacities to wheeled and tracked vehicles, added fuel cargo config

* Add fuel capacities to OH-6

* Removed custom fuel capacities from Mi-2 with external tanks

* Fix config errors

* Add CSW compatibility for static guns

* Add ACE arsenal to EMM main menu

* Add CBA versioning check for SOG:PF

* Add vn_emm to requiredAddons

required for main menu patching

* Fix arsenal not being added to main menu

* Fix styling of ACE Arsenal button

* Add CSW compat for mortars

* Disable dragging of large statics

* Disable frag for molotov

* Set damage type of melee ammo

* Add custom damage handling for punji traps

* Add ACE Explosives compat to M18 Claymores

* Improve digDistance of Claymore x3

* Add ACE Explosives compat to M14 and M16 mines

* Add Explosives compat for M16 Trip Wire mines

* Add Explosives compat for F1 Trip Wire mines

* Add Explosives compat for Arty Shell Trip wire mine

* Improve interaction points for explosives

* Add Explosives compat for Satchel charge and AT mine

* Add Explosives compat for Punji traps, improve comments

* Add Explosives compat to M112 Breaching charge

* Rename mines.hpp to explosives.hpp

* Allow digging spiderholes with entrenching tool

* Fix minor config errors

* Add CSW pictures, models and stringtable entries

* Add missing stringtable entries

* Add CSW weapon pictures and stringtable entries

* Handle punji trap damage with disabled medical

* Disable cookoff for bicycles

* Remove custom digging tools (needs deeper changes)

* Improve spiderhole digging translation

* Fill CfgPatches units and weapons arrays for Zeus

* Add witty comment

* Use lowercase for external component names

* Fix indentation

* Fix missing base class

* Remove accidentally added files

* pboProject fixes for S.O.G. Prairie Fire Compatibility (#8311)

* Change macros to work with pboproject

* Add placeholders for VN p3d files

* Add ending newlines

Co-authored-by: jonpas <jonpas33@gmail.com>

* Fix UBC

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: Björn Dahlgren <bjorn@dahlgren.io>
Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
2021-10-05 13:28:43 +02:00
66ce0ba5ff Arsenal - Restore curator camera state when exiting (#8464) 2021-10-02 06:52:50 -04:00
310da98c5e Arsenal - Fix updateUniqueItemsList incorrectly identifying backpacks (#8463) 2021-10-02 06:52:33 -04:00
64db683e53 Arsenal - Fix items in custom panels having mass of zero (#8462) 2021-10-02 06:52:20 -04:00
9eb615ee66 Various polish translation updates (#8465) 2021-10-01 21:55:17 -05:00
3b90b5eb7f Grenades - Polish translations updates (#8466)
* Grenades - Polish translations updates

* Remove rogue tab
2021-10-01 21:55:03 -05:00
26d0a85650 Medical - Polish translations updates (#8467) 2021-10-01 21:51:19 -05:00
d8fa8220c4 Realisticnames - Fix ubc (#8421) 2021-09-25 15:03:09 -05:00
48912be73c Captives - Disallow ACRE/TFAR radio usage on surrender/handcuff (#8388)
* Block radio on captive/surrendered/unconscious via status effect

* missing semicolon

* Don't broadcast setVar if radio addon doesn't exist

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-09-25 11:16:15 -05:00
f9d064e5f4 Add TFAR 1.0 support (#8392) 2021-09-25 11:14:17 -05:00
e31d931078 Cargo - Fix can't load Slingload_01_Base_F (#8437)
* fix can't load Slingload_01_Base_F

20ft containers (`Land_Cargo20_military_green_F`) can be loaded but all children from `Slingload_01_Base_F` which share the same real size of a 20ft container can't be loaded (ex: `B_Slingload_01_Ammo_F`)

* add a comment next to the changed line 

add a comment next to the changed line indicating why it has to be like that (the point of this PR) for future source reference
2021-09-25 10:55:47 -05:00