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,592 Commits 73 Branches 88 Tags 752 MiB
83adf65cad
Commit Graph

1610 Commits

Author SHA1 Message Date
johnb432
370c5558ed Merge branch 'master' into cbaPlayerEH 2024-08-28 17:00:52 +02:00
lambdatiger
da73cf979d
Common - Make FUNC(getVehicleIcon) check for strings without the .paa extension (#10257) 
* added fallback for icons without .paa post-fix

* Make sure it's at least a valid path before we spend time searching

* Revert "Make sure it's at least a valid path before we spend time searching"

This reverts commit 2d7a9454e3.

* Added checking for empty `_vehicleValue` strings

Update addons/common/functions/fnc_getVehicleIcon.sqf

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

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-08-26 11:31:25 -05:00
PabstMirror
17f2de4ec1
General - Fix some format args/strings (#10251) 2024-08-24 14:55:45 -03:00
Apricot
59314edf62
Translations - Improve Japanese (#10245) 
update Japanese
 2024-08-23 10:35:32 -05:00
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
johnb432
f3938ba0cc
Explosives - Use triggerAmmo instead of setDamage (#10182) 
* Use `triggerAmmo` instead of `setDamage`

* Update docs/wiki/framework/explosives-framework.md
 2024-08-12 06:18:21 -07:00
johnb432
ada7b93219
General - Use QUOTE(ADDON) for status effects (#10195) 
Use ADDON for status effects
 2024-08-12 06:15:09 -07: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
PabstMirror
7f966bc510 Common - Switch to CBA_fnc_addBISPlayerEventHandler 2024-08-10 13:38:33 -05: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
973cfdd1c4
Common - Move missing compats warning to pre start (#10162) 
* Remove missing compats warning

* move to common/preStart

* ?

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2024-08-06 00:48:10 -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
V1nsyara
ec5b84c278
Translation - Small update Russian (#10115) 
* Translation - Update Russian for new features

* Up to date translate RU

* Small update medical treatment

* resolve problem

* i`m cry

i hate this conflict
 2024-07-14 21:46:14 -05:00
Apricot
63d1ab82a7
Translations - Improve Japanese (#10112) 
* Improve Japanese

* Tweaks

* bit tweak

* even more tweak

* Update stringtable.xml

* Update stringtable.xml
 2024-07-13 19:22:06 -05: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
Nilia119
d66c3904d0
Translation - Add Missing German (#9975) 
* Added Missing German Translation

* Improved German Translation

* Update Medical_treatment

* Update Medical_treatment stringtable.xml

* Update addons/common/stringtable.xml

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

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update addons/arsenal/stringtable.xml

---------

Co-authored-by: BaerMitUmlaut <BaerMitUmlaut@users.noreply.github.com>
Co-authored-by: Mike-MF <TyroneMF@hotmail.com>
 2024-06-09 18:21:36 -05: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
c44a1e7ea7
Cookoff - Mini-Rewrite (#9758) 
* Cook-off improvements

* More changes

* Update fnc_getVehicleAmmo.sqf

* Better engine fire placement

* Update fnc_detonateAmmunition.sqf

* Update XEH_postInit.sqf

* Update fnc_getVehicleAmmo.sqf

* Update events-framework.md

* Various improvements

* Separate effect handling

* Tweaks

* Update XEH_postInit.sqf

* Prevent double ammo detonation

* Fixed objects not being able to cook-off again

* Added incendiary rounds as source of box cookoff

* Converted enable setting to bool

* Fixed brackets

* Update fnc_cookOff.sqf

* Update CfgEden.hpp

* Removed GVAR(enable), added GVAR(enableFire) back

* Update initSettings.inc.sqf

* Update events-framework.md

* Update addons/cookoff/functions/fnc_cookOffEffect.sqf

* Restructured, redid API events

* Fix effect for JIP, minor optimisations

* Removed `cbaSettings_settingChanged`

* Renamed variables, tweaked string table entries

* Update fire damage #9991

* Capitalize comments again

* Fix cookoff for very short durations and fix effect removal being too quick
 2024-06-05 12:36:39 -07: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
Abogado
6972f02bc4
Translation - Add Missing Spanish (#10001) 
Translation to Spanish

Translation to Spanish
 2024-05-10 20:42:55 -05:00
Fabio Schick
62353a9175
Translations - Updated Italian with recent additions (#10004) 
* hearing italian translations

* common italian translations
 2024-05-10 20:34:34 -05: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
Apricot
b513a110f5
Translations - Improve Japanese localization (3.17.1) (#9977) 
Tweaks
 2024-04-26 17:34:11 -05:00
johnb432
1eca83db9f
Common - Fix animations not playing (#9973) 
Update CfgMoves.hpp
 2024-04-24 23:41:27 -05:00
V1nsyara
32707dd860
Language Russian - Update translation (#9947) 
Russian
 2024-04-13 14:53:50 -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
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
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
PabstMirror
8805414669
Common - Cleanup strange texture (#9897) 2024-04-02 01:52:45 +02:00
jonpas
3a232bbfa8 Fix release build type 2024-04-01 18:10:30 +02:00
BaerMitUmlaut
7ddd62f4d3 Documentation - Fix typo (#9608) 2024-04-01 15:43:24 +02:00