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,452 Commits 73 Branches 88 Tags 752 MiB
14e146cbeb
Commit Graph

1667 Commits

Author SHA1 Message Date
Zakant
f1fbf6a8eb Removed legacy code 2017-03-23 15:29:52 +01:00
Zakant
5c89232306 Removed cardiac arrest check 2017-03-23 12:59:40 +01:00
PabstMirror
d403f20d71 Adjust addDamageToUnit for rewrite 2017-03-06 15:06:01 -06:00
PabstMirror
8ad3571d19 Merge branch 'master' into medical-rewrite 2017-03-02 18:00:34 -06:00
sbng-PAPA
e2c04a80c4 More accurate Korean translate for medical (#4897) 2017-03-02 17:48:48 -06:00
Dedmen Miller
512592b79d Prevent starting additional vital loops on full heal (#4885) 2017-03-02 17:22:16 -06:00
PabstMirror
c7b60d1777 Merge branch 'master' into medical-rewrite 2017-02-18 18:17:37 -06:00
Mark Ruffner
0900bf964b Medical/Repair 3den Toolbox State Fix (Bug fix for #4902) (#4905) 
* Update medical/repair 3den away from missionNamespace

* Simplify save
 2017-02-18 12:27:36 -06:00
NorXAengell
1be278fbda French translation to "Advanced throwing" and "Advanced fatigue" (#4415) 
* French translation of "Advanced fatigue" and "Advanced throwing"

Full translation of "Advanced fatigue" and "Advanced throwing".

* New batch of translation/correction
 2017-02-11 15:16:56 -06:00
commy2
9d68fbf987 fix script error caused by new arguments passed to handleDamage (#4866) 
* fix script error caused by new arguments passed to handleDamage

* Copy array to not break other handleDamage ehs

* Resize to 7
 2017-02-02 13:03:13 -06:00
BaerMitUmlaut
60c57a7f20 Fix unconscious state in cardiac arrest 2017-01-30 21:22:10 +01:00
ViperMaul
ba810a22e6 Tab clean up. 2017-01-19 18:38:51 -06:00
ViperMaul
567c9129b2 cleanup 2017-01-19 17:23:54 -06:00
ViperMaul
59c58b1269 Add settings function handler 2017-01-19 17:19:54 -06:00
ViperMaul
8db5d8f2ae Change Setting from Basic to Normal and Stringtable moves 2017-01-19 15:46:44 -06:00
ViperMaul
6972af9d0b Settings and string changes 2017-01-19 15:30:27 -06:00
ViperMaul
1078913d2a Stringtable changes. 2017-01-19 15:29:33 -06:00
ViperMaul
69dc3ba12e Add Settings to Medical Settings Module 2017-01-19 11:48:34 -06:00
jonpas
3ac00f2e21 Fix medical typo 'to' -> 'too' (#4824) 2017-01-17 15:26:07 -06:00
PabstMirror
a32478adfb Merge branch 'master' into medical-rewrite 2017-01-17 13:10:18 -06:00
jtj5283449
d4855a7ff3 Korean Translation v1.0 (#4794) 
* Add files via upload

* Add files via upload

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

japanese translation caused error while translating process, had to remove some duplicated keys in stringtable.xml.

* Fix encoding
 2017-01-02 17:52:01 -06:00
ulteq
1e79f35e43 Always visualize bandaged wounds 
* Even when GVAR(advancedBandages) or GVAR(woundReopening) are disabled
 2016-12-15 15:01:02 +01:00
ulteq
0ddfd5eb16 Disable wound reopening when advanced bandages are disabled 2016-12-15 14:51:24 +01:00
ulteq
70a2dc30e7 Refactored 'showPainInMenu' setting 
* showPainInMenu -> on/off switch
* medicSetting_PainVisualization -> 3 way switch on who can see it
 2016-12-15 14:45:58 +01:00
ulteq
91cbc0e4d4 Added new setting 'advancedDiagnose' 
* Which allows to choose between the old basic- and advanced diagnose actions
 2016-12-15 14:00:09 +01:00
ulteq
0de405fe2a Fix morphine when advanced medication is disabled 2016-12-15 12:58:06 +01:00
ulteq
65f0f56474 Implemented 'showPainInMenu' 2016-12-14 21:30:28 +01:00
ulteq
8146cb427e Revert "Implemented 'showPainInMenu' logic" 
This reverts commit 964711a38b.
 2016-12-14 21:23:26 +01:00
ulteq
964711a38b Implemented 'showPainInMenu' logic 2016-12-14 20:55:03 +01:00
ulteq
196a3999a4 Merge branch 'medical-rewrite' of https://github.com/acemod/ACE3 into medical-rewrite 2016-12-14 20:44:22 +01:00
ulteq
151d4a4bfe Settings overhaul 
New settings:
* allowSelfIV
* showPainInMenu

Converted CBA -> ACE Settings:
* advancedBandages
* advancedMedication
* fatalInjuryCondition
* cardiacArrestTime

Fixed settings:
* useLocation_Epi
* medicSetting_Epi
* painCoefficient
 2016-12-14 20:44:06 +01:00
PabstMirror
af4b3e31e1 Minor iv optimization 2016-12-14 11:50:31 -06:00
ulteq
a2b964a993 Fixed bandage config lookup 2016-12-14 18:04:56 +01:00
ulteq
5d3f97ace7 Fix IV Bags work on limbs with a tourniquet applied 2016-12-14 12:36:51 +01:00
ulteq
852f78b801 Classify the perceived pain intensity on all patient information outputs 
Fixes: #2117
 2016-12-10 15:24:20 +01:00
PabstMirror
a451ad356e Close patient display when interaction menu closes 2016-12-09 21:35:26 -06:00
PabstMirror
3907d2dc9f Cleanup moved functions 2016-12-09 21:27:42 -06:00
PabstMirror
b87bdfe14a Fix body-bag action / cleanup 2016-12-09 21:03:52 -06:00
PabstMirror
ee864b2c46 Fix medkit string, fix overpressure 2016-12-09 13:48:54 -06:00
ulteq
05b9208d3c Change debug 2016-12-09 18:43:32 +01:00
ulteq
03f9ba1bad Improved simulation of tourniquet pain: 
* Made use of the new pain level helper function
 2016-12-09 17:48:27 +01:00
ulteq
ada43148e9 Removed deprecated revive settings 2016-12-09 17:07:05 +01:00
ulteq
bfda932384 Different max. bleeding rates for different body parts 2016-12-09 15:54:33 +01:00
ulteq
a809047ac4 Merge branch 'medical-rewrite' of https://github.com/acemod/ACE3 into medical-rewrite 2016-12-09 12:57:42 +01:00
ulteq
82e88061fc Added 'DEFAULT_HEART_RATE' constant 2016-12-09 12:57:27 +01:00
PabstMirror
cc6150303f Add setting for blood bag flow rate (#4751) 2016-12-09 11:33:01 +01:00
ulteq
c486f17539 Implemented Medkit (works like in ACE2) 2016-12-08 18:11:24 +01:00
BaerMitUmlaut
a48d271368 Merge pull request #4668 from acemod/medical-rewrite-cardiacArrestLimits 
Introduce small variation to length of cardiac arrest
 2016-12-08 14:22:11 +01:00
ulteq
3b82510751 Merge new wounds into existing wounds whenever possible 
* Todo: separate 'amountOf' into two variables (wound count and bandage percentage)
 2016-12-08 12:59:30 +01:00
ulteq
78bfc0c26d Simplified damage storage 2016-12-08 11:38:43 +01:00