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.

Sign up for GitHub

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

Jump to bottom

Medical Improvements #3174

Merged
merged 14 commits into from
Feb 20, 2016
Merged

Medical Improvements #3174

merged 14 commits into from
Feb 20, 2016

Commits on Oct 2, 2015

  1. add selection, collision, fall and drowning damage events

    @commy2
    commy2 committed Oct 2, 2015
    Configuration menu
    Copy the full SHA
    573279b View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2016

  1. Merge branch '340handledamage' into medical-focus-feature

    @thojkooi
    thojkooi committed Jan 16, 2016
    Configuration menu
    Copy the full SHA
    ee9a620 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2016

  1. Add selectionDamage implementation

    @thojkooi
    thojkooi committed Jan 17, 2016
    Configuration menu
    Copy the full SHA
    6e42a10 View commit details
    Browse the repository at this point in the history

  2. Fix missing event log entries #3134

    @thojkooi
    thojkooi committed Jan 17, 2016
    Configuration menu
    Copy the full SHA
    209d100 View commit details
    Browse the repository at this point in the history

  3. add initial implementation of drowning and collision damage handling

    @thojkooi
    thojkooi committed Jan 17, 2016
    Configuration menu
    Copy the full SHA
    7de1a7b View commit details
    Browse the repository at this point in the history

  4. Stage improvements bandage effectiveness

    @thojkooi
    thojkooi committed Jan 17, 2016
    Configuration menu
    Copy the full SHA
    86158ac View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2016

  1. Increase heart rate increase speed #3134

    @thojkooi
    thojkooi committed Jan 20, 2016
    Configuration menu
    Copy the full SHA
    34613b4 View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2016

  1. Merge branch 'master' into medical-focus-feature

    @thojkooi
    thojkooi committed Feb 7, 2016
    Configuration menu
    Copy the full SHA
    84878c3 View commit details
    Browse the repository at this point in the history

  2. improve medical bandage configuration

    @thojkooi
    thojkooi committed Feb 7, 2016
    Configuration menu
    Copy the full SHA
    39cf113 View commit details
    Browse the repository at this point in the history

  3. Add Adenosine to replace atropine #1573

    @thojkooi
    thojkooi committed Feb 7, 2016
    Configuration menu
    Copy the full SHA
    bfd90cd View commit details
    Browse the repository at this point in the history

  4. Add setting for limiting usage of Epinephrine in basic medical #1792 

    Part of focus feature medical #3134. Default settings are inline with old default.
    @thojkooi
    thojkooi committed Feb 7, 2016
    Configuration menu
    Copy the full SHA
    575f362 View commit details
    Browse the repository at this point in the history

  5. Remove non functional event driven handleDamage

    @thojkooi
    thojkooi committed Feb 7, 2016
    Configuration menu
    Copy the full SHA
    e754c89 View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2016

  1. Merge branch 'master' into medical-focus-feature

    @thojkooi
    thojkooi committed Feb 13, 2016
    Configuration menu
    Copy the full SHA
    ff86359 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2016

  1. Merge branch 'master' into medical-focus-feature 

    Conflicts:
	addons/medical/functions/fnc_treatmentAdvanced_CPR.sqf
    @thojkooi
    thojkooi committed Feb 20, 2016
    Configuration menu
    Copy the full SHA
    7d063d4 View commit details
    Browse the repository at this point in the history