bux578
bfb68fe368
fix spelling errors
2015-05-01 14:19:30 +02:00
FreeZbe
80ae016021
Update stringtable.xml
2015-05-01 14:19:15 +02:00
Glowbal
e9a86da8e0
Should be in same order as the module
2015-05-01 12:18:21 +02:00
bux578
aa2e5077e4
missing german translation
2015-05-01 12:17:28 +02:00
Glowbal
5beca63ae2
Added missing private
2015-05-01 11:51:23 +02:00
KoffeinFlummi
e06e1a2f89
Make preventDeath work
2015-05-01 01:38:36 +02:00
KoffeinFlummi
cb82b20464
Let setUncon handle AI unconsciousness
2015-05-01 01:38:16 +02:00
KoffeinFlummi
48770f77d2
Rename caching variables in basic HD
2015-05-01 01:37:58 +02:00
KoffeinFlummi
67bd2b4e2f
Reduce animation forcing delay
2015-05-01 01:36:09 +02:00
KoffeinFlummi
98e44e86d8
Offload ejecting to unloadPerson
2015-05-01 01:35:50 +02:00
KoffeinFlummi
f7f416c8d3
Proper privates and alignment
2015-05-01 01:34:38 +02:00
KoffeinFlummi
aa9f1c53c7
Whoops
2015-05-01 01:34:18 +02:00
KoffeinFlummi
53835605ea
Merge remote-tracking branch 'origin/master' into basic-med-options
...
Conflicts:
addons/medical/functions/fnc_getBloodLoss.sqf
addons/medical/functions/fnc_handleDamage_basic.sqf
2015-05-01 01:25:16 +02:00
Grzegorz
3f932c0a93
Update stringtable.xml
2015-04-30 22:55:51 +02:00
Grzegorz Sikora
03973f3dcf
PL translation
2015-04-30 22:54:15 +02:00
KoffeinFlummi
d59436c588
Only force animation when necessary
2015-04-30 22:19:31 +02:00
KoffeinFlummi
8fda984903
Fix missing semicolon
2015-04-30 22:17:25 +02:00
KoffeinFlummi
965a976daf
Reorganize AI unconsciousness
2015-04-30 22:16:45 +02:00
KoffeinFlummi
f28a806938
Remove max unconsciousness time again
2015-04-30 22:15:40 +02:00
KoffeinFlummi
270c3adc1e
Do it again, but properly this time
2015-04-30 22:06:10 +02:00
KoffeinFlummi
85669a9e92
Convert Medical stringtable key names to lowercase
2015-04-30 22:01:09 +02:00
Glowbal
e7290feaa2
disabled radial option, so it isn't server selectable either
2015-04-30 21:20:04 +02:00
Glowbal
2f763a2310
Disabled client setting for menu style
2015-04-30 21:17:33 +02:00
Glowbal
1bee48214e
Merge branch 'master' into medicalMenuClientSetting
...
Conflicts:
addons/medical/ACE_Medical_Actions.hpp
addons/medical/CfgVehicles.hpp
addons/medical/stringtable.xml
2015-04-30 21:08:46 +02:00
Glowbal
432a0102e8
Improved unloadPerson function
...
Removed caller parameter.
2015-04-30 20:44:43 +02:00
KoffeinFlummi
fd152c580b
Merge branch 'master' into basic-med-options
...
Conflicts:
addons/medical/ACE_Settings.hpp
addons/medical/functions/fnc_setUnconscious.sqf
2015-04-30 18:39:33 +02:00
PabstMirror
9c02f915ec
Merge pull request #922 from acemod/medicalPrivates
...
Medical Private Variables
2015-04-30 11:34:33 -05:00
ulteq
ac33ad109f
Merge pull request #923 from Bla1337/master
...
Localization update (Russian)
2015-04-30 13:44:54 +02:00
Harakhti
4e165e2572
Update Hungarian translations
...
Let us match the current revision. At the time of making, the Ballistics
XML was broken.
2015-04-30 13:25:25 +02:00
ulteq
2c97b20781
Merge branch 'master' of https://github.com/NukeDev/ACE3 into NukeDev-master
...
Conflicts:
addons/atragmx/stringtable.xml
addons/ballistics/stringtable.xml
addons/medical/stringtable.xml
addons/missileguidance/stringtable.xml
addons/overheating/stringtable.xml
addons/realisticnames/stringtable.xml
addons/vehiclelock/stringtable.xml
2015-04-30 13:20:31 +02:00
Bla1337
5d1478b733
interact and medical system localization upd
2015-04-30 14:01:22 +03:00
PabstMirror
48f7455ef1
Opps2
2015-04-30 01:23:23 -05:00
PabstMirror
d71bba0359
opps
2015-04-30 01:21:41 -05:00
PabstMirror
eb5af0cd89
Medical Private Variables
2015-04-30 01:17:26 -05:00
PabstMirror
f90834eeab
Unused
2015-04-29 16:57:24 -05:00
PabstMirror
5fef446c00
EFUNC for dragging calls
2015-04-29 16:53:09 -05:00
PabstMirror
a39e869728
Fix extra {} wraped
...
Error position: <if ({[_unit] call ace_medical_fnc_setDea>
Error if: Type code, expected Bool
File z\ace\addons\medical\functions\fnc_handleDamage.sqf, line 50
2015-04-29 16:44:47 -05:00
Glowbal
581c64f66f
Implemented unloading from vehicles #740
2015-04-29 23:12:47 +02:00
Glowbal
943d2cbd72
Merge branch 'master' into medicalImprovements
2015-04-29 23:01:38 +02:00
Glowbal
aaa8171457
Implemented prevent instant death #839
2015-04-29 22:54:58 +02:00
Glowbal
614a93ef12
fixes #838
2015-04-29 22:04:46 +02:00
Glowbal
87465b8b10
fixes #829
2015-04-29 21:49:24 +02:00
Dimaslg
f8d5c423ae
Merge conflicts resolved
2015-04-29 21:15:22 +02:00
NukeDev
73772d9de1
Other Fixes
2015-04-29 16:44:42 +02:00
KoffeinFlummi
a1e709047e
Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge
...
Conflicts:
AUTHORS.txt
addons/aircraft/stringtable.xml
addons/attach/stringtable.xml
addons/captives/stringtable.xml
addons/common/stringtable.xml
addons/disposable/stringtable.xml
addons/dragging/stringtable.xml
addons/explosives/stringtable.xml
addons/fcs/stringtable.xml
addons/frag/stringtable.xml
addons/grenades/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/inventory/stringtable.xml
addons/kestrel/stringtable.xml
addons/laser_selfdesignate/stringtable.xml
addons/laserpointer/stringtable.xml
addons/logistics_uavbattery/stringtable.xml
addons/logistics_wirecutter/stringtable.xml
addons/magazinerepack/stringtable.xml
addons/maptools/stringtable.xml
addons/markers/stringtable.xml
addons/medical/stringtable.xml
addons/microdagr/stringtable.xml
addons/movement/stringtable.xml
addons/nametags/stringtable.xml
addons/nightvision/stringtable.xml
addons/optionsmenu/stringtable.xml
addons/overheating/stringtable.xml
addons/parachute/stringtable.xml
addons/realisticnames/stringtable.xml
addons/reload/stringtable.xml
addons/reloadlaunchers/stringtable.xml
addons/respawn/stringtable.xml
addons/safemode/stringtable.xml
addons/switchunits/stringtable.xml
addons/vehiclelock/stringtable.xml
addons/weaponselect/stringtable.xml
addons/wep_javelin/stringtable.xml
addons/winddeflection/stringtable.xml
2015-04-29 12:52:55 +02:00
Legolasindar
1c8137a7e5
fixed spanish translate for opened pull #893
...
fixed spanish translate for opened pull #893
2015-04-29 12:46:32 +02:00
Bla1337
cfbf3bd053
Localization update
2015-04-29 11:20:21 +03:00
PabstMirror
3eb2bdfc84
Display Name Progress Text
2015-04-28 21:17:29 -05:00
Glowbal
a854b90b00
Increased level at which a lot of blood message gets shown in basic medical
2015-04-28 22:19:30 +02:00
Dimaslg
956b5e3558
Spanish Translation
...
Minor fixes and some things at the Medical system translated.
2015-04-28 21:01:48 +02:00
Glowbal
f606c24854
fixes #901
2015-04-28 20:47:11 +02:00
Glowbal
dbf748ba93
Merge branch 'master' into medicalImprovements
2015-04-28 20:33:39 +02:00
Glowbal
c06caa7209
Only add JIP event for player clients
2015-04-28 20:33:01 +02:00
Glowbal
ebbb88deff
Join in progress players will now be initialized
2015-04-28 20:32:29 +02:00
Glowbal
95d83554da
Added local treatment through remoteExec for basic
2015-04-28 20:32:02 +02:00
Glowbal
c38fe384e3
added default values for getvar's
2015-04-28 19:30:35 +02:00
ulteq
2a759aba70
Merge branch 'master' of https://github.com/NukeDev/ACE3 into NukeDev-master
...
Conflicts:
addons/interact_menu/stringtable.xml
addons/medical/stringtable.xml
2015-04-28 18:55:23 +02:00
ulteq
236fc10a0f
Merge branch 'master' of https://github.com/gienkov/ACE3 into gienkov-master
...
Conflicts:
addons/medical/stringtable.xml
2015-04-28 18:15:05 +02:00
NukeDev
db82df6214
Italian's Translation's Changes v2
2015-04-28 18:10:35 +02:00
Grzegorz
b88618563d
Update stringtable.xml
2015-04-28 18:05:27 +02:00
Grzegorz Sikora
bcda77c5c7
PL translation
2015-04-28 18:03:35 +02:00
Josuan Albin
b5524fb3ee
French pass
...
* fixed ramp in /aircraft
* added aragmx entry
* added multiple medical entries
* translated missileguidance
* completed mk6mortar
* changed Sanitaire to Médical in realisticnames also fixed some typos
in there and had to rename some of the explosives (weren't fitting in
boxes in game)
* added myself to contributors
2015-04-28 18:00:09 +02:00
ulteq
dc09c554c0
Merge branch 'master' of https://github.com/gienkov/ACE3 into gienkov-master
...
Conflicts:
addons/medical/stringtable.xml
addons/mk6mortar/stringtable.xml
2015-04-28 17:44:58 +02:00
Ivan Navarro Cabello
8a55c69cd7
added spanish translation
...
added spanish translation
2015-04-28 17:03:49 +02:00
simon84
8ac6f61fcf
added some translations
...
added some translations
2015-04-28 00:36:37 +02:00
ruPaladin
59aba3fb34
Update stringtable.xml
2015-04-27 19:33:22 +03:00
Glowbal
450e324f7b
adjusted damage handling (adv medical)
2015-04-27 16:42:12 +02:00
Glowbal
e4db44d73c
adjusted damage parsing
2015-04-27 16:36:00 +02:00
Glowbal
b520a1072b
Merge branch 'master' into medicalImprovements
2015-04-27 15:41:20 +02:00
Grzegorz
78329110a1
Update stringtable.xml
2015-04-26 23:01:18 +02:00
Grzegorz Sikora
a272258500
PL translation
2015-04-26 22:59:20 +02:00
KoffeinFlummi
365f1e025b
Merge remote-tracking branch 'origin/GermanMedicalTranslation' into german-merge
...
Conflicts:
addons/medical/stringtable.xml
2015-04-26 22:04:39 +02:00
KoffeinFlummi
b472292b20
Remove tabler comments.
...
sed is awesome.
2015-04-26 21:05:41 +02:00
KoffeinFlummi
1bb8628109
Merge https://github.com/simon84/ACE3 into german-merge
2015-04-26 21:00:22 +02:00
commy2
6aea424f6d
Merge pull request #872 from acemod/muteuncon
...
mute unconsious units
2015-04-26 17:40:51 +02:00
commy2
7319a3dbc6
remove obsolete config entries
2015-04-26 17:38:48 +02:00
commy2
31ae05dd6e
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
2015-04-26 17:26:16 +02:00
commy2
90f1d1f3fa
those damn mine detectors, also fix advanced medical box not showing up in zeus
2015-04-26 17:25:56 +02:00
commy2
8976b6983d
mute unconsious units
2015-04-26 16:47:36 +02:00
bux578
6cc4f48eb2
Uppercase Injuries
2015-04-26 14:19:28 +02:00
bux578
b3c461b9da
last few translations
2015-04-26 14:02:14 +02:00
bux578
b2dd065429
remove comment
2015-04-26 12:27:06 +02:00
Glowbal
b266734f6e
Merge branch 'master' into medicalImprovements
2015-04-26 11:20:04 +02:00
Glowbal
fc08ebb0a5
added "isNotInside" exception to unload
2015-04-26 11:19:25 +02:00
bux578
dec47dade8
ups, remove test code
2015-04-26 09:38:56 +02:00
bux578
0aa2b31dd4
gj git
2015-04-26 09:37:02 +02:00
bux578
171cea998e
add most of the translations
2015-04-26 09:36:51 +02:00
VyMajoris
523cb49ff1
Added - Portuguese translation to lots of things.
...
Also fixed a typo the english key for STR_ACE_microdagr_configure.
2015-04-26 03:09:16 -03:00
KoffeinFlummi
9a8dd5ee41
Merge branch 'patch-4' of https://github.com/ruPaladin/ACE3 into russian-merge
...
Conflicts:
addons/medical/stringtable.xml
2015-04-26 01:03:29 +02:00
Glowbal
11d86248a7
Reorganised module and settings #809
2015-04-25 22:20:28 +02:00
Dimaslg
274663e1b9
Spanish Translation
...
Minor fixes and spelling mistakes.
2015-04-25 18:53:45 +02:00
Glowbal
6799903e4b
Also display different color for advanced
2015-04-25 12:45:04 +02:00
Glowbal
1415adc2bd
removed local diagnose action. Added localization
2015-04-25 12:35:07 +02:00
Glowbal
4cef2a1fa4
Merge branch 'master' into streamlinedBasicDiagnosis
2015-04-25 12:12:24 +02:00
Glowbal
55529d0396
Added support for switching from 3d selections to radial menu
2015-04-25 09:41:55 +02:00
KoffeinFlummi
d7b961043b
Remove animation reset before falling unconscious
...
This caused the unit to briefly move to the default animation,
which looked shite.
2015-04-24 22:20:16 +02:00
KoffeinFlummi
d1c95ba8a1
Add maximum unconsciousness time option
2015-04-23 11:31:27 +02:00
KoffeinFlummi
84e1937515
Add damage threshold to basic
2015-04-22 23:50:37 +02:00
KoffeinFlummi
d10f4d543d
Enable unit specific bleeding coefficient
2015-04-22 22:38:48 +02:00
KoffeinFlummi
74ca85cbd9
Change getBloodLoss to expect an array
2015-04-22 22:36:41 +02:00
