Commit Graph

338 Commits

Author SHA1 Message Date
GhostIsSpooky
a9296f66d5
Medical - Update setDead to use setHitpointDamage instigator param (#8397)
* 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>
2021-11-15 09:31:56 -06:00
Crowdedlight
5bf4167d3e
Medical - Add check to FullHealLocal in case unit is burning then extinguish before healing (#8622)
* 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>
2021-11-04 16:36:53 -05:00
PabstMirror
7bc6fdfa66
Cleanup - Trim all trailing whitespace (#8651) 2021-10-30 16:42:03 -05:00
Nilia119
d86ddb41d6
Translations - Add Missing German (#8592)
* 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>
2021-10-28 00:10:19 -05:00
PabstMirror
5468f180f0
Cargo - Add config value to block renaming (#8610) 2021-10-25 18:27:56 -05:00
Krzyciu
05c16b3250
Translations - Add Polish (#8597)
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
2021-10-24 19:22:27 +02:00
Beeperz
c00c6b826c
Added some russian translations (#8565)
* Added some russian translations

* replace tabs

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-20 13:34:43 -05:00
Elgin675
958a0bf9ec
Translations - Update French Translations (#8562)
* 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.
2021-10-19 15:30:46 -05:00
classic
e9912a4c33
Update of Japanese translation (#8530) 2021-10-15 22:48:18 -05:00
nomisum
7009404d39
Add Global Mobilization Compatibility (#7835)
* GM Compat

add GM Compat addon - it's #7835 without fastroping & refuel changes
* plus compat_gm moved into optionals
* plus a few whitespace fixes

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: Fusselwurm <fusselwurm@gmail.com>

* add ACE CSW dep (see script_component.hpp)

* warn about missiong compat_gm if GM is loaded

* move medic tents to EGVAR(medical,facilities) array thing

* add pDumbs

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: Fusselwurm <fusselwurm@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-14 10:48:54 -05:00
jonpas
6ca9d59443
Merge ACEX (#8415)
* 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>
2021-10-14 10:46:43 -05:00
GhostIsSpooky
e4be783f80
Repair - Add Locations Boost Training Setting (#8349)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-12 22:53:45 +02:00
GhostIsSpooky
374a5b632f
Medical - Refactor Clear Trauma Setting (#8345)
* 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
2021-10-12 10:08:10 +02:00
GhostIsSpooky
998f86f034
General - Move to CBA Settings (#8461)
* first pass

* second pass

* third pass

* final pass

* missing commas

* newlines

* switch to cba eventhandler

* newlines, formatting

* laser - movedToSQF

* add logging to ace_common_fnc_cbaSettings_loadFromConfig

* Update initSettings.sqf

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-11 15:48:30 -05:00
GhostIsSpooky
e92ea53385
Medical - Return tourniquets after PAK (#8419) 2021-10-11 00:34:28 +02:00
classic
536ab0568f
Update of Japanese translation (#8492) 2021-10-08 09:05:06 -05:00
Filip Maciejewski
26d0a85650
Medical - Polish translations updates (#8467) 2021-10-01 21:51:19 -05:00
Elgin675
565aa8cf0e
Add French Translation (#8427) 2021-09-07 13:35:16 -05:00
PabstMirror
efe09682cc
Add SQFC support (#8235)
* sqfc

compile_script
cba 3.15.5 and update make.py

* \n

Co-authored-by: jonpas <jonpas33@gmail.com>

* Update make.py

Co-authored-by: jonpas <jonpas33@gmail.com>
2021-09-03 19:08:34 -05:00
PabstMirror
cdd7b6d81b
Medical Treatment - Allow diagnosing death/CA (invalidates old setting) (#8162)
* Medical Treatment - Allow diagnosing death/CA

* Update addons/medical_treatment/stringtable.xml

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>

* Update addons/medical_treatment/stringtable.xml

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
2021-09-03 14:50:54 -05:00
∂ω∂
f7126383fe
Medical - Add treatment status events (#8385)
* Medical: Add item params to ace_treatmentSucceded

* Medical: Add treatment[Started,Failed] events
2021-09-03 14:37:48 -05:00
Sergey Veryaskin
106ef17071
Translation - Russian (#8376)
* Translation - Russian

* Update addons/medical_treatment/stringtable.xml

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-08-11 15:44:04 -05:00
Elgin675
46df1bd811
Translations - Update / Fix French Translations (Markers, Medical Damage and Medical Treatment) (#8334)
* 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
2021-07-24 02:40:36 -05:00
pterolatypus
c81f371f5d
Medical Treatment - Allow variable CPR chance based on blood volume (invalidates old setting) (#7983) 2021-07-23 15:59:32 +02:00
StuntKeeper
1b43cd6951
Added missing Russian translations (#8307)
Added missing Russian translations and fixed a few incorrect ones in acemedical.
2021-07-06 14:25:52 -05:00
Brett
2507e8f36b
fix minor cut re-opening (#8296) 2021-06-27 13:25:55 -05:00
Brett
d5bc7f10f5
fix my name, add it to contributers (#8295) 2021-06-27 07:01:12 +02:00
Sergey Veryaskin
c8812e093a
up russian language (#8263)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-05-25 21:06:00 -05:00
Elgin675
e4a96b7229
Update French Translation and Fix Typo (#8262) 2021-05-23 16:57:36 -05:00
Abogado
f96b410fa0
Translations - Spanish (#8229)
Complete to date spanish translation.
2021-04-26 11:48:02 -05:00
PabstMirror
a90911a7fc
Various - Add missing units/weapons to cfgPatches (#8175)
* Various - Add missing units/weapons to cfgPatches

* Update config.cpp
2021-03-17 15:48:47 -05:00
classic
c60e4111d8
Update Japanese translation (#8146) 2021-03-04 11:27:06 -06:00
pterolatypus
b2da1792e1
Medical Treatment - Settings to limit IVs to certain locations (#8116)
* Settings to limit IVs to certain locations

* Changed to one setting

* Reworded settings for consistency
2021-02-27 11:06:37 -06:00
Neviothr
75f7ed7532
Utilize isNotEqualTo (#7929)
* Utilize isNotEqualTo

* undo changes to some files

* redo some changes, fix based on @Vdauphin 's comment

* fix validator issues

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-02-27 11:05:05 -06:00
PabstMirror
bac47bb292
Chery pick 6868fa5600 (#8139)
Co-Authored-By: Toni Vicente <arv187@users.noreply.github.com>

Co-authored-by: Toni Vicente <arv187@users.noreply.github.com>
2021-02-26 13:28:42 -06:00
TyroneMF
f85632cbbd
initial push (#8099) 2021-02-18 12:58:26 -06:00
PabstMirror
e8693c8db9
Various - Use configOf command for faster lookup (#8100)
* configOf

* replace some use of CBA_fnc_getObjectConfig
2021-02-18 12:58:08 -06:00
PabstMirror
5ffcac9c88
Misc - Fix minor macro usage (#8091) 2021-02-03 17:56:18 -06:00
Dystopian
9dc82ee187
Fix fnc_common_addToInventory using (#8013) 2020-11-25 13:22:25 -06:00
Elgin675
5d1aa28419
Translations - Add French "Medical_Treatment_bodybagWhileStillAlive" key (#7993) 2020-11-07 17:08:01 -06:00
Elgin675
712a27788f
Translations - Update / Fix French Translations (Medical Treatment) (#7988)
* Translations - Fix French "TreatmentTime" keys.

* Translations - Add French "TreatmentTime" keys.

* Translations - Fix some french keys (medical_treatment).

* Translation - Add french "Treatment_WoundStitchTime" and "AllowBodyBagUnconscious "keys

* Translations - Fix french "Medical_Treatment_AllowSelfStitch_DisplayName" key

* Fix french "Medical_Treatment_MedicIV_Description" key

* Fix french "Medical_Treatment_AllowSelfIV_DisplayName" key
2020-11-07 09:35:40 -06:00
mharis001
171fbf1e9e
Medical Treatment - Settings cleanup (#7973) 2020-10-30 23:40:10 -05:00
mharis001
aab8d8eb32
Medical Treatment - Title case autoinjector item names (#7974) 2020-10-30 14:45:28 +01:00
diwako
2b0db19807
Medical - Adjustable times for many treatment actions (#7951)
* adjustable times for most constant treatment times

* add new line, formatting

* cleanup merge

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-10-29 11:37:44 -05:00
Brett
9e3409fc6e
Medical - Allow placing unconscious in a body bag (#7941)
* medical: allow placing unconscious in a bodybag

* Always show body bag action on non-awake units

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-10-29 11:37:36 -05:00
Daniel Gibson
174223bddf
Medical - Add Treatment Time Addon Settings (#7900)
* Added Addon Settings for several Medical Treatment Times

Tourniquets, IV Bags, Syringes, Splints, and Body Bags.

* Fixed stringtable indentation

* And again
2020-10-29 11:07:30 -05:00
Taha
e53bc23ebf
Turkish Language Update (#7909)
Added missing translation to Turkish
2020-10-04 10:57:46 -05:00
Björn Dahlgren
8e7f9b6db5
Medical Treatment - Fix invalid usage of ARR macro (#7933) 2020-10-03 10:21:29 -05:00
Cyruz143
ee75268205
Adding splits + torniquets to simple crate (#7885) 2020-08-30 21:55:26 -05:00
classic
49c84e2ce1
Update Japanese translation (#7880) 2020-08-28 10:30:32 -05:00