Commit Graph

14323 Commits

Author SHA1 Message Date
GhostIsSpooky
07184dc763
FN Minimi SPW reload fix (#8353) 2021-10-12 17:46:39 -05:00
Jasper
257d9536cc
Cargo - Add ability to add custom name to cargo objects (#8023)
* First Push

Added the ability to edit cargo objects (crates/boxes only) names. Either via in-game action on the object it self or via 3den attributes.

Added a single function which spawns the UI to edit the name and also edits it. This is an scripted UI, it could be changed to a config version if wanted, but as I'm not good in UI coding I left it on this simple version mainly for testing.

Added 4 new stringtable entries, 2 for action and 2 for 3den attributes.

* Add extra stringtable

Forgot to add the UI to the stringtable.

* Update fnc_renameObject.sqf

fixing tabs

* Show custom name only behind

Added new function "getNameItem" that will get the items name.
Put the custom name behind the original name between brackets "[...]".

* Added "Hide Rename Action" setting

Also removed an unused _itemClass from postInit.

* Apply suggestions from code review

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

* Update AUTHORS.txt

Added my name

* Applied the sugesstions.

* Fixed function crash

* Moved to dialog.

* Removed unused comment/code

* Update renameMenu.hpp

Fixed tabs to spaces.

* Update renameMenu.hpp

* move rename to common

* Update addons/arsenal/ui/RscAttributes.hpp

* style and use addActionToObject

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-12 17:42:38 -05:00
GhostIsSpooky
005b2aef14
Arsenal - Stop deleting unique belt items (#8483)
* prevent belt items from being deleted

* fix wrong index

* fix gps not being selected

* & fix UAV terminals not being selected

* add comments, delete extra line

* use getUnitLoadout for assignedItems
2021-10-12 17:10:18 -05:00
PabstMirror
fa99cfaa09
General - Fix missing strings (#8506)
* fix missing strings

* Add API String

Co-Authored-By: GhostIsSpooky <69561145+Salluci@users.noreply.github.com>

* fix copy

Co-authored-by: GhostIsSpooky <69561145+Salluci@users.noreply.github.com>
2021-10-12 16:10:07 -05:00
GhostIsSpooky
82f705b5a1
speed up fnc_getClaimObjects (#8459) 2021-10-12 16:09:56 -05:00
Drofseh
40ec4e9137
Update fnc_getNeedRearmMagazines.sqf (#8456) 2021-10-12 16:08:06 -05:00
GhostIsSpooky
e4be783f80
Repair - Add Locations Boost Training Setting (#8349)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-12 22:53:45 +02:00
Dystopian
0c58d8b20b
Interaction - Add interaction with terrain objects (#8103)
* Add interaction with terrain objects

* Optimize with new commands

* Handle z-position under ground

* Add warning for setting

* Add parentheses to condition

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

* Add comments

* Add parentheses to condition

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

* Add parentheses to condition

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

* Add replacement configs to dragging

This reverts commit afc5abe6cd.

* Fix validator error and optimize condition

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-12 14:36:33 -05:00
GhostIsSpooky
63d7419066
Ballistics - Cleanup & add missing magazine variants (#8410)
* change 7.62x67 to .300 WM

* initial commit

* stringtables, add LM suffix to .338 magazines, strings for 12.7x99 10Rnd mags

* use correct strings for .50 BMG 10rnd mags

* Remove 6.5C mags from inappropriate side boxes

* remove duplicate stringtable entrys

* add MX 6.5C color variants, add MSBS 6.5C mags, move 6.5C to marksman rifles only, add new mags to boxes, switch DMR_03 to sr25 magwell

* Fix UBC

* fix stupid

* add space before 'mm' in strings

* add missing 762x51 10Rnd mags

* Revert "add space before 'mm' in strings"

This reverts commit fca5fa9f14.

* redo add space before mm in strings
2021-10-12 13:08:13 -05:00
GhostIsSpooky
bbe4b488e0
Magazine Repack - Add setting & hint for repacking loaded magazines (#8475)
* add setting to repack equipped magazines

* derp

* derpderp

* always show hint, remove setting
2021-10-12 12:54:50 -05:00
Seb
88e774c30d
Interaction - Rename group self-interact (#8346)
* Group renaming self interact

* UI base

* Custom UI solution (looks terrible)

* Improve GUI, optimise functions

* Add exitWith return value to fnc_renameGroup

* tabs to spaces

* Small tweaks

* newlines

pre-empting newline gestapo

* input prompt caps

* Implement suggestions

* Remove already inherited value

* Per-side group name handling

* Add same group case sensitive changes.

* Suggestions

- Use ace_common_fnc_displayTextStructured
- Formatting
- Phrasing of strings

* replace spawn with CBA_fnc_execNextFrame

* Update addons/interaction/initSettings.sqf

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

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-12 12:53:35 -05:00
10Dozen
3d9315529d
Medical Feedback - Add indication of Fractures and applied CATs/Splints (#8321)
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
2021-10-12 14:16:30 +02:00
ace3mod
341f4c3aef [Docs] Update component dependencies
Automatically committed through CI.

[ci skip]
2021-10-12 11:33:43 +02:00
Brandon Danyluk
ca7fbe742c
Add Vehicle Towing (#8380)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-12 11:33:05 +02:00
Dystopian
65b9cf3754
Map - Use getLightingAt (more light sources illuminate map) (#8343)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-12 10:31:46 +02:00
Serg Vergun
f7b07c362d
Medical GUI - Add ability to customize Medical GUI colors (#8350)
* Add ability to customize colors of injuries

Added CBA settings entries.
Updated default values.
Added English and Russian locales.

* copypaste cleanup

* move comments and make code more maintainable

* Apply suggestions from code review

Newline at end of files

Co-authored-by: Dedmen Miller <dedmen@users.noreply.github.com>

Co-authored-by: Dedmen Miller <dedmen@users.noreply.github.com>
2021-10-12 10:11:55 +02:00
GhostIsSpooky
374a5b632f
Medical - Refactor Clear Trauma Setting (#8345)
* Refactor Clear Trauma

Add in setting for clearing trauma after stitching a wound, make clearing trauma after bandage clear trauma of individual wounds as they're bandaged instead of all at once when fully bandaged.

* Make git diff slightly prettier.

* Update fnc_bandageLocal.sqf

* Style pass

* once more for the diff

* fix stupid

* Ddd trauma/visuals on bandage reopening
2021-10-12 10:08:10 +02:00
Walthzer
fad7f84625
Explosives - Add exclusion from dynamic defuse action (#8171)
* Add GVAR(noDefusalAction)

* add changes

* Prep functions

* Update addons/explosives/functions/fnc_excludeMine.sqf

Uhm, strange. Its clearly allMines, yet Allmines didn't only build it also worked properly. Undocumented variable?

Co-authored-by: BaerMitUmlaut <BaerMitUmlaut@users.noreply.github.com>

* Update addons/explosives/functions/fnc_stopExcludingMine.sqf

Co-authored-by: BaerMitUmlaut <BaerMitUmlaut@users.noreply.github.com>

* Header Fixes

Fix information in the function headers

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

* Remove Individual Functions

* Compacter Functions

* Event

* remove tab (facepalm)

* Jonpass' Review Fixes

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

* Fix exitWith mistake

* Refractor of allowDefuse

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

* Update addons/explosives/functions/fnc_allowDefuse.sqf

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

* Update Documentation

* Rephrase documentation

* Another rephrase

* Relabel Locality

* Update addons/explosives/functions/fnc_allowDefuse.sqf

Co-authored-by: BaerMitUmlaut <BaerMitUmlaut@users.noreply.github.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-11 15:49:27 -05:00
GhostIsSpooky
998f86f034
General - Move to CBA Settings (#8461)
* first pass

* second pass

* third pass

* final pass

* missing commas

* newlines

* switch to cba eventhandler

* newlines, formatting

* laser - movedToSQF

* add logging to ace_common_fnc_cbaSettings_loadFromConfig

* Update initSettings.sqf

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-11 15:48:30 -05:00
Vdauphin
ec12ee2137
Disarming - Add quantity to ace_disarming_dropItems event (#8232)
Co-authored-by: jonpas <jonpas33@gmail.com>
2021-10-11 22:08:02 +02:00
Whigital
81b4c276f5
Common - Fix arithmeticGetResult hash values extraction (#8503) 2021-10-11 13:57:15 -05:00
Serg Vergun
af66a9881c
Interaction Menu - Add triage colors to icons at passengers list (#8366) 2021-10-11 11:51:05 +02:00
Steve Zhao
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
GhostIsSpooky
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
Serg Vergun
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
GhostIsSpooky
0d34ac2838
add string for black P99 (#8501) 2021-10-10 18:03:41 -05:00
GhostIsSpooky
e92ea53385
Medical - Return tourniquets after PAK (#8419) 2021-10-11 00:34:28 +02:00
Krzyciu
4f0fea8d67
Translations - Polish (#8497)
Add missing Polish translations
2021-10-11 00:27:06 +02:00
GhostIsSpooky
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
GhostIsSpooky
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
GhostIsSpooky
97deef5617
General - Use engine hashmaps (#8468)
Co-authored-by: Dedmen Miller <dedmen@users.noreply.github.com>
2021-10-10 18:55:14 +02:00
GhostIsSpooky
9479c29b42
Repair - Fix claimed object abuse (#8460) 2021-10-10 18:50:10 +02:00
GhostIsSpooky
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
BaerMitUmlaut
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
GhostIsSpooky
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
GhostIsSpooky
755c5ea50d
Hit Reactions - Add check for disabled damage (#8474) 2021-10-10 16:04:54 +02:00
Dedmen Miller
7bf9f3112e
Attach - Follow bone rotation for attached items (#8477) 2021-10-10 16:03:50 +02:00
PabstMirror
94c62d8ed3
Extensions - Replace ace_parse_imagepath with SQF regexFind (#8243) 2021-10-10 15:41:47 +02:00
Ozan Eğitmen
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
Ozan Eğitmen
2a7eb07803
Use modelToWorldVisualWorld (#8489)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-10 15:37:05 +02:00
jonpas
625721ac0b
No Uniform Restrictions - Update for vanilla 1.98-2.06 (#8495) 2021-10-09 22:53:36 +02:00
PabstMirror
d780c02ef1
Misc - Adjust some functions to be more compatible with sqfvm (#8494) 2021-10-09 15:32:53 -05:00
Ozan Eğitmen
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
PabstMirror
4b593f85d3
Tools - Add sog compat pDumbies (#8493) 2021-10-08 17:11:36 +02:00
classic
536ab0568f
Update of Japanese translation (#8492) 2021-10-08 09:05:06 -05:00
GhostIsSpooky
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
GhostIsSpooky
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
10Dozen
f232f84c6c
Add workaround for ballistics shields (#8418) 2021-10-07 10:46:56 -05:00
GhostIsSpooky
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
mharis001
d6559f22e0
Arsenal - Fix sort running twice (#8479) 2021-10-06 22:16:42 -05:00