Commit Graph

169 Commits

Author SHA1 Message Date
8ea8771192 Merge branch 'master' into pr/7984 2024-07-22 09:29:28 +02:00
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
92e00ca4cf Update addons/cargo/functions/fnc_paradropItem.sqf 2024-07-18 16:54:28 +02:00
5c895a2298 Fix includes 2024-07-17 13:44:23 +02:00
7c40b13e5e Address more merge conflicts 2024-07-17 12:35:10 +02:00
9a1b24df27 Update existing files 2024-07-16 21:22:33 +02:00
77269fb571 Merge branch 'master' into pr/7984 2024-07-16 21:22:11 +02:00
18ea360b1e Cargo - Add check for invoking ace_cargoAdded EH only if cargo was actually added (#10084)
Only invoke cargoAdded EH if cargo was actually added
2024-06-22 12:18:28 -03:00
052f1c95a3 Cargo - Add checks for adding cargo via config (#9999)
* Add checks for cargo via config

* Update fnc_initVehicle.sqf

* Use loaded number instead of intended number
2024-05-22 01:32:46 -05:00
9e6f624a68 Cargo - Fix undefined variable and config entries (#9965)
Cargo fixes
2024-04-23 14:07:16 -07:00
cc3fbc5f3f Cargo - Fix undefined variable (#9909)
Update fnc_initVehicle.sqf
2024-04-02 13:46:14 -07:00
8731bcc8b5 Cargo - Add alternative unloading item from vehicle cargo (#8827)
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2024-02-07 09:16:18 -03:00
a3aef6a066 General - Cleanup spaces in macros (#9769)
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
2024-02-05 14:04:24 -03:00
7696d9aa2e Cargo - Fix object lock when failling to load a carried object (#9759) 2024-02-04 06:09:15 -03:00
4470b1f341 Cargo - Show item and vehicle in progress bar text (#9747)
* improve cargo progress bar text

* spanish

---------

Co-authored-by: BrettMayson <brett@mayson.io>
2024-01-22 16:41:46 -06:00
bae63636b7 Zeus - Add Zeus modules for unloading cargo (#9661)
Added unload cargo zeus module

Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
2023-11-21 20:44:08 -03:00
3904240153 Cargo - Add item index and damage to cargo menu (#9655)
* add index and damage to cargo menu

* Update addons/cargo/functions/fnc_onMenuOpen.sqf

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Update addons/cargo/functions/fnc_onMenuOpen.sqf

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2023-11-21 01:46:16 +00:00
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
3fcef89c97 Common - Add support for non-blocking progress bar (#9493)
* add support for non-blocking-progressbar

* switch to cutRsc

* Remove fade in/out

* Update HintConfig.hpp

* Add param to and cleanup header

* Update addons/common/functions/fnc_progressBar.sqf

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* remove key handler

---------

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2023-11-11 11:22:17 -03:00
4dd2568fe0 Cargo - Remove cargo objects from zeus editable objects (#9400)
Remove cargo from zeus editable objects
2023-11-10 21:13:53 -03:00
7df63ffe2e Dragging - Fix being able to load people into vehicles from any distance (#9638) 2023-11-10 14:54:31 -05:00
a0dd4400e6 Cargo - Fix/Improve FUNC(paradropItem) (#9399)
paradropItem fixes
2023-09-14 17:54:06 -04:00
742626ff1a General - Relative script_component.hpp includes (#9378)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-09-12 20:58:10 +02:00
e47e18001f Docs - Update my display name everywhere (#9330)
* Update display name in team

* Update display name everywhere

* order

https://youtu.be/VYycQTm2HrM

---------

Co-authored-by: BrettMayson <brett@mayson.io>
2023-08-17 12:02:17 +02:00
49f4ea23e7 Docs - Add Grim to maintainers (#9223)
* secret handshake?

* fix my name

* new github username
2023-06-19 16:31:17 +03:00
102476a963 Merge remote-tracking branch 'upstream/master' into patch-3 2023-05-28 00:23:42 +02:00
edf4a70ed6 Refuel - Added ability to refuel fuel sources (#8981)
* Simplify main fuel loop

* Remove unecessary action macro

* Add container refueling

* Fuel counter behaviour is now consistent for both limited and unlimited fuel sources

* Update maxFuel and refuelContainer whenever fueling begins

* Update maxFuel and refuelContainer whenever fueling begins

* Prevent loading of fuel sources into cargo when they have a nozzle connected to them

* Added action to check how much fuel is left in a jerry can

* Prevent jerry cans from being picked up if they have a nozzle connected to them

* Added function to check if a nozzle can be connected to an object

* Prevent fuel sources which have their nozzle deployed from being loaded

* Compute both tank volumes inside of refuel instead of durring turn on

* Didn't mean to delete these

* Allow for user defined fuel capacities

* Handle more edge cases with infinite fuel sources

* Refuel - Prevent fuel sources from being dragged while they're refueling other things

* Refuel - Added flow rate multiplier for refueling fuel sources

* Refuel - Use FUNC instead of DFUNC for nozzle actions

* Refuel - getCapacity should return REFUEL_DISABLED_FUEL instead of 0 when argument is not a fuel source

* Refuel - Correctly reset fuel counter when fueling a new target

* Refuel - Implemented all suggested changes

* Refuel - Added newlines to end of files

* Refuel - Added missing newline at end of XEH_PREP

* Only setFuel once per jerry can creation

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

* Calling getFuel will initialize the fuel source

* Refuel - Add newline to end of file

---------

Co-authored-by: BaerMitUmlaut <baermitumlaut@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-02-16 20:06:11 -06:00
5cbe1201de Merge remote-tracking branch 'upstream/master' into patch-3 2022-09-05 01:53:05 +02:00
3872eb0647 Add a way to block auto carry after unload on classes (#9013) 2022-09-01 14:06:24 -05:00
2a4355dfb9 Cargo - Add setting for carry after cargo unload (#8997)
* Add setting for carry after cargo unload

* Fix typos

* Contributors

* Don't make setting global

* Update addons/cargo/stringtable.xml

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

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
2022-08-20 16:28:16 -05:00
fa45e8b7cb Cargo - Limit text length (#8915) 2022-05-17 02:37:26 -05:00
9e133aa0a5 Cargo - Make player carry/drag item on unload (#8797)
* carry item on unload

* debug off

* fix function header

* ugly nested if blocks instead of superior switch statement

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

* Add delay for server event to finish

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-05-07 22:45:57 -05:00
f3258cae98 Cargo - Remove the ability to load cooked-off items (#8876) 2022-05-02 18:57:19 -05:00
68ed19911a General - Change object config lookups to configOf (#8795)
* configOf lookups

* forEach, missed configOf

* revert handcuff distance change

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

* optimize condition

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

* capitalization

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

* use object in getVehicleIcon

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

* add return comment

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

* remove extra brackets

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

* add missing brackets

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

* add return comment pt2

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

* revert to cursorTarget

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-03-08 21:41:21 -06:00
1013e1a2cc Cargo - Improve config and fnc_getNameItem (#8777)
* change macro, block rename statics

* change macro, block rename statics

* revert noRename, improve getName function

* fix derp
2022-01-30 12:12:52 -06:00
6ec5f629b4 Merge remote-tracking branch 'upstream/master' into patch-3 2021-11-01 00:22:20 +01:00
7bc6fdfa66 Cleanup - Trim all trailing whitespace (#8651) 2021-10-30 16:42:03 -05:00
63be48f207 Cargo - Fix undefined object name in paradrop (#8543) 2021-10-17 00:48:31 -05:00
30447faa13 Merge remote-tracking branch 'upstream/master' into patch-3 2021-10-13 22:49:52 +02:00
257d9536cc Cargo - Add ability to add custom name to cargo objects (#8023)
* First Push

Added the ability to edit cargo objects (crates/boxes only) names. Either via in-game action on the object it self or via 3den attributes.

Added a single function which spawns the UI to edit the name and also edits it. This is an scripted UI, it could be changed to a config version if wanted, but as I'm not good in UI coding I left it on this simple version mainly for testing.

Added 4 new stringtable entries, 2 for action and 2 for 3den attributes.

* Add extra stringtable

Forgot to add the UI to the stringtable.

* Update fnc_renameObject.sqf

fixing tabs

* Show custom name only behind

Added new function "getNameItem" that will get the items name.
Put the custom name behind the original name between brackets "[...]".

* Added "Hide Rename Action" setting

Also removed an unused _itemClass from postInit.

* Apply suggestions from code review

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

* Update AUTHORS.txt

Added my name

* Applied the sugesstions.

* Fixed function crash

* Moved to dialog.

* Removed unused comment/code

* Update renameMenu.hpp

Fixed tabs to spaces.

* Update renameMenu.hpp

* move rename to common

* Update addons/arsenal/ui/RscAttributes.hpp

* style and use addActionToObject

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-12 17:42:38 -05:00
f602c19b3d FIX: inverted transport and transported class parachute 2021-09-01 18:10:24 +02:00
d69fff6f9f Check if a parachute is already attached
Objct can be attached to a parachute if the unloading is done throught ViV command
2021-08-22 18:09:06 +02:00
0025268eb0 fix twice parachute
- acify
2021-08-04 18:56:48 +02:00
74c4b274ff FIX missing object for paradrop function 2021-08-03 23:10:44 +02:00
07f3a5f216 Fix merge conflicts 2021-08-03 22:43:42 +02:00
267af79d81 Add support for paradropItem
- factorise the code
2021-08-03 22:36:21 +02:00
489fab4cb8 Cargo - Prevent damage to items (created from classnames) on unloading (#8324) 2021-07-23 22:45:36 +02:00
76806db31b Merge remote-tracking branch 'upstream/master' into patch-3 2021-05-09 00:23:54 +02:00
2973ea5814 Cargo - paradrop fixes (#8203)
* Small fixes in ace_cargo

Makes paradropItem and unloadItem invoke event "ace_cargoUnloaded" with parameters _itemObject, _vehicle and "paradrop" or "unload" respectivelty.
paradropItem invoked said event but if item was classname it would send classname to event which is not particularly useful.

* Update XEH_postInit.sqf

Moved event invocation to unloadItem, this provides ability to always pass object to eventhandlers.

* code refactor

refactored according to https://github.com/acemod/ACE3/pull/8203#discussion_r610394484

* Update fnc_paradropItem.sqf

apply new fix

* Revert "Update fnc_paradropItem.sqf"

This reverts commit 3db5cc1910.

* Update fnc_paradropItem.sqf

fixed hint that was broken by previous fixes

* style check

Co-authored-by: commy2 <commy-2@gmx.de>

* style check

Co-authored-by: commy2 <commy-2@gmx.de>

* naming convention

replaced object references called _item with _object.

* Update fnc_paradropItem.sqf

Co-authored-by: commy2 <commy-2@gmx.de>
2021-04-30 22:38:57 -05:00
3bfda9364d Merge remote-tracking branch 'upstream/master' into patch-3 2021-03-29 21:37:25 +02:00