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,464 Commits 73 Branches 88 Tags 752 MiB
9c65030b41
Commit Graph

192 Commits

Author SHA1 Message Date
johnb432
9c65030b41 Merge branch 'master' into pr/9273 2024-06-29 11:30:00 +02:00
Grim
95b7951919
General - Use variable for checking if medical is enabled (#10063) 2024-06-18 00:07:38 +00:00
johnb432
04564b4e4f setPosATL globally 2024-04-09 22:08:43 +02:00
johnb432
fdbaeabc47 Try syncing individually on each client 2024-04-01 16:33:08 +02:00
johnb432
1a20df808e Merge branch 'master' into pr/9273 2024-04-01 16:06:12 +02: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
johnb432
2d8dc01f2c Cleanup 2024-02-02 23:59:10 +01:00
johnb432
43fb2613be
Update addons/dragging/functions/fnc_createClone.sqf 
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2024-02-02 14:54:19 -08:00
johnb432
f805604901
Update addons/dragging/functions/fnc_dropClone.sqf 
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2024-02-02 10:47:47 -08:00
johnb432
824a9f6afe Another attempt 2024-02-02 18:19:43 +01:00
johnb432
c4b29e6ae7 Merge branch 'master' into pr/9273 2024-01-21 09:00:23 +01: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
johnb432
ceb940a124 Merged master 2024-01-14 22:36:10 +01: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
15b581b4cc Update fnc_createClone.sqf 2024-01-11 11:56:25 +01:00
johnb432
594e1187a9 Readd body moving under terrain 2024-01-09 19:37:24 +01:00
LinkIsGrim
884bccf1cb add wound texture handling 2024-01-08 04:40:28 -03:00
johnb432
d1755af35b Remove body moving under terrain 2024-01-07 18:02:12 +01:00
johnb432
3387898441 Check correct ragdoll state 2024-01-07 17:46:20 +01:00
johnb432
573bfbb92d Fix not hidden 2024-01-07 16:48:40 +01:00
johnb432
4a5f056d71 Fixed/improved checks 2024-01-07 16:29:01 +01:00
johnb432
04238fd382 Merge branch 'master' into pr/9273 2024-01-07 13:29:08 +01: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
johnb432
29881bc9a1 Update fnc_createClone.sqf 2023-10-21 12:23:06 +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
1ccd2b4643 New script_component 2023-10-03 08:46:27 +02:00
johnb432
52cd63745b Merge branch 'corpse-carry-continued2' of https://github.com/johnb432/ACE3 into corpse-carry-continued2 2023-10-03 08:39:04 +02:00
johnb432
897ca7a17b Update fnc_handleAnimChanged.sqf 2023-10-03 08:38:49 +02:00
johnb432
98e516bcc3
Merge branch 'master' into corpse-carry-continued2 2023-10-03 08:33:51 +02: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
LinkIsGrim
1ad961cbe0 Merge remote-tracking branch 'upstream/master' into corpse-carry-continued2 2023-09-06 11:05:18 -04: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
d40346d202
Merge branch 'master' into corpse-carry-continued2 2023-07-24 20:03:07 +02: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
4969f48fac
Merge branch 'master' into corpse-carry-continued2 2023-07-22 19:21:37 +02: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