Commit Graph

14741 Commits

Author SHA1 Message Date
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
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
86d79b2fc1 Common - Fixed CBA keybinds not working with progress bar (#9139)
* Fixed CBA keybinds not working on the progress bar after cursor hiding change

* Removed fallback value for uiNamespace lookup

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

---------

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
2023-02-13 21:57:32 -06:00
06ae622dda Weapon Select - Remove vehicle smoke selection key (#9144) 2023-02-09 13:17:24 -06:00
cac223c6ec Common - Use hashmap variable for canDig surfaces (#9147)
* Common - Use hashmap variable for canDig surfaces

* Update XEH_preInit.sqf

* Update fnc_canDig.sqf

* Update fnc_canDig.sqf
2023-02-09 13:16:42 -06:00
f67957cdde Translations: Korean (#9142)
* KoreanTranslation

Someone has returned all the translations in Korean to English. there is no need to return them.

* koreantranslation

* Korean Typo Fix

* Korean Translation

* Update stringtable.xml
2023-02-03 16:26:15 -06:00
a40b0d48f2 HEMTT v10 Compatibility (#9105)
* HEMTT v10 Compatibility

* Update addons/field_rations/CfgUIGrids.hpp

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

* fix PabstMirror review

* optionals

* End empty macro definitions with semi-colon (HEMTT v0.10)

* Adapt to HEMTT v0.10.0-a14

* Revert End empty macro definitions with semi-colon

* Disable old HEMTT build step in CI

* Add missing include and fix macro usage and include casings

* End empty macro definitions with semi-colon (HEMTT v0.10)

* Update addons/disarming/functions/fnc_showItemsInListbox.sqf

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

* cleanup test code

* arty - keep style same as before

* fix fire screams

* Update script_component.hpp

* Keep old hemtt/workflow/sqfc

* Update arma.yml

* Update arma.yml

* Update CfgUIGrids.hpp

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
2023-02-01 23:28:55 -06:00
f83a2df4b5 Medical Blood - Add source of blooddrop to events (#9102)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-02-01 05:03:44 -06:00
b4005bca43 Common - Fix disableUserInput blocking respawn (#9053) 2023-01-31 17:14:50 -06:00
8d2d49202d Quickmount - Fix teleport bug in UAV through change seat (#9065)
* fix bug with changeseat in uavs

* isnull to isNull

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

---------

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
2023-01-31 17:12:19 -06:00
952375c676 Tools - Add dummy rtms to make ace buildable by current mikro tools (#9135) 2023-01-28 14:13:45 -06:00
6b3aa3e0a2 Common - Hide cursor during progress bar (#9128)
* Common - Hide cursor during progress bar (w/ CBA setting)

* Fix base class define

* Removed CBA setting for disabling hiding of the cursor for the ACE progress bar

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-01-24 13:57:10 -06:00
5d759e7b5f Zeus - Don't disembark group players on Garrison (#9130) 2023-01-23 19:23:49 -06:00
25a508e3ae Changed CBA files location (#9124) 2023-01-23 12:14:00 -06:00
a997ae60bf [Docs] Update component dependencies
Automatically committed through CI.

[ci skip]
2023-01-06 22:32:11 +01:00
6860b557fb Western Sahara Compatibility (#9082) 2023-01-06 22:31:36 +01:00
e21ffc4c32 Arsenal - Fix non-local loop variable use in fnc_fillRightPanel.sqf (#9115)
* Fixed use of loop variable from outside of function and using local variable instead

* Update addons/arsenal/functions/fnc_fillRightPanel.sqf

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
2023-01-05 20:45:13 -06:00
c241f2e2a2 fix config lookup (#9106) 2022-12-10 14:15:28 -06:00
KJW
1315cb77e6 Update fnc_showAltimeter.sqf (#9108)
Bug fix
CBA_fnc_removePerFrameEventHandler was used to remove the calculations for the altimeter, but does not exist. Replaced with CBA_fnc_removePerFrameHandler to rectify this issue.
2022-12-08 15:37:33 -06:00
dc9a3eb064 Translations - Russian (#9095)
* Add missed & fix existed

* Fix russian translation when renaming
2022-12-03 13:57:43 -06:00
7f5a8e4099 Safety - Add optional flag to hide hint (#9086)
* Add optional flag to hide hint

* Update addons/safemode/functions/fnc_setWeaponSafety.sqf

* Update addons/safemode/functions/fnc_unlockSafety.sqf

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

* Update addons/safemode/functions/fnc_lockSafety.sqf

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

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-12-03 13:57:16 -06:00
5693edc96d Update fortify wiki (#9092) 2022-12-02 19:08:00 -06:00
0169373b7b Sog Compat - Cleanup class inheritance formatting (#9107) 2022-12-02 18:53:13 -06:00
553dabe60e Refuel - Fix warnings when building with latest pboProject (#9099)
* Fix inconsistent trailing semicolon for macro MACRO_NOZZLE_ACTIONS

* Remove usage of access from refuel hose class
2022-12-02 16:25:09 -06:00
e202765f91 Grenades - Change names of IR flares for consistency (#9098)
Didn't update Chinese, but all the others should be fine based on the other colors
2022-11-20 16:14:49 +00:00
09dce6f937 Explosives - Fix invalid m57 specularPower (#9094) 2022-11-07 14:00:42 +00:00
b0df20c3e9 Viewports - Add viewports for RHS BMP3 (#9062) 2022-10-21 19:30:40 -05:00
0e868dc26f Interact Menu - Add doNotCheckLOS option for config actions (#9054) 2022-10-21 19:28:51 -05:00
95a5fb040a Arsenal - Add init/remove local events to Arsenal creation/destruction (#9064)
* Added two local events to arsenal

* onInitArsenal fired when Arsenal got initiated
* onRemoveArsenal fired when Arsenal got removed

* added them to the arsenal event listing in the docs

* Update addons/arsenal/functions/fnc_removeBox.sqf

Co-authored-by: BrettMayson <brett@mayson.io>

* Update addons/arsenal/functions/fnc_removeBox.sqf

Co-authored-by: BrettMayson <brett@mayson.io>

* Renamed events in accordance with event naming patterns sans "on"

* Apply suggestions from code review

Co-authored-by: BrettMayson <brett@mayson.io>

* Improved Docs

Co-authored-by: BrettMayson <brett@mayson.io>
2022-10-21 19:28:10 -05:00
1208f7a2ce Fastroping - Disable destruction for helper object (#9051) 2022-10-19 21:38:16 -05:00
cabca961c1 Cargo - Update VTOL Cargo sizes (#9066) 2022-10-16 00:44:31 +02:00
c2bbe482b5 Add images and icon to concertina wire. (#9071) 2022-10-13 12:13:20 -05:00
8d61488e0e Fortify - Polish translation update (#9056)
**When merged this pull request will:**
- Add missing Polish fortify translations
2022-10-09 15:05:27 -05:00
28cdee6885 Korean Translation Update (#9067)
* KoreanTranslation

Someone has returned all the translations in Korean to English. there is no need to return them.

* koreantranslation

* Korean Typo Fix

* Korean Translation
2022-10-09 15:04:47 -05:00
97f211ecc5 Trenches - Polish translation update (#9049) 2022-10-02 23:45:30 +02:00
e632467fe2 Marker flags - Polish translation update (#9048) 2022-10-02 23:45:23 +02:00
928b1c5615 Towing - Polish translation update (#9050) 2022-10-02 23:45:17 +02:00
4837243b9a Viewports - Polish translation update (#9047) 2022-10-02 23:41:40 +02:00
d1a631b181 Prep 3.15.2 v3.15.2 2022-09-27 10:47:03 -05:00
39cb42d581 Hearing - Fix: CBA Extended Loadouts do not catch earplugs server side (#9041)
* Fix: Catch earplugs server side

CBA Extended Loadouts

* Remove events client side

* Add event to server and client
2022-09-23 12:40:57 -05:00
1096bd3308 Fix working if turned out (#9030) 2022-09-22 13:13:47 -05:00
3882367060 Arsenal - Show attached objects in arsenal mission (#9036) 2022-09-22 13:10:28 -05:00
9dd0472b57 Added ACE Hearing Protection to 6M2 and helmets with 6M2 (#9039) 2022-09-22 13:09:32 -05:00
5587d9dc69 Arsenal - Fixed fetching loadout from extended loadout (#9045) 2022-09-22 13:06:00 -05:00
22586fc137 Prep 3.15.1 v3.15.1 2022-09-12 16:43:22 -05:00
081e9f15a3 RHSAFRF Compat - Fix subsonic ammo ballistic attributes (#8990) 2022-09-10 13:03:02 -05:00
b9ce02acf9 Explosives - Fix cellphone ringing if RF blocking present (#8991) 2022-09-10 13:02:53 -05:00
accba4dd34 Update hunterkiller-framework.md (#9026) 2022-09-08 21:20:11 +02:00
abd3e383fb [Docs] Update component dependencies
Automatically committed through CI.

[ci skip]
2022-09-08 14:42:25 +02:00
10881fc5bd SOG Compat - Add 1.2 update support (#8974)
* Update vn_mine_tripwire_m16_02_ammo base class

* Fix fnc_handlePunjiTrapDamage

Hopefully once and for all

* Remove placement actions from punji traps

* Add Explosives compat for 1.2 content

TODO testing

* Add quoting to stringtable config usage

* Prevent bike mine placement object from swinging all over the place

* Add non attachable ACE_Triggers for big mines

Bike mine looks kinda stupid when it's attached to a car...

* Bike mine triggers

* Cartridge mine triggers

* Lighter mine triggers

* Pot mine triggers

* Jerrycan mine triggers

* Mortar shell mine triggers

* Grenade board mine triggers

* Inheritance fixes

* Update damage handler for new punji traps

* Improve interaction points and dig distances

* Dh10 mine triggers

* Bump damage of vn_mine_cartridge_ammo

* Add incendiary features to lighter and jerry can explosives

WIP

* SOG Compat - Added fuel tank volumes for SOG update 1.2 vehicles (#8978)

* Added fuel tank volumes for SOG update 1.2 vehicles

* Type 55A is similar in fuel capacity to the PTF Nasty, not the PBR

* Add missing EOLs

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

* Improve placement feedback of Whip punji

* Add inheritance to custom wound handlers

* Fix doorway punji position

* Add spikes offset for affected units of doorway trap

* Prevent spiderholes from being loaded into cargo

* Add missing continue digging action to spiderholes

* Fix spiderholes physics while being dug up via trenches system

Depends on #8998

* Add missing params

* Fix parenthesis

* Add pDrive dummy files

This is stupid.

* Enable Melee weapons in the arsenal

* Add Entrenching tool capabilities to Shovel and ETool

Depends on #8999

* Add incendiary features to Molotov and M14

* Tweak chance of being set ablaze

Now sums all hitpoints damage.

* Add ACE_damageType to napalm and he bombs

* Do not change cartridge mine damage and range if no ACE Medical

* Simplify variable config values

* Swap cartridge mine hit values

Whoopsie.

* Add overpressure configs to launchers

* Fixed an issue preventing the M1919A6 CSW from being disassembled (#8970)

* Remove disassembleTo from CSW weapons

This config property is meant for tripods.

* Add CSW config for MG42

* Simplify requiredAddons

* Remove proxy weapons from most of the CSW, adjust loading times

The animations are pretty important in case of SOGPF turrets, the ammo load times were adjusted accordingly so the total loading times is similar.

* Add vn_pavn_30_can.p3d pDrive dummy

* Fix missing MG42 mag icon

* Add field_rations values to food props/mags

Needs #9008 to be usable.

* Add more field_rations values to food props/mags

Send help.

* More food configs

* Even more food configs

Fooooood.

* More fooood

Even more foooooood.

* Fix food inheritance

* Add SGM CSW compatibility

* Various fixes for CSW

Wrong tripods for opfor guns, missing translation

* Improve TOW interaction position

* Add dragging and interaction configs to recoilles rifles

* Cleanup SGM CSW config

* Add MK18 CSW config

* Add H-12 MLRS CSW config

* Add missing Mk18 stringtable

* Add function header and logging to fnc_woundsHandlerIncendiary

* Add missing weapons in CfgPatches array

* Add entrenching tool config to backpacks

* Fix Hammer and Fire axe melee weapons

* Add missing CSW images

Thanks @BaerMitUmlaut

Co-authored-by: Samuel Deutsch <Quantx@users.noreply.github.com>
2022-09-08 14:41:52 +02:00