PabstMirror
56c4611919
Fix ace_particles smoke on arty shells ( #4768 )
...
Close #4766
2016-12-15 18:28:39 +01:00
bux578
f544d82472
add optionals meta.cpp files ( #4763 )
2016-12-15 10:55:44 -06:00
PabstMirror
fd09ec5958
Rebuild Dlls for x64 dev branch ( #4765 )
2016-12-15 10:51:47 -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
cc19499e8f
fieldDressing -> FieldDressing
2016-12-15 14:06:09 +01:00
ulteq
9ddaa01462
Always allow the use of tourniquets
...
* Even when advanced bandages are turned off
2016-12-15 14:05:08 +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
classic
0842481c2f
fix for jpn translate in medical_menu
...
Delete unnecessary the HTML tags in line 134
2016-12-15 20:58:21 +09:00
ulteq
0de405fe2a
Fix morphine when advanced medication is disabled
2016-12-15 12:58:06 +01:00
Ozan Eğitmen
ef4d289836
Add Zeus Module for FRIES ( #4597 )
...
* Initial commit
* Revert unrelated changes
* Add newline
* Fix undefined var, localize text
* Shorten strings, add missing parameters
* Fix logical error
* Fix capitalization, Update string, Only add EH on server
* Add missing uses of the private command
* Remove excess formatting
* Add module category
2016-12-14 23:55:06 -06:00
Dedmen Miller
c009000bd9
Use new private syntax for winddeflection PFH ( #4761 )
2016-12-14 23:29:07 -06: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
0d0cf38028
Fix bandage reopening classname/category lookup
2016-12-14 21:17:39 +01:00
PabstMirror
5379503772
Fix deadman range, fix clacker transfer, use setShotParents ( #4689 )
2016-12-14 14:06:32 -06:00
ulteq
e817e13cfd
Only call 'handleIncapacitation' when it makes sense
...
* Minor injuries should not trigger incapacitation
2016-12-14 21:02:24 +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
Dystopian
4f20d1f7c6
add rearm to Vehicle Ammo boxes ( #4750 )
2016-12-14 13:18:04 -06:00
Dystopian
cc3b669fcd
Fix missing refuel menu on static fuel stations ( #4533 )
...
* fix static fuel stations
* Directly compile menus and remove XEH from buildings
2016-12-14 12:48:00 -06:00
PabstMirror
af4b3e31e1
Minor iv optimization
2016-12-14 11:50:31 -06:00
ulteq
dafefda04a
Fixed typo
...
Closes: https://github.com/acemod/ACE3/pull/4697
2016-12-14 18:33:36 +01: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
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
