Master merge #2
Merged
Master merge #2
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7. - [Release notes](https://github.com/jbgutierrez/path-parse/releases) - [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7) --- updated-dependencies: - dependency-name: path-parse dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Zeus - Move to CBA settings * Zeus - Update BI module functions to 2.04 versions
* Update code guidelines for script_component * Update contributing documents for pull requests - Reflect true attribution practices - Reflect true merge process (this changed a long time ago) * Remove listed maintainer from component readmes We have almost never used these and serve as a source of confusion for new contributors.
* fix implicit dependency between medical damage and medical engine * move stringtable * valve pls fix Co-authored-by: PabstMirror <pabstmirror@gmail.com> Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Common - Block input on headbug fix * keep return
* Add Khaki MX variants * German Translations Co-authored-by: Jo David <github@jonathandavid.de> * Translations Co-authored-by: PabstMirror <pabstmirror@gmail.com> * Translations Co-authored-by: PabstMirror <pabstmirror@gmail.com> * Whoops Co-authored-by: PabstMirror <pabstmirror@gmail.com> * Capitalize Co-authored-by: Jo David <github@jonathandavid.de> Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Medical: Add item params to ace_treatmentSucceded * Medical: Add treatment[Started,Failed] events
* Add caller to ace_captiveStatusChanged event * missing bracket * Spaces, default value for _caller in setHandcuffed Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com> * use default value in SetSurrendered Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com> * update function example in doRemoveHandcuffs * fix undefined variable a lesson in not copy-pasting code Co-authored-by: PabstMirror <pabstmirror@gmail.com> * ditto last commit Co-authored-by: PabstMirror <pabstmirror@gmail.com> Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com> Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Add auto throttle to planes * add newline * clarify things * Use a better deltaTime value. Takes into account game pause * add coment * Add auto throttle cancellation on user input * misc fixes
…g) (acemod#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>
* 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>
* fix fnc_ai_handleFired * remove debug messages * use banana instead of FakePrimaryWeapon * switch from dummy item to new weaponholder * use exitWith instead of break
* Fix DAGR keybind * Fix Kestrel keybind * Consistency with other deviceKey conditions
* fix can't load Slingload_01_Base_F 20ft containers (`Land_Cargo20_military_green_F`) can be loaded but all children from `Slingload_01_Base_F` which share the same real size of a 20ft container can't be loaded (ex: `B_Slingload_01_Ammo_F`) * add a comment next to the changed line add a comment next to the changed line indicating why it has to be like that (the point of this PR) for future source reference
…od#8388) * Block radio on captive/surrendered/unconscious via status effect * missing semicolon * Don't broadcast setVar if radio addon doesn't exist Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Medical Engine - Synchronize random unconscious anims * Update addons/medical_engine/functions/fnc_applyAnimAfterRagdoll.sqf Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com> * Update addons/medical_engine/functions/fnc_applyAnimAfterRagdoll.sqf Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com> Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
* New Info: Adding custom sub item categories * typo fix * Custom sub item categories * Update arsenal.md
acemod#8397) * Redoing this * Revert "Redoing this" This reverts commit 80ff709. * Do this properly * Update fnc_handleKilled.sqf * use setDead function directly * Handle scripted camera * redo acemod#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>
* Add Spanish translation * Update addons/fire/stringtable.xml * Update addons/fire/stringtable.xml Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Update PULL_REQUEST_TEMPLATE.md * Update PULL_REQUEST_TEMPLATE.md
Co-Authored-By: Serg Vergun <1197314+severgun@users.noreply.github.com> Co-authored-by: Serg Vergun <1197314+severgun@users.noreply.github.com>
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com> Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
…a few existing ones (acemod#8731) * Add files via upload * Delete stringtable.xml * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Apply suggestions from code review Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* init commit * review changes * removed Land_vn_building_base import * case sensitive includes * changed to use script_component.hpp * config style * config style * config style * config style * revert to define * defines.hpp * defines.hpp Co-authored-by: commy2 <commy-2@gmx.de>
* Utilize isNotEqualTo command * fix pr validation
dgibso29
added a commit
that referenced
this pull request
Jul 12, 2022
…ted successfully. Added Bandage Reopening Chance Modifier Added Wound Reopen Chance Addon Setting Fixed dumb error in localization setup Credit! Resolved issue with Addon Settings definition & removed testing values. PR Feedback #1 - Removed unnecessary whitespace on LN 46 - Call global var directly at LN 87 - Updated Wound Reopen Chance localized name & description PR Feedback #2 - Increased reopen coefficient upper limit from 2 to 5. Changed author credit to reflect GitHub email. Added option to restrict PAK when patient has untreated fractures. Changed formatting and global variable. Credit to @mharis001. Apply suggestions from code review Corrected issue with checking array equality. Update fnc_isInStableCondition.sqf Merge pull request #1 from dgibso29/pr/7684 Corrected issue with checking array equality. Updated to directly check for open wounds Updated default minimum blood value to use a PAK per mharis001's comment Properly set up minimum blood required to use PAK as a percentage slider Forgot to include the REQUIRED BOOL to make the MinBloodPak slider a percentage... Resolved scope issue with checking for unbandaged wounds Why exitWith when you can break Update fnc_isInStableCondition.sqf Update fnc_isInStableCondition.sqf Merge branch 'master' into pr/7684 Revert "Merge branch 'master' into pr/7684" This reverts commit 0f46553, reversing changes made to b30de99. Update fnc_isInStableCondition.sqf Update fnc_isInStableCondition.sqf Update fnc_isInStableCondition.sqf Updated Required Wound State to PAK to current standard -- Bandaged wounds. Co-Authored-By: mharis001 <34453221+mharis001@users.noreply.github.com>
dgibso29
added a commit
that referenced
this pull request
Jul 12, 2022
…ted successfully. Added Bandage Reopening Chance Modifier Added Wound Reopen Chance Addon Setting Fixed dumb error in localization setup Credit! Resolved issue with Addon Settings definition & removed testing values. PR Feedback #1 - Removed unnecessary whitespace on LN 46 - Call global var directly at LN 87 - Updated Wound Reopen Chance localized name & description PR Feedback #2 - Increased reopen coefficient upper limit from 2 to 5. Changed author credit to reflect GitHub email. Added option to restrict PAK when patient has untreated fractures. Changed formatting and global variable. Credit to @mharis001. Apply suggestions from code review Corrected issue with checking array equality. Update fnc_isInStableCondition.sqf Merge pull request #1 from dgibso29/pr/7684 Corrected issue with checking array equality. Updated to directly check for open wounds Updated default minimum blood value to use a PAK per mharis001's comment Properly set up minimum blood required to use PAK as a percentage slider Forgot to include the REQUIRED BOOL to make the MinBloodPak slider a percentage... Resolved scope issue with checking for unbandaged wounds Why exitWith when you can break Update fnc_isInStableCondition.sqf Update fnc_isInStableCondition.sqf Merge branch 'master' into pr/7684 Revert "Merge branch 'master' into pr/7684" This reverts commit 0f46553, reversing changes made to b30de99. Update fnc_isInStableCondition.sqf Update fnc_isInStableCondition.sqf Update fnc_isInStableCondition.sqf Updated Required Wound State to PAK to current standard -- Bandaged wounds. Update fnc_isInStableCondition.sqf Update fnc_isInStableCondition.sqf Update fnc_isInStableCondition.sqf Updated Required Wound State to PAK to current standard -- Bandaged wounds. Fixed conditional logic in Stitched Requirement check. MP test completed successfully. Co-Authored-By: mharis001 <34453221+mharis001@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When merged this pull request will:
Component - Add|Fix|Improve|Change|Make|Remove bananas