Commit Graph

12247 Commits

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

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
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