* open medical menu from Zeus
* fix function header
* Zeus can use every action, add room for more buttons in medical menu
* Update addons/medical_treatment/functions/fnc_treatment.sqf
* Added zeus treatment time coeff
* Update addons/medical_gui/functions/fnc_canOpenMenu.sqf
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Update fnc_canOpenMenu.sqf
* Update initSettings.sqf
* Update fnc_moduleMedicalMenu.sqf
* Added check + documentation
* Update fnc_canTreat.sqf
---------
Authored-by: Brett <brett@mayson.io>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* add distance to action
* sort by distance
* Revert "sort by distance"
This reverts commit 89834613dd.
* show distance for crewed vehicles
* Update fnc_createVehiclesActions.sqf
* Added check for crew status
If a one or more passenger in a vehicle are conscious, not captive and hostile to the interacting unit, the interactions (passenger, cargo) will not appear.
* Update fnc_canInteractWithVehicleCrew.sqf
* Update fnc_canInteractWithVehicleCrew.sqf
* added possibility to define orientation on attach items in config
* added documentation on attach framework
* whitespace
* changed to use roll and yaw parameters instead of vectordir for easier usage, and to support placement view with rolled objects. Changed vector calculations
* Update addons/attach/functions/fnc_attach.sqf
* Docs and comments
* fix derp
* Update docs/wiki/framework/attach-framework.md
* Update attach-framework.md
---------
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
* 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
* Korean translation updated
* Korean translation updated
* Fix Merge
* Update stringtable.xml
* Update stringtable.xml
* Korean translation updated
* Korean translation minor fix
* Korean translation fixed
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Arsenal - Add option to show live search results
* use onEditChanged
* Update fnc_onKeyDown.sqf
* Update fnc_onKeyDown.sqf
* update script_components
* skip animate on live search
* Added German Translation
* Update addons/medical_treatment/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/medical_treatment/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/medical_treatment/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update stringtable.xml
* Update stringtable.xml
* Update addons/medical_engine/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update stringtable.xml
* Update stringtable.xml
---------
Co-authored-by: Jo David <github@jonathandavid.de>
* 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
* Korean translation updated
* Korean translation updated
* Fix Merge
* Update stringtable.xml
* Update stringtable.xml
* Korean translation updated
* Korean translation minor fix
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* 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
* Korean translation updated
* Korean translation updated
* Fix Merge
* Update stringtable.xml
* Update stringtable.xml
* Korean translation updated
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* 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>
* 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>
* Arsenal - Add stat for illuminator//pointer attachments
* Update fnc_statTextStatement_illuminators.sqf
* Update fnc_statTextStatement_illuminators.sqf
* Move medical interface settings to separate category
* Add translations from `str_3den_display3den_menubar_interface_text`
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* 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
* 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
* 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>
* 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
* 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>
* 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>
* 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>
* 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>
* 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>
* 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>
* 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>
* 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>
* 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
* 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
* 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>
* 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
---------
* 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 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>
* 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>
* 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>
* 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
* 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>
* 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>
* 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>
* Update display name in team
* Update display name everywhere
* order
https://youtu.be/VYycQTm2HrM
---------
Co-authored-by: BrettMayson <brett@mayson.io>
