esteldunedain
|
d6e70cfe6b
|
Merge branch 'patch-3' of https://github.com/Legolasindar/ACE3 into Legolasindar-patch-3
Conflicts:
addons/common/stringtable.xml
addons/explosives/stringtable.xml
addons/frag/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/inventory/stringtable.xml
addons/laser_selfdesignate/stringtable.xml
addons/logistics_wirecutter/stringtable.xml
addons/medical/stringtable.xml
|
2015-04-10 16:20:18 -03:00 |
|
Legolasindar
|
52d476abd3
|
Update stringtable.xml
Added spanisth translation, and two lines of english translation
|
2015-04-10 12:29:44 +02:00 |
|
Jo David
|
c258c6c00d
|
fixing translation
|
2015-04-10 09:05:37 +02:00 |
|
Jo David
|
33a14076fc
|
Merge branch 'master' of https://github.com/acemod/ACE3 into translations
Conflicts:
addons/captives/stringtable.xml
addons/medical/stringtable.xml
|
2015-04-10 09:01:24 +02:00 |
|
Glowbal
|
093d340ee7
|
Changed: Dragging/carrying now works for units with broken legs
Added unload and load of unconscious units
|
2015-04-09 21:23:10 +02:00 |
|
Pierre Humberdroz (meat)
|
4c49765c8f
|
translation changes
#370
|
2015-04-07 10:39:41 +02:00 |
|
bux578
|
92da20ce62
|
translations
#367
|
2015-04-07 10:02:33 +02:00 |
|
PabstMirror
|
c1abb2669d
|
#340 - Fix stringtables
|
2015-04-06 11:03:04 -05:00 |
|
Glowbal
|
7ffd690a71
|
Changed: IVs are now synced and medics can see a unit is receiving an IV
|
2015-04-05 20:11:54 +02:00 |
|
Glowbal
|
36288fce43
|
Updated medical action config.
Added bodybag action
Added Tourniquet action to basic.
Added more displayNameProgress entries.
Removed deadcode
|
2015-04-03 22:59:28 +02:00 |
|
bux578
|
1f3c3ce34b
|
fixed spelling of engl. autoinjector
http://en.wikipedia.org/wiki/Epinephrine_autoinjector
|
2015-03-25 18:22:45 +01:00 |
|
Glowbal
|
53e7fe1ba5
|
fixed #227
|
2015-03-24 21:08:45 +01:00 |
|
Nicolás Badano
|
a823fb2dca
|
Tweaks on action names to:
- Remove >> for submenus
- Split long action names in two lines
|
2015-03-24 00:16:32 -03:00 |
|
PabstMirror
|
2329212060
|
Medical Action Stringtable
|
2015-03-23 13:52:26 -05:00 |
|
Glowbal
|
7b519fc2e0
|
Merge branch 'master' into Medical_Dragging
Conflicts:
addons/medical/XEH_postInit.sqf
addons/medical/stringtable.xml
|
2015-03-22 09:46:58 +01:00 |
|
Nicolás Badano
|
4e32e584be
|
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
|
2015-03-21 15:33:36 -03:00 |
|
Nicolás Badano
|
f8ea603977
|
Added dynamic actions to unload patients (unconscious) from vehicles
|
2015-03-21 15:32:32 -03:00 |
|
PabstMirror
|
9578024693
|
Dupe stringtable entry
`Item STR_ACE_MEDICAL_BANDAGING listed twice`
|
2015-03-21 12:52:08 -05:00 |
|
KoffeinFlummi
|
b1ed80a23d
|
Remove trailing whitespace in medical stringtable
|
2015-03-21 00:28:19 +01:00 |
|
KoffeinFlummi
|
33d4bf2f5a
|
Add localization for basic treatments and actions
|
2015-03-20 18:21:03 +01:00 |
|
KoffeinFlummi
|
9082712ff7
|
Replace Original with English keys in stringtable
|
2015-03-20 17:54:26 +01:00 |
|
Glowbal
|
2bee533a8c
|
Added AGM stringtables for drag, carry, load & unload
|
2015-03-14 09:51:08 +01:00 |
|
Glowbal
|
4ce524ed3c
|
First draft of carry and drop unit
|
2015-03-12 21:16:49 +01:00 |
|
Glowbal
|
6b91cefb90
|
Minor fixes and added pain status
|
2015-03-09 22:23:37 +01:00 |
|
Glowbal
|
8cc0361cb4
|
localization and displayText fixes
|
2015-03-09 22:08:43 +01:00 |
|
Glowbal
|
a724fb406a
|
Added triage status
|
2015-03-05 20:55:38 +01:00 |
|
Glowbal
|
199cd05aa0
|
New variant of the medical information display
|
2015-03-05 18:43:44 +01:00 |
|
Glowbal
|
8726e7f1d2
|
Added CMS equipment items.
|
2015-03-01 10:25:37 +01:00 |
|
KoffeinFlummi
|
930fb51a20
|
Medical: First Draft
|
2015-02-03 20:09:25 +01:00 |
|
Thomas Kooi
|
e468832324
|
Added initial port of CSE medical (CMS)
|
2015-01-18 22:16:35 +01:00 |
|