jonpas
|
db2572acfd
|
Merge branch 'master' into parseList
Conflicts:
addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf
|
2015-09-28 16:06:32 +02:00 |
|
Glowbal
|
74805caa5d
|
Merge pull request #2565 from acemod/medVehAssignFix
assign vehicle module fix for prefilled veh
|
2015-09-28 15:02:48 +02:00 |
|
commy2
|
07774647e9
|
delay setUnconscious until the settings are inited, fix #148
|
2015-09-26 19:30:13 +02:00 |
|
jokoho48
|
f7787730e1
|
fix Littergeneric fly over ground(add Landcontact Points)
|
2015-09-23 20:17:16 +02:00 |
|
KoffeinFlummi
|
3471ebef16
|
Merge https://github.com/dudakov/ACE3 into russian-merge
|
2015-09-23 19:17:52 +02:00 |
|
alganthe
|
10296d2883
|
PAK and Surgical Kit strings normalized inside modules.
Signed-off-by: alganthe <alganthe@live.fr>
|
2015-09-23 15:50:50 +02:00 |
|
PabstMirror
|
f93538eb9a
|
#2423 - assign vehicle module fix for prefilled veh
|
2015-09-21 21:44:52 -05:00 |
|
PabstMirror
|
079d88ded7
|
Merge pull request #2509 from acemod/miscFixNilFunctions
Fix some nil functions
|
2015-09-21 20:36:09 -05:00 |
|
gienkov
|
bbccfbaa35
|
pl medical string
|
2015-09-22 01:04:46 +02:00 |
|
PabstMirror
|
45e44251b6
|
Merge branch 'release'
Conflicts:
addons/repair/stringtable.xml
|
2015-09-21 17:14:53 -05:00 |
|
jonpas
|
2e3014daa3
|
Merge branch 'master' into parseList
Conflicts:
addons/common/functions/fnc_assignObjectsInList.sqf
|
2015-09-21 22:46:01 +02:00 |
|
Glowbal
|
6b93760f9b
|
Merge pull request #2557 from alganthe/torso_diag_fix
Torso diag fix
|
2015-09-21 22:27:13 +02:00 |
|
PabstMirror
|
1d5217d165
|
Medical - delayedUnconsicous fix waitAndExecute
|
2015-09-21 12:43:35 -05:00 |
|
PabstMirror
|
86fae2c251
|
#2528 - addToLog date / missing string fullHeal
|
2015-09-20 13:19:51 -05:00 |
|
PabstMirror
|
7687374fcf
|
Merge branch 'master' into miscFixNilFunctions
Conflicts:
addons/common/functions/fnc_resetAllDefaults.sqf
|
2015-09-20 11:25:33 -05:00 |
|
Alessandro Foresi
|
aabc437314
|
Remove: pain diagnosis on dead patients
|
2015-09-20 17:37:33 +02:00 |
|
alganthe
|
4265b11d51
|
wrong target fixed
Signed-off-by: alganthe <alganthe@live.fr>
|
2015-09-20 14:13:22 +02:00 |
|
SilentSpike
|
35d94e8d5c
|
Fix medical litter scopeCurator values
Solves #2526 where medical litter would appear in zeus with no name.
|
2015-09-19 19:37:38 +01:00 |
|
PabstMirror
|
5f0d73bab6
|
Cleanup more stuff
|
2015-09-18 14:24:20 -05:00 |
|
PabstMirror
|
c62ea5e406
|
Fix some nil functions
|
2015-09-18 13:47:19 -05:00 |
|
esteldunedain
|
a621a0c693
|
Fixes to spanish translations
|
2015-09-18 13:36:57 -03:00 |
|
esteldunedain
|
3422f5a7f1
|
Merge branch 'master' of https://github.com/Legolasindar/ACE3 into spanish-translation
Conflicts:
addons/medical/stringtable.xml
addons/repair/stringtable.xml
|
2015-09-18 13:20:22 -03:00 |
|
commy2
|
7336e694c1
|
Merge pull request #2480 from acemod/340doanim2tweak
tweak doAnimation switchMove to do no akward camera jumps whenever possible
|
2015-09-17 22:46:54 +02:00 |
|
PabstMirror
|
7faee2e6ff
|
Merge pull request #2492 from acemod/fixCPR
Fix CPR params
|
2015-09-17 12:37:45 -05:00 |
|
PabstMirror
|
5fc127e94c
|
#2491 - fix params
|
2015-09-17 11:34:32 -05:00 |
|
KoffeinFlummi
|
067b08611e
|
Fix missing newlines
|
2015-09-17 12:54:26 +02:00 |
|
commy2
|
a09ca8fb80
|
tweak doAnimation switchMove to do no akward camera jumps whenever possible, fix #2474
|
2015-09-17 12:23:56 +02:00 |
|
kaban
|
4d2707eae2
|
Russian Translations - Update
|
2015-09-17 12:21:21 +03:00 |
|
kaban
|
341e122e4c
|
Russian Translations - Update
|
2015-09-17 11:43:14 +03:00 |
|
alganthe
|
49e0befbaf
|
added diagnose to torso
Signed-off-by: alganthe <alganthe@live.fr>
|
2015-09-16 19:44:44 +02:00 |
|
Ivan Navarro Cabello
|
463e21dd91
|
330
|
2015-09-16 12:40:30 +02:00 |
|
gienkov
|
a66f4d0e09
|
Merge remote-tracking branch 'origin/master' into pl-translation-8
|
2015-09-16 11:44:35 +02:00 |
|
Glowbal
|
7e5ab07e32
|
Merge pull request #2387 from acemod/FixHCPPE
Fix that PPEffects Throw a error on HC
|
2015-09-15 21:04:37 +02:00 |
|
Glowbal
|
478b618e4b
|
Merge pull request #2429 from MikeMatrix/feature/switchToLogMacros
Feature/switch to log macros
|
2015-09-15 14:51:23 +02:00 |
|
Glowbal
|
d52cc917ea
|
Merge pull request #2419 from acemod/FixBBTexturePath2
Fix Bandage Texture Path and UV
|
2015-09-14 23:26:00 +02:00 |
|
Glowbal
|
7b7ad6eea8
|
fixed tweak to basic bandage
|
2015-09-14 23:18:20 +02:00 |
|
Glowbal
|
10ac127159
|
Fixed incorrect new damage value in handleDamage advanced.
The new handleDamage from BI added a new value to the parameters that we didn't account for in handleDamage advanced.
|
2015-09-14 21:15:57 +02:00 |
|
Glowbal
|
33ac78dbac
|
Addresses the large amount of bandages required in basic medical
This should restore the bandaging behavior back to how it is before the adjustments made to basic medical
|
2015-09-14 21:14:56 +02:00 |
|
Glowbal
|
8c60e76979
|
Tweaks made to improve determine if fatal algorithm
|
2015-09-14 21:13:58 +02:00 |
|
Glowbal
|
37639066c2
|
Include missing frame in the caching execution
|
2015-09-14 15:19:58 +02:00 |
|
Glowbal
|
6d4744b9ea
|
Increased duration of knock down for basic medical
|
2015-09-14 15:19:18 +02:00 |
|
Glowbal
|
032dd6c87c
|
Tweaked visual effects.
|
2015-09-14 15:18:56 +02:00 |
|
jokoho48
|
fb75f6ad9e
|
Fix Bandage Texture Path and UV
|
2015-09-13 18:57:07 +02:00 |
|
Alessandro Foresi
|
89eb98a248
|
Added: IT more translation, medic partial
Fixed: dup entries (from gienkov)
|
2015-09-12 23:16:57 +02:00 |
|
Alessandro Foresi
|
d4cb290930
|
Tweaked: shorter sentence, fixed "pressione"
|
2015-09-12 22:00:43 +02:00 |
|
Alessandro Foresi
|
8fe629e953
|
Changed: epi to adrenalina, more wording fixing
|
2015-09-12 22:00:41 +02:00 |
|
Alessandro Foresi
|
5d74dd1aed
|
Tweak: Better wording
|
2015-09-12 22:00:40 +02:00 |
|
Alessandro Foresi
|
15e7f9b767
|
Add: IV now EV (endovena)
|
2015-09-12 22:00:39 +02:00 |
|
bux578
|
9748abdb48
|
change order of BloodPressure readout, fix #2400
|
2015-09-12 10:58:29 +02:00 |
|
Alessandro Foresi
|
16fd6b490d
|
Add: IT translation for medical
|
2015-09-12 09:42:48 +02:00 |
|