PabstMirror
356a8f640a
Merge branch 'master' into medical-rewrite
...
Conflicts:
addons/medical/functions/fnc_actionCheckBloodPressure.sqf
addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf
addons/medical/functions/fnc_actionCheckPulse.sqf
addons/medical/functions/fnc_actionCheckPulseLocal.sqf
addons/medical/functions/fnc_actionDiagnose.sqf
addons/medical/functions/fnc_actionRemoveTourniquet.sqf
addons/medical/functions/fnc_addHeartRateAdjustment.sqf
addons/medical/functions/fnc_addToInjuredCollection.sqf
addons/medical/functions/fnc_addUnconsciousCondition.sqf
addons/medical/functions/fnc_addVitalLoop.sqf
addons/medical/functions/fnc_canTreat.sqf
addons/medical/functions/fnc_copyDeadBody.sqf
addons/medical/functions/fnc_createLitter.sqf
addons/medical/functions/fnc_determineIfFatal.sqf
addons/medical/functions/fnc_getBloodLoss.sqf
addons/medical/functions/fnc_getBloodPressure.sqf
addons/medical/functions/fnc_getBloodVolumeChange.sqf
addons/medical/functions/fnc_getCardiacOutput.sqf
addons/medical/functions/fnc_getHeartRateChange.sqf
addons/medical/functions/fnc_getTriageStatus.sqf
addons/medical/functions/fnc_getUnconsciousCondition.sqf
addons/medical/functions/fnc_handleBandageOpening.sqf
addons/medical/functions/fnc_handleCollisionDamage.sqf
addons/medical/functions/fnc_handleDamage.sqf
addons/medical/functions/fnc_handleDamage_advanced.sqf
addons/medical/functions/fnc_handleDamage_advancedSetDamage.sqf
addons/medical/functions/fnc_handleDamage_airway.sqf
addons/medical/functions/fnc_handleDamage_caching.sqf
addons/medical/functions/fnc_handleDamage_fractures.sqf
addons/medical/functions/fnc_handleDamage_internalInjuries.sqf
addons/medical/functions/fnc_handleDamage_wounds.sqf
addons/medical/functions/fnc_handleDamage_woundsOld.sqf
addons/medical/functions/fnc_hasMedicalEnabled.sqf
addons/medical/functions/fnc_hasTourniquetAppliedTo.sqf
addons/medical/functions/fnc_isInStableCondition.sqf
addons/medical/functions/fnc_isMedicalVehicle.sqf
addons/medical/functions/fnc_itemCheck.sqf
addons/medical/functions/fnc_medicationEffectLoop.sqf
addons/medical/functions/fnc_modifyMedicalAction.sqf
addons/medical/functions/fnc_moduleAdvancedMedicalSettings.sqf
addons/medical/functions/fnc_moduleAssignMedicalFacility.sqf
addons/medical/functions/fnc_moduleBasicMedicalSettings.sqf
addons/medical/functions/fnc_moduleReviveSettings.sqf
addons/medical/functions/fnc_parseConfigForInjuries.sqf
addons/medical/functions/fnc_playInjuredSound.sqf
addons/medical/functions/fnc_reviveStateLoop.sqf
addons/medical/functions/fnc_selectionNameToNumber.sqf
addons/medical/functions/fnc_setDead.sqf
addons/medical/functions/fnc_setHitPointDamage.sqf
addons/medical/functions/fnc_setStructuralDamage.sqf
addons/medical/functions/fnc_setUnconscious.sqf
addons/medical/functions/fnc_showBloodEffect.sqf
addons/medical/functions/fnc_treatment.sqf
addons/medical/functions/fnc_treatmentAdvanced_CPR.sqf
addons/medical/functions/fnc_treatmentAdvanced_CPRLocal.sqf
addons/medical/functions/fnc_treatmentAdvanced_bandage.sqf
addons/medical/functions/fnc_treatmentAdvanced_bandageLocal.sqf
addons/medical/functions/fnc_treatmentAdvanced_fullHeal.sqf
addons/medical/functions/fnc_treatmentAdvanced_fullHealLocal.sqf
addons/medical/functions/fnc_treatmentAdvanced_medication.sqf
addons/medical/functions/fnc_treatmentAdvanced_medicationLocal.sqf
addons/medical/functions/fnc_treatmentBasic_bloodbag.sqf
addons/medical/functions/fnc_treatmentBasic_bloodbagLocal.sqf
addons/medical/functions/fnc_treatmentBasic_epipen.sqf
addons/medical/functions/fnc_treatmentBasic_morphine.sqf
addons/medical/functions/fnc_treatmentBasic_morphineLocal.sqf
addons/medical/functions/fnc_treatmentIV.sqf
addons/medical/functions/fnc_treatmentIVLocal.sqf
addons/medical/functions/fnc_treatmentTourniquet.sqf
addons/medical/functions/fnc_treatmentTourniquetLocal.sqf
addons/medical/functions/fnc_treatment_failure.sqf
addons/medical/functions/fnc_treatment_success.sqf
addons/medical/functions/fnc_unconsciousPFH.sqf
addons/medical/functions/fnc_useItem.sqf
addons/medical/functions/fnc_vitalLoop.sqf
addons/medical_blood/functions/fnc_hit.sqf
addons/medical_treatment/functions/fnc_hasItem.sqf
addons/medical_treatment/functions/fnc_useItems.sqf
2017-06-10 10:21:18 -05:00
Phyma
ffaa195fe5
Conform function headers to coding guidelines ( #5255 )
...
* Fixed headers to work with silentspike python script
* Fixed rest of the files
* Fixed ace-team
2017-06-08 15:31:51 +02:00
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
PabstMirror
bfd3695868
SQF Lint Cleanup Pass ( #5157 )
...
* SQF Lint Cleanup Pass
* Fix var in TRACE
* Add basic python tool
* Simplify
* Hit space key 6 times
* Fix error in dropNozzle
* handle error message exceptions
* Fix py
2017-05-14 14:48:05 -05:00
PabstMirror
672be73bae
Merge branch 'master' into medical-rewrite
...
Conflicts:
addons/medical/XEH_preInit.sqf
2017-03-18 09:09:45 -05:00
PabstMirror
1208e441ac
Fix unarmed sprint->prone + minor perf improvments ( #4887 )
2017-03-15 10:12:07 -05:00
commy2
a83267b2ff
manual merge
2016-12-05 20:15:16 +01:00
PabstMirror
bc89a260ff
AF - Remove setVar when removing eh
2016-11-27 16:38:33 -06:00
BaerMitUmlaut
1d8030d196
Tweaked fatigue in water
2016-11-14 21:55:26 +01:00
BaerMitUmlaut
e4a4d8f56d
Tweaked prone animation duty
2016-11-14 21:54:51 +01:00
BaerMitUmlaut
a4c6daef50
Fix AF for adjusted stances, fixes #4591
2016-11-14 19:24:21 +01:00
PabstMirror
b3e313f52b
Use vehicle eh to hide bar
2016-11-13 10:55:57 -06:00
PabstMirror
26ae3b8075
Hide bar when mounted
2016-11-12 15:51:44 -06:00
PabstMirror
e086a33e4d
Hide advFatigue bar on map / spectator
2016-11-10 17:49:18 -06:00
commy2
576a63c27e
Merge branch 'master' of https://github.com/acemod/ACE3 into medical-rewrite
2016-10-20 13:56:56 +02:00
PabstMirror
fe35e64696
Reset animation speed when not swimming ( #4546 )
2016-10-15 11:41:03 +02:00
commy2
0f43829b63
Merge branch 'master' of https://github.com/acemod/ACE3 into medical-rewrite
2016-10-10 14:29:50 +02:00
commy2
4c96278bb4
fix fatigue when diving while sprinting, fix #4481
2016-10-08 12:44:37 +02:00
commy2
673f3b4f9f
implement arithmetic source for fatigue system ( #4517 )
2016-10-06 22:46:46 +02:00
PabstMirror
0b3d38a72f
Use waitAndExecute for fatigue loop ( #4453 )
...
* Use waitAndExecute for fatigue loop
Close #4379
- Will use CBA_missionTime so it repsects pause and time accl
- Possible performance improvment over using a PFEH
* Rename main loop function
2016-09-23 16:40:52 -05:00
PabstMirror
9844ae32c9
Exit fatiuge loop when dead (don't play breathing sound)
2016-09-11 22:03:20 -05:00
BaerMitUmlaut
cc414de8d1
Add Advanced Fatigue component ( #4321 )
...
* Initial commit advanced fatigue
* Added animation changes
* Fixes, rewrites
* Broadcast 3den attribute and fix UBC
* Further animation tweaks
* Added Eden attribute and CBA settings
* Switch to CBA events
* Add beautified component name
* Rewrites, fixes, tweaks
* Move setVars to GVARs
* Add setting to disable
* Switch to status effect handler for sprint and jog blocking
* Add component name
* Failsafe for early unit player EH
* Removed raised weapon penalty for pistols
* Added respawn compatibility
* Tweaked side jog animation speed
* Added support for virtual load
* Added stamina bar
* Remove debug flags
* Added custom duty factor functions and values
* Added structural comments
* Disabled CBA settings, added ACE settings
* Fixed config
* Added readme
* Remove leftover debug diag_logs
* Improved stringtable
2016-09-04 21:33:07 +02:00
