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

add delay to Unconsciousness Captivity #3124

Merged
merged 5 commits into from
Feb 25, 2016
Merged

add delay to Unconsciousness Captivity #3124

merged 5 commits into from
Feb 25, 2016

Commits on Jan 6, 2016

  1. add delay to Unconsciousness Captivity(posible fix for #3121)

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

  2. remove ccp issue in settings 

    prevent setCaptive if unit is wake up
    @jokoho48
    jokoho48 committed Jan 6, 2016
    Configuration menu
    Copy the full SHA
    daf2fc2 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2016

  1. Merge branch 'master' of https://github.com/acemod/ACE3 into delayUnc… 

    …onCaptiv

# Conflicts:
#	addons/medical/functions/fnc_setUnconscious.sqf
    @jokoho48
    jokoho48 committed Feb 23, 2016
    Configuration menu
    Copy the full SHA
    b2d2bec View commit details
    Browse the repository at this point in the history

  2. fix simicolon 

    add stringtable entrys
    @jokoho48
    jokoho48 committed Feb 23, 2016
    Configuration menu
    Copy the full SHA
    c61763e View commit details
    Browse the repository at this point in the history

  3. remove module settings 

    change defualt in ACE_Settings
    @jokoho48
    jokoho48 committed Feb 23, 2016
    Configuration menu
    Copy the full SHA
    0956b97 View commit details
    Browse the repository at this point in the history