Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,855 Commits 73 Branches 88 Tags 752 MiB
0293eaa423
Commit Graph

1007 Commits

Author SHA1 Message Date
PabstMirror
afde7264ba
UI - Add keybind to hide all hud elements (#10227) 
* UI - Add keybind to hide all hud elements

* Handle advFatigue stamina bar

* Update stringtable.xml

* Update docs/wiki/framework/ui-framework.md

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2024-08-22 12:13:54 -05:00
Grim
fcfb2121be
Common - Use lifeState check in FUNC(isAwake) (#9646) 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-08-17 12:59:26 -03:00
BrettMayson
043b3907fe
Extensions - Rust (#9015) 
Co-authored-by: Pepijn Holster <pgaholster@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: LorenLuke <LukeLLL@aol.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-08-17 12:50:38 -03:00
PabstMirror
3ff635f82d
Common - Use hashmap for canInteractWith check (#10189) 2024-08-11 20:29:33 -03:00
johnb432
b7f48a912f
IR Light - Fix bad item replacements and switching to primary weapons (#10119) 
* Fix bad item replacements and switching to primary weapons

* Update addons/irlight/functions/fnc_initItemContextMenu.sqf

* Update fnc_initItemContextMenu.sqf

* Remove unused funtions

* Various fixes/tweaks

- Added a weapon parameter to `switchAttachmentMode`
- Made `switchPersistentLaser` take pointer switching into account
- Fixed IR light attachments being added to the wrong weapon
 2024-08-11 08:08:50 -07:00
johnb432
4db0f7de24
Interaction - Improve FUNC(switchWeaponAttachment) (#10145) 
* Improve swtichWeaponAttachment

* change interact_SWA to use common_SAM (#10176)

* change interact_SWA to use common_SAM

* Directly call

* exit on bad arg

* Update fnc_switchAttachmentMode.sqf

* Minor optimisations

* Cleanup leftover code, use unit instead of target

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Update addons/interaction/functions/fnc_switchWeaponAttachment.sqf

* Revert some unnecessary changes

* Remove sound, as it was part of the CBA attachment switching & pass missing parameter

* Add sound back, to indicate new attachment

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2024-08-09 14:08:07 -07:00
johnb432
7838dea543
Common - Improve persistent lights/lasers (#10118) 
* Improve persistent lasers

* Update addons/common/functions/fnc_switchPersistentLaser.sqf

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

* Fix inventory changes toggling laser, removed alignment code

* Update addons/common/functions/fnc_switchPersistentLaser.sqf

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

* Added API for setting weapon lights/lasers

* Fix undefined variables

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2024-08-08 01:01:39 -07:00
johnb432
6a25e9365a
Safemode - Refactor (#10111) 
* Refactor safemode

* Further improvements and fixes

* Update XEH_postInit.sqf

* Don't allow binoculars to be set to safe

* Add API for getting weapon safety status

* Update fnc_jamWeapon.sqf

* Added doc

* Update fnc_playChangeFiremodeSound.sqf

* Update addons/overheating/functions/fnc_jamWeapon.sqf

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

* Update addons/weaponselect/functions/fnc_selectWeaponMode.sqf

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

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2024-08-02 13:59:18 +02:00
PabstMirror
ba22c407e3
Common - Add ace_common_fnc_switchAttachmentMode (#10135) 
* Common - Add `ace_common_fnc_switchAttachmentMode`

* Update addons/common/functions/fnc_switchAttachmentMode.sqf

* Update addons/common/functions/fnc_switchAttachmentMode.sqf

* playSound only for ACE_player

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2024-07-27 19:15:28 +02:00
johnb432
b6e9cabc34
Cargo & Dragging - Disable UAV AI when being dragged, carried or cargo (#10100) 
* Disable UAV AI when being dragged, carried or cargo

* Update addons/common/functions/fnc_disableAiUAV.sqf

* Improve dragging/carrying conditions, fixed duplicate JIP
 2024-07-22 08:38:39 +02:00
johnb432
5cada7d397
General - Remove "SwitchWeapon" spam (#10113) 
* Remove "switchWeapon" spam

* Update fnc_startDragLocal.sqf

* Don't add invalid fire modes

* Tweaks & fix
 2024-07-20 08:13:42 +02:00
johnb432
dae2c5b465
Common - Clean up ace_common_fnc_hasItem & ace_common_fnc_hasMagazine functions (#10108) 
* Clean up hasItem & hasMagazine functions

* Replace EFUNC

* Update fnc_hasItem.sqf
 2024-07-03 08:39:04 -07:00
johnb432
7b0e5b6416
Common - Fix ace_common_fnc_uniqueItems (#10107) 
Fix `ace_common_fnc_uniqueItems`
 2024-07-03 08:30:41 -07:00
johnb432
ee0e947611
General - Use ace_common_fnc_isAwake where possible (#10098) 
* Use `ace_common_fnc_isAwake` where possible

* Revert bad change
 2024-07-02 12:38:14 -07:00
PabstMirror
5c8ea65f7c
Common - Update header for addPlayerEH (#10086) 2024-06-23 18:12:30 -05:00
johnb432
7ea2aab2c9
Common - Improve PBO checking (#9266) 
* Update PBO checking

* Added kicking of clients without ACE loaded

* Update fnc_errorMessage.sqf

* Update fnc_checkVersionNumber.sqf

* More compatibility for #9568

* Cleanup

* Minor cleanup + added server source

* update outdated/not present error message

* check version number fixes

* Update fnc_errorMessage.sqf

* Changed error names

Server is always right, client has either older or newer versions, or missing or additional addons

* Improved ACE detection method

* Tweaks and fixes

* Try another approach

* Update events-framework.md

* Update XEH_postInit.sqf

* Update fnc_checkVersionNumber.sqf

* Removed check for non-ACE clients

* Update XEH_postInit.sqf

* Cleanup

* Remove rogue change

* Improved message display in systemChat

* Update fnc_checkPBOs.sqf

* Removed loop variable initialisers

* Fixed header

* Updated headers

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
 2024-06-22 15:52:59 +02:00
Mike-MF
1c6c4d6bff
All - Fix parentheses around code (#10073) 
* Fix Brackets around code

* Update fnc_handleFired.sqf

* Shouldn't have changed this one

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2024-06-18 14:08:03 +00:00
Grim
95b7951919
General - Use variable for checking if medical is enabled (#10063) 2024-06-18 00:07:38 +00:00
johnb432
421071027e
Common - Add wheel hitpoint function (#10075) 
* Add wheel hitpoint function

* Moved cache to missionNamespace
 2024-06-17 10:31:35 -07:00
Grim
59af3e1f6d
General - Change CBA Namespaces to HashMap (#8801) 
* medical_treatment

* advanced_throwing

* common, csw

* Update fnc_replaceRegisteredItems.sqf

* Sanitised numerous components

* Update XEH_postInit.sqf

* Update XEH_postInit.sqf

* FUNC -> LINKFUNC

* Changed tagging hashmap

* Reverted some changes

* Reverted some changes

* Update XEH_clientInit.sqf

* Tweaks and fixes

* Fix number replacements

* Minor cleanup

* Update fnc_getMagazineName.sqf

* Update fnc_getMagazineName.sqf

* Minor improvement

* Made factions case-sensitive and added `toLowerANSI` to be safe

* Update fnc_getDetectedObject.sqf

* Update addons/common/functions/fnc_actionKeysNamesConverted.sqf

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* Throw error if item doesn't exist

---------

Co-authored-by: Salluci <69561145+Salluci@users.noreply.github.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-06-11 12:34:32 -03:00
PabstMirror
898daff7f6
General - Cleanup event capitalization (#10062) 2024-06-11 08:00:50 -07:00
PabstMirror
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
johnb432
99bb6983bb
Common - Improve addWeapon (#10051) 
Improve `addWeapon`
 2024-06-01 09:52:18 -07:00
johnb432
1cca2db964
General - Cleaned up cbaSettings_settingChanged (#10050) 
Adapted `cbaSettings_settingChanged`
 2024-05-31 13:20:21 -07:00
johnb432
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
johnb432
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
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
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
415d2f685c
General - Change FUNC to LINKFUNC where appropriate (#9882) 
FUNC -> LINKFUNC
 2024-03-28 13:57:23 -05:00
Mike-MF
cee187adac
General - Convert vehicle to objectParent (#9801) 
Convert vehicle to objectParent
 2024-03-26 09:54:06 -03:00
johnb432
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
BrettMayson
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
Grim
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
BrettMayson
f76485ff3a
Common - Fix addToInventory for magazines (#9823) 
fix addToInventory for magazines
 2024-03-04 14:00:31 -08:00
johnb432
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
Grim
d6eb6b981c
Common - Allow multiple events to clear a cached call (#9770) 2024-02-11 22:13:37 -03:00
PabstMirror
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
PabstMirror
a3aef6a066
General - Cleanup spaces in macros (#9769) 
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
 2024-02-05 14:04:24 -03:00
alexban011
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
Grim
5bd1fa7629
Common - Update header for FUNC(getWeight) (#9765) 2024-02-04 16:08:07 -03:00
BrettMayson
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
PabstMirror
7e255bf05b
Tools - Fix header arg types (#9752) 
Fix header arg types
 2024-01-22 16:33:30 -06:00
Grim
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
Grim
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
Grim
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
johnb432
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
johnb432
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
johnb432
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
BrettMayson
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