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
KoffeinFlummi
f6eeb5e3ba
Add pain coefficient
2015-04-22 22:29:31 +02:00
jaynus
b384d62edd
Fixes typos in medical strings causing missing strings.
2015-04-21 17:02:50 -07:00
Ivan Navarro Cabello
55887b7cfe
updated stringtable for spanish
...
added some spanish translate
2015-04-21 19:03:55 +02:00
Glowbal
1df42b17c2
close all dialogs
2015-04-20 22:22:09 +02:00
Glowbal
362051e2db
Merge pull request #717 from acemod/medicalFixes
...
Medical fixes
2015-04-20 22:16:57 +02:00
Glowbal
f7719f0e0a
tab
2015-04-20 22:08:31 +02:00
Glowbal
842bfe0b98
enabled advanced wounds setting
2015-04-20 22:00:11 +02:00
Glowbal
90cf882e02
Using setvar instead of event sync again
2015-04-20 21:58:27 +02:00
Glowbal
8be7ccaab7
setting for moving unit from group on unconscious
2015-04-20 21:37:30 +02:00
esteldunedain
7953919b89
Merge branch 'simpleDiagnosis' into streamlinedBasicDiagnosis
2015-04-20 10:24:59 -03:00
esteldunedain
1e3b44e32e
Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into streamlinedBasicDiagnosis
2015-04-20 10:24:24 -03:00
ruPaladin
08caf0c695
Updated russian translation (medical)
...
Перевел как смог, вероятно данная настройка будет в ACE3 Настройки. Нужно проверить влезет ли туда. Если влезет, то подкорректировать перевод. Правки строго приветствуются.
2015-04-20 15:18:17 +03:00
bux578
13b11d7225
Merge pull request #768 from Tachii/patch-17
...
Update stringtable.xml
2015-04-20 13:02:38 +02:00
Tachii
20293bd11b
Update stringtable.xml
2015-04-20 00:26:20 +03:00
Tachii
6c8b587890
Update stringtable.xml
2015-04-20 00:02:01 +03:00
Tachii
5038674aef
Update stringtable.xml
2015-04-19 23:01:38 +03:00
Tachii
60cab963bf
Update stringtable.xml
2015-04-19 23:00:51 +03:00
Glowbal
17899db086
added some missing privates
2015-04-19 19:49:56 +02:00
Glowbal
5e82c51926
Merge branch 'master' into medicalFixes
2015-04-19 18:45:07 +02:00
jaynus
aad8d6b785
Fixed: max litter scalar array, have internal values.
2015-04-19 09:04:42 -07:00
Tachii
a7d913b80e
Update stringtable.xml
2015-04-19 18:54:47 +03:00
Tachii
596fadcba0
ru translations fixes
...
Не стоит додумывать правильные значения или то, как вы думаете это должно интерпертироваться. Нужно переводить то, что написано. Как пример Very Light Wounds - это не царапины, это очень лёгкие ранения. Царапины - это scratches
2015-04-19 18:51:35 +03:00
Tachii
a83925dd2d
Update stringtable.xml
2015-04-19 18:43:05 +03:00
Glowbal
f6bbeb6bd6
switched back to old init method
2015-04-19 17:28:47 +02:00
Glowbal
8a7b3a1b33
Removed damage thresholds from basic medical
2015-04-19 13:08:28 +02:00
Glowbal
b71ac1485d
Merge branch 'master' into medicalFixes
2015-04-19 12:06:54 +02:00
ruPaladin
45fd90c6e0
Rus translation (medical)
2015-04-19 10:49:06 +03:00
bux578
0d86374bee
Merge pull request #754 from gienkov/master
...
PL translation
2015-04-19 07:08:54 +02:00
KoffeinFlummi
65fd6b0937
Merge https://github.com/EpMAK/ACE3 into russian-merge
...
Conflicts:
addons/ballistics/stringtable.xml
addons/medical/stringtable.xml
addons/nametags/stringtable.xml
addons/respawn/stringtable.xml
2015-04-19 01:04:32 +02:00
KoffeinFlummi
592e0d2dd3
Merge https://github.com/ruPaladin/ACE3 into russian-merge
...
Conflicts:
addons/ballistics/stringtable.xml
addons/interact_menu/stringtable.xml
addons/medical/stringtable.xml
2015-04-19 00:51:09 +02:00
Grzegorz Sikora
c08125e0f3
PL translation
2015-04-18 22:00:37 +02:00
Glowbal
9825d030e3
Merge pull request #714 from acemod/localMedicalGarbage
...
ACE JIP data and event synchronization (Tested with Litter change)
2015-04-18 21:25:53 +02:00
jaynus
ca74ce721d
Use cleanup settings, and force server TTL on the events.
2015-04-18 11:48:44 -07:00
jaynus
e54c68f7f9
handle cleanup
2015-04-18 11:37:06 -07:00
jaynus
852b4df61d
Settings changes. createVehicleLocal derp.
2015-04-18 11:16:18 -07:00
jaynus
c438d9e790
Merge remote-tracking branch 'origin/master' into localMedicalGarbage
2015-04-18 11:12:22 -07:00
Glowbal
22456a4301
use pain instead
2015-04-18 19:49:29 +02:00
FreeZbe
f55bd5a629
French: updates / fixes stringtable
2015-04-18 18:49:46 +02:00
jaynus
c5f5b11d31
strings.
2015-04-18 08:37:21 -07:00
jaynus
f31e3c1fd4
litter simulation createVehicleLocal /w temporal network sync.
2015-04-18 08:31:03 -07:00
jaynus
c952a97de8
Revert "synced events implemented into litter."
...
This reverts commit 32df4a2adc
2015-04-17 19:38:05 -07:00
jaynus
32df4a2adc
synced events implemented into litter.
2015-04-17 19:33:07 -07:00
esteldunedain
faa7513a79
Merge branch 'streamlinedBasicDiagnosis' of github.com:KoffeinFlummi/ACE3 into simpleDiagnosis
2015-04-17 20:09:04 -03:00
esteldunedain
15720dce31
Yellow and Red medical crosses
2015-04-17 20:08:30 -03:00
esteldunedain
cba00e7b5d
Merge remote-tracking branch 'origin/master' into simpleDiagnosis
2015-04-17 20:03:04 -03:00
esteldunedain
c423e9d743
Merge remote-tracking branch 'origin/medicalFixes' into simpleDiagnosis
...
Conflicts:
addons/medical/ACE_Medical_Actions.hpp
addons/medical/ACE_Medical_SelfActions.hpp
2015-04-17 20:02:51 -03:00
esteldunedain
a5c3e86cd3
Fixes
2015-04-17 20:00:43 -03:00
esteldunedain
cce9e1f04c
Simple diagnose
2015-04-17 19:38:03 -03:00
esteldunedain
1d208b4efc
Modify Function for medical actions
2015-04-17 19:36:03 -03:00
Glowbal
d1a09ae7fc
fixed vehicle crashes for adv
2015-04-17 23:15:41 +02:00
Glowbal
bc4d102d08
changed variable initialization - everything is now done local
2015-04-17 22:43:31 +02:00
Glowbal
cbc3584f9d
removed duplicate condition attribute
2015-04-17 22:24:42 +02:00
Glowbal
9670267d20
Fixed wrong classnames for IV treatments
2015-04-17 22:21:54 +02:00
Glowbal
f5effca216
fixed handleDamage basic
2015-04-17 22:21:15 +02:00
Glowbal
6d18e484c1
Cache condition for target instead of caller
2015-04-17 22:02:43 +02:00
Glowbal
0e858be1b1
Changed conditions for body parts are now always true.
...
This way the medical information is always available, and should help a bit with performance as well.
2015-04-17 22:00:07 +02:00
Grzegorz Sikora
7489e514ce
PL translation
2015-04-17 21:48:04 +02:00
Glowbal
fa7bb5f9c6
Added unconscious state check
2015-04-17 21:28:47 +02:00
Glowbal
008c36ac76
fixes #699
2015-04-17 21:27:57 +02:00
Glowbal
eb731b1169
fixes #653
2015-04-17 21:07:09 +02:00
Glowbal
31bc09a9a3
fixed AI standing up before being killed
...
Doesn't matter if we enable AI again on dead units
2015-04-17 21:06:30 +02:00
Glowbal
9b4435827e
Added setting for unconscious animations on treatment
2015-04-17 20:51:57 +02:00
Glowbal
80139521bc
fixes #691
2015-04-17 20:49:24 +02:00
Glowbal
b333e6e662
Keep units longer unconscious, instead of quickly fading in/out
2015-04-17 20:40:24 +02:00
Glowbal
847ee7e229
Moved unconscious event, so it won't conflict in case the unit is still being carried
2015-04-17 20:38:02 +02:00
Glowbal
8b7e46c45f
fixes #656
2015-04-17 20:26:28 +02:00
Glowbal
c86be12668
fixes #599
2015-04-17 20:24:05 +02:00
Glowbal
111a350a84
Merge branch 'master' into advMedicalEventSync
2015-04-17 20:11:53 +02:00
PabstMirror
6e077de829
Medical - Use default value instead of 0 for getVar
...
#683 - should prevent people getting knocked out from any damage source
if the variables are undefined
2015-04-17 12:13:23 -05:00
EpMAK
31a2f1b279
Russian translations
...
Again, filling strings, fixing errors
2015-04-17 19:36:07 +03:00
ruPaladin
2698490569
medical (patient status semantic fixes)
2015-04-17 17:49:03 +03:00
ruPaladin
874cc75271
medical (semantic correction)
2015-04-17 16:22:02 +03:00
esteldunedain
9de834e156
Prototype of simplified diagnosis for basic medical. The left gui is completely scraped. Instead, the medical interaction points are color coded to reflect theier damage (bleeding rate).
2015-04-17 00:04:27 -03:00
simon84
e7f9bc09df
German translations
...
Conflicts:
addons/disarming/stringtable.xml
addons/hearing/stringtable.xml
addons/medical/stringtable.xml
addons/microdagr/stringtable.xml
addons/nametags/stringtable.xml
addons/optionsmenu/stringtable.xml
addons/overheating/stringtable.xml
addons/winddeflection/stringtable.xml
2015-04-16 22:52:49 +02:00
simon84
cc75928cc0
Merge remote-tracking branch 'acemod/master'
...
Conflicts:
addons/disarming/stringtable.xml
addons/hearing/stringtable.xml
addons/medical/stringtable.xml
addons/microdagr/stringtable.xml
addons/nametags/stringtable.xml
addons/optionsmenu/stringtable.xml
addons/overheating/stringtable.xml
addons/winddeflection/stringtable.xml
2015-04-16 22:47:51 +02:00
simon84
c18284d964
German translation
2015-04-16 22:04:24 +02:00
bux578
5764310833
german translation
...
double checked by bw medic
2015-04-16 21:58:39 +02:00
KoffeinFlummi
11f9478035
Merge https://github.com/Legolasindar/ACE3 into spanish-merge
...
Conflicts:
addons/advanced_ballistics/stringtable.xml
addons/atragmx/stringtable.xml
addons/ballistics/stringtable.xml
addons/javelin/stringtable.xml
addons/kestrel4500/stringtable.xml
addons/laserpointer/stringtable.xml
addons/medical/stringtable.xml
addons/scopes/stringtable.xml
addons/weather/stringtable.xml
2015-04-16 18:31:31 +02:00
Glowbal
59ae4623ff
Derp
2015-04-16 00:17:17 +02:00
Glowbal
f3ca1a85b9
Merge branch 'master' of github.com:acemod/ACE3
2015-04-16 00:15:57 +02:00
Glowbal
0f4b7d0977
fixes #347
...
Please??
2015-04-16 00:14:05 +02:00
PabstMirror
0076be6a86
Fix stringtables
2015-04-15 17:08:35 -05:00
KoffeinFlummi
8aeeff616e
Merge branch 'master' of https://github.com/acemod/ACE3
2015-04-15 22:21:21 +02:00
commy2
6f6d080dbd
port inject sound
2015-04-15 22:16:54 +02:00
KoffeinFlummi
5c3b06b1bf
Merge branch 'patch-1' of https://github.com/ramius86/ACE3 into italian-merge
...
Conflicts:
addons/medical/stringtable.xml
2015-04-15 22:06:18 +02:00
Glowbal
c88479d54d
staged work
2015-04-15 19:45:42 +02:00
ruPaladin
a3965424b9
addons/medical translation to Russian
2015-04-15 19:09:10 +03:00
Ivan Navarro Cabello
40b784fb7a
update stringtable
...
added spanish translate
2015-04-15 17:41:10 +02:00
KoffeinFlummi
8b915380b7
Merge branch 'hungarian-merge'
2015-04-15 13:55:02 +02:00
KoffeinFlummi
2ffbccbf20
Merge branch 'hu-translate' of https://github.com/Harakhti/ACE3 into hungarian-merge
2015-04-15 12:59:56 +02:00
Marco
af3fdf9b91
Update stringtable.xml
...
Italian translation
2015-04-15 10:28:09 +02:00
PabstMirror
a36739c697
Merge pull request #418 from acemod/flashbangTweaks
...
Flashbang tweaks
2015-04-14 23:23:15 -05:00
Nicolás Badano
10b1587453
Merge pull request #592 from gienkov/master
...
PL translation
2015-04-14 20:36:25 -03:00
Grzegorz Sikora
3543b9c806
PL Translation
...
Some french, german and russian entries were listed twice, had to remove
one of two here and there so this list is for revision by different
translators
2015-04-15 00:43:42 +02:00
esteldunedain
ad750977e0
Fix ACRE volume on medical unconsciousness
2015-04-14 19:17:05 -03:00
Felix Wiegand
5d8dd701d2
Merge pull request #518 from acemod/basic-medical-tweaks
...
Basic medical tweaks
2015-04-14 23:49:00 +02:00
jaynus
c6943fbdaf
fixes to ACRE volume, and this transform should really be in set/get global volume. Closes #588
2015-04-14 14:45:21 -07:00
KoffeinFlummi
f07949cf19
Remove some old todos
2015-04-14 22:57:18 +02:00
KoffeinFlummi
676f7c8732
Remove hitpart from action names for non-self
2015-04-14 22:50:06 +02:00
KoffeinFlummi
13d7649c4a
Buff colour flashing effect
2015-04-14 22:49:26 +02:00
KoffeinFlummi
2391c5e6d6
Tweak crate names
2015-04-14 22:34:19 +02:00
KoffeinFlummi
91e25dc215
Missing stringtable entries
2015-04-14 22:34:08 +02:00
KoffeinFlummi
7af6ea36a6
Fix missing pain effect option name
2015-04-14 22:07:43 +02:00
KoffeinFlummi
684c36f8a5
Add pain effect option
2015-04-14 21:49:56 +02:00
KoffeinFlummi
e7807c009f
Use playerInventoryChanged instead of Take
...
This makes sure to also fire when other mods, like TFAR (when adding
backpacks) add items via script.
2015-04-14 21:28:18 +02:00
Glowbal
af255604ac
Switched to event based sync system for open wounds
2015-04-14 21:17:36 +02:00
KoffeinFlummi
71b19b4621
Remove duplicate bleeding code
2015-04-14 20:40:38 +02:00
KoffeinFlummi
ba377dfd3a
Show seperate message for "scratches"; localize
2015-04-14 20:40:17 +02:00
KoffeinFlummi
c6118901b4
Merge branch 'master' into basic-medical-tweaks
2015-04-14 20:35:17 +02:00
KoffeinFlummi
7ca36cdb65
Always show wounds, even for very low damage
2015-04-14 20:28:19 +02:00
KoffeinFlummi
a4c93ab2e2
Add seperate crates for basic and advanced
2015-04-14 20:28:00 +02:00
KoffeinFlummi
c379f2775e
Style fixes
2015-04-14 20:27:42 +02:00
KoffeinFlummi
63fe4118d4
Merge https://github.com/FreeZbe/ACE3 into french-merge
2015-04-14 14:48:13 +02:00
KoffeinFlummi
96319c8799
Merge https://github.com/ruPaladin/ACE3 into russian-merge
2015-04-14 12:50:14 +02:00
Harakhti
1b60a335a5
Translation: J to M
...
I feel burned out. This was very specifically long and tedious.
2015-04-13 23:03:09 +02:00
Kllrt
1c611ba2db
Added another new CZ strings
2015-04-13 21:15:04 +02:00
bux578
8c24d9ec35
fix invalid xml, fix duplicate keys
2015-04-13 15:25:30 +02:00
KoffeinFlummi
8d4003a396
Merge https://github.com/HerrStein/ACE3 into german-merge
2015-04-13 14:21:00 +02:00
KoffeinFlummi
f6c7d444e1
Merge https://github.com/Anthariel/ACE3 into french-merge
2015-04-13 13:31:48 +02:00
KoffeinFlummi
b93cf4fb4a
Merge branch 'polish-merge'
2015-04-13 13:01:17 +02:00
KoffeinFlummi
118b5509ea
Merge https://github.com/gienkov/ACE3 into polish-merge
2015-04-13 13:00:59 +02:00
PabstMirror
bf3e3d3b64
#542 - ACE_fakeWeapon not found
2015-04-13 03:46:42 -05:00
PabstMirror
70dbae5a25
#527 - Unconscious switching groups
2015-04-13 00:32:07 -05:00
Anthariel
77058857e6
Update stringtable.xml
...
Wrong translation
2015-04-13 02:02:19 +02:00
simon84
51bc7208bc
German translation
...
Some german translations and corrections
2015-04-12 20:52:15 +02:00
KoffeinFlummi
664cc7077d
Reduce blood loss rate
2015-04-12 18:06:57 +02:00
KoffeinFlummi
6062128436
Remove tourniquet option, add check pulse/response
2015-04-12 18:01:29 +02:00
KoffeinFlummi
f794eaac43
Merge branch 'master' into basic-medical-tweaks
...
Conflicts:
addons/medical/ACE_Medical_Actions.hpp
addons/medical/functions/fnc_handleDamage_basic.sqf
addons/medical/stringtable.xml
2015-04-12 18:00:22 +02:00
Anthariel
3f84ac4817
Update stringtable.xml
2015-04-12 17:59:53 +02:00
Anthariel
3842272c43
Update stringtable.xml
...
Fixing French & English translation error that I've made on the line : 780 and 781 (thanks KoffeinFlummi)
2015-04-12 17:55:53 +02:00
Glowbal
019163c9ce
Merge pull request #489 from acemod/medicalPerformanceImprovements
...
Medical performance improvements
2015-04-12 14:44:18 +02:00
KoffeinFlummi
8f2a1735ae
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
2015-04-12 14:28:28 +02:00
KoffeinFlummi
614afa8537
Merge https://github.com/Kllrt/ACE3 into czech-merge
...
Conflicts:
addons/attach/stringtable.xml
addons/captives/stringtable.xml
addons/common/stringtable.xml
addons/dragging/stringtable.xml
addons/explosives/stringtable.xml
addons/goggles/stringtable.xml
addons/grenades/stringtable.xml
addons/hearing/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/medical/stringtable.xml
addons/microdagr/stringtable.xml
addons/nametags/stringtable.xml
addons/optionsmenu/stringtable.xml
addons/overheating/stringtable.xml
addons/realisticnames/stringtable.xml
addons/reload/stringtable.xml
addons/reloadlaunchers/stringtable.xml
addons/weaponselect/stringtable.xml
addons/wep_javelin/stringtable.xml
addons/winddeflection/stringtable.xml
2015-04-12 14:27:59 +02:00
