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
johnb432
b32ad48f82
Potential fix for duplicating
2023-07-21 19:24:25 +02:00
johnb432
fb065d1098
Continue corpse carry
2023-07-20 19:42:35 +02:00
johnb432
ccbf48030f
Merge remote-tracking branch 'upstream/master' into corpse-carry-continued2
2023-07-20 19:14:58 +02: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
BaerMitUmlaut
2d30be436c
Prevent screams of agony from dragged corpse
2020-10-11 20:46:49 +02:00
BaerMitUmlaut
efd71c6179
Bury corpse to prevent desecration
2020-10-11 20:46:43 +02:00
BaerMitUmlaut
28e0491d3e
Add comment with reasoning for detach before delete
2020-10-11 20:37:59 +02:00
BaerMitUmlaut
3fa5b6958c
Remove duplicate clone
...
Co-authored-by: Dystopian <sddex@ya.ru>
2020-10-05 10:36:49 +02:00
BaerMitUmlaut
905e8cae82
Fix doccomment for dropClone
...
Co-authored-by: Dystopian <sddex@ya.ru>
2020-10-05 10:35:44 +02:00
BaerMitUmlaut
b00977eda0
Create clones for corpse carrying/dragging
2020-10-04 22:39:52 +02: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
commy2
6ac2906aba
setMass method to disable collisions
2019-03-24 09:26:00 +01:00
commy2
cea1599112
manual merge
2019-03-23 23:46:30 +01:00
Magnetar
bb2d1e4e9e
Merge branch 'master' into medical-rewrite
2019-03-17 17:39:43 +01:00
PiZZAD0X
13193d3e6d
Dragging - Additional weight override parameter for setCarryable/setDraggable ( #6780 )
...
* Added weight override parameter to ace_dragging_fnc_setCarryable/setDraggable
- Additional optional parameter that ignores the `startCarry`/`startDrag` weight checks.
- Minor `==` to `isEqualto` replacements
* `count crew _target isEqualto -1` to `count crew _target isEqualto 0`
* Tab Replacement
- remove \t
* Reverted UAV check, Params formatting, Lazy Eval
* Update addons/dragging/functions/fnc_startCarry.sqf
Co-Authored-By: PiZZAD0X <509thparachuteinfantry@gmail.com>
* Update fnc_startDrag.sqf
* Remove beta suggestion extra line additions
* Update addons/dragging/functions/fnc_startDrag.sqf
Co-Authored-By: PiZZAD0X <509thparachuteinfantry@gmail.com>
2019-01-20 10:23:24 -06:00
PabstMirror
59aa38185a
Dragging - Fix player getting locked with isCarrying ( #6770 )
2019-01-07 09:45:48 -06:00
Dedmen Miller
e2ac18a05d
[WIP] Fix script errors reporting wrong line numbers ( #6407 )
...
* advanced_ballistics
* advanced_fatigue
* advanced_throwing
* ai
* aircraft
* arsenal
* atragmx
* attach
* backpacks
* ballistics
* captives
* cargo
* chemlights
* common
* concertina_wire
* cookoff
* dagr
* disarming
* disposable
* dogtags
* dragging
* explosives
* fastroping
* fcs
* finger
* frag
* gestures
* gforces
* goggles
* grenades
* gunbag
* hearing
* hitreactions
* huntir
* interact_menu
* interaction
* inventory
* kestrel4500
* laser
* laserpointer
* logistics_uavbattery
* logistics_wirecutter
* magazinerepack
* map
* map_gestures
* maptools
* markers
* medical
* medical_ai
* medical_blood
* medical_menu
* microdagr
* minedetector
* missileguidance
* missionmodules
* mk6mortar
* modules
* movement
* nametags
* nightvision
* nlaw
* optics
* optionsmenu
* overheating
* overpressure
* parachute
* pylons
* quickmount
* rangecard
* rearm
* recoil
* refuel
* reload
* reloadlaunchers
* repair
* respawn
* safemode
* sandbag
* scopes
* slideshow
* spectator
* spottingscope
* switchunits
* tacticalladder
* tagging
* trenches
* tripod
* ui
* vector
* vehiclelock
* vehicles
* viewdistance
* weaponselect
* weather
* winddeflection
* yardage450
* zeus
* arsenal defines.hpp
* optionals
* DEBUG_MODE_FULL 1
* DEBUG_MODE_FULL 2
* Manual fixes
* Add SQF Validator check for #include after block comment
* explosives fnc_openTimerUI
* fix uniqueItems
2018-09-17 14:19:29 -05:00
commy2
4db844e596
merge
2017-12-23 01:47:43 +01:00
