-
Notifications
You must be signed in to change notification settings - Fork 0
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
Commits on Sep 3, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 38baa8d - Browse repository at this point
Copy the full SHA 38baa8dView commit details
Commits on Sep 29, 2020
-
Configuration menu - View commit details
-
Copy full SHA for e384666 - Browse repository at this point
Copy the full SHA e384666View commit details -
Arsenal - Remove launcher sorts (#7890)
Brett authoredSep 29, 2020 Configuration menu - View commit details
-
Copy full SHA for e2e31ef - Browse repository at this point
Copy the full SHA e2e31efView commit details
Commits on Oct 1, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 5de9ef7 - Browse repository at this point
Copy the full SHA 5de9ef7View commit details -
Configuration menu - View commit details
-
Copy full SHA for d808e3a - Browse repository at this point
Copy the full SHA d808e3aView commit details -
Configuration menu - View commit details
-
Copy full SHA for f06b3d5 - Browse repository at this point
Copy the full SHA f06b3d5View commit details
Commits on Oct 3, 2020
-
Translations - Fix french translations (Fastroping) (#7910)
* Fix french fastroping translations * Add nickname to 'authors.txt"
Configuration menu - View commit details
-
Copy full SHA for f25e023 - Browse repository at this point
Copy the full SHA f25e023View commit details -
Configuration menu - View commit details
-
Copy full SHA for aa3d28e - Browse repository at this point
Copy the full SHA aa3d28eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 2f37320 - Browse repository at this point
Copy the full SHA 2f37320View commit details -
Configuration menu - View commit details
-
Copy full SHA for c4e7092 - Browse repository at this point
Copy the full SHA c4e7092View commit details -
Configuration menu - View commit details
-
Copy full SHA for 8e7f9b6 - Browse repository at this point
Copy the full SHA 8e7f9b6View commit details -
Configuration menu - View commit details
-
Copy full SHA for 74d74ed - Browse repository at this point
Copy the full SHA 74d74edView commit details -
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
Configuration menu - View commit details
-
Copy full SHA for e27110a - Browse repository at this point
Copy the full SHA e27110aView commit details -
Frag - Add frag values to R_MRAAWS_HE_F (#7927)
* Add frag values to R_MRAAWS_HE_F * damn tabs * Use GVAR() macro
Configuration menu - View commit details
-
Copy full SHA for 6278b67 - Browse repository at this point
Copy the full SHA 6278b67View commit details
Commits on Oct 4, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 5fa490a - Browse repository at this point
Copy the full SHA 5fa490aView commit details -
Configuration menu - View commit details
-
Copy full SHA for e53bc23 - Browse repository at this point
Copy the full SHA e53bc23View commit details -
Configuration menu - View commit details
-
Copy full SHA for 4e83b38 - Browse repository at this point
Copy the full SHA 4e83b38View commit details
Commits on Oct 5, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 8651d4c - Browse repository at this point
Copy the full SHA 8651d4cView commit details -
Configuration menu - View commit details
-
Copy full SHA for aa74178 - Browse repository at this point
Copy the full SHA aa74178View commit details
Commits on Oct 9, 2020
-
Grenades - Remove ref to missing audio (#7928)
* Remove ref to missing audio * Removing unused dummy files
Configuration menu - View commit details
-
Copy full SHA for d19bdce - Browse repository at this point
Copy the full SHA d19bdceView commit details -
Configuration menu - View commit details
-
Copy full SHA for 56baf2b - Browse repository at this point
Copy the full SHA 56baf2bView commit details
Commits on Oct 10, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 4cfe26b - Browse repository at this point
Copy the full SHA 4cfe26bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 73e151e - Browse repository at this point
Copy the full SHA 73e151eView commit details
Commits on Oct 12, 2020
-
Documentation - Fix typos and missing semi-colon in Arsenal (#7956)
Because when I copied it, it definitely was an oopsie moment.
Configuration menu - View commit details
-
Copy full SHA for cab4d1d - Browse repository at this point
Copy the full SHA cab4d1dView commit details
Commits on Oct 21, 2020
-
Configuration menu - View commit details
-
Copy full SHA for e07d2ae - Browse repository at this point
Copy the full SHA e07d2aeView commit details -
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>
Configuration menu - View commit details
-
Copy full SHA for 25cc139 - Browse repository at this point
Copy the full SHA 25cc139View commit details -
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>
Configuration menu - View commit details
-
Copy full SHA for 153644b - Browse repository at this point
Copy the full SHA 153644bView commit details
Commits on Oct 25, 2020
-
Scopes - Weapons IronSightBaseAngle updated (#7958)
* spar_IronSightBaseAngle * spar_IronSightBaseAngle * spar_IronSightBaseAngle
Configuration menu - View commit details
-
Copy full SHA for 8e999ae - Browse repository at this point
Copy the full SHA 8e999aeView commit details -
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>
Configuration menu - View commit details
-
Copy full SHA for 84b18d3 - Browse repository at this point
Copy the full SHA 84b18d3View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0f6a9ec - Browse repository at this point
Copy the full SHA 0f6a9ecView commit details
Commits on Oct 26, 2020
-
Arsenal - Provide reference to the current box (#7948)
* arsenal: provide ref to current box * use objNull instead of nil * Update fnc_openBox.sqf
Configuration menu - View commit details
-
Copy full SHA for a67d6ee - Browse repository at this point
Copy the full SHA a67d6eeView commit details
Commits on Oct 29, 2020
-
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>
Configuration menu - View commit details
-
Copy full SHA for 78c3071 - Browse repository at this point
Copy the full SHA 78c3071View commit details -
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>
Configuration menu - View commit details
-
Copy full SHA for 2220822 - Browse repository at this point
Copy the full SHA 2220822View commit details -
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
Configuration menu - View commit details
-
Copy full SHA for 174223b - Browse repository at this point
Copy the full SHA 174223bView commit details -
Documentation - Remove slideshow note (#7715)
* Documentation - Remove slideshow note Fix in Arma 3 v2.00 * Remove another issue reference
Configuration menu - View commit details
-
Copy full SHA for 42f4edc - Browse repository at this point
Copy the full SHA 42f4edcView commit details -
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>
Configuration menu - View commit details
-
Copy full SHA for afb3dad - Browse repository at this point
Copy the full SHA afb3dadView commit details -
Configuration menu - View commit details
-
Copy full SHA for ef56a2d - Browse repository at this point
Copy the full SHA ef56a2dView commit details -
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>
Configuration menu - View commit details
-
Copy full SHA for 9e3409f - Browse repository at this point
Copy the full SHA 9e3409fView commit details -
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>
Configuration menu - View commit details
-
Copy full SHA for 2b0db19 - Browse repository at this point
Copy the full SHA 2b0db19View commit details -
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>
Configuration menu - View commit details
-
Copy full SHA for b389740 - Browse repository at this point
Copy the full SHA b389740View commit details -
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
Configuration menu - View commit details
-
Copy full SHA for b991fe1 - Browse repository at this point
Copy the full SHA b991fe1View commit details
Commits on Oct 30, 2020
-
Configuration menu - View commit details
-
Copy full SHA for aab8d8e - Browse repository at this point
Copy the full SHA aab8d8eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 2ca13fc - Browse repository at this point
Copy the full SHA 2ca13fcView commit details
Commits on Oct 31, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 171fbf1 - Browse repository at this point
Copy the full SHA 171fbf1View commit details
Commits on Nov 2, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 260706c - Browse repository at this point
Copy the full SHA 260706cView commit details -
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>
Configuration menu - View commit details
-
Copy full SHA for 9226035 - Browse repository at this point
Copy the full SHA 9226035View commit details
Commits on Nov 3, 2020
-
Configuration menu - View commit details
-
Copy full SHA for ff2136c - Browse repository at this point
Copy the full SHA ff2136cView commit details -
Configuration menu - View commit details
-
Copy full SHA for af2973a - Browse repository at this point
Copy the full SHA af2973aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 12ad406 - Browse repository at this point
Copy the full SHA 12ad406View commit details
Commits on Nov 4, 2020
-
Configuration menu - View commit details
-
Copy full SHA for ae13438 - Browse repository at this point
Copy the full SHA ae13438View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0a27a27 - Browse repository at this point
Copy the full SHA 0a27a27View commit details
Commits on Nov 5, 2020
-
Configuration menu - View commit details
-
Copy full SHA for bc71949 - Browse repository at this point
Copy the full SHA bc71949View commit details
Commits on Nov 7, 2020
-
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
Configuration menu - View commit details
-
Copy full SHA for 712a277 - Browse repository at this point
Copy the full SHA 712a277View commit details -
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
Configuration menu - View commit details
-
Copy full SHA for 95d4dc8 - Browse repository at this point
Copy the full SHA 95d4dc8View commit details -
Configuration menu - View commit details
-
Copy full SHA for 5d1aa28 - Browse repository at this point
Copy the full SHA 5d1aa28View commit details
Commits on Nov 8, 2020
-
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>
Configuration menu - View commit details
-
Copy full SHA for 119450f - Browse repository at this point
Copy the full SHA 119450fView commit details -
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
Configuration menu - View commit details
-
Copy full SHA for 0e64275 - Browse repository at this point
Copy the full SHA 0e64275View commit details -
Ballistics - Update the B 556x45 dual (#7982)
* B_556x45_dual * B_556x45_dual
Configuration menu - View commit details
-
Copy full SHA for 718d282 - Browse repository at this point
Copy the full SHA 718d282View commit details -
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>
Configuration menu - View commit details
-
Copy full SHA for d27122f - Browse repository at this point
Copy the full SHA d27122fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 0c84cdd - Browse repository at this point
Copy the full SHA 0c84cddView commit details -
Explosives - Add
clackerAdded
event (#7994)* Add clackerPlaced event * Update docs/wiki/framework/events-framework.md Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Configuration menu - View commit details
-
Copy full SHA for 1efa25f - Browse repository at this point
Copy the full SHA 1efa25fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 92cd367 - Browse repository at this point
Copy the full SHA 92cd367View commit details
Commits on Nov 10, 2020
-
Configuration menu - View commit details
-
Copy full SHA for a621d2e - Browse repository at this point
Copy the full SHA a621d2eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 6299428 - Browse repository at this point
Copy the full SHA 6299428View commit details
Commits on Nov 15, 2020
-
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>
Configuration menu - View commit details
-
Copy full SHA for ad75c7c - Browse repository at this point
Copy the full SHA ad75c7cView commit details
Commits on Nov 16, 2020
-
Configuration menu - View commit details
-
Copy full SHA for d887b4a - Browse repository at this point
Copy the full SHA d887b4aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 109e12c - Browse repository at this point
Copy the full SHA 109e12cView commit details
Commits on Nov 20, 2020
-
Configuration menu - View commit details
-
Copy full SHA for b4e1909 - Browse repository at this point
Copy the full SHA b4e1909View commit details
Commits on Nov 24, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 137af79 - Browse repository at this point
Copy the full SHA 137af79View commit details
Commits on Nov 25, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 9dc82ee - Browse repository at this point
Copy the full SHA 9dc82eeView commit details
Commits on Nov 29, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 2ec28c5 - Browse repository at this point
Copy the full SHA 2ec28c5View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0e88479 - Browse repository at this point
Copy the full SHA 0e88479View commit details -
Configuration menu - View commit details
-
Copy full SHA for a64ba9f - Browse repository at this point
Copy the full SHA a64ba9fView commit details
Commits on Dec 2, 2020
-
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>
Configuration menu - View commit details
-
Copy full SHA for 5a6b21d - Browse repository at this point
Copy the full SHA 5a6b21dView commit details