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,662 Commits 73 Branches 88 Tags 752 MiB
b91e892710
Commit Graph

11662 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Glowbal
2151fcad8f #4692 Update dev homepage for v3.8.3 
[ci skip]
 2016-12-13 23:16:41 +01:00
Glowbal
86fd9347f8 #4692 update homepage for v3.8.3 
[ci skip]
 2016-12-13 23:16:12 +01:00
Glowbal
c8ef10341e Merged branch release-v3.8.3 into master 2016-12-13 23:14:12 +01:00
Glowbal
0df98f794c Prep 3.8.3 2016-12-12 19:50:16 +01:00
jonpas
1ecd674ac6 Exclude uniforms with inherited modelSides (#4720) 2016-12-12 19:36:53 +01:00
PabstMirror
06caea825b AdvThrow - Make sure ammo setVar is not empty (#4743) 2016-12-12 19:33:34 +01:00
commy2
757ab78191 fix usage of reserved variable "" in FUNC(getDetectorConfig), fix #4741 (#4742) 2016-12-12 19:33:05 +01:00
PabstMirror
11b464b585 Fix blood drop selection if blood loss is high 
close #4739
 2016-12-12 19:32:23 +01:00
PabstMirror
de34d57d5b Update SMG_02 base class for 1.66 (#4718) 2016-12-12 19:31:52 +01:00
PabstMirror
14c7e9af17 AF - Remove setVar when removing eh 2016-12-12 19:30:58 +01:00
magicsh0tz
d1287a471d Switched to CBA_fnc_waitAndExecute (#4709) 
* Switched to CBA_fnc_waitAndExecute

* Switched to CBA_fnc_waitAndExecute
 2016-12-12 19:30:21 +01:00
Glowbal
b72541df23 Jpn translation v382 (#4710) 
* jpn scopes translation

this is Japanese translation for scope

* fix jpn weather translation

Fix for Weather japanese translation

* fix jpn Repair translation

fix jpn Repair translation

* jpn zeus translation

Japanese localization for zeus
 2016-12-12 19:29:58 +01:00
ulteq
6b611ffbbd Cleanup: 'handleBandageOpening' 2016-12-10 16:36:36 +01:00
ulteq
a3fd916d21 Do not restore blood volume in partial heal 2016-12-10 16:30:05 +01:00
ulteq
1bc1865313 Minor cleanup: 'treatmentBandageLocal' 2016-12-10 15:39:03 +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
c2f9010183 opps 2016-12-09 21:29:23 -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
8afc4083d0 Advanced Ballistics - Improved spin drift calculation (#4755) 2016-12-09 13:22:53 -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
0a81baf498 Better and simpler bleeding rate calculation 2016-12-09 14:11:07 +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
31bc54ff33 Further improved the wound merging logic 2016-12-09 10:55:24 +01:00
PabstMirror
c431a7d236 Ignore UAV AI hitpoints 2016-12-08 15:53:52 -06: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
b81a5adcb9 Renamed 'healTime' calculation helper 2016-12-08 12:30:59 +01:00
ulteq
9dee5a9083 Don't remove wounds on partial heal 2016-12-08 12:16:11 +01:00
ulteq
beb1c7036c Removed todo flag 2016-12-08 11:55:38 +01:00
ulteq
280943cb4d Fixed occluded medication (tourniquet removal logic) 2016-12-08 11:54:59 +01:00
ulteq
78bfc0c26d Simplified damage storage 2016-12-08 11:38:43 +01:00
ulteq
627ea0ebdc Dynamically translate different wound types 
* Brings back minor, medium, large wounds
 2016-12-07 21:56:13 +01:00
ulteq
89c68364ef Fix pain suppression not affecting 'setCustomAimCoef' 2016-12-07 19:51:28 +01:00
ulteq
708ac207fd Make Avulsions even less likely 2016-12-07 19:10:12 +01:00
ulteq
6ce1910a96 Fix partial heal 2016-12-07 18:53:12 +01:00
ulteq
66803a4b4d Fix damage coloring 2016-12-07 18:53:04 +01:00
ulteq
8c5da66c43 Increase "basic medication" effectiveness of morphine 2016-12-07 18:41:42 +01:00
ulteq
74fefb6f69 New body part colors: 
* Red bleeding
* Blue tourniquet
* Yellow/Orange damage
 2016-12-07 18:28:35 +01:00
ulteq
7f1678b7e6 Increased wake up chance 2016-12-07 18:19:35 +01:00