KoffeinFlummi
|
102d86d7d1
|
Merge remote-tracking branch 'origin/master' into medical-basic
|
2015-03-19 21:30:27 +01:00 |
|
KoffeinFlummi
|
b470276f7f
|
Close dialogs when falling unconscious.
|
2015-03-17 08:03:11 +01:00 |
|
PabstMirror
|
93262f3b92
|
Use ace_isUnconscious in anim changed EH
|
2015-03-13 00:45:12 -05:00 |
|
PabstMirror
|
93a1cdaab6
|
setCaptivityStatus in setUnconsicous
|
2015-03-10 10:35:00 -05:00 |
|
Glowbal
|
fc1a52d48b
|
Added events for unconscious
|
2015-03-08 17:52:40 +01:00 |
|
KoffeinFlummi
|
e7c0c78e5d
|
Merge branch 'medical-rewrite' of https://github.com/KoffeinFlummi/ACE3 into medical-rewrite
|
2015-02-28 23:36:13 +01:00 |
|
KoffeinFlummi
|
eeb2f6e8bb
|
Fix script error in setUnconscious
|
2015-02-28 23:35:53 +01:00 |
|
Glowbal
|
69801a65b0
|
Removed dead code
|
2015-02-28 23:34:14 +01:00 |
|
Glowbal
|
cff3e23d38
|
More work done on medical
Added TODOs for remoteFuncExecs to be replaced by event system
Added usage of displayTextStructed events
Fixed useItem calls instead of useItems
|
2015-02-28 13:17:17 +01:00 |
|
Glowbal
|
65137b347b
|
Replaced quote(func for quote(dfunc
|
2015-02-28 13:02:05 +01:00 |
|
Glowbal
|
bbc2a62476
|
Rewrite of unconscious. Now supports basic method of unconsciousness.
|
2015-02-28 12:05:22 +01:00 |
|
KoffeinFlummi
|
ddadabc661
|
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into medical-rewrite
Conflicts:
addons/medical/XEH_postInit.sqf
addons/medical/XEH_preInit.sqf
addons/medical/config.cpp
addons/medical/equipment/Atropin-pen_used.p3d
addons/medical/equipment/Bandage-Pack.p3d
addons/medical/equipment/Bandage-elastic.p3d
addons/medical/functions/fnc_ActionCheckPulse.sqf
addons/medical/functions/fnc_ActioncheckBloodPressure.sqf
addons/medical/functions/fnc_actionCarryUnit.sqf
addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf
addons/medical/functions/fnc_actionCheckPulseLocal.sqf
addons/medical/functions/fnc_actionCheckResponse.sqf
addons/medical/functions/fnc_actionDragUnit.sqf
addons/medical/functions/fnc_actionLoadUnit.sqf
addons/medical/functions/fnc_actionPlaceInBodyBag.sqf
addons/medical/functions/fnc_actionRemoveTourniquet.sqf
addons/medical/functions/fnc_actionUnloadUnit.sqf
addons/medical/functions/fnc_cleanUpCopyOfBody.sqf
addons/medical/functions/fnc_getBloodVolumeChange.sqf
addons/medical/functions/fnc_getUnconsciousCondition.sqf
addons/medical/functions/fnc_handleDropUnit.sqf
addons/medical/functions/fnc_handleHeal.sqf
addons/medical/functions/fnc_handleTreatment_Action_AirwayLocal.sqf
addons/medical/functions/fnc_handleTreatment_Action_BandageLocal.sqf
addons/medical/functions/fnc_handleTreatment_Action_CPR.sqf
addons/medical/functions/fnc_handleTreatment_Action_Stitching.sqf
addons/medical/functions/fnc_handleTreatment_Action_fullHeal.sqf
addons/medical/functions/fnc_handleTreatment_Action_fullHealLocal.sqf
addons/medical/functions/fnc_handleTreatment_Category_Advanced.sqf
addons/medical/functions/fnc_handleTreatment_Category_Airway.sqf
addons/medical/functions/fnc_handleTreatment_Category_Bandaging.sqf
addons/medical/functions/fnc_handleTreatment_Category_Medication.sqf
addons/medical/functions/fnc_handleUnitVitals.sqf
addons/medical/functions/fnc_initalizeModuleCMS.sqf
addons/medical/functions/fnc_makeCopyOfBody.sqf
addons/medical/functions/fnc_moduleAssignMedicalEquipment.sqf
addons/medical/functions/fnc_moduleBasicRevive.sqf
addons/medical/functions/fnc_onKilled.sqf
addons/medical/functions/fnc_onStartMovingUnit.sqf
addons/medical/functions/fnc_onTreatmentCompleted.sqf
addons/medical/functions/fnc_registerUnconsciousCondition.sqf
addons/medical/functions/fnc_setDead.sqf
addons/medical/functions/fnc_setUnconscious.sqf
addons/medical/ui/define.hpp
addons/medical/ui/menu.hpp
|
2015-02-24 22:35:05 +01:00 |
|
KoffeinFlummi
|
daff184f75
|
More work on basic callbacks.
|
2015-02-24 22:09:31 +01:00 |
|
Glowbal
|
a609d00730
|
Implemented a setDead function. Allows for interception of all kills and using a revive script instead.
Added playInjuredSound for damaged units.
Fixed some mistakes with variable names.
|
2015-02-08 13:18:08 +01:00 |
|
Glowbal
|
0a161319d2
|
Added initial draft of setUnconscious
|
2015-02-08 10:25:03 +01:00 |
|