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