Glowbal
|
18998bb619
|
Split up the openWounds through the ACE event system
Based upon the suggestions from Jaynus
|
2015-02-28 20:48:34 +01:00 |
|
Glowbal
|
d293008586
|
Fixed indentation
|
2015-02-28 19:28:05 +01:00 |
|
Glowbal
|
451f8b6d0b
|
Fixed advanced medical handleDamage chain. Now supports killing units.
|
2015-02-28 19:22:46 +01:00 |
|
Glowbal
|
f1445a4c45
|
Fixed script errors
|
2015-02-28 18:59:37 +01:00 |
|
Glowbal
|
9986fddf6b
|
Fixed undefined _bloodPressure
|
2015-02-28 18:46:44 +01:00 |
|
Glowbal
|
5e65d5e9a8
|
Added support for displayText on treatment actions
|
2015-02-28 15:46:37 +01:00 |
|
KoffeinFlummi
|
8c6df1b00c
|
Fix indentation in treatment
|
2015-02-28 15:23:12 +01:00 |
|
KoffeinFlummi
|
9d7d66a025
|
Merge branch 'master' into medical-rewrite
|
2015-02-28 15:22:34 +01:00 |
|
KoffeinFlummi
|
114718e8ae
|
Fix line ending in .editorconf
|
2015-02-28 15:22:21 +01:00 |
|
KoffeinFlummi
|
bde6ec1996
|
Indentation in CfgVehicles
|
2015-02-28 15:19:49 +01:00 |
|
KoffeinFlummi
|
2873bdf0ed
|
Add basic anims; add system for prone/self anims
|
2015-02-28 15:10:58 +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 |
|
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 |
|
PabstMirror
|
901a06587d
|
Merge pull request #144 from KoffeinFlummi/cseSoundWaves
CSE sound waves
|
2015-02-27 15:32:16 -06:00 |
|
PabstMirror
|
bf21a8bc91
|
Pull configSetting from upstream
|
2015-02-27 15:28:48 -06:00 |
|
PabstMirror
|
7e2283115c
|
Merge pull request #155 from KoffeinFlummi/fixSurrendering
Fix surrendering/handcuffs
|
2015-02-26 14:22:48 -06:00 |
|
KoffeinFlummi
|
fe79e624ff
|
Derp
|
2015-02-26 07:41:56 +01:00 |
|
Glowbal
|
3721e14561
|
Merge pull request #161 from KoffeinFlummi/displayTextRemoteClients
Improvements for displayText
|
2015-02-25 14:35:55 +01:00 |
|
Glowbal
|
5b50910ef6
|
Fixed incorrect size
|
2015-02-25 11:23:35 +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
|
5883c673e4
|
Merge branch 'displayTextRemoteClients' of github.com:KoffeinFlummi/ACE3 into displayTextRemoteClients
|
2015-02-24 20:25:43 +01:00 |
|
Glowbal
|
e10c907454
|
Added missing header arguments
|
2015-02-24 20:25:34 +01:00 |
|
PabstMirror
|
80ac6d83de
|
Zeus Module Messages
|
2015-02-24 12:44:54 -06:00 |
|
PabstMirror
|
97d1889971
|
Shift Display to Right if Zeus Interface is open
|
2015-02-24 12:40:22 -06:00 |
|
PabstMirror
|
ae3de331c4
|
Module At Mission Start (Issue #148)
|
2015-02-24 11:51:37 -06:00 |
|
PabstMirror
|
233647a144
|
Merge branch 'master' into fixSurrendering
|
2015-02-24 11:37:28 -06:00 |
|
PabstMirror
|
5364980997
|
Zeus Module Hints
|
2015-02-24 11:36:49 -06:00 |
|
Glowbal
|
37031b5002
|
Replaced execRemoteFnc by ACE event system
|
2015-02-24 18:10:40 +01:00 |
|
Glowbal
|
278f0ab889
|
Fixed indentation
Added check for AI units
|
2015-02-24 18:02:41 +01:00 |
|
PabstMirror
|
85c568a061
|
Comments
|
2015-02-24 10:27:53 -06:00 |
|
Glowbal
|
6fde2de40f
|
Improved localization support and sendDisplayText to remote client objects.
|
2015-02-24 17:14:19 +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 |
|