Update from remote #1
Merged
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
* Fix french fastroping translations * Add nickname to 'authors.txt"
* Transfer to CBA settings, add timer options * Remove wiki note * Tweak arrays, stringtables * moveToSQF
* Add frag values to R_MRAAWS_HE_F * damn tabs * Use GVAR() macro
Added missing translation to Turkish
* Remove ref to missing audio * Removing unused dummy files
Because when I copied it, it definitely was an oopsie moment.
* vehiclelock: events * Update addons/vehiclelock/functions/fnc_lockpick.sqf Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com> * Update addons/vehiclelock/functions/fnc_lockpick.sqf Co-authored-by: PabstMirror <pabstmirror@gmail.com> * Update addons/vehiclelock/functions/fnc_lockpick.sqf Co-authored-by: PabstMirror <pabstmirror@gmail.com> Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com> Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* fix 2 hemtt ingame errors * Extract broken calls to function * Update addons/interaction/functions/fnc_doRemoteControl.sqf Co-authored-by: Dystopian <sddex@ya.ru> Co-authored-by: Dystopian <sddex@ya.ru>
* spar_IronSightBaseAngle * spar_IronSightBaseAngle * spar_IronSightBaseAngle
* Implement Events in slideshow framework. * Update function header * Pass correct agruments to next call of autoTransiton. * Add return of slideshow ID Return slideshow ID so it can be stored for later use with the events. * Replace repeat code with variable. _image. * Redundant comment removal * Update addons/slideshow/functions/fnc_createSlideshow.sqf Co-authored-by: jonpas <jonpas33@gmail.com> Co-authored-by: jonpas <jonpas33@gmail.com>
* Arsenal - conditional on sorts * fix: zero divisor * update fnc_addSort * Update fnc_fillSort.sqf Co-authored-by: PabstMirror <pabstmirror@gmail.com>
…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
…al GUI) (#7987) * Translation - Add french "Arsenal_sortByProtection" keys * Translation - Add french "Markers_Timestamp" keys * Translation - Add french "Medical_GUI_InteractionMenuShowTriage" keys
* Remove global DAGR_NEXT variable * Remove global ERR variable * Fix overwriting global this variable * Fix overwriting global total and hitpoint variables * fix condition Co-authored-by: PabstMirror <pabstmirror@gmail.com>
…rest (#7547) * Add setting to disable bleedout in cardiac arrest * Improve setting name and description
* B_556x45_dual * B_556x45_dual
* Fix unconscious AI aiming at enemies * Improve handling when locality changes Co-authored-by: PabstMirror <pabstmirror@gmail.com> Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Add clackerPlaced event * Update docs/wiki/framework/events-framework.md Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Fix loading patients into turret only seats * Fix cargo logic, adjust function for captives (#8000) Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* fix getting players from a group * add brackets Co-authored-by: jonpas <jonpas33@gmail.com> * small refactoring * remove useless parentheses Co-authored-by: commy2 <commy-2@gmx.de> Co-authored-by: jonpas <jonpas33@gmail.com> Co-authored-by: commy2 <commy-2@gmx.de>
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