* 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>
* 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
* 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>
* 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
* Refactor medical to use hashmaps for wound storage
- We most frequently want to access wounds by body part, so this makes
that a constant time lookup.
- The body part index is no longer stored in every wound since it's
inherent in the wound storage.
- Using body part names as the keys of the hashmap to improve code
clarity (no more magic numbers).
closes#6468
* Add deserilization migration from old wound arrays
Will migrate from old form array wound storage to the new hashmap
strucutre during deserlization. This is relevant for communities piping
medical state out to a database or similar between sessions.
* fix issue with suture stitching
* change version number in comment
---------
Co-authored-by: Salluci <salluci.lovi@gmail.com>
* Japanese Translation Update
Fill missing Japanese translation and Weird translation fixes made long ago.
* Remove Corner Bracket and change it to apostrophe
* Update STR_ACE_Common_unloadWeapon
* Update SunflowerSeeds Description
* Korean Translation 100% done
fixed typos, changing the Korean transliteration of proper nouns, and changing the meaning of the original to a more understandable interpretation without compromising the transmission of the original
* Something Edited
edit incorrect translation and add typo correction
* Improve Chinese translation
* Optional Compat SOG and Tracers Simplified Chinese
* Fix settings string not correctly localized
* Fix mode of heli minigun have no realistic name
* Fix Regex replace flaw
* fix merge
* Various improvements
* Translate CSW, fix short name not short
* Trim
* Magazines naming
* Minor tweak
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Redoing this
* Revert "Redoing this"
This reverts commit 80ff709676.
* Do this properly
* Update fnc_handleKilled.sqf
* use setDead function directly
* Handle scripted camera
* redo #8387
I'm dumb.
* try this
* if construct outside of ctrlSetEventHandler
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
* tweak disableUserInput / handleKilled
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* added check if burning in fullheal and then extinguish
* Add check if fire module is loaded as PabstMirror showed
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Added German Translation
Added German Translation
* Added German Translation
Added German Translation
* Added German Translation
Added German Translation
* Added German Translation
Added German Translation
* Added German Translation
Added German Translation
* Update addons/arsenal/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/ballistics/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/ballistics/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/cargo/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/cargo/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update stringtable.xml
* Update stringtable.xml
* Update stringtable.xml
* Update stringtable.xml
* Update stringtable.xml
* Update stringtable.xml
* Update stringtable.xml
* Update stringtable.xml
* Update stringtable.xml
* Update addons/common/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/common/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/common/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/ui/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/vehicle_damage/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/vehicle_damage/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/vehiclelock/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/common/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/cookoff/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/cookoff/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/explosives/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/explosives/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/field_rations/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/field_rations/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/field_rations/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/fire/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/field_rations/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/fortify/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/gforces/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/grenades/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/gunbag/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/hellfire/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/hellfire/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/interact_menu/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/interaction/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/magazinerepack/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/map_gestures/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/map_gestures/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/map_gestures/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/map_gestures/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/map_gestures/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/map_gestures/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/markers/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/markers/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/markers/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/markers/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/markers/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/medical_damage/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/medical_damage/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/medical_engine/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/medical_engine/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/medical_feedback/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update stringtable.xml
* Update addons/medical/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Apply suggestions from code review
Co-authored-by: Jo David <github@jonathandavid.de>
* Update stringtable.xml
* Update addons/explosives/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/gforces/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/medical/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/medical_engine/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
Co-authored-by: Jo David <github@jonathandavid.de>
* Add french translation of EnableSpeedIndicator keys
* Add french translation of EpilepsyFriendlyMode keys
* Add french translation (SpecterOS, SpecterOS 7.62, Burris XTR II, EOTech XPS3)
* Add french translation of the cargo renaming fonctionality (added in PR8023)
* Fix typo in 127x99_API_Mag_NameShort translations
* Add french translation of `LocationsBoostTraining_Description` key
* Add french translation of `interactWithTerrainObjects_Description` key
* Add french translation of `repackLoadedMagazines` keys
* Add french translation of `Rename group` self-interact fonctionality (added in PR8346)
* Add french translation of `Medical_Feedback_EnableHUDIndicators` keys
* Add french translation of Vehicle Towing fonctionality (Added in PR8380)
* Fix English and Japanese translation of length rope (18.3, 27.4 and 36.6 meters)
* Add french translation of customize Medical GUI colors settings (added in PR8350)
* Add french translation for additional progress bar information feature (added in PR8428)
* Add french translation in multiple modules.
* Fix French translation of `STR_ACE_Overheating_cookoffCoef_description` key.
* Merge ACEX - first attempt
Backwards compatibility with XGVAR set of macros used on all settings and config entries
Public API functions not taken into account yet, many other things probably still missed
* Resolve issues
* Switch to addSetting, backward compatible CfgPatches, missed XGVAR.
* Remove unnecessary backwards compat
* Convert ACEX Categorised settings to initSettings / Fix Intel items magazine
* Apply suggestions from code review
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Remove maintainers from merged ACEX components
* Cleanup unused module and faction classes
* Sitting - Add more object configs by @Dystopian
https://github.com/acemod/ACEX/pull/255
* Translations - Add Japanese by @classicarma
https://github.com/acemod/ACEX/pull/259
* Kill Tracker - Add killtracker.inc public include file by @Freddo3000"
https://github.com/acemod/ACEX/pull/251
* Add ACEX authors and sort authors file
* acex - final tweaks (#8513)
* acex - handle old funcs
* replace thirst/hunger setvars to acex naming
fix macro
Revert "fix macro"
This reverts commit d807e5e804c43916eaa42d34a89af94c6d9a48ad.
Revert "replace thirst/hunger setvars to acex naming"
This reverts commit bafc607884932d6e339daedc7c22e25dddbdd868.
x
Co-authored-by: TyroneMF <TyroneMF@hotmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Refactor Clear Trauma
Add in setting for clearing trauma after stitching a wound, make clearing trauma after bandage clear trauma of individual wounds as they're bandaged instead of all at once when fully bandaged.
* Make git diff slightly prettier.
* Update fnc_bandageLocal.sqf
* Style pass
* once more for the diff
* fix stupid
* Ddd trauma/visuals on bandage reopening
* French translation - fix typo
* French translation - add french translation of `STR_ACE_Markers_MarkerDirectionScaleSlider_Tooltip` key
* French translation - Add french translation of `Medical_Treatment_CPRSuccessChance` keys
Fix french translation of `Medical_Treatment_TreatmentTimeCPR_DisplayName` key