a735ec5803
Merge branch 'master' into 40mmBrass
2024-06-09 18:23:05 -05:00
97bc371f5c
Common - Add addPlayerEH for adding EHs to ace_player ( #10056 )
...
* Common - Add `addPlayerEH` for adding EHs to ace_player
* Update fnc_addPlayerEH.sqf
* convert ui to use new func
2024-06-09 18:20:39 -05:00
99bb6983bb
Common - Improve addWeapon ( #10051 )
...
Improve `addWeapon`
2024-06-01 09:52:18 -07:00
1cca2db964
General - Cleaned up cbaSettings_settingChanged ( #10050 )
...
Adapted `cbaSettings_settingChanged`
2024-05-31 13:20:21 -07:00
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
3f9da5f308
Add ace_common_fnc_addPlayerEH
2024-05-23 19:44:45 -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
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
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
415d2f685c
General - Change FUNC to LINKFUNC where appropriate ( #9882 )
...
FUNC -> LINKFUNC
2024-03-28 13:57:23 -05:00
cee187adac
General - Convert vehicle to objectParent ( #9801 )
...
Convert vehicle to objectParent
2024-03-26 09:54:06 -03:00
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
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
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
f76485ff3a
Common - Fix addToInventory for magazines ( #9823 )
...
fix addToInventory for magazines
2024-03-04 14:00:31 -08:00
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
d6eb6b981c
Common - Allow multiple events to clear a cached call ( #9770 )
2024-02-11 22:13:37 -03:00
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
a3aef6a066
General - Cleanup spaces in macros ( #9769 )
...
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com >
2024-02-05 14:04:24 -03:00
f1e3753606
Common - Fix syntax error in fnc_disableUserInput.sqf ( #9767 )
...
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com >
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com >
2024-02-04 16:24:04 -03:00
5bd1fa7629
Common - Update header for FUNC(getWeight) ( #9765 )
2024-02-04 16:08:07 -03:00
1e404cf85b
General - SQF Improvements ( #9698 )
...
Co-authored-by: Dystopian <sddex@ya.ru >
Co-authored-by: PabstMirror <pabstmirror@gmail.com >
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com >
2024-02-04 14:50:24 -03:00
7e255bf05b
Tools - Fix header arg types ( #9752 )
...
Fix header arg types
2024-01-22 16:33:30 -06:00
42e2e08c2b
Common - Add JIP support to status effects ( #9740 )
...
* add JIP support to status effects
* fix TRACE
* typo
2024-01-16 09:37:57 -06:00
cb08a7c172
General - Change UAV unit config lookups to unitIsUAV ( #9735 )
...
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com >
2024-01-15 18:39:28 -03:00
8bc5f513b4
Dragging - Prevent multiple units carrying the same object ( #9730 )
...
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com >
2024-01-13 13:39:39 -03:00
2a2efbb73a
Common - Add keycombo support for FUNC(disableUserInput) ( #9659 )
...
* Add keycombo support for disableUserInput
* Update addons/common/functions/fnc_disableUserInput.sqf
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com >
---------
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com >
2024-01-07 09:59:38 -08:00
0f08ba2fdc
Arsenal - Fix animations not playing properly ( #9705 )
...
* Make arsenal animations play properly
* Update addons/arsenal/functions/fnc_showItem.sqf
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com >
* Moved to common
* Update CfgMoves.hpp
* move to function, add reload safeguard
* selectWeapon immediately
* open left panel on current weapon
* VR mission poses + fix removing vests
* cAsInG
---------
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com >
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com >
2024-01-01 14:22:53 -08:00
8ca5263f18
Common - Make FUNC(isModLoaded) case-insensitive ( #9704 )
...
* Update fnc_isModLoaded.sqf
Co-authored-by: PabstMirror <pabstmirror@gmail.com >
* Update fnc_isModLoaded.sqf
---------
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com >
Co-authored-by: PabstMirror <pabstmirror@gmail.com >
2023-12-31 17:45:01 -08:00
464ab0cefb
Tools - Add HEMTT SQF support and fix commas are not semicolons ( #9663 )
...
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com >
Co-authored-by: PabstMirror <pabstmirror@gmail.com >
Co-authored-by: jonpas <jonpas33@gmail.com >
2023-12-07 03:20:47 +00:00
3f61a41be3
Common/CSW - Use status effect for enableWeaponDisassembly ( #9413 )
...
* uuse weaponDisassemblyEnabled
* convert to status effect
* fix edge conditions
* Update addons/common/functions/fnc_claim.sqf
Co-authored-by: PabstMirror <pabstmirror@gmail.com >
* Update addons/common/XEH_postInit.sqf
Co-authored-by: PabstMirror <pabstmirror@gmail.com >
* Update addons/common/XEH_postInit.sqf
Co-authored-by: PabstMirror <pabstmirror@gmail.com >
* Update XEH_postInit.sqf
* Update addons/common/functions/fnc_claimSafeServer.sqf
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com >
* Update fnc_claimSafeServer.sqf
* change status effect key
* status effect key
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com >
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com >
2023-11-22 21:16:42 -03:00
6741822480
Interaction - Allow unloading patients, bodies, and captives from inside vehicles ( #9645 )
...
* add unloading from inside vehicles
* Update addons/common/functions/fnc_findUnloadPosition.sqf
* Update fnc_findUnloadPosition.sqf
2023-11-22 19:38:52 -03:00
d1f0dc5e83
Cargo - Improve various aspects ( #9617 )
...
* Update CfgVehicles.hpp
* Cargo cleanup
* Update menu.hpp
* Updated status effect key
* Update fnc_onMenuOpen.sqf
* Update fnc_onMenuOpen.sqf
* fix comment from merge
* nil interaction GVARs on menu close
* fix carry bug
* Fix floating objects in MP
* Updated ace_cargoAdded doc
* Fix progress bar prematurely stopping
* Finer cursor object selection
---------
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com >
2023-11-17 20:07:28 -03:00
3fcef89c97
Common - Add support for non-blocking progress bar ( #9493 )
...
* add support for non-blocking-progressbar
* switch to cutRsc
* Remove fade in/out
* Update HintConfig.hpp
* Add param to and cleanup header
* Update addons/common/functions/fnc_progressBar.sqf
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com >
* remove key handler
---------
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com >
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com >
2023-11-11 11:22:17 -03:00
836be21f2d
Tools - HEMTT PW3 fixes ( #9585 )
...
Co-authored-by: PabstMirror <pabstmirror@gmail.com >
2023-11-01 02:29:59 +01:00
d74082402d
Common - Fix mod compat string and add source of main to outdated error ( #9568 )
...
fix stupid + add source
2023-10-23 17:09:09 -04:00
9d1695ffe2
Common - Improve logs and message for version problems ( #9560 )
...
* Common - Diagnose ace install if there are version problems
* update user error message
* whitespace
* missing lettr
* remove source from compat
---------
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com >
2023-10-23 16:29:32 -04:00
5bf46245b2
Common - Fix replaceRegisteredItems if replacing item with nothing ( #9552 )
2023-10-23 19:20:23 +02:00
8104c8f465
Common - Increase sway update frequency ( #9490 )
...
increase sway update frequency
2023-10-14 20:21:08 -04:00
0b695be841
Laserpointer - Block switching to unsupported visible lasers ( #9416 )
2023-09-22 18:09:46 +02:00
742626ff1a
General - Relative script_component.hpp includes ( #9378 )
...
Co-authored-by: PabstMirror <pabstmirror@gmail.com >
2023-09-12 20:58:10 +02:00
eaea6f29b8
Medical - Add setting to drop weapon on unconsciousness ( #8433 )
...
* added chance of dropping weapon on unconsciousness
* Moved throwWeapon to common
* Fixed spelling error
* wording changes
* typo
* fix usgae in burn reaction
* Update addons/medical_status/stringtable.xml
* Update addons/medical_status/functions/fnc_setUnconsciousState.sqf
* Update addons/medical_status/stringtable.xml
* move condition
* derp
---------
Co-authored-by: BrettMayson <brett@mayson.io >
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com >
2023-09-09 02:17:24 -04:00
88e0c8f27b
Common - Improve FUNC(removeSpecificMagazine) with 2.14 changes ( #9227 )
2023-09-05 16:14:42 +02:00
cc26f00df3
Common/Adv. Fatigue/Medical - Add unified sway calculation ( #9226 )
...
* fix adv fatigue sway interaction with medical
* change medical sway scaling
* move to common
* function header
* number tweaks
* baseline is always at least 1
* Add error msgs and warn if using old ACE_setCustomAimCoef
* Update addons/common/functions/fnc_addSwayFactor.sqf
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com >
2023-09-02 18:09:19 -04:00
8b3b265d87
Common - Add FUNC(escapeRegex) ( #9355 )
...
* add function
* add source
2023-08-30 19:31:10 -04:00
0bee7614ad
Common - Improve weapon unloading ( #9344 )
...
Fix weapon unloading
2023-08-26 12:04:31 -04:00
e47e18001f
Docs - Update my display name everywhere ( #9330 )
...
* Update display name in team
* Update display name everywhere
* order
https://youtu.be/VYycQTm2HrM
---------
Co-authored-by: BrettMayson <brett@mayson.io >
2023-08-17 12:02:17 +02:00
8c5ab18350
Various - Misc Cleanup ( #9317 )
...
* Various - Misc Cleanup
* Update addons/common/functions/fnc_canDig.sqf
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com >
---------
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com >
2023-08-13 14:13:02 -05:00
eb53e7a2fe
Tools - document_functions.py: handle header sub indexs for arguments ( #9303 )
...
* tools - handle header sub indexs for arguements
* convert remaining
* Update coding-guidelines.md
2023-08-08 22:51:20 -05:00
