jonpas
|
f45c0334fc
|
Added spaces
|
2015-09-06 03:49:52 +02:00 |
|
ViperMaul
|
98202f4f38
|
Additional debug statements for caching and wounds.
|
2015-09-05 15:31:14 -07:00 |
|
jonpas
|
f2bfc385eb
|
Merge branch 'master' into removeVignetteAndCleanUI
Conflicts:
addons/ui/README.md
addons/ui/config.cpp
|
2015-09-05 22:00:51 +02:00 |
|
jonpas
|
ce1c735d89
|
Removed Vignette, Cleaned up UI
|
2015-09-05 21:57:22 +02:00 |
|
Glowbal
|
a745b07cb6
|
Merge pull request #2365 from jonpas/addSparePartsSettingInitDelay
Used new setting init delay function in addSpareParts
|
2015-09-05 21:18:25 +02:00 |
|
Jonathan Pereira
|
7147891710
|
Added latest ACE3 PT-BR translations
|
2015-09-05 15:12:31 -03:00 |
|
jonpas
|
a8412361bd
|
Use setting init delay function for addSpareParts
|
2015-09-05 19:33:25 +02:00 |
|
Joko
|
b03589ec34
|
Merge pull request #2364 from TheMagnetar/patch-1
Repair: Fix possible out of bounds setting
|
2015-09-05 19:18:15 +02:00 |
|
Jonathan Pereira
|
52147c43dc
|
Merge remote-tracking branch 'acemod/master' into translating01
|
2015-09-05 13:07:05 -03:00 |
|
TheMagnetar
|
27a0e8f639
|
Repair: Fix possible out of bounds setting
Setting "engineerSetting_fullRepair" had an out of bounds default value.
|
2015-09-05 16:30:00 +02:00 |
|
Glowbal
|
315f46c6c6
|
Merge branch 'master' into medical-adjustments2
|
2015-09-05 14:41:25 +02:00 |
|
Glowbal
|
0a6b77b902
|
Removed more deprecated wound sync code
|
2015-09-05 14:10:28 +02:00 |
|
Glowbal
|
e4c246984f
|
Removed another debug trace that should not be there
|
2015-09-05 14:10:04 +02:00 |
|
Glowbal
|
d9af19df28
|
properly fixes unconscious weird behavior. Because it never registered any unconscious conditions.
|
2015-09-05 14:08:46 +02:00 |
|
Glowbal
|
41db78b52b
|
Merge pull request #2341 from acemod/323tracers
better scaling for tracer sizes, fix #1008
|
2015-09-05 13:47:37 +02:00 |
|
commy2
|
46d741281b
|
Merge pull request #2358 from acemod/322flashbangexplosive
sort flashbang under explosive grenades, not misc grenades
|
2015-09-05 13:40:24 +02:00 |
|
Glowbal
|
a4b4c5d2a3
|
Merge pull request #2187 from jonpas/trackToTrackedVehicles
Added Spare Parts module handling
|
2015-09-05 13:36:42 +02:00 |
|
Glowbal
|
dad96822be
|
Only add 1/4 of the new damage to pain instead of everything.
|
2015-09-05 13:27:02 +02:00 |
|
Glowbal
|
6405ef7d91
|
Merge branch 'master' into medical-adjustments2
|
2015-09-05 13:22:44 +02:00 |
|
Glowbal
|
f15a1c033d
|
Added allowSelfTreatment attribute to treatment actions
|
2015-09-05 13:20:19 +02:00 |
|
Glowbal
|
f0a074072f
|
Merge pull request #2329 from acemod/323medicalstrcturaldamage
setStructuralDamage function
|
2015-09-05 13:16:13 +02:00 |
|
Glowbal
|
446f367f8b
|
Merge pull request #2359 from acemod/fixRestoreGear
fix restore gear
|
2015-09-05 13:09:21 +02:00 |
|
Glowbal
|
9c7f7429d1
|
Merge pull request #2350 from jonpas/cargoHideActionOnLocked
Prevent Cargo opening if vehicle is locked
|
2015-09-05 13:09:14 +02:00 |
|
Glowbal
|
a4e406658f
|
Reduced initial knockdown time for basic medical
|
2015-09-05 13:02:19 +02:00 |
|
Glowbal
|
17ad7ecb8c
|
replaced diag_logs by trace
|
2015-09-05 12:59:09 +02:00 |
|
Glowbal
|
9c0288cd3f
|
Removed debug message
|
2015-09-05 12:55:49 +02:00 |
|
Glowbal
|
c8a7b94777
|
Merge pull request #2363 from acemod/MedicalMenuBlackoutBlur
Add Screen Blur and Blackout for Medical Menu by Interact_menu setting
|
2015-09-05 12:53:04 +02:00 |
|
Glowbal
|
d617fba6c6
|
Merge branch 'master' into medical-adjustments2
|
2015-09-05 12:51:18 +02:00 |
|
Glowbal
|
c828544d02
|
Added init stacking
|
2015-09-05 12:50:32 +02:00 |
|
jokoho48
|
c70c9cdee6
|
Add Screen Blur and Blackout for Medical Menu by Interact_menu setting
|
2015-09-05 12:49:23 +02:00 |
|
Glowbal
|
23d45c53cf
|
Merge branch 'master' into medical-adjustments2
|
2015-09-05 12:47:32 +02:00 |
|
Glowbal
|
c673ea2cbb
|
Restored uniqueIds
|
2015-09-05 12:38:12 +02:00 |
|
Glowbal
|
17648739dd
|
Removed more deprecated wound sync code
|
2015-09-05 12:37:01 +02:00 |
|
Glowbal
|
25a75b9f69
|
fixed incorrect macro usage
|
2015-09-05 12:35:48 +02:00 |
|
Glowbal
|
6b73eafcce
|
Allow users to disable medical 3d interaction.
|
2015-09-05 12:31:52 +02:00 |
|
Glowbal
|
268220bbae
|
Possible fix for weird unconscious behavior in basic medical
|
2015-09-05 12:20:40 +02:00 |
|
Glowbal
|
4122b32dba
|
Removed deprecated wound sync code
|
2015-09-05 12:02:09 +02:00 |
|
Glowbal
|
e0db571e13
|
Minor adjustment to fatality change on torso damage
|
2015-09-05 12:00:45 +02:00 |
|
Glowbal
|
883b9ab545
|
Removed blur screen for medical menu #2069
|
2015-09-05 11:58:34 +02:00 |
|
Glowbal
|
85dc59d66c
|
Fixed: should only display "no injuries" when there are no injuries. Not the other way around
|
2015-09-05 11:57:41 +02:00 |
|
Glowbal
|
130569c485
|
Made basic medical bleeding information work with new damage system
|
2015-09-05 11:57:17 +02:00 |
|
Glowbal
|
39ff82e764
|
fixes for CPR condition in basic medical and improvements to lethalDamage
|
2015-09-05 11:52:12 +02:00 |
|
Glowbal
|
4514812523
|
Basic bandaging now works with new damage system
|
2015-09-05 11:51:46 +02:00 |
|
Glowbal
|
cd9e5df782
|
Clean up of handleDamage. Fixes some debug code
|
2015-09-05 11:25:56 +02:00 |
|
Glowbal
|
df3dbc9772
|
Removed deprecated fire handling
|
2015-09-05 11:25:31 +02:00 |
|
Glowbal
|
a25f640614
|
fixes #2114 No CPR available in basic medical when revive is enabled
|
2015-09-05 11:07:10 +02:00 |
|
Glowbal
|
3d342ece20
|
Fixes #2156 Animation is still played even if you cancel any treatment
|
2015-09-05 11:04:11 +02:00 |
|
Glowbal
|
a02f95ae06
|
Merge pull request #2355 from acemod/settingInitDelayFunctions
Setting init delay functions
|
2015-09-05 11:01:44 +02:00 |
|
[OMCB]kaban
|
085b60bddd
|
Added some name to AUTHORS.txt
|
2015-09-05 05:45:25 +03:00 |
|
[OMCB]kaban
|
cc9a566c15
|
Fix due to review
|
2015-09-05 05:23:27 +03:00 |
|