Commit Graph

12071 Commits

Author SHA1 Message Date
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