PabstMirror 1aebae32c5 Merge branch 'master' into medical-rewrite ...

Conflicts:
	addons/medical/functions/fnc_treatment_failure.sqf
	addons/medical/functions/fnc_treatment_success.sqf

2017-05-14 14:50:36 -05:00

..

fnc_addDutyFactor.sqf

Add Advanced Fatigue component (#4321)

2016-09-04 21:33:07 +02:00

fnc_createStaminaBar.sqf

Add Advanced Fatigue component (#4321)

2016-09-04 21:33:07 +02:00

fnc_getAnimDuty.sqf

Fix unarmed sprint->prone + minor perf improvments (#4887)

2017-03-15 10:12:07 -05:00

fnc_getMetabolicCosts.sqf

Fix unarmed sprint->prone + minor perf improvments (#4887)

2017-03-15 10:12:07 -05:00

fnc_handleEffects.sqf

manual merge

2016-12-05 20:15:16 +01:00

fnc_handlePlayerChanged.sqf

SQF Lint Cleanup Pass (#5157)

2017-05-14 14:48:05 -05:00

fnc_handleStaminaBar.sqf

Use vehicle eh to hide bar

2016-11-13 10:55:57 -06:00

fnc_mainLoop.sqf

Fix unarmed sprint->prone + minor perf improvments (#4887)

2017-03-15 10:12:07 -05:00

fnc_moduleSettings.sqf

Add Advanced Fatigue component (#4321)

2016-09-04 21:33:07 +02:00

fnc_removeDutyFactor.sqf

Add Advanced Fatigue component (#4321)

2016-09-04 21:33:07 +02:00

script_component.hpp

Add Advanced Fatigue component (#4321)

2016-09-04 21:33:07 +02:00