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

37 Commits

Author SHA1 Message Date
johnb432
b5205c1fd0
Update addons/dragging/XEH_postInit.sqf 
Co-authored-by: Joko <hoffman.jonas95@gmail.com>
 2024-07-01 10:13:01 -07:00
johnb432
28560b9ad9 Sync corpses when JIP to avoid weird hitbox collision, renamed function and added API 
The idea behind the API is for 3rd party mods that include garbage collectors to exclude corpses that are being dragged/carried.
 2024-07-01 18:36:37 +02: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
824a9f6afe Another attempt 2024-02-02 18:19:43 +01: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
04238fd382 Merge branch 'master' into pr/9273 2024-01-07 13:29:08 +01: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
johnb432
2e7f56ee39
Dragging - Fix captives (#9660) 
Fixes and cleanup
 2023-11-21 17:18:19 -03: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
5b1491278d
Dragging - Fix for #9385 (#9387) 2023-09-11 14:29:56 +02: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
f070e3ff30
Added handling of captivity when dragging/carrying (#9284) 2023-07-23 07:49:08 +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
johnb432
b32ad48f82 Potential fix for duplicating 2023-07-21 19:24:25 +02:00
johnb432
cbc7748eef Update XEH_postInit.sqf 2023-07-20 19:44:49 +02:00
johnb432
ccbf48030f Merge remote-tracking branch 'upstream/master' into corpse-carry-continued2 2023-07-20 19:14:58 +02: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
BaerMitUmlaut
b00977eda0 Create clones for corpse carrying/dragging 2020-10-04 22:39:52 +02:00
LachlanSneddon
c39992199a
Dragging - Add Keybind for Carry (#7746) 
* add carry keybind

* Corrected canCarry Check

* Removed 'False' in key up parameter

* removed newline
 2020-06-13 15:51:47 -05: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
commy2
5613ec5d5a treatment functions and unconsciousness rework 2016-10-06 00:54:57 +02:00
PabstMirror
6f22df40b6 dragging - Don't run animChanged event on all units 
Also Fix CBA_fnc_addPlayerEventHandler
 2016-08-03 15:35:10 -05:00
PabstMirror
96efbaef53 Add Drag/Drop Keybind 2016-07-01 16:28:44 -05:00
commy2
89ecc81111 convert common events to CBA playerEvents 2016-06-22 01:39:20 +02:00
Glowbal
694503c01b Fix medical events 2016-06-03 20:57:21 +02:00
Glowbal
fa2cf55156 Fix medical related events 2016-06-03 20:22:34 +02:00
SilentSpike
c4b75160a4 Run event renaming script 2016-05-24 14:13:11 +01:00
SilentSpike
108ff4f644 Replace ACE event system calls with CBA counterparts 
Regex used:

\[(.+?),(.+?),(.+?)\]\s+call\s+E?FUNC\((common,)?(target|object)Event\)
[$1,$3,$2] call CBA_fnc_targetEvent

E?FUNC\((common,)?(server|global|local)Event\)
CBA_fnc_$2Event

E?FUNC\((common,)?(add|remove)EventHandler\)
CBA_fnc_$2EventHandler
 2016-05-22 16:47:39 +01:00
jonpas
4918dbacb0 Replace and depreacate EFUNC(common,addScrollWheelEventHandler) with MouseZChanged Display EH 2016-03-02 17:33:46 +01:00
commy2
2fe142032e rework modifier key, cleanup sandbags, tripod, ladder, fix #2590 2015-09-26 03:16:55 +02:00