Commit Graph

12353 Commits

Author SHA1 Message Date
Grim
e5a49f3acf
Compat RHS - Make compats autoload if mod is present (#9294)
* autoload RHS USAF compat

* whoops

* fix filepatching builds

* pboProject pls

* add ONE semicolon.

* remove meta.cpp

* add AFRF, move stringtables

* add addon.toml

* stringtable validation

* change subconfig folder names for stringtables

* macros

* sigh

* macros

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

* add SAF compat

* missing file

* config brackets

* Update addons/compat_rhs_afrf3/compat_rhs_afrf3_explosives/config.cpp

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

* Update addons/compat_rhs_usf3/compat_rhs_usf3_csw/CfgVehicles.hpp

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

* capitalization

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

* fix double class

* gref and fastroping

* fix functions

* Update CfgVehicles.hpp

---------

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-09-03 11:36:19 -05:00
Filip Maciejewski
a7d8c3eb3a
Compat SOG - Make compat auto load if DLC is present (#9204)
* Move SOG compat to addons/

* Set component to skip loading when SOG not present

* Use skipWhenMissingDependencies for GRAD Trenches compatiblity

* Tools - Add SOG dlc launch config

* move trenches to sub config, handle grad with 2nd subconfig

* fix `Land_vn_b_prop_fueldrum_01` UBC

* use ifndef

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-09-03 11:31:45 -05:00
Björn Dahlgren
1a3bce1a23
Add compatibility mod for CSLA CDLC (#8839)
* Add compatibility mod for CSLA CDLC

* Fix syntax issue

* Add open bolt property to machine guns

* Move to addons and update UBC

* Update addon.toml

* Update addons/compat_csla/CfgWeapons.hpp

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* Update addons/compat_csla/CfgMagazines.hpp

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* split explosives to sub config

* ifndef

* reduce range on stinger backblast (is soft-launch)

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-09-03 11:31:26 -05:00
Grim
cc26f00df3
Common/Adv. Fatigue/Medical - Add unified sway calculation (#9226)
* fix adv fatigue sway interaction with medical

* change medical sway scaling

* move to common

* function header

* number tweaks

* baseline is always at least 1

* Add error msgs and warn if using old ACE_setCustomAimCoef

* Update addons/common/functions/fnc_addSwayFactor.sqf

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-09-02 18:09:19 -04:00
Grim
8439a931e4
Gunbag - Add check for weapon in virtual items on loadout set (#9358)
* add check for weapon in arsenal virtual items

* fix variable

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

* add INFO

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

---------

Co-authored-by: BrettMayson <brett@mayson.io>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-09-01 17:52:45 -03:00
Will/KJW
beb4ec8f06
Explosives - Add modded defusal kit support (#9353)
* Update CfgWeapons.hpp

* Update XEH_preStart.sqf

* Update XEH_preInit.sqf

* Update fnc_canDefuse.sqf

* Update fnc_canDefuse.sqf

* fix condition

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

* Update fnc_interactEH.sqf

* Update addons/explosives/functions/fnc_interactEH.sqf

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

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-09-01 17:52:28 -03:00
Apricot
c1c1433c44
Translations - Improve and Add Japanese (#9357)
* update japanese

* full-width to half-width

* more tweak
2023-08-31 11:24:35 -05:00
Grim
8f24884f73
Arsenal - Use regex matching for searchbars (multi-word searching) (#9348)
* use regex

* remove extra brackets

* add regex pattern, change refill condition

* add missing quote

* change pattern again

* bleh, we'll just go with this

* use pattern quote (thanks veteran)

* remove comment

* use escapeRegex function

* add regex to 3DEN attribute
2023-08-30 19:41:35 -04:00
Grim
8b3b265d87
Common - Add FUNC(escapeRegex) (#9355)
* add function

* add source
2023-08-30 19:31:10 -04:00
Will/KJW
c88695fb82
Captives - Add modded cable tie support (#9350)
* Update fnc_canApplyHandcuffs.sqf

* Update fnc_canApplyHandcuffs.sqf

* Update fnc_doApplyHandcuffs.sqf

* Update XEH_preStart.sqf

* Update fnc_doApplyHandcuffs.sqf

* Update fnc_canApplyHandcuffs.sqf

* Update XEH_preInit.sqf

* Update fnc_doApplyHandcuffs.sqf

stray bracket

* Update addons/captives/XEH_preStart.sqf

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* Update CfgWeapons.hpp

* Update CfgWeapons.hpp

* Update fnc_canApplyHandcuffs.sqf

* Change to restraints

Update XEH_preInit.sqf

* Update XEH_preStart.sqf

* Update fnc_canApplyHandcuffs.sqf

* Update fnc_doApplyHandcuffs.sqf

* Update CfgWeapons.hpp

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-08-30 17:03:44 -04:00
PabstMirror
bee0362921
Hellfire - Add support for MELB hardpoint (1x) (#9352) 2023-08-30 12:44:43 -05:00
PabstMirror
fdb7330385
Arsenal - Add stat to show how AI will use ammo (#8434)
* Arsenal - Show AI Usage

* Add condition and move to ballistics

* Add stringtables

* add getVar
2023-08-29 14:34:24 -05:00
PabstMirror
e6a8222966
Map - Update map lighting effect every frame (#9349)
Map - Update lighting effect every frame
2023-08-29 12:32:44 -03:00
johnb432
528539210e
Reload/Reload Launcher - Fix headers (#9347)
Header fixes
2023-08-28 17:20:53 -03:00
johnb432
b90d0379ca
Reload Launcher - Improve various aspects (#9335)
* Add notifications to reloadLauncher

- Add notifications to reloadLauncher
- Also set _reloadTime to `magazineReloadTime min 2.5` instead of just 2.5 if there is no `buddyReloadTime` set

* Change message format

* Add setting displayStatusText for reloadLaunchers

* reloadlauncher improvements

* Comments

* Updated so it's similar to reload addon

* Added failure message

* Update addons/reloadlaunchers/functions/fnc_reloadLauncher.sqf

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

* Changed reload conditions

* Tweaked notifications

---------

Co-authored-by: Drofseh <Drofseh@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-08-28 15:14:45 -03:00
johnb432
59ee36560f
Reload Launchers - Code cleanup (#9334)
* reloadlaunchers cleanup

* Update fnc_canLoad.sqf
2023-08-28 14:27:01 -03:00
johnb432
44e0fdb6fa
Reload - Code cleanup and various improvements (#9343)
* Reload code cleanup

* Update fnc_startLinkingBelt.sqf

* Update addons/reload/functions/fnc_getAmmoToLinkBelt.sqf

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

---------

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
2023-08-28 14:26:24 -03:00
johnb432
519b1cbeb4
Repair - Improve wheel repair interaction position (#9345)
Update fnc_addRepairActions.sqf
2023-08-28 09:52:21 -03:00
johnb432
0bee7614ad
Common - Improve weapon unloading (#9344)
Fix weapon unloading
2023-08-26 12:04:31 -04:00
PabstMirror
582f6e32ed
Slideshow - Add support for maps as textures (#9150)
* Slideshow - Add support for maps as textures

* Update script_mod.hpp

* Update fnc_mapImage.sqf

* cleanup

* Update fnc_mapImage.sqf

* Apply suggestions from code review

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

* mapImage_init comments

* Update fnc_mapImage.sqf

* Apply suggestions from code review

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

* add support for mission config maps

---------

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
2023-08-25 10:33:42 -05:00
PabstMirror
65d5ccf600
Medical GUI - Dynamically create any number of action buttons (#9332)
* Medical Gui - Dynamically create any number of action buttons

* Fix right alignment, add h-spacing, fix 2.14 select
2023-08-25 10:32:39 -05:00
PabstMirror
59fa842527
Map Tools - Fix for 2.14 aspect ratio changes (#9219)
Close #9176
2023-08-25 10:25:00 -05:00
olimolly
6c0797eaa2
Add french translation for new painUnconsciousTreshold setting (#9341) 2023-08-24 09:37:13 -05:00
JonBons
2709490efd
Cookoff - Move canHaveFireJet logic into vehicle_damage (#9060)
* Moved ace_cookoff_canHaveFireJet config logic into vehicle_damage as a param passed into cookoff to improve modularity

* Use original arg order

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-08-23 12:37:17 -05:00
PabstMirror
8e25472d5b
Night Vision - Use default effects when controlling UAVs (#9338) 2023-08-21 14:23:53 -05:00
PabstMirror
fabd9c5fdb
Weather - Fix number in fnc_calculateWindChill.sqf (#9340)
Update fnc_calculateWindChill.sqf
2023-08-21 14:23:21 -05:00
Grim
d33a158e2e
Arsenal - Favorites System (#9307)
* improve page handling

* drop MAX_STATS_PER_PAGE for now

* hide stats box when empty

* improve hiding

* improve _fnc_hideUnused

* condition

* prevent page overflow

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

* favorites var

* function prep

* favorites only

* improve favorites adding, add include

* fix stupid

* fix color setting (todo: lnb color)

* add button, finalize

* setting tooltip

* stringtable again

* fix setting overwrite, improve tooltip

* fix losing weapon items

* fix macro

* fix setting to intended overwrite

* remove unnecessary private

* docs

* more docs

* is

* improve button text

* docs

* fix tooltip not showing unless menuBar was clicked

* improve weapon accessory lookup

* empty line

* update refresh calls

* fix left panel

* cleanup currentCargo

* use BI string for favorites

* BI strings again

* no favorites for face/voice/insignia

* stringtable again

* add missing setColorRight

* Add comment for favorites setup

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-08-19 23:56:59 -04:00
Grim
2f8d92701f
Arsenal - Fix magazine misc items categorization (#9336)
fix stupid
2023-08-20 00:43:22 -03:00
Grim
8f3a1c5694
Arsenal - Fix changing stats via script (#9312)
* fix addStat

* fix removeStat

* improve priority sorting

* change append to pushBack
2023-08-19 22:45:07 -04:00
Grim
007995612d
Arsenal - Fix virtual non-weapon magazines in inventory being treated as unique (#9309)
* sigh

* add comment in scanConfig

* fix misc magazines

* improve magazine misc items check

* check player loadout first for uniqueItems
2023-08-19 22:38:06 -04:00
PabstMirror
4b7ee55588
Nametags - Cleanup unused crew info component (#9333) 2023-08-19 21:20:27 -05:00
Grim
42101e8fa2
Fastroping - Fix equipping FRIES during vehicle init (#9299)
* delete fries with vehicle

* FUNCK -> FUNC

* Delay 1 frame so setVar won't fail if ran before initpost

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-08-19 01:38:47 -04:00
johnb432
682ae05f59
Medical Status - Remove status effects upon death/featureCamera (#9301)
* Update fnc_handleKilled.sqf

* move to function

* Removed skipSetHidden

* Revert "Removed skipSetHidden"

This reverts commit 452c5216a7.

* Update addons/medical_status/XEH_postInit.sqf

* add comment, force git to run actions

---------

Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-08-18 13:16:20 -04:00
Grim
55cc755542
CSW - Disable non-CSW rearm actions for CSW vehicles (#9255)
* improve CSW integration

* do this more cleanly

* code style

* revert ammo handling check change
2023-08-18 13:10:15 -04:00
johnb432
a168330550
Arsenal - Add arsenal actions addition and removal via functions (#9318)
* Add and remove arsenal actions via functions

* Fixed header

* Update addons/arsenal/functions/fnc_addAction.sqf

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* Update fnc_addSort.sqf

* Update addons/arsenal/functions/fnc_removeAction.sqf

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* Update addons/arsenal/functions/fnc_removeAction.sqf

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-08-18 12:33:56 -04:00
PabstMirror
d290ca3d63
Aircraft - Use COMPILE_SCRIPT macro (#9331) 2023-08-17 21:52:29 +02:00
Kyle Mckay
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
Bailey Danyluk
ef23310aec
Docs - Change name (again) (#9328) 2023-08-16 19:18:01 -04:00
PabstMirror
8517a6ef73
Fastroping - Add compatibility with 2.12 (#9327)
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
2023-08-16 21:00:52 +02:00
Will/KJW
3e35984610
Medical GUI - Improve Selected Category colouration (#9324)
Co-authored-by: jonpas <jonpas33@gmail.com>
2023-08-16 20:32:53 +02:00
jonpas
0cef0ba6e9
Fastroping - Add Auto add FRIES setting (#9319)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
2023-08-16 14:16:44 +02:00
Will/KJW
9abb43ad3a
Fastroping - Improve AI flight height (#9270)
Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-08-16 14:16:29 +02:00
Mike-MF
9bcd990dd0
Nightvision - Add White Phosphor NVGs (#9321)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-08-16 14:15:53 +02:00
jonpas
43cded706c
Interaction - Use assignTeam instead of deprecated CBA event (#9326) 2023-08-16 14:15:44 +02:00
PabstMirror
8c5ab18350
Various - Misc Cleanup (#9317)
* Various - Misc Cleanup

* Update addons/common/functions/fnc_canDig.sqf

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

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2023-08-13 14:13:02 -05:00
Grim
7c70ded9bc
CSW - Fix mag multiplication in multiplayer (#9232) 2023-08-12 21:31:30 +02:00
Grim
fdbcc62c74
Repair - Make headlights repairable (#9306) 2023-08-11 19:44:12 +02: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
f941e0217b
Arsenal - Improve sorting (#9314)
Tweaked arsenal sorting
2023-08-09 06:25:18 +03:00
johnb432
8d7cc09586
Arsenal - Fix unique explosives showing up in the "all magazines" tab (#9308)
Check all magazines last
2023-08-05 22:07:19 +03:00
Sergey Vergun
96a4a8cf8e
Medical - Add Pain Unconscious Threshold setting (#8394)
* Add PAIN_UNCONSCIOUS slider

Add PAIN_UNCONSCIOUS slider to ACE Medical settings

* fix GVAR name

* Update addons/medical_damage/stringtable.xml

Co-authored-by: Salluci <69561145+Salluci@users.noreply.github.com>

* Update addons/medical_damage/stringtable.xml

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

* stringtable

* remove setter in preInit and cleanup PAIN_UNCONSCIOUS_DEFAULT

---------

Co-authored-by: Salluci <69561145+Salluci@users.noreply.github.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-08-05 15:32:21 +03:00
johnb432
a591aa9508
Advanced Fatigue - Add cap to muscle damage (#9302)
Update fnc_mainLoop.sqf
2023-08-04 21:07:12 -05:00
PabstMirror
6fb9161ecc
Medical Engine - Fix unloading dead units in vehicles and handle deleted units vehicles (#9283)
* Medical Engine - Unlock when dead

* Update fnc_unloadPersonLocal.sqf

* Update addons/common/functions/fnc_unloadPersonLocal.sqf

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* fix actually unloading people to found emptyPos

* handle deleted units

* handle dead units

ref 179957c39d

* vehicle -> objectParent

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-08-02 08:59:46 +03:00
johnb432
6bc1ae453b
Update fnc_loadUnit.sqf (#9300) 2023-08-01 11:35:55 -05:00
Grim
628d62d329
Laser - Cleanup laser designator config and code (#9289)
* cleanup laser designator code

* condition

* use macro for IDC

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

* IDC to macro

* switch to _currentShooter

* hide CA_Distance even if fade fails

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-07-30 04:41:46 +03:00
Dystopian
14e92dfb7f
Repair - Add enable setting (#8070)
* Add enable setting

* Optimize eden expressions

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

* Add debug

* Update addons/repair/functions/fnc_addRepairActions.sqf

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* Fix strange indent

* Optimize bool to number conversion

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* Prevent run before setting is ready

* Move postInit to EH

* remove all transportRepair = 0

* remove requiredAddons

---------

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
2023-07-29 07:53:05 +03:00
johnb432
7ef9d19bc5
Update fnc_replaceUniqueItemsLoadout.sqf (#9297) 2023-07-29 01:01:42 +03:00
johnb432
add312cbf1
Logistics wirecutter - Add wirecutter stats to ACE arsenal (#9296)
* Added wirecutter stats to arsenal

* Update addons/logistics_wirecutter/ACE_Arsenal_Stats.hpp

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

* Update addons/logistics_wirecutter/ACE_Arsenal_Stats.hpp

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

* Update ACE_Arsenal_Stats.hpp

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-07-29 01:01:25 +03:00
Grim
2f0ed27d93
Arsenal - Improve stats display (#9290)
* improve page handling

* drop MAX_STATS_PER_PAGE for now

* hide stats box when empty

* improve hiding

* improve _fnc_hideUnused

* condition

* prevent page overflow

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

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-07-29 01:00:05 +03:00
Grim
4fea9669bb
UI - Fix UAVs not being considered vehicles for HUD elements (#9288)
* consider UAVs as vehicles for UI display

* fix condition

* readd reload ui condition

* improved UAV check

* use getConnectedUAVUnit

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

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-07-29 00:44:14 +03:00
Dystopian
0321545098
Rearm - Add enable setting (#8067)
* Add enable setting

* Update test

* Optimize eden macro

* Fix bad command name in eden

* Apply suggestions from code review

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

* Cleanup unused argument

* Handle RHS config

* Optimize init function a little

* Improve macro

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

* compats and leftovers

* function header (sorry jonpas)

* add enabled check to initSupplyVehicle

* use toString

* fix validate

* inheritance cleanup

---------

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
2023-07-28 12:47:23 +03:00
Grim
93520bdc9d
Arsenal - Add and Improve stats (#9291)
* add nv and magnification stats

* improve ballistics conditions

* add ammo count stat

* Update addons/arsenal/ACE_Arsenal_Stats.hpp

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

* Update addons/nightvision/ACE_Arsenal_Stats.hpp

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

* cleanup

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-07-28 10:05:12 +03:00
Grim
5e6476aa5a
Arsenal - Make Zeuses able to save, delete, and edit Default Loadouts (#9278)
* allow zeus to edit default loadouts

* typo
2023-07-28 07:55:10 +03:00
Grim
12905a0702
Arsenal - Fix #9040 bugs/regressions (#9293)
* fix saving loadout with weapon in container

* readd magazine refill
2023-07-28 07:53:53 +03:00
LorenLuke
2578ead13b
Laser - Add Aircraft Laser Spot Tracker and Point Locking (#8453)
* Initial commit

* optimize/clean, add ignoreOwners param

* locality, PFH condition

---------

Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
2023-07-28 07:03:02 +03:00
Tim Beswick
cd36871f90
Repair - Fix bug in detection for ignoring hitpoints (#9261)
* Fix bug in detection for ignoring repair hitpoints

* Use define for array any

* Add warning if hitpoint group would be ignored

* Apply suggestions from code review

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* Change ANY to ANY_OF

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-07-28 06:32:30 +03:00
LorenLuke
18551144bd
Map Tools - Add Vernier Scale and Improve resolution (#8674)
* Adds 4mil Vernier scale to large and small maptools.

* Updates aligned images, adds 2 mil vernier scale.

* Changes vernier scale from cyan to red.

* Increased map tool resolution to 4K

* fix mips

---------

Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
2023-07-28 05:27:24 +03:00
johnb432
174841751c
Arsenal - Improve support for unique equipment (#9287)
* work on arsenal actions

* cycle through pages

* docs

* cleanup

* Update addons/gunbag/functions/fnc_weaponName.sqf

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

* missing fil

* Update addons/arsenal/functions/fnc_itemInfo.sqf

* Update addons/arsenal/functions/fnc_refresh.sqf

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

* remove CBA_loadoutSet gunbag cache

* update fnc_refresh

* Added unique item support for left panel items

* Cleanup

* fix 3den

* add scopeEditor

---------

Co-authored-by: Brett <brett@mayson.io>
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: Salluci <salluci.lovi@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-07-25 09:41:15 +03:00
BrettMayson
3edeff217a
Arsenal - Action Buttons (#9069)
* work on arsenal actions

* cycle through pages

* docs

* cleanup

* Update addons/gunbag/functions/fnc_weaponName.sqf

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

* missing fil

* Update addons/arsenal/functions/fnc_itemInfo.sqf

* Update addons/arsenal/functions/fnc_refresh.sqf

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

* remove CBA_loadoutSet gunbag cache

* update fnc_refresh

* fix 3den

---------

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: Salluci <salluci.lovi@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-07-25 09:30:49 +03:00
PabstMirror
74984769a5
Tagging - Add custom stencil text tags in 3DEN (#9149)
* Tagging - Add custom stencil text tags

* hack to force preloading font

* Add 3den

* header

* Apply suggestions from code review

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

* Update addons/tagging/functions/fnc_generateStencilTexture.sqf

---------

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: Salluci <salluci.lovi@gmail.com>
2023-07-24 05:55:39 +03:00
Grim
e9cde7268f
skip removing clan tag if spray painted (#9285) 2023-07-24 02:23:13 +03: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
Grim
1011b963bc
fix losing interactions with notepad open (#9282) 2023-07-23 07:48:53 +03:00
BaerMitUmlaut
52ed0fc6be
Medical Engine - Prevent automatic unloading of dead or unconscious units (#7959)
* Lock seats of unconscious or dead units

* disable pullOutBody if medical is loaded

* fix undefined var and switch to objectParent

---------

Co-authored-by: Salluci <salluci.lovi@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-07-22 09:41:20 +03:00
Grim
4f4389dd59
Common - Fix loading units into FFV cargo seats (#9280) 2023-07-22 09:12:42 +03:00
Grim
39e4f9340b
Common/Medical - Change vehicle checks to objectParent (#9281)
* switch to objectParent

* use objectParent in unloadUnit

* fix derp

* allow unload patient on dead units
2023-07-22 09:11:58 +03: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
PabstMirror
9d1b696480
Arsenal - Fix adding inventory item with empty name to dummies (#9279)
* Arsenal - Fix adding inventory item with empty name to dummies

* Update XEH_postInit.sqf
2023-07-22 06:32:15 +03:00
Grim
35ce8d1883
Common - Add variable to block item replacement temporarily (#9265)
* add blocking item replacement

* don't add if player changed

* re-curse instead of fake item

* compileFinal

* Update fnc_registerItemReplacement.sqf

* move to separate function

* remove fakeitem replacement

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-07-22 06:31: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
Grim
31e1ad0cff
Arsenal - Add Tools category and moveOnOverwrite parameter to FUNC(addCustomRightPanelButton) (#9247)
* add tools tab and setting

* move to preinit

* fix icon, add restart warning

* derp

Co-authored-by: Dystopian <sddex@ya.ru>

* Update addons/arsenal/stringtable.xml

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

* remove setting

* add keepIfOverriden parameter

* docs again

* documentation whitespace

* docs grammar, change parameter name

* fix docs

* more docs fixes

* magazine support

* deprecate spare barrel item

* more docs, improve condition

---------

Co-authored-by: Dystopian <sddex@ya.ru>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-07-21 22:39:48 +03:00
johnb432
c8404f496e
Arsenal - Add/Fix/Improve/Change numerous aspects (#9040)
* Arsenal update

* Fixes

* Update fnc_onSelChangedLeft.sqf

* Update fnc_updateUniqueItemsList.sqf

* Header fixes

* Fix for defines.hpp

Co-authored-by: Dystopian <sddex@ya.ru>

* Moved fnc_baseWeapon, filtered invalid items

* Update addons/arsenal/functions/fnc_scanConfig.sqf

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* Fixes and tweaks

- Sorting is guaranteed to give a fixed order
- Dog tags no longer throw errors when reloading the ACE arsenal mission when you had some saved in your loadout before quitting the last time you played.

* Cleanup, bug fixes and additions

- Added the ability to add items from "CfgMagazines" into the "Misc. items" or custom tabs.
- Added "baseWeapon" class support for weapon attachments. If a weapon attachment has the config property "baseWeapon" defined, it will take that item and show that in the arsenal.
- Added stronger filtering on item scopes (scope > 0 at least for every item)
- Added "descending" (default, as it is now) and "ascending" sort order as a drop down menu,
- Unique backpacks in containers can now be removed with either the "-" or "clear all items" button.
- When sorting by a number, 2 decimal points have been added, so that when you sort by weight it returns the correct order.

* More fixes and tweaks

- Converted the arsenal to partially work with hashmaps instead of arrays (for configItems and virtualItems, currentItems is still an array).
- Because of the above, performance of FUNC(addVirtualItems) and FUNC(removeVirtualItems) has improved immensely.
- Sorting now caches results, reducing repeated sorting times drastically.
- CBA disposable launchers are handled differently now: Within the arsenal, you can change weapon attachments on disposable launchers, but you can't change their magazines (primary or secondary). Item info on the right and the stats show correct information.
- FUNC(addSort) now checks if the new sorting method already exists and doesn't add it if it does.
- FUNC(removeSort) now exists. You can't remove the default sort type (alphabetically) to avoid problems with the arsenal.
- Both FUNC(addStat) and FUNC(compileStats) actually taken priority into account now. Because of that priority on several stats needed to be tweaked.
- FUNC(removeStat) ensures that there are no gaps within the stat array (so if there is an empty spot in the stats page, it's because there is a stat, but the condition for it being shown hasn't been met).

* Update fnc_replaceUniqueItemsLoadout.sqf

* Update fnc_onSelChangedLeft.sqf

* Update fnc_scanConfig.sqf

* Update docs/wiki/framework/arsenal-framework.md

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* Minor cleanup

* Baseweapon filtering

* Improvements + better unique items support

* Update fnc_fillRightPanel.sqf

* Update fnc_onSelChangedLeft.sqf

Fixed: Switching between weapons with incompatible primary magazines while a compatible secondary magazine is loaded doesn't equip the new weapon's primary magazine.

* Update addons/common/functions/fnc_uniqueUnitItems.sqf

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

* undefined variable

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

* fix undefined loadout var

* Update fnc_fillLoadoutsList.sqf

---------

Co-authored-by: Dystopian <sddex@ya.ru>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-07-21 21:25:25 +03:00
BrettMayson
12bb5aced4
Tools - HEMTT preprocess is now an object (#9275)
* hemtt: preprocess is now an object

* error on deprecated usage
2023-07-21 11:23:03 -05:00
Grim
aead9a8eb4
fix nvg stat detection (#9254) 2023-07-16 12:45:33 -05:00
johnb432
8d107776c4
Overpressure - Fix invulnerable units taking backblast damage when firing launchers (#9256) 2023-07-14 22:33:54 +03:00
Grim
cdbf572462
Mk6 Mortar - Fix AI usage (#9258) 2023-07-13 19:54:39 +03: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
Grim
8032ccacfc
Common - Add FUNC(hasZeusAccess) (#9252)
* add fnc_hasZeusAccess

* header

* Update addons/common/functions/fnc_hasZeusAccess.sqf

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-07-10 06:45:22 +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
johnb432
e181ba5aa1
Gunbag - Fix arsenal caching conflicting with CBA_fnc_setLoadout (#9250)
* Update XEH_preInit.sqf

* Update addons/gunbag/XEH_preInit.sqf

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-07-10 00:13:43 +03:00
johnb432
1aa7eb2a1a
Update fnc_codeToString.sqf (#9249) 2023-07-09 23:41:12 +03:00
Will
05c9e4247b
Logistics Wirecutter - Add modded class support (#9235)
* Update script_component.hpp

Change check for wire cutters for all child classes in addition to current class

* Update script_component.hpp

fix bracket

* Change isKindOf for alt syntax

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* Update addons/logistics_wirecutter/script_component.hpp

Better performing searching for wirecutter

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

* Update XEH_postInit.sqf

Index all possible wirecutters

* Update script_component.hpp

arrayIntersect with possible wirecutters

* Update XEH_postInit.sqf

Incorrect quotes

* Update CfgWeapons.hpp

Add iswirecutter to wirecutter

* Update XEH_postInit.sqf

Remove pointless parentheses

* Update addons/logistics_wirecutter/script_component.hpp

fix for incorrect arrayintersect check

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

* Update addons/logistics_wirecutter/XEH_postInit.sqf

Incorrect quoting

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

* use configClasses and cache at preStart

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: BrettMayson <brett@mayson.io>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
2023-07-09 19:37:30 +03:00
Tim Beswick
29b5eb97a9
Medical - Handle wound hashmaps deserialized as CBA_namespaces (#9245) 2023-07-09 17:33:51 +03:00
Grim
45af0cdca0
Medical Treatment - Remove early exit when stitching with sutures (#9243) 2023-07-07 08:19:45 +03:00
Grim
0e26755b88
Medical - Add arsenal category (#9220)
* add medical category to arsenal

* function header

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

* move to preinit, protect list

* improve macro

* documentation

* add config property

* add CfgMagazines

* Revert "add CfgMagazines"

Arsenal doesn't support magazines in custom categories

---------

Co-authored-by: GhostIsSpooky <69561145+Salluci@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-07-07 07:14:44 +03:00
Grim
30a0e55843
Field Rations - Add arsenal category (#9221)
* add field rations category

* improve macro

* second verse same as the first

* account for empty items

* switch to configClasses

* documentation

* add API variable

* Update docs/wiki/framework/field-rations-framework.md
2023-07-07 07:14:35 +03:00
Grim
04e41a4d5a
Repair - Make Full Repair Time dependent on vehicle damage (#8417)
* add variable full repair time

* enable compile cache

* Fix stupid

* whoops

* incremental full repair

* cleanup function header

* ignore hitpoints inFullRepairProgress

* fix getHitPointsToIgnore

* final cleanup

* don't show repair hint while doing full repair

* make this all work

* fix stupid

put this back in place

* Add setting for speedup when near repair facility/vehicle

enable compile cache

* refactor near repair facility/vehicle checks

* remove skipping hint from do_repair

better for feedback this way

* git diff stuff

* use functions directly in ACE_Repair.hpp

* add check for vehicle proximity

* add a new line

* switch to multiply by setting instead

* speed boost settings, remove exit addRepairActions

* stringtable

* remove speed boost settings

* fix things, add forceDisplayName

* name in function header

* fix TRACE

* add animation looping

* remove systemChat

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

* add time coefficient setting

* move to repair category

* time coefficient max and default values

---------

Co-authored-by: Salluci <69561145+Salluci@users.noreply.github.com>
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
2023-07-06 06:52:04 +03:00
Grim
50430e47ef
Medical - Change Epinephrine Wake Up Boost setting description (#9240)
* change stringtable

* keep old translations
2023-07-06 06:51:25 +03:00
Grim
cc1636c14f
Repair - Change Repair Threshold setting descriptions (#9242)
* change stringtable

* change setting to % slider

* keep old translations
2023-07-06 06:51:00 +03:00
Grim
c7e13ca4c7
Repair - Move to separate settings menu (#9236)
* Repair - Move from logistics settings menu

* Repair - Move from logistics settings menu
2023-07-03 16:00:46 +03:00
Grim
ba4fcf615d
Medical GUI - Add setting to show Damage (#8444)
* use pain variable for severe pain and use threshold in damage color calculation

show % of damage threshold in medical menu

* use damage taken instead of damage left

* Add setting and switch to separate tooltip

* tooltip -> entry

* Change display names and tooltip

* switch to qualitative

* remove newlines

---------

Co-authored-by: Salluci <69561145+Salluci@users.noreply.github.com>
Co-authored-by: BrettMayson <brett@mayson.io>
2023-07-01 01:37:08 +03:00
Dystopian
22b93e2d03
Vehicles - Add Resume/Set functionality to speed control (#8967)
* Add Resume/Set functionality to speed control

* Apply suggestions from code review

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

---------

Co-authored-by: BrettMayson <brett@mayson.io>
2023-06-28 17:17:14 +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
PabstMirror
f812daa095
Javelin - Fix weapon being in top-attack when loading AP magazine (#9161)
Co-authored-by: BrettMayson <brett@mayson.io>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-06-28 12:55:45 +02:00
JonBons
055503928c
Vehicle Damage - Fix incoming damage from blank hit selection resulting in absurd damage values (#9194) 2023-06-28 13:39:33 +03:00
BrettMayson
10c1085aba
Repair - Add wheel patching (#8835)
* patch wheels on vehicles

* all tire patching working

Co-authored-by: mp-singh <mandeep@mandeepsingh.ca>

* doc

* remove unused string

* Update CfgVehicles.hpp

* use strintable

* setting for where the wheel can be patched

* localize

* Update stringtable.xml

* can't patch a missing tire

* removal > replacement

* Update addons/repair/initSettings.sqf

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

* Apply suggestions from code review

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

* Apply suggestions from code review

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

* Apply suggestions from code review

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

* patch icon

* use PATCH_WHEEL_STEP_TIME

* fix wheel translation

---------

Co-authored-by: mp-singh <mandeep@mandeepsingh.ca>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
2023-06-28 13:39:08 +03:00
pterolatypus
f434549faf
Medical Treatment - Change stitching action to be per-body-part (#9005)
* Make stitching action per-body-part

* Apply suggestions from code review

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

---------

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
Co-authored-by: Salluci <salluci.lovi@gmail.com>
2023-06-28 01:43:45 +03:00
PabstMirror
4f0577ce5f
Medical Engine - Ignore Reflector Hitpoints (#9131) 2023-06-27 19:41:10 +03:00
pterolatypus
4a3ad40c04
Adv Fatigue - Make stamina penalty for weapon raised/ready scale with weapon inertia (#8669)
* Stamina penalty for weapon raised/ready is scaled by weapon inertia

* Newline

* Tabs

my editor hates me

* Use format

* Improved item validation and caching
2023-06-27 19:40:07 +03:00
Grim
2571550bbc
Intel Items - Change scope for better Arsenal filtering (#9228)
* scope changes

* review change
2023-06-27 10:46:56 +03:00
Cyruz
aa21ba50a9
Cookoff - Improve destroying vehicle post cookoff (#9029)
* Have vehicle explode when cookoff completes

* Adjust strings

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-06-25 01:06:26 -03:00
Kyle Mckay
02365609b5
Medical - Change medical to use hashmaps for wound storage (#8926)
* Refactor medical to use hashmaps for wound storage

- We most frequently want to access wounds by body part, so this makes
  that a constant time lookup.
- The body part index is no longer stored in every wound since it's
  inherent in the wound storage.
- Using body part names as the keys of the hashmap to improve code
  clarity (no more magic numbers).

closes #6468

* Add deserilization migration from old wound arrays

Will migrate from old form array wound storage to the new hashmap
strucutre during deserlization. This is relevant for communities piping
medical state out to a database or similar between sessions.

* fix issue with suture stitching

* change version number in comment

---------

Co-authored-by: Salluci <salluci.lovi@gmail.com>
2023-06-24 08:11:56 +03:00
Crowdedlight
6181616cc3
Fire - Fix fire spread to invincible units and not being able to be put on fire by proximity if multiple units are on fire (#8632)
* fire do not propagate to close unit if allowDamage is disable don that unit

* change burnCounter so it works with multiple instances of fires

* fixed exiting burning not resetting burn counter

* changed !isEqualTo to isNotEqualTo

* changed !isEqualTo to isNotEqualTo

* lazy eval, respect old allowDamage variable

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: Salluci <salluci.lovi@gmail.com>
2023-06-24 05:34:31 +03:00
Mathew Horner
78c1ce3ae9
Logistics Wirecutter - Check if fence model is in FENCE_P3DS even if config check fails. (#9201)
* Check if fence model is in FENCE_P3DS even if config check fails.

* Fix early return condition

* Simplify condition
2023-06-24 05:10:04 +03:00
Wakbub
117c3092f8
Common - Fix added throwables not being throwable (#9186)
Replace
- addMagazineCargoGlobal with addItemTo(Uniform/Vest/Backpack to make added throwables throwable.
2023-06-24 05:09:30 +03:00
Filip Maciejewski
beffc7660c
Fire - Loop "Pat down" action until patient is put out of fire (#9017)
* Adjust burn intensity defines and move to shared

* Loop "Pat down" action until patient is put out of fire

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-06-24 05:08:23 +03:00
BaerMitUmlaut
728f556ae4
Medical AI - Use suppressed EH to determine safety of AI (#8242)
* Use suppressed EH to determine safety of AI

* Require CBA 3.15.3

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: BrettMayson <brett@mayson.io>
2023-06-23 18:59:11 -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
Laid3acK
b75d20634b
Ballistics - Add 12.7x108mm APDS AB values (#9191)
* 127x108_apds_compat_ace3

* 127x108_apds_compat_ace3

* 127x108_apds_compat_ace3

* 127x108_apds_compat_ace3

* 127x108_apds_compat_ace3

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-06-22 16:01:09 +03:00
Laid3acK
4aacbb960f
Ballistics - Improve B_127x108_Ball values (#9192)
* 127x108_compat_ace3

* 127x108_compat_ace3

* 127x108_compat_ace3
2023-06-22 04:35:44 -03:00
Kam
1e6073c467
give tourniquet to patient or medic depending on setting (#9206) 2023-06-22 04:26:28 -03:00
Grim
34c5988333
Frag/Medical Damage - Treat shrapnel as grenade damage (#9218)
* treat shrapnel as grenades

* switch to frag
2023-06-22 04:06:52 -03:00
Laid3acK
626d886b3b
Hearing - Remove outdated 12.7x108mm audibleFire value (#9193)
* 127x108_hearing

* 127x108_hearing
2023-06-22 04:06:07 -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
Zachary Dunn
864d2e9eee
Explosives - Add "ace_explosives_setup" CBA Event (#9197) 2023-06-20 13:36:57 -06:00
Grim
49f4ea23e7
Docs - Add Grim to maintainers (#9223)
* secret handshake?

* fix my name

* new github username
2023-06-19 16:31:17 +03:00
Mike-MF
888ac6c9bc
Arsenal - Fix null comparison (#9213) 2023-06-10 18:59:13 +02:00
Abogado
3d3aa8d877
Update Spanish translation (#9203)
An update of the spanish to the text strings that have been added lately.
2023-05-29 18:22:37 -05:00
KJW
fd3c9c967d
Medical Treatment - Improve Medical Actions underwater (#9096) 2023-05-15 23:47:00 -06:00
PabstMirror
2e54ee7bee
Explosives - Add getVar to disable setShotParents (#9190)
* Explosives - Add getVar to disable setShotParents

* Update docs/wiki/framework/explosives-framework.md
2023-05-03 11:55:02 -05:00
PabstMirror
fedefd5799
SOG Compat - Fix compatibility with grad trenches (__has_include) (#9189) 2023-05-01 19:40:16 +02:00
Ellis Nielsen
cd41594a60
Towing - Add CBA event for towing start and cancel (#9178)
Co-authored-by: commy2 <commy-2@gmx.de>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-05-01 19:39:22 +02:00
jonpas
d279a8e607 Documentation - Cleanup function documentation output 2023-05-01 17:38:27 +02:00
jonpas
48a4e9682c Forbit use of (optional) in function headers, always require a value 2023-05-01 17:33:07 +02:00
Cre8or
19e72d7b71
Explosives - Fix incorrect shotParents (#9171)
* Update fnc_setupExplosive.sqf

- Added `setShotParents` to the resulting explosive, enabling support for kill tracking

* Add setShotParents to fnc_placeExplosive

* Remove setShotParents from fnc_setupExplosive

* Move setShotParents into place event

* fix tabs

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-04-30 17:06:44 -05:00
PabstMirror
52842b6f14
Scopes - Add tool to diagnose scope height (#9152)
* Scopes - Add tool to diagnose scope height

* fix ico_01, tws_mg scopes
2023-04-30 16:57:34 -05:00
PabstMirror
79925b2f76
Interaction - Fix opening locked doors for GM buildings (#9154)
* Interaction - Fix opening locked doors for GM buildings

Fix #9143

* Update addons/interaction/functions/fnc_openDoor.sqf
2023-04-30 16:56:39 -05:00
PabstMirror
19e88aa8e7
Common - Fix script error in fnc_getVehicleCargo (#9156)
* Update fnc_getVehicleCargo.sqf

Close #9155

* change var name

Co-Authored-By: commy2 <6576312+commy2@users.noreply.github.com>

---------

Co-authored-by: commy2 <6576312+commy2@users.noreply.github.com>
2023-04-30 16:56:26 -05:00
PabstMirror
fbe23ee45f
Optionals - Load dynamically based on presence of mod (__has_include) (#9116)
* Optionals - Load dynamically

* Update XEH_preStart.sqf

* Update pboproject.yml

* Update script_macros.hpp

* use addon.toml for hemtt

* Update pboproject.yml

* update all actions

ref
Node.js 12 actions are deprecated. Please update the following actions to use Node.js 16: actions/checkout@v2, actions/upload-artifact@v2.

* Update arma.yml

* Update arma.yml

* Update arma.yml

* Update arma.yml

* Update arma.yml

* Update arma.yml

* Apply suggestions from code review

Co-authored-by: Björn Dahlgren <bjorn@dahlgren.io>

* Update settings.json

* cleanup interm hemtt changes

* Update .github/workflows/arma.yml

* Apply suggestions from code review

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

---------

Co-authored-by: Björn Dahlgren <bjorn@dahlgren.io>
Co-authored-by: jonpas <jonpas33@gmail.com>
2023-04-30 16:53:43 -05:00
jonpas
76e1aafb33
Use function documentation script (#6897)
Co-authored-by: Björn Dahlgren <bjorn@dahlgren.io>
2023-04-30 23:03:35 +02:00
PabstMirror
9e42c53196
xm157 - Fix latitude calc for maps not in getMapData (#9188) 2023-04-27 20:18:12 -05:00
PabstMirror
b78f8684b7
Common - switch getTurretConfigPath to use cba func (#9180) 2023-04-14 17:42:57 -05:00
Enrico Machado
1bf3d5086c
Fixed wrong portuguese translation of "head" (#9183)
"Caebça" is wrong, the correct would be "Cabeça"
2023-04-14 17:41:32 -05:00
BaerMitUmlaut
4aa8d59701
Use polyline marker for straight lines (#9174) 2023-04-03 12:18:47 -05:00
PabstMirror
f1fc0df6ef
Respawn - fix script error (#9166) 2023-03-20 13:18:57 -05:00
PabstMirror
bcbd762748
Fortify - Categories (#9167)
* Fortify - Categories

* Update fnc_registerObjects.sqf

* Apply suggestions from code review

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

* Apply suggestions from code review

* Update docs/wiki/framework/fortify-framework.md

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

* Update addons/fortify/ACEX_Fortify_Presets.hpp

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

* just use flat objects array

* Update fnc_getPlaceableSet.sqf

---------

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
2023-03-18 19:23:20 -05:00
Whigital
50100b8178
Viewdistance - Fix viewdistance from videosettings (#9140) 2023-03-18 14:28:27 -05:00
Cyruz
2092d4fd71
Cookoff - Remove flares from cookoff (#9146)
* Framework for removing flares

* Seperate fnc and strings etc

* Improvements from @mharis001

* Fix incorrect header fnc

* Clean-up return

* Remove setting
2023-03-18 14:24:27 -05:00
Filip Maciejewski
4997a4c102
Explosives - Fix mine defuse exclusion not workin before postInit is executed (#9170) 2023-03-16 08:52:29 +00:00
PabstMirror
169dbdfee0
Field Rations - Add water supply to well from Contact DLC (#9168)
* Field Rations - Add water supply to well from contact dlc

* Update addons/field_rations/CfgVehicles.hpp

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

---------

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
2023-03-15 23:43:53 -05:00
Psycool
d87e16e87e
Korean Translation Improved (#9164)
* 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

* Korean Translation Added

Added Korean translation related to Cargo Refuel

* Merge branch 'master' of https://github.com/Psycool3695/ACE3
2023-03-10 19:17:36 -06:00
BrettMayson
e252ef67d6
Medical Treatment - Suture (#9020)
Co-authored-by: Walthzer <19926813+Walthzer@users.noreply.github.com>
2023-03-06 14:17:01 -06:00
Zman6258
56348e70fa
Added missing vanilla casing types (#9162)
Super minor change, but I noticed not every vanilla casing had a corresponding ace3 casing defined. Most noticeable with 7.62x39, where they swap from steel to brass casings on landing.
2023-03-01 12:42:46 -06:00
Psycool
434820d8dd
Added Korean Translation (#9160)
* 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

* Korean Translation Added

Added Korean translation related to Cargo Refuel
2023-02-27 14:42:10 -06:00
BaerMitUmlaut
60cc8fbe88
Fix respawn when letting AI take over playable units (#9145) 2023-02-23 23:28:06 -06:00
PabstMirror
4de8487db0
Update fnc_makeJerryCan.sqf (#9153) 2023-02-17 22:19:31 -06:00
TACHarsis
1693e6834d
Added ace_rearm_sourceInitialized event (#9134) 2023-02-17 20:59:23 -06:00
TACHarsis
28e8e7d4ca
Refuel - Add events for fuel source and jerry can creation (#9133)
* Refuel - Added events

* Added ´ace_refuel_fuelSourceInitialized´ and `ace_refuel_jerryCanInitalized´ events
* Updated documentation

* Cleaner implementation && more coherent with analog rearm event

* Rebase merging is weird
2023-02-17 20:49:57 -06:00
Samuel Deutsch
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
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
JonBons
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
PabstMirror
06ae622dda
Weapon Select - Remove vehicle smoke selection key (#9144) 2023-02-09 13:17:24 -06:00
PabstMirror
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
Psycool
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
BrettMayson
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
BrettMayson
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
mharis001
b4005bca43
Common - Fix disableUserInput blocking respawn (#9053) 2023-01-31 17:14:50 -06:00
letus
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
PabstMirror
952375c676
Tools - Add dummy rtms to make ace buildable by current mikro tools (#9135) 2023-01-28 14:13:45 -06:00
JonBons
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
GhostIsSpooky
5d759e7b5f
Zeus - Don't disembark group players on Garrison (#9130) 2023-01-23 19:23:49 -06:00
TACHarsis
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
GhostIsSpooky
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
Smith
dc9a3eb064
Translations - Russian (#9095)
* Add missed & fix existed

* Fix russian translation when renaming
2022-12-03 13:57:43 -06:00
Cyruz
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
Björn Dahlgren
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
BrettMayson
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
BrettMayson
09dce6f937
Explosives - Fix invalid m57 specularPower (#9094) 2022-11-07 14:00:42 +00:00
mharis001
0e868dc26f
Interact Menu - Add doNotCheckLOS option for config actions (#9054) 2022-10-21 19:28:51 -05:00
TACHarsis
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
mharis001
1208f7a2ce
Fastroping - Disable destruction for helper object (#9051) 2022-10-19 21:38:16 -05:00
Mike-MF
cabca961c1
Cargo - Update VTOL Cargo sizes (#9066) 2022-10-16 00:44:31 +02:00
Mike-MF
c2bbe482b5
Add images and icon to concertina wire. (#9071) 2022-10-13 12:13:20 -05:00
Krzyciu
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
Psycool
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
Filip Maciejewski
97f211ecc5
Trenches - Polish translation update (#9049) 2022-10-02 23:45:30 +02:00
Filip Maciejewski
e632467fe2
Marker flags - Polish translation update (#9048) 2022-10-02 23:45:23 +02:00
Filip Maciejewski
928b1c5615
Towing - Polish translation update (#9050) 2022-10-02 23:45:17 +02:00
Filip Maciejewski
4837243b9a
Viewports - Polish translation update (#9047) 2022-10-02 23:41:40 +02:00
PabstMirror
d1a631b181 Prep 3.15.2 2022-09-27 10:47:03 -05:00
Vdauphin
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
Dystopian
1096bd3308
Fix working if turned out (#9030) 2022-09-22 13:13:47 -05:00
BrettMayson
3882367060
Arsenal - Show attached objects in arsenal mission (#9036) 2022-09-22 13:10:28 -05:00
zharf
5587d9dc69
Arsenal - Fixed fetching loadout from extended loadout (#9045) 2022-09-22 13:06:00 -05:00
PabstMirror
22586fc137 Prep 3.15.1 2022-09-12 16:43:22 -05:00
Whigital
b9ce02acf9
Explosives - Fix cellphone ringing if RF blocking present (#8991) 2022-09-10 13:02:53 -05:00
Vdauphin
8a949d4f24
ace_tagCreated EH not fire x (#9025) 2022-09-06 14:37:24 -05:00
Filip Maciejewski
f734fa9e86
Field Rations - Basic CfgMagazines support (#9008)
* Add basic CfgMagazines support for field_rations

* Update headers

* Fix CBA context menu

* Add backward compatiblity to fnc_consumeItem

* Fix item refill not finishing

Whoopsie.

* Revert "Add backward compatiblity to fnc_consumeItem"

In hindsight it's not necessary, this is not public function.
2022-09-06 13:21:45 +02:00
Filip Maciejewski
508e669e05
Trenches - Add modded Entrenching Tools support (#8999)
* Add support for other entrenching tools

* Docs

* Remove unused variable

* Check unit weapons for entrenching tool

`weapons` returns weapons in weapon slots and from all containers.

* Update addons/trenches/README.md

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

* Support for shovel Backpacks

* Update XEH_preStart.sqf

* Add Arsenal "Entrenching Tool" stat

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-09-05 00:21:29 +02:00
PabstMirror
a339074659
Tagging - Allow tagging vehicles (overwrite "clan" tag) (#8852)
* Tagging - Allow tagging vehicles (overwrite "clan" tag, req 2.10)

* Update addons/tagging/functions/fnc_createTag.sqf

Co-authored-by: Neil Evers <neil.evers.1995@gmail.com>

* fix var

* set REQUIRED_VERSION to 2.10

* don't tag if veh has no valid selectionClan

Co-authored-by: Neil Evers <neil.evers.1995@gmail.com>
2022-09-04 16:38:09 -05:00
Whigital
66801bb0ed
Goggles - Fix APR and Regulator overlays being flipped (#9009) 2022-09-04 16:37:48 -05:00
PabstMirror
44ac76f2cf
xm157 - fix ab func (#9021) 2022-09-03 12:49:07 +02:00
Filip Maciejewski
3872eb0647
Add a way to block auto carry after unload on classes (#9013) 2022-09-01 14:06:24 -05:00
PabstMirror
cc3bad3c56
XM157 (NGSW-FC Smart Scope) Framework (#8897)
* XM157 (NGSW-FC Smart Scope)

* Update addons/common/functions/fnc_rscObjectHelper.sqf

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

* Update addons/xm157/functions/fnc_weaponInfo_draw.sqf

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

* Headers

* Handle prone-deploy weapon bank

* Disable Reticle picker for now

* some localizations

* Change font

looks like CUP modifies EtelkaMonospaceProBold for some reason??

* Create xm157-framework.md

* Formating

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
2022-09-01 13:44:19 -05:00
PabstMirror
981a8ea352
Hunter Killer (Commander Override) (#8496)
* Hunter Killer (Commander Override) - Initial Demo

* Just do a one-time slew

* Update fnc_eachFrame.sqf

* Update addons/hunterkiller/functions/script_component.hpp

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

* Update for ArmA 2.08

* cleanup

* Rework Observe / Control configs

* Add to all 2035 tanks

* Update script_component.hpp

* Use eyeDirection on commander turrets

* Update docs/wiki/framework/hunterkiller-framework.md

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

* Add to all 2035, support ture/false setVars

* remove from apcs because mods don't know how to do inheritance

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
2022-09-01 13:38:22 -05:00
Filip Maciejewski
a6ced105ee
Add No vehicle clan logo component (#9018)
* Add novehicleclanlogo component

* Documentation

* Update README.md

* Use selection name from vehicle config
2022-09-01 12:44:38 -05:00
Timi007
11984f6dcb
Marker Flags - Add placing system & icons (#8951) 2022-08-30 22:17:31 -06:00
PabstMirror
4eef2da0fe
Missile Guidance - Use weaponsInfo to optimize fire-mode selection (#8879) 2022-08-29 09:33:58 +01:00
Filip Maciejewski
78f0262e10
Fire - Increase effectiveness of rolling for putting out fire (#9016)
* Increase effectiveness of rolling for putting out fire

* Use same value for rolling and pat down
2022-08-29 02:27:10 +02:00
Dystopian
20fb895b31
Towing - Add rope to vehicle inventory (#8963)
* Add rope to vehicle inventory

* Use LINKFUNC

* Make setting not need restart

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

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-08-29 02:24:24 +02:00
RcINS
e677021e5a
Translation - Improve ace_rangecard translation (#9012)
* Complete Simplified Chinese translation

* Slight tweak translation

* Fix rangecard Chinese translation
2022-08-28 18:10:21 -05:00
Filip Maciejewski
ecb7721c77
Medical - Disable blood spurts for fire, burn and drown damage types (#9001) 2022-08-25 12:05:50 -05:00
BrettMayson
438a90b63d
Common - Add CBA extended loadout (#8923)
* extended loadouts - earplugs, gunbag, and arsenal identity

* arsenal - maintain default loadout size check

* restore comment

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

* fix forgotten example

Co-authored-by: jonpas <jonpas33@gmail.com>
2022-08-25 11:56:54 -05:00
JonBons
8e06f2ec6b
Cookoff - Tweaked effects cleanup to add Deleted EH globally and trigger a local cleanup event (#9000) 2022-08-20 16:38:06 -05:00
JonBons
f846b9ab82
Cookoff - Randomized the delay from start of cookoff and ammunition detonation (#9002)
* Cookoff - Added a random delay between a vehicle being killed and when the ammo starts to cookoff

* Cookoff - Tweaked min ammo start delay to 1 second

* minor syntax and macro cleanup
2022-08-20 16:36:37 -05:00
Tim Beswick
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
Filip Maciejewski
a421a63eea
Trenches - Add "placed" and "finished" events (#8998)
* Add trench placed and finished global events

* Docs
2022-08-20 15:43:50 -05:00
Ozan Eğitmen
f3c66e83b4
Refuel - Add Progress Bar Duration Setting (#8971)
* Refuel: Allow changing progress bars' duration

* Clarify Turkish progressDuration_DisplayName

* Update addons/refuel/functions/fnc_moduleRefuelSettings.sqf

* Change progressDuration setting's type to TIME

* Update progressDuration setting display name, add description too

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-08-17 13:25:37 +02:00
Samuel Deutsch
7a64ccb7a5
Refuel - Improved fuel hose texture (#8983)
* Added custom fuel hose

* Fixed indentation

* Added model config for hose

* Added model config for hose
2022-08-17 13:00:54 +02:00
Whigital
286537cd54
Fortify - Fix funds being lost when canceling deploy (#8992) 2022-08-17 12:59:07 +02:00
Kam
131b0b9472
Captives - Load into back seats first (#8973)
Reverses the list of seats for loading captives
2022-08-16 15:33:15 +01:00
GhostIsSpooky
4943b2119d
CSW - Fix loading with ammo from vehicle cargo (#8995)
Co-authored-by: GhostIsSpooky <LinkIsParking@hotmail.com>
2022-08-14 17:09:01 +01:00
Cyruz
b47b8014e7
Fix incorrect mempoint for sound src (#8989) 2022-08-09 09:38:06 -05:00
Whigital
fc17697ef7
Overpressure - Fix backblast originating at projectile (#8985)
* Overpressure - Fix backblast originating at the projectile

* RHSUSF - Improve backblast for shoulder launchers

* RHSAFRF - Improve backblast for shoulder launchers

* RHSGREF - Improve backblast for shoulder launchers

* RHSSAF - Improve backblast for shoulder launchers

* Overpressure - Simplify projectile offset and cache lookups

* Overpressure - Remove parentheses and use array as hash key

* Overpressure - Rename caching function and move lookup
2022-08-01 18:32:02 +01:00
RcINS
904310c99a
Translation - Add Simplified Chinese translation (#8984)
* Complete Simplified Chinese translation

* Slight tweak translation
2022-07-30 18:08:44 -05:00
ZluskeN
df3a9de7cd
Advanced Vehicle Damage disabled by default. (#8925)
Maintainers [...] want Advanced Vehicle Damage disabled by default.
https://github.com/acemod/ACE3/pull/8734#discussion_r787918244
2022-07-23 19:59:21 +02:00
diwako
83f9c8331d
Interaction Menu - Fix black screen option not removing background properly (#8969) 2022-07-23 10:37:18 -05:00
Psycool
44ccc7b185
Korean Typo Fix (#8968)
* KoreanTranslation

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

* koreantranslation

* Korean Typo Fix
2022-07-19 17:09:08 -05:00
JonBons
36442d34cd
Cookoff - Fix smoke effects not getting cleaned up (#8933)
* Cookoff: Added handling for cleaning up smoke effects when vehicle is deleted mid-cookoff

* Cookoff - Prevent effects cleanup Deleted EH from getting duplicated

* Cookoff - Added locality safety check to effects cleanup

* Cookoff -  Global effects cleanup is now triggered by the server to handle locality transfer
2022-07-15 15:59:49 +01:00
Cyruz
1a95070b80
Trenches - Add camouflage action using surfaceTexture (#8935)
* Port 7833 to use surfaceTexture
* Add camo action
* Remove unused args from statement call
* Rogue missing space
* Add animation + delay for camo action
* Add authors
2022-07-15 15:42:00 +01:00
JonBons
15deea56cb
Cookoff - Removed references to unused ignoreTurret parameter 2022-07-14 21:27:07 +01:00
Dystopian
9569a16efc
Fix rearm of dead vehicles (#8962) 2022-07-10 09:47:47 +01:00
formtapez
1b7755225a
new fences for the wirecutter (#8945) 2022-07-08 20:15:29 -05:00
Psycool
088e5ebb6d
Added Korean Translation for new stuff (#8960)
* KoreanTranslation

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

* koreantranslation
2022-07-08 20:15:04 -05:00
PabstMirror
4400d860ac
Kestrel4500 - Cleanup unused onUnload handler (2.10 compatiblity) (#8961) 2022-07-08 22:49:11 +01:00
JonBons
654e4c1b7d
Cookoff - Add ability to disable fire jet effect in configs (#8953)
* Cookoff: Add ability to disable fire jet effect for vehicles it doesn't make sense on

* Cookoff: Fixed pressure jet sound playing when both jet and ring effects are disabled
2022-07-01 17:20:31 +01:00
Psycool
57893f311d
KoreanTranslation (#8937)
Someone has returned all the translations in Korean to English. there is no need to return them.
2022-06-21 13:35:06 -05:00
Filip Maciejewski
d8af7b34b7
Cookoff - Fix ammo not being removed from turrets with additional FFV (#8928) 2022-06-06 13:50:53 +02:00
ZluskeN
3f7530d89e
Cookoff - Add setting to destroy vehicle after cooking off (#8734)
* Add setting to destroy vehicle after cooking off

* Update stringtable.xml

* Update stringtable.xml

* Update addons/cookoff/stringtable.xml

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

* Update addons/cookoff/stringtable.xml

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

* Update initSettings.sqf

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
2022-05-31 15:50:55 +02:00
Krzyciu
cce1700f9c
Translations - Add Missing Polish (#8921)
* Translations - Add Missing Polish

When merged this pull request will:

- Add missing Polish Translations

* Missing space

* Typo

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

* Typo

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-05-28 12:30:28 -05:00
Apricot
74e49d1f5a
Translations - Add and Improve Missing Japanese (#8924)
* Japanese Translation Update

Fill missing Japanese translation and Weird translation fixes made long ago.

* Remove Corner Bracket and change it to apostrophe

* Update STR_ACE_Common_unloadWeapon

* Update SunflowerSeeds Description
2022-05-27 14:06:51 -05:00
PabstMirror
190cefea69 Prep 3.15.0 Build 67 2022-05-24 09:03:42 -05:00
PabstMirror
d497e390ab Merge branch 'master' into release-3.14.2 2022-05-18 13:08:29 -05:00
Drofseh
86f08af250
Common - Add keybind and function to unload unit's weapon/muzzle (#8735)
* add keybind and function to unload unit's weapon/muzzle

- add keybind and function to unload unit's weapon/muzzle
- requires https://github.com/CBATeam/CBA_A3/pull/1527

* change function name

* rename the file too

* Create common-framework.md

* Set REQUIRED_CBA_VERSION to 3.15.7

* Update required CBA version

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

* Apply suggestions from code review

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-05-18 13:07:47 -05:00
PabstMirror
99e3715922 Prep 3.14.2 Build 66 2022-05-17 17:33:32 -05:00
LorenLuke
da1c5d3b21
Cookoff - Adds heating effect to cookoff (#8685)
* Adds heating effect to cookoff 

Makes tanks that cook-off actually heat up on IR.

* Adds cbaEvent 'setTIPars'

* Adds CBAEvent call in cookOff.sqf

* Spaces out line. Adds proper event heading.

* Moves TI event to cookOffEffect.sqf;

* Update addons/cookoff/functions/fnc_cookOffEffect.sqf

Co-authored-by: pterolatypus <pterolatypus@users.noreply.github.com>

* Changes global event for TI pars to local command

* Reverts file to before previous commits in PR.

* Update addons/cookoff/functions/fnc_cookOffEffect.sqf

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

* Update addons/cookoff/functions/fnc_cookOffEffect.sqf

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

* Update addons/cookoff/XEH_postInit.sqf

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

* ti params and add comments to formula

Co-authored-by: pterolatypus <pterolatypus@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
2022-05-17 12:09:10 -05:00
PabstMirror
a4258f3587
Viewports (#8480)
* Viewports

* Support mem-points

* Update CfgVehicles.hpp

* Add some docs

* Cleanup Debugging

* Update addons/viewports/dev/debugPoints.sqf

Co-authored-by: Dystopian <sddex@ya.ru>

* Update addons/viewports/dev/debugPoints.sqf

Co-authored-by: Dystopian <sddex@ya.ru>

* Update addons/viewports/functions/fnc_eachFrame.sqf

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

* configProperties / 3den macro

* Update viewports-framework.md

* Update viewports-framework.md

* Add compats for rhs btrs

* Update addons/viewports/dev/debugPoints.sqf

Co-authored-by: Drofseh <Drofseh@users.noreply.github.com>

Co-authored-by: Dystopian <sddex@ya.ru>
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: Drofseh <Drofseh@users.noreply.github.com>
2022-05-17 11:55:09 -05:00
pterolatypus
699e286db7
Tagging - Add more tags (#8908)
* Added more tags and reorganised interaction

* Removed empty lines from stringtable

* Fix macros, use item picture as interaction icon

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

* Use texture as icon, remove colour from names

* Tagging - Compile actions when added

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-05-17 11:54:47 -05:00
pterolatypus
bf8aa1ab7f
Medical Damage - Improve falling and collision damage (#8861)
* Adjust wound params for falling

* Tweaked thresholds for collision

* Tweaked collision and added custom handling

* medical_damage - cleanup woundHandler naming (#8824)

* medical_damage - cleanup woundHandler naming

* woundsHandlerBase

(cherry picked from commit bdeb347ea9)

* Tweaked thresholds a bit more

* Removed collision handler

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-05-17 11:54:05 -05:00
PabstMirror
fa45e8b7cb
Cargo - Limit text length (#8915) 2022-05-17 02:37:26 -05:00
PabstMirror
0df5320879
FieldRations - fix string (#8916) 2022-05-17 00:57:24 -05:00
Dystopian
3a7f034e25
Vehicles - Add cruise control/speed limiter to boats (#8905)
* Add cruise control to boats

* fix other use of `Controll`

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-05-16 22:59:12 -05:00
PabstMirror
38b4de9382
Cookoff - fix locality of fire_removeFireSource event (#8907) 2022-05-13 19:54:09 -05:00
mharis001
56df203477
Interaction - Fix handle animation name for carrier doors (#8909) 2022-05-13 00:24:41 -04:00
Drofseh
53c0348a15
Overheating - Add barrel mass config value (#8906) 2022-05-11 18:21:05 -05:00
Björn Dahlgren
e0a3bd65ab
Cleanup FRIES macro and fix UBC issues in RHS Compats (#8842) 2022-05-09 20:54:42 -05:00
Psycool
61f74831a1
Korean Translation 100% done (#8899)
* Korean Translation 100% done

fixed typos, changing the Korean transliteration of proper nouns, and changing the meaning of the original to a more understandable interpretation without compromising the transmission of the original

* Something Edited

edit incorrect translation and add typo correction
2022-05-09 20:28:28 -05:00
Brett
6851183e1f
Add Marker Flags (#8696)
* add marker flags

* minor cleanup

* use pictures for actions

* check canDig

* review changes

* Update fnc_placeFlag.sqf

* fix hiddenSelectionsTextures

* Update addons/marker_flags/functions/fnc_pickUpFlag.sqf

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

* Cache flag list at pre-start

* Add model for flag pole

* Pass item name to pickUpFlag via action

* Update addons/marker_flags/stringtable.xml

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

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
2022-05-09 20:28:10 -05:00
Tim Beswick
27c5464654
Common - Add separate blockSpeaking status for acre direct (#8904)
* Add separate blockSPeaking status for acre direct

* Move TFAR code to new blockSpeaking handler

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-05-08 13:20:15 -05:00
GhostIsSpooky
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
Cyruz
3ddec6cb15
Casings - Add infantry bullet casings (#8857)
* 1st pass on casings

* Readability tweaks

* Pretty sure these are needed...

* Jonpas never lies

* Whitespace fix

* Add brother Diwako and allow client override

* Use index, avoid count

* Both settings a client-side

* Add Commy fixings

* Proper case for diwako + config

* Formatting and AGLtoASL

* Perf warning

* if not required

* Axing parentheses

* Remove pointless GVAR update in settings

* Update addons/casings/functions/fnc_createCasing.sqf

Removed unused param

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

* Update addons/casings/functions/fnc_createCasing.sqf

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

* Update addons/casings/functions/fnc_createCasing.sqf

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

* Default to off due to performance concerns on low-end hardware

* Add LIS check to avoid floating

* Cleanup header

* Further playtesting shows ROADWAY & FIRE have better results

* Re-enable by default

* Update addons/casings/functions/fnc_createCasing.sqf

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

* Update addons/casings/functions/fnc_createCasing.sqf

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

* Update addons/casings/functions/fnc_createCasing.sqf

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

* Update addons/casings/functions/fnc_createCasing.sqf

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

* offset setPosWorld with small z-bump

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-05-07 22:45:24 -05:00
YetheSamartaka
e994906169
Medical - Add AI Unconsciousness exception (when using zeus module) (#8903)
* Add DF-15 GForceCoef Value

This adds missing ACE_GForceCoef value for DF-15 uniforms.

* DF-15 PR - cfgWeapons formating

DF-15 PR - cfgWeapons formating

* DF-15 PR - cfgWeapons formating II

Forgot to save it with braces and spaces around =

* Update CfgWeapons.hpp

* sync

* Add AI Unconsciousness exception option

- Adds AI Unconsciousness exception option. If enabled, it allows you to put AI into unconsciousness via Zeus Module even though the AI unconsciousness is disabled. This "feature" was possible before the medical rewrite and allowed to put selected AI units into unconsciousness  even though the overall AI unconsciousness was disabled. This was very handy and many groups missing this option including myself.
- Special thanks to Pterolatypus for consultation.

* tabs to spaces

tabs to spaces

* last tab to space :copium:

last tab to space :copium:

* stringtable tabs to spaces

stringtable tabs to spaces

* Addon option removed, adjusted variable name

- Addon option removed
- adjusted variable name

* utilized QEGVAR

- utilized QEGVAR in getVariable

* removed fnc and put the code inside the condition

- I've managed to properly implement the getVariable inside the condition thus allowing me to remove the function. Also kymckay had a good point on swapping the order for faster eval.

* Update XEH_PREP.hpp

* setVariable optimalization

- setVariable optimalization

Co-authored-by: pterolatypus <pterolatypus@users.noreply.github.com>

* Update addons/medical_statemachine/Statemachine.hpp

Co-authored-by: pterolatypus <pterolatypus@users.noreply.github.com>

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: pterolatypus <pterolatypus@users.noreply.github.com>
2022-05-07 22:44:33 -05:00
PabstMirror
ada486448c
Aircraft - Drone Tools (#8276)
* Aircraft - Drone Tools

* Update addons/aircraft/functions/fnc_droneAddActions.sqf

Co-authored-by: Dystopian <sddex@ya.ru>

* Update addons/aircraft/functions/fnc_droneAddMapHandler.sqf

Co-authored-by: Dystopian <sddex@ya.ru>

* Update fnc_droneAddActions.sqf

* Move map drawing to laser and make it work on any source

Co-authored-by: Dystopian <sddex@ya.ru>
2022-05-05 11:07:54 -05:00
Dystopian
89badcc71f
CSW - Fix missing magazine on assembling (#8880)
* Fix missing magazine on assembling

* Fix adding mag when csw is empty

* Fix missing magazine when player has launcher
2022-05-04 17:28:58 -05:00
jonpas
e2a822c828
User Interface - Add ability to hide Default Action Icon (#8883) 2022-05-04 17:28:32 -05:00
pterolatypus
67842a2656
Medical Vitals - Add event to vitals loop (#8891)
* Added event to vitals loop

* Pass deltaT to event

* Added event to documentation
2022-05-03 18:04:58 -05:00
Drofseh
36ae99b9f3
MapTools - Allow mod maps and compasses to use map tools (#8858)
* allow mod maps and compasses to use map tools

* single quotes

* Update addons/maptools/CfgVehicles.hpp

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

* Update addons/maptools/CfgVehicles.hpp

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-05-02 20:40:59 -05:00
Wakbub
f3258cae98
Cargo - Remove the ability to load cooked-off items (#8876) 2022-05-02 18:57:19 -05:00
Wakbub
6a213bcf60
Cargo / Dragging - Fix Invisible Target Soldier being loadable and draggable/carriable (#8873) 2022-05-02 18:54:30 -05:00
Dystopian
54c13c5f42
Move carry mag getting code to function (#8888) 2022-05-02 18:54:04 -05:00
Wakbub
70641c39a1
Laser/Laserpointer - Fix localization of laser (#8885)
Add
- `laser`: Add Hungarian translation of laser.

Fix
- `laser`: Fix capitalization of laser.
- `laserpointer`: Fix Japanese translation of laser.
2022-05-02 18:53:18 -05:00
PabstMirror
b70353f009
Vector - Disable tilting the reticule when zoomed (#8882) 2022-05-02 18:52:59 -05:00
Wakbub
d2038ab287
Spottingscope - Fix destruction of Spotting Scope (#8893)
Fix `Error setposasl: Type Object, expected Array` when destroying Spotting Scope.
2022-05-02 18:03:51 -05:00
PabstMirror
ad5c275532
arsenal - fix hash getvar default type (#8892) 2022-04-25 19:35:52 -05:00
Dedmen Miller
8192108e19
Pylons - Show ammo description in pylon loadout tooltips (#8881)
* Show ammo description in pylon loadout tooltips

* Update addons/pylons/functions/fnc_showDialog.sqf

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

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
2022-04-23 10:24:50 +01:00
jonpas
3442a47942
General - Remove deprecated functions (#8878) 2022-04-17 08:27:19 +01:00
Jo David
a20110874c
replace urls (#8875) 2022-04-14 09:22:23 +02:00
diwako
51b703a746
Common - Fix undefined variable (#8872)
Moved ace_common_isModLoadedCache from postinit to preinit. The hash object can be used before post init which then produces errors.
2022-04-10 15:27:10 -05:00
Wakbub
dd07b0fa30
Fix Error Type String, expected Array (#8871)
Pass an array instead of a string to insert.
2022-04-09 13:50:47 -05:00
Nilia119
3b79693717
Added Missing German Translation (#8870)
- Added Missing Translation in CSW
- Added Missing Translation in field_radio
- Added Missing Translation in finger
- Added Missing Translation in noradio
- Added Missing Translation in overpressure
2022-04-09 13:49:26 -05:00
PabstMirror
fa7dbce104
Field Rations - Add sunflower seeds (#8833) 2022-04-08 20:44:15 -05:00
zharf
72774c909a
Laser - Fix seeker owner return value (#8862)
* Fix laser seeker return value

Back to consistent with the documentation

* Pick the owner with most hits instead of the last one in the hashmap
2022-04-06 17:02:39 -05:00
b-mayr-1984
020cf2ddd8
maptools - Improve behaviour upon first open (show under mouse position instead of bottom-left corner) (#8848)
* open map tools in center of screen upon first open

Don't show the map tools at the bottom-left corner of the map when you first open it, but right where your mouse is.

* always move to mouse position when opened (not just once)

incorporated feedback from co-authors

Co-Authored-By: Drofseh <Drofseh@users.noreply.github.com>
Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* replace tabs by 4x whitespaces in order for checks to complete successfully

* move code to fnc_updateMapToolMarkers so it always runs

Co-authored-by: Drofseh <Drofseh@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-04-06 16:49:27 -05:00
Brett
d135371319
Vehicles - Add cruise control (#8792)
* add cruise control

* Update fnc_speedLimiter.sqf
2022-03-17 13:06:32 -05:00
PabstMirror
70f3f55367
Vehicles - Mousewheel will set speed limiter value to even multiples (#8840)
* Vehicles - Mousewheel will set speed limiter value to multiples of 5

* Limit setting to whole numbers only
2022-03-17 13:03:28 -05:00
GhostIsSpooky
f85ed213c5
Grenades - Add fire source to incendiary grenades (#8756)
* add fire source to incendiary grenade

* improvide fire source condition

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

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
2022-03-08 21:52:07 -06:00
GhostIsSpooky
8d83982d86
Advanced Fatigue - Improve misc. code (#8800)
* add improvements from #8763

* review changes

* writing is hard

Co-authored-by: BaerMitUmlaut <BaerMitUmlaut@users.noreply.github.com>

* missing ;

Co-authored-by: BaerMitUmlaut <BaerMitUmlaut@users.noreply.github.com>
2022-03-08 21:41:56 -06:00
GhostIsSpooky
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
PabstMirror
ed228c54ac
Common - Block radio status effect without blocking direct voice (ACRE) (#8659)
* Common - Block radio status effect won't block PTT voice (ACRE)

* Update addons/common/XEH_postInit.sqf
2022-03-08 16:40:48 -06:00
GhostIsSpooky
b800bc4ae1
Fix fire not causing burn damage (#8750) 2022-03-08 16:36:26 -06:00
Drofseh
70da38cec5
Finger - Add scaling settings (#8676)
* Add scaling settings

- sizeCoef will scale the size directly from the setting value, default 1x is the same as the current size.
- proximityScaling will scale the size based on the distance between the observer and the pointer, 2x as large at maxRange, 0.25x at 0m distance.

* fix slider decimal value

* bug fix
2022-03-07 12:35:49 -06:00
JonBons
8b60fae23a
Magazine Repack - Add idle animation when a player starts repacking magazines (#8825)
* Added Gear gesture animation when a player starts repacking magazines

(previously you'd just sit there doing nothing for X seconds)

* Added Repack Animation ACE Setting for allow for disabling of idle animation during repacking

* Corrected Polish translation for setting name

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

* Corrected German translation for setting name

* Removed French translation until someone can provide one

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
2022-03-07 12:35:26 -06:00
GhostIsSpooky
a4ae61f1fc
CSW - Add reloading from nearSupplies (#8776)
* allow players to reload from nearSupplies

* limit reloading to friendly sides

* add handling for ai getting inside empty weapon

* configOf for lookup

* add getin handler, hammer out remaining bugs

* configOf lookup

* improve friendly/object filter

* more configOf lookups

* Capitalize settings, add ammo storage setting

* remove systemChat

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

* fix TRACE

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

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-03-07 12:29:19 -06:00
GhostIsSpooky
5a72b61a50
Interact Menu - Add blocking while editing CT_EDIT (#8796)
* Interact Menu - Add blocking while editing CT_EDIT

* use findIf

* Use A3 defines
2022-03-07 12:29:02 -06:00
GhostIsSpooky
9209fedcf7
Medical Statemachine - Improve edge case death handling (#8788)
* fix #8772

* add WARNING for dead/null units

* fix macro

* improve warnings

* handle scripted death without warnings

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

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-03-07 12:28:51 -06:00
johnb432
90ebe08012
Arsenal tweak (#8786)
Previously:
- When a new weapon was selected, only magazines defined in the "magazines" attribute of the old weapon's class were deleted.
- When a new weapon was selected, it would consume a magazine from the loadout.

Now:
- When a new weapon is selected, it will only remove the magazines from the previous weapon that are not compatible with the current weapon.
- When a new weapon is selected, it does not consume a magazine from the loadout.
2022-03-07 12:26:56 -06:00
Vdauphin
282dd33d59
Nametags - Fix ACE nametag drawIcon3D parameter error when player controlled unit dies (#8764)
* FIX: `_icon` can be `nil`

* Migrate from `if` to `switch`

* Missing ()
2022-03-07 12:26:22 -06:00
Brett
6c0bc67b37
Medical GUI - Add setting to show blood loss (#8450)
* add setting to show bloodloss

* Update initSettings.sqf

* Update stringtable.xml

* Update initSettings.sqf

* Update addons/medical_gui/stringtable.xml

Co-authored-by: Serg Vergun <1197314+severgun@users.noreply.github.com>

Co-authored-by: Serg Vergun <1197314+severgun@users.noreply.github.com>
2022-03-07 12:23:53 -06:00