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
14,874 Commits 73 Branches 88 Tags 752 MiB
37be6130f2
Commit Graph

14874 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sergey Vergun
96a4a8cf8e
Medical - Add Pain Unconscious Threshold setting (#8394) 
* Add PAIN_UNCONSCIOUS slider

Add PAIN_UNCONSCIOUS slider to ACE Medical settings

* fix GVAR name

* Update addons/medical_damage/stringtable.xml

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

* Update addons/medical_damage/stringtable.xml

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

* stringtable

* remove setter in preInit and cleanup PAIN_UNCONSCIOUS_DEFAULT

---------

Co-authored-by: Salluci <69561145+Salluci@users.noreply.github.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-08-05 15:32:21 +03:00
johnb432
a591aa9508
Advanced Fatigue - Add cap to muscle damage (#9302) 
Update fnc_mainLoop.sqf
 2023-08-04 21:07:12 -05:00
PabstMirror
6fb9161ecc
Medical Engine - Fix unloading dead units in vehicles and handle deleted units vehicles (#9283) 
* Medical Engine - Unlock when dead

* Update fnc_unloadPersonLocal.sqf

* Update addons/common/functions/fnc_unloadPersonLocal.sqf

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

* fix actually unloading people to found emptyPos

* handle deleted units

* handle dead units

ref 179957c39d

* vehicle -> objectParent

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2023-08-02 08:59:46 +03:00
johnb432
6bc1ae453b
Update fnc_loadUnit.sqf (#9300) 2023-08-01 11:35:55 -05:00
Grim
628d62d329
Laser - Cleanup laser designator config and code (#9289) 
* cleanup laser designator code

* condition

* use macro for IDC

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

* IDC to macro

* switch to _currentShooter

* hide CA_Distance even if fade fails

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-07-30 04:41:46 +03:00
Dystopian
14e92dfb7f
Repair - Add enable setting (#8070) 
* Add enable setting

* Optimize eden expressions

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* Add debug

* Update addons/repair/functions/fnc_addRepairActions.sqf

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

* Fix strange indent

* Optimize bool to number conversion

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

* Prevent run before setting is ready

* Move postInit to EH

* remove all transportRepair = 0

* remove requiredAddons

---------

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
 2023-07-29 07:53:05 +03:00
johnb432
7ef9d19bc5
Update fnc_replaceUniqueItemsLoadout.sqf (#9297) 2023-07-29 01:01:42 +03:00
johnb432
add312cbf1
Logistics wirecutter - Add wirecutter stats to ACE arsenal (#9296) 
* Added wirecutter stats to arsenal

* Update addons/logistics_wirecutter/ACE_Arsenal_Stats.hpp

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

* Update addons/logistics_wirecutter/ACE_Arsenal_Stats.hpp

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

* Update ACE_Arsenal_Stats.hpp

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-07-29 01:01:25 +03:00
Grim
2f0ed27d93
Arsenal - Improve stats display (#9290) 
* improve page handling

* drop MAX_STATS_PER_PAGE for now

* hide stats box when empty

* improve hiding

* improve _fnc_hideUnused

* condition

* prevent page overflow

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

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-07-29 01:00:05 +03:00
Grim
4fea9669bb
UI - Fix UAVs not being considered vehicles for HUD elements (#9288) 
* consider UAVs as vehicles for UI display

* fix condition

* readd reload ui condition

* improved UAV check

* use getConnectedUAVUnit

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

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-07-29 00:44:14 +03:00
PabstMirror
7f24dc2282
Extensions - Fix gtest branch change (#9014) 2023-07-28 22:47:22 +02:00
Dystopian
0321545098
Rearm - Add enable setting (#8067) 
* Add enable setting

* Update test

* Optimize eden macro

* Fix bad command name in eden

* Apply suggestions from code review

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

* Cleanup unused argument

* Handle RHS config

* Optimize init function a little

* Improve macro

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

* compats and leftovers

* function header (sorry jonpas)

* add enabled check to initSupplyVehicle

* use toString

* fix validate

* inheritance cleanup

---------

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
 2023-07-28 12:47:23 +03:00
Grim
93520bdc9d
Arsenal - Add and Improve stats (#9291) 
* add nv and magnification stats

* improve ballistics conditions

* add ammo count stat

* Update addons/arsenal/ACE_Arsenal_Stats.hpp

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

* Update addons/nightvision/ACE_Arsenal_Stats.hpp

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

* cleanup

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-07-28 10:05:12 +03:00
Grim
5e6476aa5a
Arsenal - Make Zeuses able to save, delete, and edit Default Loadouts (#9278) 
* allow zeus to edit default loadouts

* typo
 2023-07-28 07:55:10 +03:00
Grim
12905a0702
Arsenal - Fix #9040 bugs/regressions (#9293) 
* fix saving loadout with weapon in container

* readd magazine refill
 2023-07-28 07:53:53 +03:00
LorenLuke
2578ead13b
Laser - Add Aircraft Laser Spot Tracker and Point Locking (#8453) 
* Initial commit

* optimize/clean, add ignoreOwners param

* locality, PFH condition

---------

Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
 2023-07-28 07:03:02 +03:00
Tim Beswick
cd36871f90
Repair - Fix bug in detection for ignoring hitpoints (#9261) 
* Fix bug in detection for ignoring repair hitpoints

* Use define for array any

* Add warning if hitpoint group would be ignored

* Apply suggestions from code review

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

* Change ANY to ANY_OF

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2023-07-28 06:32:30 +03:00
LorenLuke
18551144bd
Map Tools - Add Vernier Scale and Improve resolution (#8674) 
* Adds 4mil Vernier scale to large and small maptools.

* Updates aligned images, adds 2 mil vernier scale.

* Changes vernier scale from cyan to red.

* Increased map tool resolution to 4K

* fix mips

---------

Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
 2023-07-28 05:27:24 +03:00
johnb432
174841751c
Arsenal - Improve support for unique equipment (#9287) 
* work on arsenal actions

* cycle through pages

* docs

* cleanup

* Update addons/gunbag/functions/fnc_weaponName.sqf

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* missing fil

* Update addons/arsenal/functions/fnc_itemInfo.sqf

* Update addons/arsenal/functions/fnc_refresh.sqf

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* remove CBA_loadoutSet gunbag cache

* update fnc_refresh

* Added unique item support for left panel items

* Cleanup

* fix 3den

* add scopeEditor

---------

Co-authored-by: Brett <brett@mayson.io>
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: Salluci <salluci.lovi@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2023-07-25 09:41:15 +03:00
BrettMayson
3edeff217a
Arsenal - Action Buttons (#9069) 
* work on arsenal actions

* cycle through pages

* docs

* cleanup

* Update addons/gunbag/functions/fnc_weaponName.sqf

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* missing fil

* Update addons/arsenal/functions/fnc_itemInfo.sqf

* Update addons/arsenal/functions/fnc_refresh.sqf

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* remove CBA_loadoutSet gunbag cache

* update fnc_refresh

* fix 3den

---------

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: Salluci <salluci.lovi@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2023-07-25 09:30:49 +03:00
PabstMirror
74984769a5
Tagging - Add custom stencil text tags in 3DEN (#9149) 
* Tagging - Add custom stencil text tags

* hack to force preloading font

* Add 3den

* header

* Apply suggestions from code review

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

* Update addons/tagging/functions/fnc_generateStencilTexture.sqf

---------

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: Salluci <salluci.lovi@gmail.com>
 2023-07-24 05:55:39 +03:00
Grim
e9cde7268f
skip removing clan tag if spray painted (#9285) 2023-07-24 02:23:13 +03:00
johnb432
dbe372cb48
Dragging - Improve code (#9271) 
* Code cleanup

* Moved keybinds to initKeybinds.sqf

* Update addons/dragging/initKeybinds.sqf

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

* Update addons/dragging/functions/fnc_carryObject.sqf

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

* Update addons/dragging/functions/fnc_getWeight.sqf

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

* Rephrasing and adjustments for dragging

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2023-07-24 02:07:37 +03:00
johnb432
f070e3ff30
Added handling of captivity when dragging/carrying (#9284) 2023-07-23 07:49:08 +03:00
Grim
1011b963bc
fix losing interactions with notepad open (#9282) 2023-07-23 07:48:53 +03:00
BaerMitUmlaut
52ed0fc6be
Medical Engine - Prevent automatic unloading of dead or unconscious units (#7959) 
* Lock seats of unconscious or dead units

* disable pullOutBody if medical is loaded

* fix undefined var and switch to objectParent

---------

Co-authored-by: Salluci <salluci.lovi@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2023-07-22 09:41:20 +03:00
Grim
4f4389dd59
Common - Fix loading units into FFV cargo seats (#9280) 2023-07-22 09:12:42 +03:00
Grim
39e4f9340b
Common/Medical - Change vehicle checks to objectParent (#9281) 
* switch to objectParent

* use objectParent in unloadUnit

* fix derp

* allow unload patient on dead units
 2023-07-22 09:11:58 +03:00
johnb432
9505d4c47e
Dragging - Fix unintended Cargo dependency and improve ragdoll/disconnection handling (#9272) 
* Improvements

* fix unintended cargo dependency

* stringtable

---------

Co-authored-by: Salluci <salluci.lovi@gmail.com>
 2023-07-22 07:01:30 +03:00
PabstMirror
9d1b696480
Arsenal - Fix adding inventory item with empty name to dummies (#9279) 
* Arsenal - Fix adding inventory item with empty name to dummies

* Update XEH_postInit.sqf
 2023-07-22 06:32:15 +03:00
Grim
35ce8d1883
Common - Add variable to block item replacement temporarily (#9265) 
* add blocking item replacement

* don't add if player changed

* re-curse instead of fake item

* compileFinal

* Update fnc_registerItemReplacement.sqf

* move to separate function

* remove fakeitem replacement

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-07-22 06:31:30 +03:00
Grim
e5dc124fe8
Dragging - Add additional weight checks on inventory modification (#9225) 
* Allow run when carrying light-weight objects

* Use global var instead of macro

* add weight check, improve getWeight & conditions

* changes from review

* changes from review - postInit

* add param to ignore PhysX mass

* add settings

* BI issue tracker in comment

* change defaults, remove overweight setting

* remove public variable

* setting name changes

* updating case in statusEffect_addType

* move to XEH

* derp

* Add some extra checks for closed events

* Update XEH_postInit.sqf

* conditions

---------

Co-authored-by: Dystopian <sddex@ya.ru>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-07-22 06:30:40 +03:00
PabstMirror
ad1f50304f
Tools - fix toml file read (#9277) 2023-07-21 14:53:49 -05:00
Grim
31e1ad0cff
Arsenal - Add Tools category and moveOnOverwrite parameter to FUNC(addCustomRightPanelButton) (#9247) 
* add tools tab and setting

* move to preinit

* fix icon, add restart warning

* derp

Co-authored-by: Dystopian <sddex@ya.ru>

* Update addons/arsenal/stringtable.xml

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

* remove setting

* add keepIfOverriden parameter

* docs again

* documentation whitespace

* docs grammar, change parameter name

* fix docs

* more docs fixes

* magazine support

* deprecate spare barrel item

* more docs, improve condition

---------

Co-authored-by: Dystopian <sddex@ya.ru>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-07-21 22:39:48 +03:00
johnb432
c8404f496e
Arsenal - Add/Fix/Improve/Change numerous aspects (#9040) 
* Arsenal update

* Fixes

* Update fnc_onSelChangedLeft.sqf

* Update fnc_updateUniqueItemsList.sqf

* Header fixes

* Fix for defines.hpp

Co-authored-by: Dystopian <sddex@ya.ru>

* Moved fnc_baseWeapon, filtered invalid items

* Update addons/arsenal/functions/fnc_scanConfig.sqf

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

* Fixes and tweaks

- Sorting is guaranteed to give a fixed order
- Dog tags no longer throw errors when reloading the ACE arsenal mission when you had some saved in your loadout before quitting the last time you played.

* Cleanup, bug fixes and additions

- Added the ability to add items from "CfgMagazines" into the "Misc. items" or custom tabs.
- Added "baseWeapon" class support for weapon attachments. If a weapon attachment has the config property "baseWeapon" defined, it will take that item and show that in the arsenal.
- Added stronger filtering on item scopes (scope > 0 at least for every item)
- Added "descending" (default, as it is now) and "ascending" sort order as a drop down menu,
- Unique backpacks in containers can now be removed with either the "-" or "clear all items" button.
- When sorting by a number, 2 decimal points have been added, so that when you sort by weight it returns the correct order.

* More fixes and tweaks

- Converted the arsenal to partially work with hashmaps instead of arrays (for configItems and virtualItems, currentItems is still an array).
- Because of the above, performance of FUNC(addVirtualItems) and FUNC(removeVirtualItems) has improved immensely.
- Sorting now caches results, reducing repeated sorting times drastically.
- CBA disposable launchers are handled differently now: Within the arsenal, you can change weapon attachments on disposable launchers, but you can't change their magazines (primary or secondary). Item info on the right and the stats show correct information.
- FUNC(addSort) now checks if the new sorting method already exists and doesn't add it if it does.
- FUNC(removeSort) now exists. You can't remove the default sort type (alphabetically) to avoid problems with the arsenal.
- Both FUNC(addStat) and FUNC(compileStats) actually taken priority into account now. Because of that priority on several stats needed to be tweaked.
- FUNC(removeStat) ensures that there are no gaps within the stat array (so if there is an empty spot in the stats page, it's because there is a stat, but the condition for it being shown hasn't been met).

* Update fnc_replaceUniqueItemsLoadout.sqf

* Update fnc_onSelChangedLeft.sqf

* Update fnc_scanConfig.sqf

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

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

* Minor cleanup

* Baseweapon filtering

* Improvements + better unique items support

* Update fnc_fillRightPanel.sqf

* Update fnc_onSelChangedLeft.sqf

Fixed: Switching between weapons with incompatible primary magazines while a compatible secondary magazine is loaded doesn't equip the new weapon's primary magazine.

* Update addons/common/functions/fnc_uniqueUnitItems.sqf

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

* undefined variable

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

* fix undefined loadout var

* Update fnc_fillLoadoutsList.sqf

---------

Co-authored-by: Dystopian <sddex@ya.ru>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-07-21 21:25:25 +03:00
BrettMayson
12bb5aced4
Tools - HEMTT preprocess is now an object (#9275) 
* hemtt: preprocess is now an object

* error on deprecated usage
 2023-07-21 11:23:03 -05:00
PabstMirror
efe1ecd4cd
workflow/tools - trivial cleanup (#9274) 
* workflow - trivial cleanup

* Add Validate headers to vscode tasks
 2023-07-20 16:15:21 -05:00
Grim
aead9a8eb4
fix nvg stat detection (#9254) 2023-07-16 12:45:33 -05:00
Grim
b54a5463ee
RHS Compat - Improve macro usage (#9262) 
* macro usage, swap barrel on PKP

* revert barrel swap
 2023-07-16 12:27:09 -05:00
Dystopian
510d35497f
Sitting - Fix setting and keys in documentation (#9264) 
* Sitting - Fix setting and keys in documentation

* Update docs/wiki/feature/sitting.md

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

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2023-07-16 01:29:47 +03:00
Dystopian
d64c09cbdd
Vehicles - Document Resume/Set speed control functionality (#9263) 
* Vehicles - Document Resume/Set

* Update docs/wiki/feature/vehicles.md

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

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2023-07-16 01:29:03 +03:00
johnb432
8d107776c4
Overpressure - Fix invulnerable units taking backblast damage when firing launchers (#9256) 2023-07-14 22:33:54 +03:00
Grim
cdbf572462
Mk6 Mortar - Fix AI usage (#9258) 2023-07-13 19:54:39 +03:00
Grim
535662b883
Dragging - Add limping check to carrier and improve limping check for target unit (#9251) 
* fix limping damage threshold

* add check for carrier not limping
 2023-07-10 06:45:53 +03:00
Grim
8032ccacfc
Common - Add FUNC(hasZeusAccess) (#9252) 
* add fnc_hasZeusAccess

* header

* Update addons/common/functions/fnc_hasZeusAccess.sqf

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-07-10 06:45:22 +03:00
Dystopian
1b8c56f0be
Interaction - Add actions to access and allow carrying inventory holders (#6029) 
* Add interaction to inventory holders

* Add Take Weapon action

* Add Drag/Carry actions

* Fix menu position

* Add Inventory action also to unconscious

* Underwater: Fix menu position, disable gear action

* Add dead body weapons carrying with workaround

* Disable man gear action in water

* Optimize position code

* Fix macro using

* Use macro and power

* Restrict max dragged items count

* Remove superfluous condition, Add Take action to all holders

* Cleanup XEH

* Remove weapon carry-drop workaround

* code style changes

* code style changes

* brackets, isEqualTo, vehicle check

* code style changes

* brackets, isEqualTo, vehicle check

---------

Co-authored-by: Salluci <salluci.lovi@gmail.com>
 2023-07-10 05:49:37 +03:00
johnb432
e181ba5aa1
Gunbag - Fix arsenal caching conflicting with CBA_fnc_setLoadout (#9250) 
* Update XEH_preInit.sqf

* Update addons/gunbag/XEH_preInit.sqf

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2023-07-10 00:13:43 +03:00
johnb432
1aa7eb2a1a
Update fnc_codeToString.sqf (#9249) 2023-07-09 23:41:12 +03:00
Will
ab2207924f
Logistics Wirecutter - Add documentation (#9248) 
* Create wirecutter-framework.md

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

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2023-07-09 21:14:54 +03:00
Will
05c9e4247b
Logistics Wirecutter - Add modded class support (#9235) 
* Update script_component.hpp

Change check for wire cutters for all child classes in addition to current class

* Update script_component.hpp

fix bracket

* Change isKindOf for alt syntax

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

* Update addons/logistics_wirecutter/script_component.hpp

Better performing searching for wirecutter

Co-authored-by: BrettMayson <brett@mayson.io>

* Update XEH_postInit.sqf

Index all possible wirecutters

* Update script_component.hpp

arrayIntersect with possible wirecutters

* Update XEH_postInit.sqf

Incorrect quotes

* Update CfgWeapons.hpp

Add iswirecutter to wirecutter

* Update XEH_postInit.sqf

Remove pointless parentheses

* Update addons/logistics_wirecutter/script_component.hpp

fix for incorrect arrayintersect check

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

* Update addons/logistics_wirecutter/XEH_postInit.sqf

Incorrect quoting

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* use configClasses and cache at preStart

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: BrettMayson <brett@mayson.io>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
 2023-07-09 19:37:30 +03:00