Glowbal
|
275b0c4300
|
Merge branch 'release'
Conflicts:
README.md
addons/finger/stringtable.xml
|
2015-08-04 22:29:05 +02:00 |
|
Glowbal
|
43f8c87387
|
Merge pull request #1972 from jokoho48/MedicalModelUpdate
Medical Litter model update
|
2015-08-04 20:06:51 +02:00 |
|
PabstMirror
|
b3741f4036
|
Capitalization for macro CBA_fnc_addPerFrameHandler
|
2015-08-04 02:34:38 -05:00 |
|
KoffeinFlummi
|
261cd42202
|
Merge branch 'pl-translation-4' of https://github.com/gienkov/ACE3 into polish-merge
|
2015-08-02 17:14:41 +02:00 |
|
KoffeinFlummi
|
8f848947ac
|
Merge https://github.com/Clon1998/ACE3 into german-merge
|
2015-08-02 17:11:06 +02:00 |
|
jokoho48
|
ee11622cd5
|
Fix Position
|
2015-08-01 16:10:08 +02:00 |
|
jokoho48
|
9d8daf84a4
|
add New Medical Models
|
2015-08-01 15:46:25 +02:00 |
|
Glowbal
|
ca2a16af02
|
fix #1946
|
2015-07-30 18:21:24 +02:00 |
|
Glowbal
|
a4d5d9cb27
|
Possible improvement for handling minor levels of pain in advanced medical
|
2015-07-30 17:43:52 +02:00 |
|
SilentSpike
|
16597515f0
|
Adding remaining missing English straings
|
2015-07-28 20:55:22 +01:00 |
|
gienkov
|
5bb1dded4b
|
Merge remote-tracking branch 'origin' into pl-translation-4
|
2015-07-27 00:47:54 +02:00 |
|
Glowbal
|
d1809e597c
|
Removed requirement for the medical dll
Medical extension is now an optional requirement that improves performance for advanced medical when used.
|
2015-07-26 20:54:49 +02:00 |
|
Glowbal
|
dfec850aa8
|
Merge pull request #1910 from SzwedzikPL/backpack_macro_in_cfgs
addX macro in configs
|
2015-07-26 08:37:47 +02:00 |
|
SzwedzikPL
|
6258e73290
|
addX macro in confgis
|
2015-07-25 21:59:52 +02:00 |
|
Glowbal
|
ea8dc0a5ec
|
Merge pull request #1809 from SzwedzikPL/medical_fix_treat_at_attendant
Fix for 'Treat at...' option
|
2015-07-25 21:22:44 +02:00 |
|
Glowbal
|
3a53991ed0
|
fixed rvmat and texture paths
|
2015-07-25 21:21:31 +02:00 |
|
PabstMirror
|
40ed985d34
|
Config Fixes
|
2015-07-25 12:56:57 -05:00 |
|
gienkov
|
2f24b240b4
|
Fix end line marker
|
2015-07-23 13:59:50 +02:00 |
|
gienkov
|
61fa466a53
|
Medical and slideshow pl translation
|
2015-07-23 13:56:54 +02:00 |
|
PabstMirror
|
cbd74d768b
|
Medical - Don't play *_medic anims at end
|
2015-07-23 02:43:19 -05:00 |
|
Joko
|
9bdb192c8a
|
Add New LitterGloves
Add New Litter/packingbandage
Change all Litter Model and Texture to a nomenclature (littergeneric_name)
|
2015-07-19 15:31:15 +02:00 |
|
Glowbal
|
015fd1afb0
|
Merge pull request #1864 from jokoho48/TextureUpdate
Update IV Blood and Plasma Texture
|
2015-07-17 11:06:49 +02:00 |
|
Joko
|
1b9d02a8a5
|
Update IV Blood and Plasma Texture
|
2015-07-17 09:40:43 +02:00 |
|
Glowbal
|
0154dfc51e
|
Merge pull request #1799 from jokoho48/3DModelUpdate
Add and Update Some 3D Object and Textures
|
2015-07-17 08:17:42 +02:00 |
|
Joko
|
c9a47ec053
|
Add LoDs for IVBag 250/500/1000
Add LoDs for Kestrell
|
2015-07-16 14:41:42 +02:00 |
|
Joko
|
b2b7015b8e
|
Remove Unessesary Comments in RVMAT
|
2015-07-15 21:35:30 +02:00 |
|
Joko
|
9aa0285064
|
Revert LoD Changes
|
2015-07-15 21:13:05 +02:00 |
|
Joko
|
fd4d4abb73
|
Move UAV Battery form models to data
change LoD Distance
Fix IVBag names(my issue)
|
2015-07-15 20:51:06 +02:00 |
|
Joko
|
a72312738e
|
Add to all Objects a LoD with nothing in for "hiding" Objects in Distance
Remove Old Earplugs
Use 3 Object instead of 9 for IVBag with Using of Model Config
|
2015-07-15 20:34:35 +02:00 |
|
Nicolás Badano
|
01d8d7957c
|
Merge pull request #1824 from Legolasindar/master
Update spanish translation
|
2015-07-13 15:36:36 -03:00 |
|
PabstMirror
|
d4f70134e6
|
medical/setUnconscious header
|
2015-07-12 10:25:00 -05:00 |
|
Glowbal
|
d3bed7aedb
|
fixed -1 to disable the revive timer does not work
|
2015-07-09 13:02:48 +02:00 |
|
Ivan Navarro Cabello
|
78529af60c
|
Update spanish translation
|
2015-07-08 20:57:46 +02:00 |
|
SzwedzikPL
|
defc82694b
|
Fix for 'Treat at...' option
|
2015-07-06 21:30:49 +02:00 |
|
Joko
|
fa900452ea
|
Add DAGR (by Blackpixxel)
Add QuikClot to Medical (by Blackpixxel)
Add QuikClot Litter (by Blackpixxel)
Update Blackpixxel at Author
Fix IRStrobe Texture Path
|
2015-07-05 22:21:17 +02:00 |
|
Joko
|
0c099dc4d1
|
Add 3D Object IVBag Blood, Plasma and Saline with 1000ml, 500ml, 250ml(Made by PaxJaromeMalues)
Add PaxJaromeMalues to AUTHORS
|
2015-07-04 22:50:32 +02:00 |
|
ProfessorCZ
|
89a9218e59
|
CZ Translation - Update
|
2015-07-04 15:56:00 +02:00 |
|
Clon1998
|
c61a0f03cd
|
Fixed german translation.
Fixed german translation for Key STR_ACE_Medical_AssignMedicVehicle_EnableList_Description
|
2015-07-04 09:43:42 +02:00 |
|
Glowbal
|
57c4bc453a
|
Merge pull request #1779 from SzwedzikPL/zeus_no_paineffect
disable pain effect in zeus camera
|
2015-07-03 23:20:33 +02:00 |
|
Glowbal
|
44de95ea81
|
Merge pull request #1790 from acemod/medicalImprovements
Medical improvements
|
2015-07-03 22:21:20 +02:00 |
|
Glowbal
|
fd649aee38
|
Changed default value for surgical kit. Should be use anytime
|
2015-07-03 22:17:31 +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
|
07303633e4
|
Merge pull request #1692 from acemod/fixVanillaDamageEffectsShowing
Fix vanilla damage effects
|
2015-07-03 21:41:26 +02:00 |
|
gienkov
|
70862c5de9
|
PL translation
|
2015-07-02 23:55:26 +02:00 |
|
SzwedzikPL
|
13999fdd31
|
finddisplay into curatorcamera
|
2015-07-02 19:36:34 +02:00 |
|
SzwedzikPL
|
c2e4ee431f
|
no pain effect in zeus camera
|
2015-07-02 13:56:56 +02:00 |
|
ToasterBR
|
f4a51d57ef
|
Translation to Brazilian Portuguese (PT-BR)
Made all remaining translations, including new ones like the sitting
module, for example.
|
2015-06-27 15:48:39 -03:00 |
|
ulteq
|
241e8acdd9
|
Merge pull request #1541 from jonpas/sitting
Sitting
|
2015-06-26 21:34:34 +02:00 |
|
Glowbal
|
e153e47bb2
|
Disabled litter on treatment failure. #1403
We give back the items, so litter does not make sense at the moment.
In the future we need to expand this with conditions for success/failure.
|
2015-06-20 12:54:00 +02:00 |
|
Glowbal
|
9e00fc479b
|
CPR local is now also only executed when the target is still alive.
Otherwise it's quite useless
|
2015-06-20 12:51:42 +02:00 |
|