Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,739 Commits 73 Branches 88 Tags 752 MiB
0672b0da35
Commit Graph

64 Commits

Author SHA1 Message Date
BaerMitUmlaut
a95c380dcc Remove legacy medical settings (#5609) 2017-10-11 22:23:12 +02:00
PabstMirror
02c308e141 Use createSimpleObject for medical litter 2016-08-01 16:20:13 -05:00
SzwedzikPL
cdcde46a7d Fix double displayName in medical settings 2016-03-22 13:05:47 +01:00
PabstMirror
b5e95f3945 Add some names/descriptions to settings configs 2016-03-08 01:17:40 -06:00
jonpas
905586bddc Make unused medical strings be used 2016-02-27 21:04:04 +01:00
jonpas
6ad107ecc0 Add medical category to delayUnconCaptive 2016-02-25 17:03:38 +01:00
jokoho48
0956b97dce remove module settings 
change defualt in ACE_Settings
 2016-02-23 15:49:03 +01:00
jokoho48
b2d2bec2cf Merge branch 'master' of https://github.com/acemod/ACE3 into delayUnconCaptiv 
# Conflicts:
#	addons/medical/functions/fnc_setUnconscious.sqf
 2016-02-23 15:31:38 +01:00
Glowbal
575f362fb6 Add setting for limiting usage of Epinephrine in basic medical #1792 
Part of focus feature medical #3134. Default settings are inline with old default.
 2016-02-07 13:10:38 +01:00
PabstMirror
c2f780e95f #1259 - Medical Locations Boost Training 2016-01-09 23:54:48 -06:00
jokoho48
daf2fc2669 remove ccp issue in settings 
prevent setCaptive if unit is wake up
 2016-01-06 18:01:24 +01:00
jokoho48
6d49bbda28 add delay to Unconsciousness Captivity(posible fix for #3121) 2016-01-06 17:46:59 +01:00
PabstMirror
aad6cab896 #2765 - Fix location check when set to disabled 2015-10-19 01:20:11 -05:00
Glowbal
6b73eafcce Allow users to disable medical 3d interaction. 2015-09-05 12:31:52 +02:00
PabstMirror
763f793d0e Localize Catagoires in loadSettingsLocalizedText 
Minor, but allows us to use CSTRINGS in configs for consistancy
 2015-08-13 13:20:37 -05:00
Glowbal
872c257901 Used the wrong string macro. 2015-08-08 13:21:13 +02:00
Glowbal
e9151d921c Localized category names for medical settings 2015-08-08 11:52:37 +02:00
Glowbal
d125b9ad9c Add category to options menu. Initial work. 2015-08-07 21:14:45 +02:00
Glowbal
9edf1b1adf Implemented use conditions for PAK and SurgicalKit 
It is now possible to only have a treatment action show up for stable (not bleeding) patients
 2015-07-03 22:16:18 +02:00
Glowbal
5013254769 Merge pull request #1530 from legman/akalegman_zeus_unconscious 
Fixed Zeus Unconscious
 2015-06-13 20:48:18 +02:00
ulteq
eef7c1295a Added new adv. medical module option 'painIsOnlySuppressed' 2015-06-11 17:36:18 +02:00
ulteq
0c40c1b439 Added Adv. Medical module option 'healHitPointAfterAdvBandage': 
* Changed the default value to '0'
 2015-06-11 15:30:39 +02:00
AKALegman
5431ab5e01 fixed conflicts 2015-06-10 20:03:00 +01:00
AKALegman
1ae8e29ac2 updated isPlayer v2 2015-06-08 19:12:16 +01:00
PabstMirror
32ce0aa6fd Macroize all stringtables 2015-06-05 21:02:24 -05:00
jonpas
6072e14077 Changed all strings to macros (except external) 2015-05-27 19:04:25 +02:00
Glowbal
80162627ec Fixed spelling of enableUnconsciousnessAI 2015-05-01 18:49:59 +02:00
Glowbal
e9a86da8e0 Should be in same order as the module 2015-05-01 12:18:21 +02:00
KoffeinFlummi
53835605ea Merge remote-tracking branch 'origin/master' into basic-med-options 
Conflicts:
	addons/medical/functions/fnc_getBloodLoss.sqf
	addons/medical/functions/fnc_handleDamage_basic.sqf
 2015-05-01 01:25:16 +02:00
KoffeinFlummi
965a976daf Reorganize AI unconsciousness 2015-04-30 22:16:45 +02:00
KoffeinFlummi
f28a806938 Remove max unconsciousness time again 2015-04-30 22:15:40 +02:00
Glowbal
e7290feaa2 disabled radial option, so it isn't server selectable either 2015-04-30 21:20:04 +02:00
Glowbal
2f763a2310 Disabled client setting for menu style 2015-04-30 21:17:33 +02:00
Glowbal
1bee48214e Merge branch 'master' into medicalMenuClientSetting 
Conflicts:
	addons/medical/ACE_Medical_Actions.hpp
	addons/medical/CfgVehicles.hpp
	addons/medical/stringtable.xml
 2015-04-30 21:08:46 +02:00
KoffeinFlummi
fd152c580b Merge branch 'master' into basic-med-options 
Conflicts:
	addons/medical/ACE_Settings.hpp
	addons/medical/functions/fnc_setUnconscious.sqf
 2015-04-30 18:39:33 +02:00
Glowbal
614a93ef12 fixes #838 2015-04-29 22:04:46 +02:00
Glowbal
11d86248a7 Reorganised module and settings #809 2015-04-25 22:20:28 +02:00
Glowbal
55529d0396 Added support for switching from 3d selections to radial menu 2015-04-25 09:41:55 +02:00
KoffeinFlummi
d1c95ba8a1 Add maximum unconsciousness time option 2015-04-23 11:31:27 +02:00
KoffeinFlummi
f6eeb5e3ba Add pain coefficient 2015-04-22 22:29:31 +02:00
Glowbal
8be7ccaab7 setting for moving unit from group on unconscious 2015-04-20 21:37:30 +02:00
Glowbal
5e82c51926 Merge branch 'master' into medicalFixes 2015-04-19 18:45:07 +02:00
jaynus
aad8d6b785 Fixed: max litter scalar array, have internal values. 2015-04-19 09:04:42 -07:00
Glowbal
b71ac1485d Merge branch 'master' into medicalFixes 2015-04-19 12:06:54 +02:00
jaynus
ca74ce721d Use cleanup settings, and force server TTL on the events. 2015-04-18 11:48:44 -07:00
jaynus
852b4df61d Settings changes. createVehicleLocal derp. 2015-04-18 11:16:18 -07:00
jaynus
c5f5b11d31 strings. 2015-04-18 08:37:21 -07:00
jaynus
f31e3c1fd4 litter simulation createVehicleLocal /w temporal network sync. 2015-04-18 08:31:03 -07:00
Glowbal
9b4435827e Added setting for unconscious animations on treatment 2015-04-17 20:51:57 +02:00
KoffeinFlummi
7af6ea36a6 Fix missing pain effect option name 2015-04-14 22:07:43 +02:00