Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update from remote #1

Merged
merged 74 commits into from
Dec 6, 2020
Merged

Update from remote #1

merged 74 commits into from
Dec 6, 2020

Commits on Sep 3, 2020

  1. Configuration menu
    Copy the full SHA
    38baa8d View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2020

  1. Configuration menu
    Copy the full SHA
    e384666 View commit details
    Browse the repository at this point in the history
  2. Arsenal - Remove launcher sorts (#7890)

    Brett authored Sep 29, 2020
    Configuration menu
    Copy the full SHA
    e2e31ef View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2020

  1. Configuration menu
    Copy the full SHA
    5de9ef7 View commit details
    Browse the repository at this point in the history
  2. remove useless file (#7922)

    bux authored Oct 1, 2020
    Configuration menu
    Copy the full SHA
    d808e3a View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f06b3d5 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2020

  1. Translations - Fix french translations (Fastroping) (#7910)

    * Fix french fastroping translations
    
    * Add nickname to 'authors.txt"
    Elgin675 authored Oct 3, 2020
    Configuration menu
    Copy the full SHA
    f25e023 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    aa3d28e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    2f37320 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    c4e7092 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    8e7f9b6 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    74d74ed View commit details
    Browse the repository at this point in the history
  7. Explosives - Add CBA settings for max/min/default timer values (#7916)

    * Transfer to CBA settings, add timer options
    
    * Remove wiki note
    
    * Tweak arrays, stringtables
    
    * moveToSQF
    Freddo3000 authored Oct 3, 2020
    Configuration menu
    Copy the full SHA
    e27110a View commit details
    Browse the repository at this point in the history
  8. Frag - Add frag values to R_MRAAWS_HE_F (#7927)

    * Add frag values to R_MRAAWS_HE_F
    
    * damn tabs
    
    * Use GVAR() macro
    Neviothr authored Oct 3, 2020
    Configuration menu
    Copy the full SHA
    6278b67 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2020

  1. Configuration menu
    Copy the full SHA
    5fa490a View commit details
    Browse the repository at this point in the history
  2. Turkish Language Update (#7909)

    Added missing translation to Turkish
    tahakocal authored Oct 4, 2020
    Configuration menu
    Copy the full SHA
    e53bc23 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4e83b38 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2020

  1. Configuration menu
    Copy the full SHA
    8651d4c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    aa74178 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2020

  1. Grenades - Remove ref to missing audio (#7928)

    * Remove ref to missing audio
    
    * Removing unused dummy files
    Cyruz143 authored Oct 9, 2020
    Configuration menu
    Copy the full SHA
    d19bdce View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    56baf2b View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2020

  1. Configuration menu
    Copy the full SHA
    4cfe26b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    73e151e View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2020

  1. Documentation - Fix typos and missing semi-colon in Arsenal (#7956)

    Because when I copied it, it definitely was an oopsie moment.
    Saborknight authored Oct 12, 2020
    Configuration menu
    Copy the full SHA
    cab4d1d View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2020

  1. Configuration menu
    Copy the full SHA
    e07d2ae View commit details
    Browse the repository at this point in the history
  2. Vehicle Lock: add events (#7938)

    * 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>
    3 people authored Oct 21, 2020
    Configuration menu
    Copy the full SHA
    25cc139 View commit details
    Browse the repository at this point in the history
  3. Reload/Interaction - Fix 2 hemtt ingame errors (#7924)

    * 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>
    jokoho48 and Dystopian authored Oct 21, 2020
    Configuration menu
    Copy the full SHA
    153644b View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2020

  1. Scopes - Weapons IronSightBaseAngle updated (#7958)

    * spar_IronSightBaseAngle
    
    * spar_IronSightBaseAngle
    
    * spar_IronSightBaseAngle
    Laid3acK authored Oct 25, 2020
    Configuration menu
    Copy the full SHA
    8e999ae View commit details
    Browse the repository at this point in the history
  2. Slideshow - Add "SlideChanged" event (#7954)

    * 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>
    Walthzer and jonpas authored Oct 25, 2020
    Configuration menu
    Copy the full SHA
    84b18d3 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0f6a9ec View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2020

  1. Arsenal - Provide reference to the current box (#7948)

    * arsenal: provide ref to current box
    
    * use objNull instead of nil
    
    * Update fnc_openBox.sqf
    BrettMayson authored Oct 26, 2020
    Configuration menu
    Copy the full SHA
    a67d6ee View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2020

  1. Medical - Show triage level in interaction (#7940)

    * medical: show triage in interaction
    
    * rename
    
    * clean up comments
    
    * Update addons/medical_gui/functions/fnc_modifyActionTriageLevel.sqf
    
    Co-authored-by: jonpas <jonpas33@gmail.com>
    
    * Update addons/medical_gui/functions/fnc_modifyActionTriageLevel.sqf
    
    Co-authored-by: jonpas <jonpas33@gmail.com>
    
    * Add setting (disabled, enabled, medicsOnly)
    
    * Apply suggestions from code review
    
    Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
    
    Co-authored-by: jonpas <jonpas33@gmail.com>
    Co-authored-by: PabstMirror <pabstmirror@gmail.com>
    Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
    4 people authored Oct 29, 2020
    Configuration menu
    Copy the full SHA
    78c3071 View commit details
    Browse the repository at this point in the history
  2. Gunbag - Add BI Arsenal Compatibility (#7887)

    * Initial Commit
    
    * Remove development components
    
    * Adapt to ACE_player & resolve returned assignment
    
    * Update addons/gunbag/functions/fnc_BIArsenalClose.sqf
    
    Co-authored-by: commy2 <commy-2@gmx.de>
    
    Co-authored-by: commy2 <commy-2@gmx.de>
    mjc4wilton and commy2 authored Oct 29, 2020
    Configuration menu
    Copy the full SHA
    2220822 View commit details
    Browse the repository at this point in the history
  3. 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
    dgibso29 authored Oct 29, 2020
    Configuration menu
    Copy the full SHA
    174223b View commit details
    Browse the repository at this point in the history
  4. Documentation - Remove slideshow note (#7715)

    * Documentation - Remove slideshow note
    
    Fix in Arma 3 v2.00
    
    * Remove another issue reference
    jonpas authored Oct 29, 2020
    Configuration menu
    Copy the full SHA
    42f4edc View commit details
    Browse the repository at this point in the history
  5. Markers - Add timestamps (#7947)

    * Add timestamps to markers
    
    * Tiny tweaks
    
    * Update addons/markers/functions/fnc_canTimestamp.sqf
    
    Co-authored-by: Brett <brett@bmandesigns.com>
    
    * Update addons/markers/functions/fnc_initInsertMarker.sqf
    
    Co-authored-by: Brett <brett@bmandesigns.com>
    
    * Add timestamp format setting
    
    * Script cleanup, move checkbox under desc
    
    * Fix stringtable validation
    
    * Tweaks
    
    * Remove styling from stringtable
    
    * Edit timestamps instead of append
    
    Credits to @PabstMirror
    
    Co-authored-by: Brett <brett@bmandesigns.com>
    Freddo3000 and Brett authored Oct 29, 2020
    Configuration menu
    Copy the full SHA
    afb3dad View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    ef56a2d View commit details
    Browse the repository at this point in the history
  7. 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>
    BrettMayson and PabstMirror authored Oct 29, 2020
    Configuration menu
    Copy the full SHA
    9e3409f View commit details
    Browse the repository at this point in the history
  8. 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>
    diwako and PabstMirror authored Oct 29, 2020
    Configuration menu
    Copy the full SHA
    2b0db19 View commit details
    Browse the repository at this point in the history
  9. Medical AI - Fix AI healing itself too fast when hit (#7955)

    * Fix AI healing itself too fast when hit
    
    * make time constants gvars
    
    Co-authored-by: PabstMirror <pabstmirror@gmail.com>
    BaerMitUmlaut and PabstMirror authored Oct 29, 2020
    Configuration menu
    Copy the full SHA
    b389740 View commit details
    Browse the repository at this point in the history
  10. Arsenal - Sort by protection (helm, uniform, vest) (#7952)

    * Arsenal - Sort by protection (helm, uniform, vest)
    
    * Update fnc_sortStatement_protection.sqf
    
    * split to 2 different sorts
    PabstMirror authored Oct 29, 2020
    Configuration menu
    Copy the full SHA
    b991fe1 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2020

  1. Configuration menu
    Copy the full SHA
    aab8d8e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2ca13fc View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2020

  1. Configuration menu
    Copy the full SHA
    171fbf1 View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2020

  1. Configuration menu
    Copy the full SHA
    260706c View commit details
    Browse the repository at this point in the history
  2. Arsenal - Conditional on sorts (#7889)

    * Arsenal - conditional on sorts
    
    * fix: zero divisor
    
    * update fnc_addSort
    
    * Update fnc_fillSort.sqf
    
    Co-authored-by: PabstMirror <pabstmirror@gmail.com>
    Brett and PabstMirror authored Nov 2, 2020
    Configuration menu
    Copy the full SHA
    9226035 View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2020

  1. Configuration menu
    Copy the full SHA
    ff2136c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    af2973a View commit details
    Browse the repository at this point in the history
  3. Prep 3.13.5 Build 56

    PabstMirror committed Nov 3, 2020
    Configuration menu
    Copy the full SHA
    12ad406 View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2020

  1. Configuration menu
    Copy the full SHA
    ae13438 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0a27a27 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2020

  1. Configuration menu
    Copy the full SHA
    bc71949 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2020

  1. 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
    Elgin675 authored Nov 7, 2020
    Configuration menu
    Copy the full SHA
    712a277 View commit details
    Browse the repository at this point in the history
  2. Translations - Update French Translations (Arsenal, Markers and Medic…

    …al GUI) (#7987)
    
    * Translation - Add french "Arsenal_sortByProtection" keys
    
    * Translation - Add french "Markers_Timestamp" keys
    
    * Translation - Add french "Medical_GUI_InteractionMenuShowTriage" keys
    Elgin675 authored Nov 7, 2020
    Configuration menu
    Copy the full SHA
    95d4dc8 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    5d1aa28 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2020

  1. DAGR / Interaction Menu / Repair - Fix overwriting globals (#7990)

    * 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>
    BaerMitUmlaut and PabstMirror authored Nov 8, 2020
    Configuration menu
    Copy the full SHA
    119450f View commit details
    Browse the repository at this point in the history
  2. Medical Statemachine - Add setting to disallow bleedout in cardiac ar…

    …rest (#7547)
    
    * Add setting to disable bleedout in cardiac arrest
    
    * Improve setting name and description
    BaerMitUmlaut authored Nov 8, 2020
    Configuration menu
    Copy the full SHA
    0e64275 View commit details
    Browse the repository at this point in the history
  3. Ballistics - Update the B 556x45 dual (#7982)

    * B_556x45_dual
    
    * B_556x45_dual
    Laid3acK authored Nov 8, 2020
    Configuration menu
    Copy the full SHA
    718d282 View commit details
    Browse the repository at this point in the history
  4. Medical Status - Fix unconscious AI aiming at enemies (#7977)

    * 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>
    BaerMitUmlaut and PabstMirror authored Nov 8, 2020
    Configuration menu
    Copy the full SHA
    d27122f View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    0c84cdd View commit details
    Browse the repository at this point in the history
  6. Explosives - Add clackerAdded event (#7994)

    * Add clackerPlaced event
    
    * Update docs/wiki/framework/events-framework.md
    
    Co-authored-by: PabstMirror <pabstmirror@gmail.com>
    dedmen and PabstMirror authored Nov 8, 2020
    Configuration menu
    Copy the full SHA
    1efa25f View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    92cd367 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2020

  1. Configuration menu
    Copy the full SHA
    a621d2e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6299428 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2020

  1. Common / Medical - Fix loading patients into turret only seats (#7980)

    * Fix loading patients into turret only seats
    
    * Fix cargo logic, adjust function for captives (#8000)
    
    Co-authored-by: PabstMirror <pabstmirror@gmail.com>
    BaerMitUmlaut and PabstMirror authored Nov 15, 2020
    Configuration menu
    Copy the full SHA
    ad75c7c View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2020

  1. Configuration menu
    Copy the full SHA
    d887b4a View commit details
    Browse the repository at this point in the history
  2. Prep 3.13.5 Build 57

    PabstMirror committed Nov 16, 2020
    Configuration menu
    Copy the full SHA
    109e12c View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2020

  1. Configuration menu
    Copy the full SHA
    b4e1909 View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2020

  1. Configuration menu
    Copy the full SHA
    137af79 View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2020

  1. Configuration menu
    Copy the full SHA
    9dc82ee View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2020

  1. Configuration menu
    Copy the full SHA
    2ec28c5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0e88479 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    a64ba9f View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2020

  1. Map Gestures - Fix briefing mode group (#8025)

    * 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>
    3 people authored Dec 2, 2020
    Configuration menu
    Copy the full SHA
    5a6b21d View commit details
    Browse the repository at this point in the history