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 |
|
Glowbal
|
1e377d460e
|
now also resets used medication on init
|
2015-02-28 11:48:11 +01:00 |
|
Glowbal
|
6d01a00901
|
Added storage for all logs
|
2015-02-28 11:47:35 +01:00 |
|
Glowbal
|
05d2d9de6b
|
Merge branch 'medical-rewrite' of github.com:KoffeinFlummi/ACE3 into medical-rewrite
Conflicts:
addons/medical/XEH_preInit.sqf
|
2015-02-28 11:43:38 +01:00 |
|
Glowbal
|
49e04ae7bb
|
Added more treatment options and variables to init
|
2015-02-28 11:41:27 +01:00 |
|
KoffeinFlummi
|
fe79e624ff
|
Derp
|
2015-02-26 07:41:56 +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
|
65eb69fece
|
Added examine actions
|
2015-02-23 20:35:36 +01:00 |
|
Nicolás Badano
|
669568cafe
|
Merge pull request #157 from KoffeinFlummi/selfInteractionMenu
Self action menu and Action menu on selections
|
2015-02-23 14:24:43 -03:00 |
|
Glowbal
|
4a64716420
|
Added support for displaying a treatment icon for the action
|
2015-02-23 18:19:35 +01:00 |
|
Glowbal
|
40d98b04a4
|
Merge pull request #145 from KoffeinFlummi/standardize_ui
Standardize UI
|
2015-02-23 18:11:11 +01:00 |
|
Glowbal
|
fe0363ab48
|
Now dynamically collects the available damageTypes
|
2015-02-23 16:18:33 +01:00 |
|
Glowbal
|
bb89816a70
|
Replaced FUNC for DFUNC
|
2015-02-23 10:23:09 +01:00 |
|
Glowbal
|
df710235d5
|
Added useItems
Fixed header on hasItems
|
2015-02-22 19:50:14 +01:00 |
|
Glowbal
|
bcb5bb59f6
|
Basic actions can now use any of the advanced treatment items.
|
2015-02-22 18:46:49 +01:00 |
|
Glowbal
|
cbfb413f22
|
Changed: an array now means that it can be any of the given items
|
2015-02-22 18:42:30 +01:00 |
|
Glowbal
|
8b3e5ac8e2
|
Added hasItems function
|
2015-02-22 18:38:06 +01:00 |
|
Glowbal
|
2b061e8de3
|
Added itemConsumed attribute
|
2015-02-22 18:34:59 +01:00 |
|
Glowbal
|
b05e09ccb8
|
Added advanced treatment actions
|
2015-02-22 18:33:46 +01:00 |
|
KoffeinFlummi
|
ca930a5717
|
Add basic treatments, rename onProgress
|
2015-02-22 17:45:46 +01:00 |
|
Glowbal
|
ab6bc998c2
|
Added canAccessMedicalEquipment check
|
2015-02-22 15:01:31 +01:00 |
|
Glowbal
|
82c181cd7c
|
Fixed header
|
2015-02-22 14:54:54 +01:00 |
|
Glowbal
|
5e0eb7323a
|
Added option to toggle between progressbar top and bottom
|
2015-02-22 14:38:48 +01:00 |
|
Glowbal
|
77666e8097
|
Added weapon resting state icon
|
2015-02-22 13:58:51 +01:00 |
|
Glowbal
|
dd51037c5e
|
Added support for image color
|
2015-02-22 13:44:17 +01:00 |
|
Glowbal
|
9d44ec18b8
|
Added a default text color setting
|
2015-02-22 13:35:05 +01:00 |
|
Glowbal
|
323d673eec
|
Removed deprecated config entries (DisplayMessage and DisplayInformation)
|
2015-02-22 13:20:17 +01:00 |
|
Glowbal
|
7f6a647b4d
|
Merge branch 'medical-rewrite' of github.com:KoffeinFlummi/ACE3 into medical-rewrite
|
2015-02-22 12:26:19 +01:00 |
|
Glowbal
|
56dad70a9e
|
Removed redundant level checks
|
2015-02-22 12:26:08 +01:00 |
|
Kieran
|
c8bf9d2ce1
|
Changed 'impacted' to 'crushed'
Changed "Impacted Tissue" to "Crushed tissue", as its a bit more to-the-point (less chance for confusion), and still accurate
|
2015-02-22 21:25:28 +10:00 |
|
Kieran
|
7ea31f8b05
|
Added causes to contusions - ace_med_treatment.hpp
Added vehiclecrash and falling to contusion causes.
(As those two situations commonly do result in bruising)
|
2015-02-22 21:21:27 +10:00 |
|
Glowbal
|
14411a5ef0
|
Fixed weird fix for getNumber for Array bug in setSettingFromConfig.
|
2015-02-22 11:36:21 +01:00 |
|
Glowbal
|
1ed50bfe3e
|
Fixed font size
|
2015-02-22 11:35:52 +01:00 |
|
Glowbal
|
47e27d7be3
|
Merge branch 'standardize_ui' of github.com:KoffeinFlummi/ACE3 into standardize_ui
|
2015-02-22 11:19:46 +01:00 |
|
Glowbal
|
8393645df9
|
Changed position to be inline with the weapon selector UI element by default
|
2015-02-22 11:19:32 +01:00 |
|
Glowbal
|
a574487166
|
Added localization support for displayText
|
2015-02-22 11:19:10 +01:00 |
|
Glowbal
|
9f3a0fe8d4
|
Removed displayInfo and displayMessage functions.
|
2015-02-22 11:18:37 +01:00 |
|
Glowbal
|
9dc33c659d
|
Now takes selections into account
|
2015-02-22 10:56:46 +01:00 |
|
Glowbal
|
bdaec01112
|
Added medication overdose and wearoff.
|
2015-02-22 10:27:57 +01:00 |
|
Glowbal
|
fa2d0c6b06
|
Specified bleeding rate more accurately for subclasses
|
2015-02-22 09:40:36 +01:00 |
|
Glowbal
|
8e539bfb56
|
Added ability to use subclasses for injuries.
Allows for usage of minor, medium and large injury variants.
|
2015-02-22 09:27:01 +01:00 |
|
PabstMirror
|
8945f99be1
|
Fix CurrentChannel
GVAR -> FUNC
onEachFrame exits when channel control is closed
|
2015-02-21 21:19:54 -06:00 |
|
PabstMirror
|
11be8f6f8f
|
Merge pull request #156 from KoffeinFlummi/nightVisionCleanup
Night vision cleanup
|
2015-02-21 20:21:04 -06:00 |
|
Glowbal
|
e091ba1fd1
|
Added hasMedicalEnabled
|
2015-02-22 00:49:38 +01:00 |
|
Glowbal
|
e21046459e
|
Fixed location checking in treatment call
|
2015-02-22 00:47:14 +01:00 |
|
Glowbal
|
ab045e49c8
|
Fixed incorrect function calls for location
|
2015-02-22 00:45:58 +01:00 |
|
Glowbal
|
1781629c13
|
Added isMedic, isMedicalVehicle, isInMedicalFacility and hasTourniquetAppliedTo functions.
|
2015-02-22 00:44:11 +01:00 |
|