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,540 Commits 73 Branches 88 Tags 752 MiB
checkExtensionHash
Commit Graph

162 Commits

Author SHA1 Message Date
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
05ab1bbe99
Dragging - Fix dragging/carrying failing for items in ViV (#10128) 
* Unload ViV before dragging/carrying

* Update addons/dragging/functions/fnc_carryObject.sqf

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

* Use lazy eval to check if item was unloaded

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2024-07-20 08:26:53 +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
68738316c2
Dragging - Remove weight calculation workaround (#10117) 
* loadAbs has been fixed

* Update fnc_getWeight.sqf
 2024-07-19 19:13:44 +02: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
Grim
95b7951919
General - Use variable for checking if medical is enabled (#10063) 2024-06-18 00:07:38 +00: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
a8ed533004
Dragging - Minor code cleanup (#9859) 
* Dragging minor code cleanup

* Update fnc_startCarryPFH.sqf

* Revert UAV changes
 2024-03-26 09:50:21 -03:00
johnb432
11844ef05e
Dragging - Fix dropping incorrect object when carrying fails (#9860) 
Update fnc_startCarryPFH.sqf
 2024-03-18 14:17:05 -03:00
johnb432
0856e58ae9
Dragging - Release ownership when target is too heavy to drag/carry (#9858) 
Release ownership when target is too heavy to drag/carry
 2024-03-18 14:16:34 -03:00
PabstMirror
edf627ce51
Dragging - Add logging for claimSafe failure (#9739) 2024-01-16 09:16:51 -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
e8c10f905e
Dragging - Minor optimisation (#9679) 
Minor optimisation for dragging
 2023-12-18 14:02:45 -03:00
johnb432
2e7f56ee39
Dragging - Fix captives (#9660) 
Fixes and cleanup
 2023-11-21 17:18:19 -03:00
johnb432
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
Filip Maciejewski
9f9507931f
Dragging - Fix being able to load cargo if the system is disabled (#9639) 2023-11-10 14:56:22 -05:00
Filip Maciejewski
7df63ffe2e
Dragging - Fix being able to load people into vehicles from any distance (#9638) 2023-11-10 14:54:31 -05:00
Grim
406fce2836
Dragging - Add setting for Max Weight Coefficient (#9569) 
* add arcade mode setting

* tweak stringtable

* stringtable

* change to slider

* fix spelling

* Update stringtable.xml

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-10-24 00:57:05 -04:00
Grim
f35f872963
Dragging - Prevent carrying crewed static weapons (#9491) 
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-10-23 19:21:50 +02:00
PabstMirror
d70c049b4f
CSW/Dragging - Handle null objects causing script errors (#9529) 
* CSW - Handle static weapon be deleted

* add same fix to dragging
 2023-10-18 22:17:07 -04:00
johnb432
11664b0040
Dragging - Improve featureCamera handling (#9389) 
* Update XEH_postInit.sqf

* Update XEH_postInit.sqf

* Update XEH_postInit.sqf

* Different approach

* Updated to new script_component

* fix variable lookup

---------

Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
 2023-09-19 23:56:20 -04:00
johnb432
7a3e5dd3e0
Dragging - Add config support for weight ignoring (#9396) 
* Update fnc_initObject.sqf

* Update dragging-framework.md
 2023-09-12 18:57:55 -04:00
jonpas
742626ff1a
General - Relative script_component.hpp includes (#9378) 
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-09-12 20:58:10 +02:00
PabstMirror
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
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
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
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
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
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
Dystopian
8b94d765aa
Dragging - Allow run when carrying light-weight objects (#8338) 
* Allow run when carrying light-weight objects

* Use global var instead of macro

* Update addons/common/XEH_postInit.sqf

---------

Co-authored-by: jonpas <jonpas33@gmail.com>
 2023-06-28 14:43:10 +03:00
Ampersand
e5654914cc
Dragging - Improve carrying by allowing carried object to be loaded into vehicle by key or mouse (#9138) 
* load carried object

* check for medical loaded

* space

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

* consolidate mouse hint in pfh

---------

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
 2023-06-23 15:11:16 +03:00
Grim
793ef7bba5
Dragging - Use improved loadAbs for weight calculation (#8457) 
* use improved loadAbs for weight calculation

* fix double counted backpack cargo

---------

Co-authored-by: Salluci <69561145+Salluci@users.noreply.github.com>
 2023-06-22 04:04:19 -03:00
mharis001
67ebb15e07
Dragging - Improve weapon reselect behaviour (#9052) 
* Dragging - Improve weapon reselect behaviour

* Add and use func to getFiremodeIndex

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-02-13 22:01:51 -06:00
PabstMirror
7bc6fdfa66
Cleanup - Trim all trailing whitespace (#8651) 2021-10-30 16:42:03 -05:00
Dystopian
7687429b82
Fix keyhandler removing when drop (#8443) 2021-09-18 11:06:01 -05:00
Serg Vergun
3827178606
Remove 4th never used parameter (#8342) 2021-08-03 13:06:12 -05:00
Dystopian
ad41bf2c60
Dragging - Add more objects configs (#8104) 
Co-authored-by: jonpas <jonpas33@gmail.com>
 2021-07-23 16:11:57 +02:00
Dániel Boros
af54808f67
Dragging - Add new dragging animations (#7950) 
* New custom animation added

* Adjusted CfgMoves and the script components

* New drop animation and key handler

* CBA settings and new ManActions added

* Adjustments to the drop animation

* Added translations and fixed some stuff

* Update CfgMovesBasic.hpp

* Fix translations

Co-authored-by: Elgin675 <elgin675@hotmail.com>
Co-authored-by: Blutze <37950828+Blutze@users.noreply.github.com>

* Use the same key to drop object

* Update addons/dragging/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Fix French translation

Co-authored-by: Elgin675 <elgin675@hotmail.com>

* Lower the weapon accuracy of the drag animations

* Removed auto-switch to handgun

* Update fnc_startDrag.sqf

 - Holding a launcher breaks the firing animation.
 - Now the unit has to hold either a primary weapon or handgun.

* Handle the unit's current weapon

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

* Update addons/dragging/functions/fnc_handlePlayerWeaponChanged.sqf

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

* Update addons/dragging/initSettings.sqf

Co-authored-by: Elgin675 <elgin675@hotmail.com>
Co-authored-by: Blutze <37950828+Blutze@users.noreply.github.com>
Co-authored-by: Jo David <github@jonathandavid.de>
Co-authored-by: BaerMitUmlaut <BaerMitUmlaut@users.noreply.github.com>
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
 2021-04-20 13:33:58 +02:00
Neviothr
75f7ed7532
Utilize isNotEqualTo (#7929) 
* Utilize isNotEqualTo

* undo changes to some files

* redo some changes, fix based on @Vdauphin 's comment

* fix validator issues

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-02-27 11:05:05 -06:00
PabstMirror
e8693c8db9
Various - Use configOf command for faster lookup (#8100) 
* configOf

* replace some use of CBA_fnc_getObjectConfig
 2021-02-18 12:58:08 -06:00
jonpas
6522dba87e
Dragging - Fix mass synchronization (#8071) 
* Dragging - Fix mass synchronization

* Cleanup redundant argument
 2021-01-20 14:49:38 -06:00
Jo David
3b15014099
Dragging - Add possiblity to rotate a carried object (#7640) 
* Add possiblity to rotate a carried object

* simplify the code by using cba_events_control instead of a custom set variable

* le ACE and don't save frames
 2020-04-20 17:45:59 +02:00
BaerMitUmlaut
54086bb2ef
Fix being stuck dragging when in combat pace (#7617) 2020-04-03 18:28:14 -05:00
mharis001
2bad2fac68 Improve dragging getWeight function (#7261) 2019-12-11 11:53:34 -06:00
BaerMitUmlaut
5bdbb5c398 Speed up carry animation (#7216) 2019-10-05 22:32:38 +02:00
PabstMirror
16ed2a82c2
Merge pull request #4064 from acemod/medical-rewrite 
Medical rewrite
 2019-03-30 15:20:15 -05:00
commy2
5277bc083b fix a macro 2019-03-24 09:41:36 +01:00
commy2
6cff8deba8 cleanup dragging 2019-03-24 09:28:58 +01:00