Mysteryjuju
0a83b6e840
Translations - Add missing french translations ( #9577 )
...
Signed-off-by: Mysteryjuju <mysteryjuju42@gmail.com>
2023-10-24 16:47:24 -04:00
Grim
b8a9376a65
Medical Treatment - Use Laws of War bodybag model and add colored bodybags ( #9371 )
...
* add colored bodybags
* fix dogtags, add icons, revert item model to original
* Retexture ace's item model
* Keep original vehicle classname
* Update fnc_placeInBodyBagOrGrave.sqf
* fix displayName
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-10-24 15:16:52 -04:00
Grim
be6582ea44
Medical Engine - Disable uniform passthrough scaling, increase passthrough effect on vests ( #9524 )
...
* add separate pow for vests
* missing 0.02
* skip uniform scaling
* mathity math mamath
2023-10-24 15:15:47 -04:00
Enrico Machado
0f38de2bd0
Translations - Portuguese ( #9576 )
...
Fixed Portuguese typos
2023-10-24 13:59:21 -04:00
Psycool
eefa53221d
Translations - Korean ( #9573 )
...
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-10-24 14:23:12 +02:00
Grim
406fce2836
Dragging - Add setting for Max Weight Coefficient ( #9569 )
...
* add arcade mode setting
* tweak stringtable
* stringtable
* change to slider
* fix spelling
* Update stringtable.xml
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-10-24 00:57:05 -04:00
Grim
e5c3470f5d
Compat RHS - Fix explosives compat ( #9571 )
...
* fix RHS explosives
* fix clipboard
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Add dev script to test explosive mags
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-10-24 00:55:06 -04:00
Grim
0372447650
Medical GUI - Skip body part-specific info for medical peek ( #9570 )
...
* add no body part support to patient info
* move up one row
* header, comment
2023-10-23 19:47:06 -04:00
Grim
d74082402d
Common - Fix mod compat string and add source of main to outdated error ( #9568 )
...
fix stupid + add source
2023-10-23 17:09:09 -04:00
PabstMirror
9d1695ffe2
Common - Improve logs and message for version problems ( #9560 )
...
* Common - Diagnose ace install if there are version problems
* update user error message
* whitespace
* missing lettr
* remove source from compat
---------
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
2023-10-23 16:29:32 -04:00
Grim
72bc3fc355
Arsenal - Fix search case-sensitivy for non-ANSI characters ( #9565 )
...
* fix regex for non-ANSI
* Update addons/arsenal/functions/fnc_handleSearchbar.sqf
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Update addons/arsenal/functions/fnc_handleSearchbar.sqf
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-10-23 16:07:02 -04:00
Grim
339cfa8024
Arsenal - Add support for modifying Virtual Items while opened ( #9542 )
...
* add support for mod. virt. items while opened
* updateUniqueItems
* execNextFrame
* add notification and TRACE
* remove debug
* Update addons/arsenal/functions/fnc_addVirtualItems.sqf
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
* Update addons/arsenal/functions/fnc_refresh.sqf
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
* move to removeBox
* update english to plural, others are fine
* missing include
* directCall in refresh
---------
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2023-10-23 13:31:21 -04:00
Grim
f35f872963
Dragging - Prevent carrying crewed static weapons ( #9491 )
...
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-10-23 19:21:50 +02:00
PabstMirror
5bf46245b2
Common - Fix replaceRegisteredItems if replacing item with nothing ( #9552 )
2023-10-23 19:20:23 +02:00
PabstMirror
9160826faa
HuntIR - Use ammo event handler ( #9561 )
2023-10-23 13:04:00 -04:00
PabstMirror
17daea0ff8
Repair - Fix displayed text when repairing lights ( #9555 )
2023-10-23 18:53:28 +02:00
Mysteryjuju
12f0cbbef9
Translations - Add French Translations ( #9557 )
...
Signed-off-by: Mysteryjuju <mysteryjuju42@gmail.com>
2023-10-22 14:44:37 -05:00
PabstMirror
dd0838b2d7
Arsenal - Add stat for capabilities of pointer attachments ( #9499 )
...
* Arsenal - Add stat for illuminator//pointer attachments
* Update fnc_statTextStatement_illuminators.sqf
* Update fnc_statTextStatement_illuminators.sqf
2023-10-21 13:19:41 -04:00
Filip Maciejewski
f45b67222b
Compat RHS - Add hunterkiller support to M2A3 ( #9554 )
...
* Add RHS launch config
* RHS Compat - Add hunter killer to M2A3
2023-10-21 13:19:25 -04:00
Grim
4d80299d34
Medical GUI - Add sound and conditional switching to Medical Menu keybinds ( #9487 )
...
* add sound and condition to category switch
* improve conditional switching
* better toggle handling
* playSound
* header
* Update addons/medical_gui/functions/fnc_onKeyDown.sqf
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-10-21 13:18:48 -04:00
MiszczuZPolski
c7bf57c71c
Medical Treatment - Add missing sutures to advanced crate ( #9553 )
...
add missing sutures to advanced crate
2023-10-21 11:01:33 -04:00
Grim
642ca3c14d
Medical - Make dug graves respect terrain slope ( #9545 )
...
* slope dug graves
* remove parentheses
2023-10-20 02:40:48 +00:00
Grim
80703ce760
Arsenal - Fix editor attribute search ( #9544 )
...
fix 3den attribute search
2023-10-20 01:23:40 +00:00
amsteadrayle
5d49a57bd1
Medical - Move GUI and Feedback settings to separate category ( #9537 )
...
* Move medical interface settings to separate category
* Add translations from `str_3den_display3den_menubar_interface_text`
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-10-19 20:37:58 -04:00
Grim
55566fd60f
Interaction/Dragging - Remove actions from scripted weaponHolders ( #9541 )
...
remove actions from scripted holders
2023-10-19 20:24:38 -04:00
PabstMirror
124798cb8d
Advanced Throwing - Call ammo event handlers ( #9535 )
...
AdvThrowing - Run ammo event handlers
Close #9532
2023-10-19 19:25:44 -04:00
amsteadrayle
f0a6fc7b9d
Advanced Fatigue - Add settings to change sway factor with weapon rested/deployed ( #9536 )
...
Add setting to change sway factor with weapon rested/deployed
2023-10-19 19:25:19 -04:00
MiszczuZPolski
2fbc40b62d
Medical GUI - Change minimal value of damage threshold ( #9538 )
...
* change minimal value of damage threshold
* applying pabst suggestion
* remove space
* Update addons/medical_gui/functions/fnc_updateBodyImage.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-10-19 19:25:05 -04:00
Apricot
6f001c72bd
Translations - Japanese Hotfix for Arsenal Sorting ( #9533 )
...
Japanese arsenal sort hotfix
2023-10-19 12:18:44 -05:00
PabstMirror
e3f447c8bd
Zeus - Fix trench module on clients ( #9513 )
...
* Zeus - Fix trench module on clients
* Update addons/zeus/functions/fnc_moduleLayTrench.sqf
2023-10-19 12:15:14 -05:00
PabstMirror
d70c049b4f
CSW/Dragging - Handle null objects causing script errors ( #9529 )
...
* CSW - Handle static weapon be deleted
* add same fix to dragging
2023-10-18 22:17:07 -04:00
PabstMirror
902e365536
Tools - Update addon.toml to HEMTT 1.9.1 ( #9511 )
...
Tools - Update addon.toml to hemtt1.91
2023-10-18 14:19:20 -05:00
Mike-MF
262b7fe5c6
Night Vision - Add prefix to colorPreset ( #9520 )
...
* Add ACE Prefix to colorPreset, update docs.
* remove pointless bwc
2023-10-18 15:03:21 -04:00
MiszczuZPolski
c92eca7751
Medical Treatment - Improve display name for arsenal tab ( #9525 )
...
* add new display name for arsenal tab
* german language added
* Update stringtable.xml
* Update stringtable.xml
2023-10-18 15:02:30 -04:00
Grim
209edf0433
Arsenal - Add FUNC(getVirtualItems) ( #9512 )
...
add API
2023-10-18 14:51:00 -04:00
Grim
b2b49cc993
Arsenal - Fix saving loadouts on new profiles ( #9523 )
...
* fix
* Fix unrelated TRACE macro in arsenal
* Update addons/arsenal/functions/fnc_onArsenalOpen.sqf
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-10-18 14:17:22 -04:00
TIANYAO ZHANG
abb6519d6d
Translations - Update Chinessimp ( #9517 )
...
Update chinessimp translation to stringtable.xml
2023-10-18 12:18:39 -05:00
Grim
97b68fc7ae
Medical GUI - Fix Medical Menu triage button position ( #9515 )
...
fix
2023-10-18 00:51:27 -04:00
Grim
b9748041d4
Field Manual - Fix HuntIR Monitor & Fortify Tool display names ( #9509 )
...
* fix huntir/fortify tool display names
* add note on sutures
2023-10-17 20:19:09 -04:00
jonpas
1036a58aee
Prep 3.16.0 Build 72
2023-10-17 20:41:59 +02:00
jonpas
6080004f56
Merge branch 'master' into release-3.16.0
2023-10-17 20:40:46 +02:00
amsteadrayle
6e8a27c9a6
Medical GUI - Remake body outline textures ( #9503 )
...
Co-authored-by: jonpas <jonpas33@gmail.com>
2023-10-17 14:43:44 +00:00
Bob-Murphy
ed1ef14749
SPE Compat - Fix Spearhead 1944 fuel drums for refuel system ( #9507 )
2023-10-17 16:37:18 +02:00
Bob-Murphy
60f0249161
SPE Compat - Add Spearhead 1944 fuel drums to refuel system ( #9505 )
...
* Create land.hpp
* Update CfgVehicles.hpp
2023-10-17 11:55:52 +02:00
PabstMirror
9873bf566c
Field Manual - Remove all use of +=, cleanup magwell capitlization ( #9494 )
...
* Field Manual - Cleanup toml
* Fix magwell capitilization
* asc - skip fnc_zeusAttributes as it's hardcoded to be blocked
* Eliminate all use of += in fieldmanual
* Update sqfc.json
2023-10-16 01:49:23 -05:00
Psycool
124baca84b
Korean translation improved ( #9500 )
...
* 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
* Korean translation Add/Updated
* Fixed wrong strings
* Korean translation improved
2023-10-16 01:48:08 -05:00
Krzyciu
fb55508c99
Translations - Add Polish Translations ( #9489 )
...
* Translations - Add Polish Translations
**When merged this pull request will:**
- Add missing polish translations
- Remove russian translation from polish - ace_common
### IMPORTANT
- [ ] If the contribution affects [the documentation](https://github.com/acemod/ACE3/tree/master/docs ), please include your changes in this pull request so the documentation will appear on the [website](https://ace3.acemod.org/ ).
- [x] [Development Guidelines](https://ace3.acemod.org/wiki/development/ ) are read, understood and applied.
- [x] Title of this PR uses our standard template `Component - Add|Fix|Improve|Change|Make|Remove {changes}`.
* Update addons/fieldmanual/stringtable.xml
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Update addons/fieldmanual/stringtable.xml
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Update addons/fieldmanual/stringtable.xml
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Update stringtable.xml
* Update addons/fieldmanual/stringtable.xml
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Apply suggestions from code review
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
2023-10-16 00:21:02 -05:00
amsteadrayle
2f2c253c39
Medical GUI - Remake drag/carry category icon ( #9498 )
...
Remake carry icon
2023-10-15 20:45:02 -04:00
amsteadrayle
f2ae068e9f
Medical GUI - Fix action button width ( #9497 )
...
Fix action button width
2023-10-15 18:58:48 -04:00
amsteadrayle
9ecb35250d
Medical GUI - Use selected color when triage category selected ( #9495 )
...
Show selected color for triage category
2023-10-15 18:45:52 -04:00
amsteadrayle
863d88ff41
Medical GUI - Add divider bars for triage and toggle category buttons ( #9496 )
...
* Add divider bars for triage and toggle category buttons
* Tweak vertical position of category icons
* Fix spacing
2023-10-15 18:45:45 -04:00
Grim
8104c8f465
Common - Increase sway update frequency ( #9490 )
...
increase sway update frequency
2023-10-14 20:21:08 -04:00
amsteadrayle
c54a26cc42
Medical GUI - Show warning if tourniquet will interfere with medical menu action ( #9475 )
...
* Warn if tourniquet will interfere with medical action
* Add setting to enable, default to off
* Tweak tooltip message
* Tweak code style, missing semicolon
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
* Use localize macro
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
---------
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-10-14 19:28:22 -04:00
amsteadrayle
b54be029df
Medical GUI - Move target name to middle header ( #9483 )
...
* Switch "status" header to player name
* Set title to "Medical Menu"
* Remove unused STATUS strings
* Switch to existing MedicalMenu string
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
* Revert "Remove unused STATUS strings"
This reverts commit 62c1ced06a
2023-10-14 19:27:57 -04:00
amsteadrayle
f774eaf787
Medical GUI - Fix asymmetry in the medical menu ( #9486 )
...
* Fix assymmetry in the medical menu
* Add center divider in Activity/Quick View panel
2023-10-13 16:33:19 -04:00
amsteadrayle
503373bb83
Medical GUI - Improve toggle button icon and tooltip ( #9485 )
...
Improve toggle button icon and tooltip
2023-10-13 07:46:42 -04:00
Grim
5a2fd70075
Field Manual - Add Medical Menu entry ( #9482 )
...
* add medical menu
* add R/L note
* Translate display name
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-10-12 23:19:07 -04:00
amsteadrayle
1e3d9cc22a
Medical GUI - Show number of available treatment items in medical menu ( #9474 )
...
* Initial implementation of item count display
* Put everything inside function, add padding
* Extract and explain null string
* Fix tab in config file
* Add function header
* Use ACE item counting function
* Extract column width to variable
* Move constants declaration closer to usage
* Add special case for sutures
* Add setting to enable/disable
* Expand to allow showing in tooltip
* Split into counting and formatting function
* Fix incorrect check for case with no items
* Remove ineffective padding from tooltip
* Check for surgical kit item instead of display name
* Update return description in header
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Add `private` keyword for inline functions
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* capitalization/vars
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
* nil checks, localize macro
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
* Remove button text mode and setting
* possessive
* Update addons/medical_gui/functions/fnc_formatItemCounts.sqf
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2023-10-12 22:39:23 -04:00
amsteadrayle
e52594112d
Medical GUI - Add keybinds to navigate the Medical Menu ( #9477 )
...
* Add keybinds to select categories and body parts
* Add some comments, rearrange, remove debug prints
* Remove unneeded escape key handling
* Replace function with inline code
2023-10-12 12:50:48 -04:00
PabstMirror
58cedab493
Repair - Fix script error if vehicle is null ( #9479 )
2023-10-12 12:47:59 -04:00
Tim Beswick
bd377c49fc
Repair - Allow setting spare wheels/tracks count in config ( #9481 )
...
* Allow setting spare wheels/tracks count in config
* Update repair framework docs
2023-10-12 12:45:56 -04:00
amsteadrayle
2eb914836c
Medical GUI - Add R and L labels on body image ( #9480 )
...
Add R and L labels on body image
2023-10-12 12:44:13 -04:00
PabstMirror
b818f9f6e4
Prep 3.16.0 Build 71
2023-10-11 16:01:11 -05:00
PabstMirror
0b22c981e9
Merge branch 'master' into release-3.16.0
2023-10-11 16:00:33 -05:00
Hypoxic
176482381a
Field Manual - Add Framework ( #9320 )
...
* Field Manual Framework
Created barebones framework for addition of the Field Manual
* Created Stringtable.xml
Created Stringtable.xml
Created a few strings... more to come
* Update addons/fieldmanual/config.cpp
Moved opening brace
Co-authored-by: Mike-MF <TyroneMF@hotmail.com>
* Update addons/fieldmanual/config.cpp
new lines at end of file
Co-authored-by: Mike-MF <TyroneMF@hotmail.com>
* update stringtable.xml
Added arguments to ACE_Field_Rations_Base
Added strings for descriptions of subclasses
* update stringtable.xml
Added medical item documentation
Added field ration documentation
* Update stringtable.xml
Added fortify tool documentation
* updated stringtable.xml and cfgHints.hpp
Added item documentation
Cleaned up other strings
Added additional arguments and made them universal
* updated/reordered contents. added images
Reordered CfgHints.hpp
Added Range Tables string
Reordered stringtable
Added images for inline use
* changed indentation style
changed indentation style to guidelines
added empty line to the end of each file
* Update addons/fieldmanual/CfgHints.hpp
remove redundant includes
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Update addons/fieldmanual/CfgHintCategories.hpp
remove redundant includes
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Update stringtable.xml
added explosives string - no image yet
* Update stringtable.xml
added dead man's switch - no image as of yet
* Update addons/fieldmanual/script_component.hpp
Co-authored-by: jonpas <jonpas33@gmail.com>
* Update addons/fieldmanual/script_component.hpp
Co-authored-by: jonpas <jonpas33@gmail.com>
* Update addons/fieldmanual/stringtable.xml
Co-authored-by: jonpas <jonpas33@gmail.com>
* Update stringtable.xml
Removed containers
Modified table to 4 space indentation
Started using Tabler
* update cfghints and stringtable
moved the fortify tool to items and removed it's specialized class
added DAGR and MicroDAGR strings - no image
* restructure
CfgHints.cpp - added additional arguments + placeholders for forward compatibility
Removed images and img from strings - will add in a different PR
Stringtable.xml - added 99% of content
* update strings
updated stringtables
consolidated cfghint base classes
* cfghints
fixed multiline string code
* Update CfgHints.hpp
Missed trailing \
* update cfghints.hpp
fixed leading \
still trying to get the pboproject to like it
* Update stringtable.xml
deleted original stringtable entry due to error with
Arma/Vlidate (pull_request)
* Update addons/fieldmanual/script_component.hpp
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
* Update addons/fieldmanual/CfgHintCategories.hpp
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
* Update addons/fieldmanual/stringtable.xml
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
* Update addons/fieldmanual/stringtable.xml
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
* Update addons/fieldmanual/stringtable.xml
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
* Update addons/fieldmanual/stringtable.xml
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
* Update addons/fieldmanual/stringtable.xml
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
* Update addons/fieldmanual/stringtable.xml
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
* Update addons/fieldmanual/stringtable.xml
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
* Apply suggestions from code review
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
* Update stringtable.xml
changed structures for spray paint to surfaces
* Apply suggestions from code review
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
* Dynamically get item names
* stringtables, better unbound key handling
* disable preprocess (rip tools)
* bound key change
* standardize on medical keybinds
* fix medial menu keybind
---------
Co-authored-by: Hypoxic <amartini@martinicreations.com>
Co-authored-by: Mike-MF <TyroneMF@hotmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
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-10-11 15:53:10 -05:00
amsteadrayle
119d8bce5d
Medical GUI - Change default body color to improve contrast ( #9476 )
...
Change default body color to improve contrast
2023-10-11 07:40:13 -04:00
amsteadrayle
008cd5a851
Medical GUI - Add outline to selected body part in Medical Menu ( #9471 )
...
* Add functionality to show selected body part on body image
* Add controls for patient information display
* Receive selected body part through argument
* Improve selected check
* Add body part outline textures
* Second pass at outline textures
* Third pass at outline textures
* Add setting for outline color
* Fix capitalization
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
* Fix capitalization
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
---------
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-10-11 05:25:28 -04:00
amsteadrayle
c407aebe6a
Medical GUI - Display qualitative bleed rate in injury list ( #9469 )
...
* Display qualitative bleed rate in injury list
* Remove debug print
* Reference existing vitals metrics in bleed rates
* Use `default` case for highest bleed rate
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-10-11 05:23:31 -04:00
PabstMirror
60143be55f
Arsenal - Add stats for buddy-loading launchers and belt linking ( #9470 )
...
* reload launchers - show if enable arsenal stat
* Apply suggestions from code review
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
* Add ACE_isBelt stat
* buddy
---------
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2023-10-09 19:20:23 -04:00
Fabio Schick
b4c72d8255
Captives - Allow disarming and blindfolding captives in vehicles ( #9463 )
...
* Can disarm captives in vehicles
* Can blindfold captives in vehicles
* Fix dropping goggles/blindfold into large vehicles
* Apply suggestions from code review
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
---------
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-10-09 14:58:49 -03:00
amsteadrayle
941207c45c
Medical GUI - Peek Medical Info on Hit ( #9467 )
...
* Basic implementation of medical status peek on hit
* Fix flickering on repeated hits
* Overhaul to show damaged body part
* Add setting to enable/disable
* Add setting for duration
* Fix capitalization
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
* Use recommended equality check
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
* Default to off
* change setting limits
---------
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-10-09 14:57:47 -03:00
PabstMirror
97febbe574
Laser - Fix LST conditions ( #9472 )
2023-10-09 13:58:00 -03:00
amsteadrayle
0e2c7167a5
Medical GUI - Add keybind to show player's patient information display ( #9464 )
...
* Add keybind to show patient information display
* Return false
* Add fadeout delay and associated setting
* Switch to CBA setting rounding
* Change setting type to time
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
* Fix incorrect behavior on repeated key presses
* Tweak setting name and description
* Tweak to prevent overlapping WUAE
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
---------
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-10-08 17:34:51 -04:00
amsteadrayle
78bb0514d1
Medical GUI - Reformat injury list to clarify global vs. limb-specific information ( #9468 )
...
* Reorder injury list to clarify global vs. local
* Add non-issue entries and deemphasize with color
* Give non-issue color to "No injuries..." entry
* Hook up to string tables
* move bleeding above blood volume lost
---------
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
2023-10-07 12:25:41 -04:00
PabstMirror
7b32cb76f8
Interact Menu - Fix zeus cursor menu closing ( #9466 )
2023-10-06 19:39:11 -05:00
PabstMirror
e8d1695c83
Zeus - Show where trench will go ( #9462 )
...
* Zeus - Show where trench will go
* Update fnc_moduleLayTrench.sqf
2023-10-04 17:10:21 -05:00
PabstMirror
bd43c32334
Trenches - Terrain Trenching ( #9148 )
...
* Common - Use hashmap variable for canDig surfaces
* Update XEH_preInit.sqf
* Trenches - Terrain Trenching (simple blocks)
* Update fnc_canDig.sqf
* Update fnc_canDig.sqf
* Handle locality
* move code around, stringtable
* use third block for floor
* cleanup debug
* update includes, add tooltip
2023-10-04 14:21:50 -04:00
PabstMirror
98e189bfb4
Arsenal - Always show muzzle velocity even if not configured for AB ( #9457 )
2023-10-04 14:21:07 -04:00
PabstMirror
8143cdc1da
Medical AI - Add setting to replace gear for AI ( #9458 )
2023-10-04 14:19:10 -04:00
Grim
f088d9bfa1
General - uiNamespace cleanup ( #9425 )
...
* fix clear trauma on stitch
* add compileFinal and move to hashmap
* add missin param
* fix captives
* explosives/medtreat
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-10-04 14:09:05 -04:00
PabstMirror
50fba4545f
Zeus - Fix bis_fnc_activateaddons error in moduleCurator ( #9459 )
...
Close #9445
2023-10-03 08:08:04 -03:00
LorenLuke
a5a8b5387a
Laser - Add Individual Laser Code Digit Control ( #9434 )
...
* Initial Commit
* Use DIK Codes
* Update headers and dev code for new default frequency
---------
2023-10-02 12:29:38 -05:00
PabstMirror
3c9d7733e8
Medical Treatment - Fix grave digging ( #9455 )
2023-10-02 11:05:56 -04:00
PabstMirror
3626b37c01
Tagging - Fix stringtable ( #9456 )
2023-10-02 11:05:13 -04:00
Drofseh
8bf0772558
Medical Treatement - Add Grave Digging To Body Bags ( #9442 )
...
* add grave digging to body bags
* move buryBodyBag action to config, change grave ui icon to headstone
* improvements from code review
* switch direction check to man instead of bodybag, nominally allowing anything to be buried
---------
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-10-01 14:55:13 -04:00
BrettMayson
66deb59037
Medical Treatment - Add event and setting for grave creation ( #9441 )
...
graves: event and setting for markers
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-10-01 14:31:38 -04:00
Grim
31a64a33b6
Compat SOG - Add explosives support to 1.3 mines ( #9450 )
...
* add fuse claymore
* add WP mines
* missing semicolon
* add dummy
2023-10-01 14:30:24 -04:00
Apricot
6429d0639f
Tagging - Add new colors and filled square tag ( #9443 )
...
* Adds yellow and white tags and filled square tag
Add:
Yellow Splay
White Splay
Filled Square tag for all colors
Change (and remove):
Remove color variations from the "X" strings and unify it.
Tweak some Japanese strings.
* tweak japanese
2023-10-01 13:43:03 -04:00
Drofseh
b9580a0349
Medical Treatment - Change isAwake check for grave digging to only apply to CAManBase ( #9451 )
...
* Move awake check for bodybag grave
* Apply suggestions from code review
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-10-01 13:42:07 -04:00
PabstMirror
38c79347ae
Misc - Config caplitzation fixes ( #9452 )
2023-10-01 12:09:02 -05:00
Marstruc
a8bd08136e
Medical Treatment - Add new Grave model ( #9444 )
...
* Added Grave model, swapped Grave classnames
* Change p3d name of Grave model
* Update addons/medical_treatment/CfgVehicles.hpp
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Updated grave model, textures, classname.
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-10-01 08:48:31 -04:00
Drofseh
dbf288851e
Medical Treatement - Don't allow conscious patients to be buried ( #9448 )
...
Don't allow conscious patients to be buried
2023-09-30 11:32:06 -04:00
Psycool
c49c5afcba
Fixed wrong strings ( #9446 )
...
* 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
* Korean translation Add/Updated
* Fixed wrong strings
2023-09-29 12:27:51 -05:00
Assanali Mukhanov
537487522f
Compat SOG - Add barrel swap for MGs and belt linking for drum magazines ( #9439 )
...
* Add barrel swap support to SOG MGs
* Set SOG MG drum mags as belts, allow belt linking
* Remove tracer mag configs
Since they inherit from the "normal" magazines, these config entries, indeed, seem pointless.
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Remove barrel swap from RPD and M1918
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-09-28 15:20:46 -04:00
Grim
8e464744a1
Medical - Increase pain from bullet-inflicted bruises ( #9438 )
...
increase bruise pain
2023-09-28 15:17:42 -04:00
Krzyciu
08d0bd09c4
Translations - Add Polish Translations ( #9437 )
...
* Translations - Add Polish Translations
When merged this pull request will:
**When merged this pull request will:**
- Add missing polish translations
- Fix spelling in existing translations
### IMPORTANT
- [ ] If the contribution affects [the documentation](https://github.com/acemod/ACE3/tree/master/docs ), please include your changes in this pull request so the documentation will appear on the [website](https://ace3.acemod.org/ ).
- [x] [Development Guidelines](https://ace3.acemod.org/wiki/development/ ) are read, understood and applied.
- [x] Title of this PR uses our standard template `Component - Add|Fix|Improve|Change|Make|Remove {changes}`.
* Update stringtable.xml
---------
2023-09-27 13:54:12 -05:00
Psycool
94ceed201c
Korean translation Updated ( #9436 )
...
* 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
* Korean translation Add/Updated
2023-09-27 13:28:04 -05:00
PabstMirror
03332f0019
Prep 3.16.0 Build 70
2023-09-26 16:09:34 -05:00
Björn Dahlgren
5d2c6eb948
Medical GUI - Fix cross_grave.paa building with pboProject ( #9435 )
2023-09-26 17:01:39 +02:00
BrettMayson
d2f5c2de02
Spearhead 1944 Compatibility ( #9292 )
...
* compat(spe): initial
* --changed csw/turrets
* disable spe disassemble
* csw: all mortars done
* more cleanup
* add missing hearing protection
* final cleanup
* goofed and removed too much
* ok all done
* formatting
* remove adt
* -+ updated frameworks
- Ballistics Framework Finished (Infantry Weapons)
- Wirecutter & Trench Framework Finished (Vests/Backpacks)
- Explosives Framework Finished (Added backward support for IFA3 Detonator/Firecord)
- Crew Served Weapons Framework Finished (Fixed Assemble/Disassemble)
* formatting
* Require HEMTT v1.7.2
* cleanup tabs / formating
* Apply suggestions from code review
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: ZluskeN <pontux@gmail.com>
* split to subcomponents, fix ubcs
* swap has_include for skipWhenMissingDependencies
* fix explosives
* add pdumies for ww2
* Apply suggestions from code review
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
* cleanup sten duplicate configs
* move hearing to macro
* fix macro repaclement
* Use `SUBADDON`
* Move `addonRootClass` to bottom of CfgPatches
* Relative includes
* move config macro includes to config.cpp
* comment off csw changes for now
* Update .hemtt/project.toml
---------
Co-authored-by: Coldfront15 <born2toot2@gmail.com>
Co-authored-by: Brett Mayson <brett@joinoffstreet.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: ZluskeN <pontux@gmail.com>
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
2023-09-25 15:37:59 -05:00
Grim
cf4fe835c3
Repair - Fix adding actions for hitpoints with the same name ( #9430 )
2023-09-25 20:55:23 +02:00
Grim
ac29287542
Arsenal/Compat RHS - Improve support for RHS attachments ( #9386 )
...
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-09-25 18:36:46 +02:00
Fabio Schick
11bc2695f5
Captives - Blindfold captive units ( #9361 )
...
* Fixed typo
* Added "Blindfold Captive" interaction
* Changed comment readability as requested
* Better handling of captive goggle replacement
if the capturer's inventory cannot contain the captive's goggles, move them to the captive's inventory, if that also can't fit them, drop them on the ground.
* Removed extra new line
* Make "validBlindfolds" a CBA Setting
* Add remaining localizations
I speak German and Italian fluently and can also infer the proper sentence structure and conjugations in French/Spanish/Portuguese, the other eastern languages are completely foreign to me though and I have to trust Google/DeepL.
* Removed non-verified translations
* Use GVAR(blindfold) config entry
* Remove unused "_state" parameter
* Check if captive isn't already blindfolded before blindfolding
Co-Authored-By: johnb432 <58661205+johnb432@users.noreply.github.com>
* Added "remove blindfold" interaction
Co-Authored-By: johnb432 <58661205+johnb432@users.noreply.github.com>
* Correct Error Message
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
* Optimized duplicate code
* Apply suggestion to fix script_component includes
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2023-09-24 17:45:43 -04:00
Grim
aee47c9bc6
Medical - Add damage handling for explosive damage while inside vehicles ( #9246 )
...
* Add vehicle explosion handling
* Missing semicolon
* scale armor damage using passthrough
* add - to comment
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
* improve condition
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
* remove extra brackets
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
* remove extra brackets
* fix damage sorting
* whitespace
* comment
* fix function header
* fix infinite armor when no item equipped
* modify condition & handling for vehicle explosion
* add vehiclehit woundHandler
* finalize
* add vehiclehit woundHandler
* finalize
* cleanup
* more cleanup
* name
* randomize hitpoints
* finalize
* don't scale structural damage
* fix undefined var
* remove _i
* fix script error, tone down scaling
* add AVD checks
* Update addons/medical_damage/functions/fnc_woundsHandlerVehiclehit.sqf
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* nuke AVD crew damage handling
* get rid of aircraft crash lethality compensation
---------
Co-authored-by: James Woods <pterolatypus@gmail.com>
Co-authored-by: GhostIsSpooky <69561145+Salluci@users.noreply.github.com>
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-09-24 15:58:59 -04:00
Drofseh
94f3b301e0
Medical Treatment - Add Grave Digging for Corpse Disposal ( #9276 )
...
* Add grave digging
* Update fnc_placeInBodyBagOrGrave.sqf
* Update fnc_placeInBodyBagOrGrave.sqf
* Update fnc_placeInBodyBagOrGrave.sqf
* Update addons/medical_treatment/functions/fnc_placeInBodyBag.sqf
Co-authored-by: BrettMayson <brett@mayson.io>
* Add setting to enable/disable
* improvements
- fix flipped bool in fnc_canDigGrave
- improve fnc_placeInBodyBagOrGrave.sqf by splitting out some checks and item assignment into separate bodybag and grave functions
* fix typo in variable
* Apply suggestions from code review
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
* Apply suggestions from code review
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
* add to XEH_PREP and fix event for non-local patient
* Add interaction to check name on headstone
* Update addons/medical_treatment/XEH_postInit.sqf
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
* Simplify Setting
* Apply suggestions from code review
Co-authored-by: jonpas <jonpas33@gmail.com>
* Update addons/medical_treatment/stringtable.xml
Co-authored-by: jonpas <jonpas33@gmail.com>
* Make placeInBodyBagOrGrave more generic and use any grave class
* Update addons/medical_treatment/functions/fnc_placeInGrave.sqf
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
* Update medical-treatment-framework.md
* Update docs/wiki/framework/medical-treatment-framework.md
Co-authored-by: jonpas <jonpas33@gmail.com>
* update docs
* Update addons/medical_treatment/functions/fnc_placeInBodyBagOrGrave.sqf
* Update addons/medical_treatment/functions/fnc_placeInGrave.sqf
* fix includes
---------
Co-authored-by: BrettMayson <brett@mayson.io>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-09-24 15:57:08 -04:00
Mike-MF
6fd24c1455
Compat WS RealisticNames - XMS ( #9429 )
...
* Compat WS - XMS
* add modified original translations
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-09-24 14:56:04 -04:00
Grim
77a73aee71
Backpacks - Add extra condition for backpack checking ( #9428 )
...
Update fnc_isBackpack.sqf
2023-09-24 12:06:20 -05:00
Grim
bf6dc5a7a1
Backpacks - Code cleanup ( #9409 )
...
backpacks
2023-09-24 00:13:33 -04:00
PabstMirror
0d9bcdd708
Nightvision - Fix detecting if vehicle's turret has NVGs ( #9421 )
...
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-09-23 21:00:04 +02:00
PabstMirror
bd0dfe4b30
compat rhs - fix SUBCSTRING and check_strings.py ( #9424 )
2023-09-23 12:40:48 -05:00
Mike-MF
b4940e6fa3
Cargo - Improve cargo space values ( #9418 )
...
Alter Cargo values
2023-09-23 13:08:28 -04:00
Mike-MF
ab6dd0164e
Compat WS - Realistic Names ( #9419 )
...
* Compat WS - Realistic Names
* use cba subcstring
* cleanup python
* Update script_macros_common.hpp
---------
Co-authored-by: BrettMayson <brett@mayson.io>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-09-23 13:07:52 -04:00
Grim
da60a1b39d
Medical Engine - Improve damage calculation for explosive-resistant armor ( #9216 )
...
* scale armor damage using passthrough
* add - to comment
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
* improve condition
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
* remove extra brackets
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
* remove extra brackets
* fix damage sorting
* whitespace
* comment
* fix function header
* fix infinite armor when no item equipped
* cleanup
* more cleanup
* name
* don't scale structural damage
* add setting
* fix key name
* add cap to passThrough
* fix script error in setting
---------
Co-authored-by: GhostIsSpooky <69561145+Salluci@users.noreply.github.com>
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
2023-09-23 13:07:06 -04:00
Grim
ec96cdf12c
Medical Treatment - Fix clearing trauma after stitch with multiple wounds ( #9420 )
...
fix clear trauma on stitch
2023-09-23 12:59:10 -04:00
PabstMirror
d8eb97f4ec
Tools - Fix configs for hemtt1.9.0 ( #9423 )
2023-09-23 11:37:41 -05:00
Grim
0ba67ea173
Optics - Add items to new vanilla rails ( #9410 )
2023-09-22 18:10:22 +02:00
PabstMirror
0b695be841
Laserpointer - Block switching to unsupported visible lasers ( #9416 )
2023-09-22 18:09:46 +02:00
Will/KJW
51e6134b71
Grenades - Improve flashbang sound ( #9415 )
2023-09-22 18:08:34 +02:00
Mike-MF
5eab95d984
Casings - Add Western Sahara Casings ( #9417 )
...
* Add WS Casings
* Minor formatting fix
2023-09-22 12:03:07 -04:00
Jasper
6f58830603
Common - Add lockInventory status effect ( #9402 )
...
Add lockInventory status effect
2023-09-22 12:02:09 -04:00
johnb432
11664b0040
Dragging - Improve featureCamera handling ( #9389 )
...
* Update XEH_postInit.sqf
* Update XEH_postInit.sqf
* Update XEH_postInit.sqf
* Different approach
* Updated to new script_component
* fix variable lookup
---------
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
2023-09-19 23:56:20 -04:00
Grim
37be6130f2
RHS Compat - Readd basic 5.56 suppressor to 5.56 muzzle slot ( #9412 )
...
bleh
2023-09-19 23:13:38 -04:00
Grim
bd4d1a7a50
IR Lights - Fix visible pointers for DBAL ( #9414 )
...
* fix dbal visible pointer
* fix dbal visible pointer
* remove unused macro
* tweak numbers, move define to single file
* change max range
2023-09-19 22:55:15 +02:00
Grim
b84a84c0ff
Laser Pointer - Use engine method for visible lasers ( #9411 )
...
* initial commit
* tweak numbers
* nuke framework
* cleanup JR
2023-09-19 15:29:13 -04:00
johnb432
748f9aff31
Dragging - Enabled dragging whilst limping ( #9379 )
...
Enabled dragging whilst limping
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
2023-09-18 22:43:10 -04:00
BaerMitUmlaut
d6faac5881
Add IR Flashlights ( #6563 )
...
* Initial IR flashlight tests
* More experiments
* Rewrite using engine IR lights
* Rework ranges, fix bugs, add docs
* Fix uncommented DISABLE_COMPILE_CACHE
Co-authored-by: jonpas <jonpas33@gmail.com>
* Markdown fixes
Co-authored-by: jonpas <jonpas33@gmail.com>
* Markdown fixes
Co-authored-by: jonpas <jonpas33@gmail.com>
* Markdown fixes
Co-authored-by: jonpas <jonpas33@gmail.com>
* Markdown fixes
Co-authored-by: jonpas <jonpas33@gmail.com>
* Markdown fixes
Co-authored-by: jonpas <jonpas33@gmail.com>
* Use baseWeapon instead of custom property
* Add baseWeapon to SPIR
---------
Co-authored-by: jonpas <jonpas33@gmail.com>
2023-09-17 09:32:39 +02:00
johnb432
a0dd4400e6
Cargo - Fix/Improve FUNC(paradropItem) ( #9399 )
...
paradropItem fixes
2023-09-14 17:54:06 -04:00
Grim
f7b520b56b
Markers - Fix issues with custom channels ( #9383 )
2023-09-13 05:05:42 +02:00
johnb432
7a3e5dd3e0
Dragging - Add config support for weight ignoring ( #9396 )
...
* Update fnc_initObject.sqf
* Update dragging-framework.md
2023-09-12 18:57:55 -04:00
jonpas
742626ff1a
General - Relative script_component.hpp includes ( #9378 )
...
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-09-12 20:58:10 +02:00
jonpas
7cbdb7f410
General - Use subcomponent macro (CBA 3.16.0) ( #9375 )
2023-09-12 20:40:38 +02:00
Pepijn Holster
ea783b6c7a
Advanced Ballistics - Fix _mapSize sometimes 0 by using engine command ( #9394 )
...
Update fnc_initializeTerrainExtension.sqf
2023-09-12 13:04:06 -05:00
johnb432
119702a189
Zeus - Fix Group Side module ( #9388 )
...
Co-authored-by: jonpas <jonpas33@gmail.com>
2023-09-12 17:41:38 +02:00
Krzyciu
4a12f61352
Translations - Add Polish Translations ( #9391 )
...
Translation - Add Polish Translation
When merged this pull request will:
Add Missing Polish Translations
Fix Spelling in existing translations
2023-09-11 21:33:48 -05:00
PabstMirror
07ab8751a6
XM157 - Fix spin drift offset when using advanced ballistics ( #9392 )
...
xm157 - Fix spin drift calc when using ab
2023-09-11 20:44:25 -05:00
Nilia119
4ce6fcb3cc
Translation - Add German Translation ( #9390 )
...
Added German Translation
2023-09-11 20:37:20 -05:00
johnb432
5b1491278d
Dragging - Fix for #9385 ( #9387 )
2023-09-11 14:29:56 +02:00
Grim
de8940af9b
Medical Treatment - Add setting to rollover bandage effectiveness ( #8426 )
...
* use leftover bandage effectiveness on other wounds in same limb
variable naming
* Comments
Co-authored-by: Kyle Mckay <5459452+kymckay@users.noreply.github.com>
* variable naming, fix part index check in findMostEffectiveWound
trace 4
* fix function header
* Account for multiple wounds in time calculation
* fix trace, remove systemChat
* update for hashmaps
* compile cache
* Update addons/medical_treatment/functions/fnc_findMostEffectiveWounds.sqf
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
* add bandage effectiveness setting
* stupid
* remove limit on bandageRemaining
* Update addons/medical_treatment/functions/fnc_bandageLocal.sqf
Co-authored-by: BrettMayson <brett@mayson.io>
* Update fnc_getBandageTime.sqf
* Update fnc_bandageLocal.sqf
* fix header / debug
---------
Co-authored-by: Salluci <69561145+Salluci@users.noreply.github.com>
Co-authored-by: Kyle Mckay <5459452+kymckay@users.noreply.github.com>
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: BrettMayson <brett@mayson.io>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-09-10 02:06:15 -04:00
PabstMirror
29ba42bfb5
Markers - Don't try to move poly-line markers ( #9381 )
2023-09-09 16:29:57 -05:00
Grim
56e905ab7a
Fire - Fix macro ( #9376 )
...
Update fnc_burnReaction.sqf
2023-09-09 02:24:41 -04:00
Broström.A | Evul
eaea6f29b8
Medical - Add setting to drop weapon on unconsciousness ( #8433 )
...
* added chance of dropping weapon on unconsciousness
* Moved throwWeapon to common
* Fixed spelling error
* wording changes
* typo
* fix usgae in burn reaction
* Update addons/medical_status/stringtable.xml
* Update addons/medical_status/functions/fnc_setUnconsciousState.sqf
* Update addons/medical_status/stringtable.xml
* move condition
* derp
---------
Co-authored-by: BrettMayson <brett@mayson.io>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-09-09 02:17:24 -04:00
Grim
dbd5fbaf31
Medical - Add internal variable for wake-up timer and stable blood volume ( #9374 )
...
* Medical - Allow changing SPONTANEOUS_WAKE_UP_INTERVAL via var
* add variable for minimum blood volume
* change variable name
* update pain comment
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-09-09 00:15:43 -04:00
PabstMirror
f644e7516c
Compats - Make rest of compats auto load if mod present ( #9372 )
...
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
2023-09-08 16:57:33 +02:00
PabstMirror
c163d6d53a
Laserpointer - Block laser attachments if setting disabled (CBA 3.16.0) ( #9346 )
...
* Laserpointer - Block laser attachements if setting disabled
req https://github.com/CBATeam/CBA_A3/pull/1595
* Apply suggestions from code review
* Update addons/main/script_mod.hpp
---------
Co-authored-by: jonpas <jonpas33@gmail.com>
2023-09-07 14:05:24 -05:00
Grim
017e097ac4
Advanced Fatigue - Fix metabolic cost mass multiplier for walking ( #9368 )
...
4 -> 2
2023-09-07 00:42:33 -04:00
Grim
c2ab5a24bc
Night Vision - Change Apex and Wide NVGs to Gen 4 ( #9369 )
...
make Apex and Wide NVGs gen 4
2023-09-06 20:44:30 -04:00
PabstMirror
25b8fd6d54
Medical AI - Add setting to require items for treatment ( #9362 )
...
* Medical AI - Add setting to require items for treatment
* all ivs
* invert setting
* Update addons/medical_ai/stringtable.xml
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
* move item hash to preStart
---------
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-09-06 12:37:26 -04:00
Grim
f75d237d47
Tagging - Fix tagModel not being utilized for custom tags ( #9366 )
...
fix tagModel
2023-09-06 12:20:04 -04:00
jonpas
576e6b7d55
Compat WS - Add No Uniform Restrictions subconfig ( #9365 )
...
* Compat WS - Add No Uniform Restrictions subconfig
* Update addons/compat_ws/compat_ws_nouniformrestrictions/config.cpp
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
---------
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-09-06 12:03:20 -04:00
Grim
99c7bea6fe
Compat GM - Make compat autoload when mod is present ( #9364 )
...
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-09-06 02:33:13 +02:00
PabstMirror
9d745da465
Compats - Use 2.14 skipWhenMissingDependencies ( #9363 )
2023-09-06 02:32:44 +02:00
Grim
aa107ed517
Medical - Add treating with items from vehicle inventory ( #9286 )
...
* allow pulling items from vehicle inventory
* use vehicle items first
2023-09-05 11:20:56 -03:00
jonpas
938f421ac3
AI - Add automatic NVG equip/unequip ( #9313 )
...
Co-authored-by: Dystopian <sddex@ya.ru>
Co-authored-by: Mike-MF <TyroneMF@hotmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-09-05 16:20:06 +02:00
Mike-MF
5417a18d7f
Compat WS - Make compat auto load if DLC is present ( #9205 )
2023-09-05 16:19:09 +02:00
Grim
88e0c8f27b
Common - Improve FUNC(removeSpecificMagazine) with 2.14 changes ( #9227 )
2023-09-05 16:14:42 +02:00
PabstMirror
03c3e74636
Maptools - Cleanup pre-2.14 compatibility code ( #9342 )
...
ref #9219
2023-09-05 10:38:38 -03:00
Will/KJW
e3d6d6cc4e
Fastroping - Remove 2.12 compatibility ( #9329 )
...
Update fnc_deployAIWaypoint.sqf
2023-09-05 10:37:56 -03:00
johnb432
c11e7690bf
Arsenal - Remove redundant fix for hand guns and binoculars with secondary muzzles ( #9305 )
...
Update fnc_onSelChangedRight.sqf
2023-09-05 10:37:02 -03:00
Dystopian
10ffcea9b7
Optionals - Add No Medical and No Realistic Names components ( #8187 )
...
* Add nomedical and norealisticnames components
* Add fire component disabling
* Make it work
* remove headlight skipping
* update preprocess syntax
* fix git screwup
* Apply suggestions from code review
---------
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
2023-09-03 21:56:54 -04:00
Grim
36f34ec551
Medical - Add 'Open (Backpack)' action to dead units ( #9239 )
...
* add open bag interaction
* only add actions to uncon/dead
* improve assembly backpack check
* Fixes
* Removed test code
* move to postInit
* fix locality
* locality edge case
* Fix double actions on dead units
* improve comment
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
---------
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-09-03 21:48:09 -04:00
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
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
