Commit Graph

42 Commits

Author SHA1 Message Date
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
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
6a213bcf60 Cargo / Dragging - Fix Invisible Target Soldier being loadable and draggable/carriable (#8873) 2022-05-02 18:54:30 -05:00
2ff27d86fb Cargo/Dragging - Add Flexible Fuel Tanks cargo/dragging (#8604)
* Add flexible fueltanks cargo/dragging

* Use proper macros in cargo

* Enable carrying
2021-10-25 18:26:58 -05:00
0c58d8b20b Interaction - Add interaction with terrain objects (#8103)
* Add interaction with terrain objects

* Optimize with new commands

* Handle z-position under ground

* Add warning for setting

* Add parentheses to condition

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

* Add comments

* Add parentheses to condition

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

* Add parentheses to condition

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>

* Add replacement configs to dragging

This reverts commit afc5abe6cd.

* Fix validator error and optimize condition

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-12 14:36:33 -05:00
ad41bf2c60 Dragging - Add more objects configs (#8104)
Co-authored-by: jonpas <jonpas33@gmail.com>
2021-07-23 16:11:57 +02:00
cea1599112 manual merge 2019-03-23 23:46:30 +01:00
6ae7c28025 Dragging - Add compatibilty for 1.84 static weapons and radars (#6494)
* Dragging - Add compatibilty for 1.84 static weapons and radars

* Reload - Disable check ammo keybind when in UAV
2018-08-01 15:29:54 -05:00
a2804f6097 Add Camping Light interaction (#6078)
* Add camping light interaction

* Add dragging

* Add cargo loading

* Handle Camping_Light_off objects

* Fix work in MP

* Replace action with command
2018-02-26 12:12:21 -06:00
a50cf4e300 Added drag and Cargo ability to Orange crates (#5421)
* Added load and carry ability to some new upcoming crates

* Added missing crate to dragging

* Added missing ones for cargo.
2017-09-07 19:45:37 +02:00
183eaaecdc Cleanup heli pod actions (#5271)
Close #4783
- Make taru pods non loadable
- Make taru pods non draggable
- Increase interaction range for huron pods
2017-06-14 15:35:17 +02:00
b3fa074c38 Disable dragging on big AA Turrets (#5251) 2017-06-06 01:39:49 -05:00
07ebb83281 Fix PlasticCase drag direction 2016-10-29 21:37:50 +02:00
e83791c246 Fix carrying direction for Land_WoodenBox_F 2016-10-27 23:30:40 +02:00
0dfee34a56 Added additional cargo and dragging for crates (#4129)
* Added Cargo and Dragging for `Land_WoodenBox_F` and `Land_WoodenCrate_01_F`.
2016-08-13 11:33:41 +02:00
43c1c89cc1 Made new APEX crates draggable 2016-07-14 15:12:54 +02:00
598c3dc181 Fix 1.60 UBC (slingloads) 2016-05-30 17:11:06 -05:00
7fcbe93b71 Cleaned up excessive whitespace 2016-05-03 02:32:44 +02:00
357045a0ed Merge pull request #3518 from ColdEvul/CargoAndInteractionCase
Carry, drag and load metal and plastic cases
2016-04-03 11:43:11 +00:00
4ceb1b34b8 Merge pull request #3566 from acemod/removeDragCarryFromCannons
Disable drag and carry for StaticCannon
2016-03-08 19:05:04 +01:00
1a77b0fcd4 Disable drag and carry for StaticCannon
#3528
2016-03-08 11:43:35 -06:00
60af0d3162 Merge pull request #3456 from acemod/StandardizeConfigArrayGVAR
Standardize GVAR array brackets in configs.
2016-03-08 18:19:50 +01:00
80bada0365 Fixed carrying rotation. 2016-03-02 22:27:29 +01:00
b91897de3b Added comment 2016-03-02 16:41:45 +01:00
e7ec87d284 Added carry and interaction for case. 2016-03-02 16:38:23 +01:00
fa3913752b replace XEH_ENABLED macro with actual class, fix #3482, fix #3483 2016-03-01 17:05:00 +01:00
8bb7b072d4 Standardize grammar of GVAR arrays in configs to place the square brackets outside the GVAR macro.
This prevents any possible confusion when the GVARs are used in code.
2016-02-28 15:18:15 +01:00
27c6934ff2 Merge pull request #2230 from SzwedzikPL/interactions_lamps
Interaction with portable lamps
2016-02-20 16:47:28 +01:00
5f0a2b1945 use event system, polish translation 2016-02-05 04:26:54 +01:00
7b8be590b4 Merge branch 'acemod/master' into interactions_lamps 2016-02-05 01:43:06 +01:00
276aea04c1 Changes for CBA 2.3 2016-01-24 11:41:10 -06:00
427628045c fix ThingX capitalization, fix #3076 2016-01-03 15:21:38 +01:00
03b82e5859 Adjusted interaction nod, changed carrying height for he barrier. 2015-11-01 22:38:55 +01:00
100c20fc83 Fixed missing strings
XEH_ENABLED
carryPosition
carryDirection
dragPosition
dragDirection
2015-11-01 20:33:18 +01:00
b82350baa2 Made ``RoadCone_F` and its inhered `RoadBarrier_F`` dragable, carryable and storeable.
I remade it and removed comments and unnecessary strings. I also removed the unworking one from the last version.
2015-10-28 21:33:00 +01:00
3e19b33493 interaction with portable lamps 2015-08-22 20:00:26 +02:00
f231b2b14c removing wheels logic, carryable wheels 2015-03-29 03:35:55 +02:00
c23c0788f6 tweaks, carry static weapons 2015-03-18 13:36:22 +01:00
75548e21d9 add carry objects 2015-03-17 15:42:25 +01:00
27404fed1b function to drop object, fix position event 2015-03-16 19:25:29 +01:00
efb3657da3 drag boxes 2015-03-16 14:31:16 +01:00
f3f20439c8 config stuff, functions to make objects dragable 2015-03-14 13:51:23 +01:00