Glowbal
7d063d4dee
Merge branch 'master' into medical-focus-feature
...
Conflicts:
addons/medical/functions/fnc_treatmentAdvanced_CPR.sqf
2016-02-21 00:37:30 +01:00
PabstMirror
8b932fd5a0
Fix some undefined functions / strings
2016-02-20 16:58:45 -06:00
ChairborneIT
0021bc08df
Added translation for most Italian stringtable entries
2016-02-20 21:39:05 +01:00
Thomas Kooi
2930fab6c6
Merge pull request #3354 from acemod/playerBodybags
...
Fix bagging respawning players (alt)
2016-02-20 17:26:07 +01:00
Thomas Kooi
4f10d551d6
Merge pull request #2949 from gienkov/fixWoundCount
...
ceil number of wounds
2016-02-20 16:56:17 +01:00
PabstMirror
fc3bb0de6b
Fix #3355 - add missing semi-colons
2016-02-19 18:51:25 -06:00
PabstMirror
dffcbc7650
Cleanup events
2016-02-19 15:45:37 -06:00
PabstMirror
44b526ab6d
bodybag - hide player corpse and delete later
...
Fix #1301
2016-02-19 15:41:13 -06:00
PabstMirror
ed653456e5
Merge pull request #3338 from acemod/translations156merge
...
Fix Merge Conflicts on More Italian Translations
2016-02-19 15:09:40 -06:00
Grzegorz
95250c8ecd
medical PL translation
...
3.5.0 ready
2016-02-19 19:10:59 +01:00
Thomas Kooi
95532ea521
Merge pull request #3333 from acemod/medicalEvents
...
Replace execRemoteFnc in ace_medical
2016-02-19 12:00:00 +01:00
commy2
5d0d8576ea
Merge pull request #3288 from SzwedzikPL/edenassignsettings
...
Repair & medical object attributes for eden editor
2016-02-19 11:47:26 +01:00
commy2
be8f7f9cc0
Merge pull request #3276 from acemod/156selectapply
...
replace filter and map with select and apply
2016-02-18 14:23:02 +01:00
esteldunedain
88eae19646
Replace execRemoteFnc in ace_medical
2016-02-17 22:54:43 -03:00
PabstMirror
be742c13cd
Merge branch 'master' into 155selectRandom
2016-02-17 15:58:19 -06:00
PabstMirror
dccc1d33fd
Merge remote-tracking branch 'it/translation/15bn/alef' into translations156merge
2016-02-17 12:30:03 -06:00
Thomas Kooi
26cb6bd6a3
Merge pull request #3326 from acemod/makeAdvMedicalWoundsConsistant
...
Make wound assignment consistent for dll/sqf
2016-02-17 18:34:28 +01:00
PabstMirror
40396fc69e
Remove debug
2016-02-17 09:37:08 -06:00
PabstMirror
f1797feead
Make wound assignment consistent for dll/sqf
...
Dll now exits on first match for threshold damage (exitWith)
Remove random wound in sqf to match dll
Fix backblast threshold order
Add lower vehiclecrash threshold
Add dll version logging
2016-02-16 12:19:18 -06:00
PabstMirror
5c9dfd7dc5
Handle enemy causing veh explode, fix revive unload
...
Fix #3269
2016-02-15 22:23:37 -06:00
PabstMirror
9441b548be
Fix vehicle crashes not being fatal to non-drivers
...
Fix #3306
2016-02-15 17:11:04 -06:00
Glowbal
ff86359247
Merge branch 'master' into medical-focus-feature
2016-02-13 19:51:45 +01:00
Ivan Krouglyi
0a226b5ee9
Update fnc_treatment_success.sqf
...
Error at 84 line - you forget ";"
2016-02-13 03:29:42 +03:00
PabstMirror
ff4ba98e68
Pre-load again on mission load (save game)
2016-02-10 11:50:30 -06:00
commy2
82086efca0
manual merge
2016-02-10 10:11:33 +01:00
PabstMirror
e1b83b8172
Manually pre-load for StaticWeapons and Car
...
Fix #3168
2016-02-09 22:43:38 -06:00
SzwedzikPL
0c80551fd8
ace attribute category, lower case classes
2016-02-10 01:17:18 +01:00
SzwedzikPL
94ea26c7b9
typo fix
2016-02-08 00:14:55 +01:00
SzwedzikPL
3bfac35b65
ace repair and medical attributes
2016-02-07 23:56:45 +01:00
Glowbal
e754c89c73
Remove non functional event driven handleDamage
2016-02-07 13:18:19 +01:00
Glowbal
575f362fb6
Add setting for limiting usage of Epinephrine in basic medical #1792
...
Part of focus feature medical #3134 . Default settings are inline with old default.
2016-02-07 13:10:38 +01:00
Glowbal
bfd90cd5d3
Add Adenosine to replace atropine #1573
2016-02-07 12:54:23 +01:00
Glowbal
39cf11367f
improve medical bandage configuration
2016-02-07 12:37:00 +01:00
Glowbal
84878c3d8b
Merge branch 'master' into medical-focus-feature
2016-02-07 12:11:25 +01:00
commy2
ac007e6995
replace more map with apply
2016-02-06 12:08:04 +01:00
PabstMirror
35333cbe9d
Merge branch 'cargoCleanup'
2016-02-04 12:51:52 -06:00
Thomas Kooi
69746a133b
Merge pull request #3254 from ProfessorCZ/master
...
Czech Translation - Update
2016-02-04 19:36:28 +01:00
PabstMirror
336184dfaa
Change medication removal from array
2016-02-04 10:00:33 -06:00
PabstMirror
3cc10a27ce
Tourniquets block medication until released
...
Close #2704
2016-02-03 14:40:26 -06:00
ProfessorCZ
61611d0ec7
Czech Translation - Update
...
Update
2016-02-03 18:31:31 +01:00
PabstMirror
46d6e92bca
Add quick debug defines to all script_components
2016-01-28 23:26:02 -06:00
PabstMirror
c0eccc67c3
Change all SCALAR to NUMBER in headers
2016-01-28 18:19:15 -06:00
PabstMirror
17a882fe4d
Add findUnloadPosition integration
2016-01-26 18:01:01 -06:00
Glowbal
34613b42f2
Increase heart rate increase speed #3134
2016-01-20 11:49:10 +01:00
PabstMirror
04bccf47d7
Replace all use of deprecated commands
2016-01-19 09:39:07 -06:00
Glowbal
86158ac45b
Stage improvements bandage effectiveness
2016-01-17 14:09:22 +01:00
Glowbal
7de1a7bc6c
add initial implementation of drowning and collision damage handling
2016-01-17 13:21:18 +01:00
Glowbal
209d10065b
Fix missing event log entries #3134
2016-01-17 12:28:37 +01:00
Glowbal
6e42a10d47
Add selectionDamage implementation
2016-01-17 12:28:08 +01:00
Glowbal
ee9a620a63
Merge branch '340handledamage' into medical-focus-feature
2016-01-16 22:03:28 +01:00
Thomas Kooi
c8c91d2af7
Merge pull request #3138 from acemod/increaseTrainingInLocations
...
Medical Locations Boost Training
2016-01-16 21:59:45 +01:00
PabstMirror
1affbd7d2f
Move littler syncedEH install to after settingInit
2016-01-14 17:06:46 -06:00
PabstMirror
c2f780e95f
#1259 - Medical Locations Boost Training
2016-01-09 23:54:48 -06:00
jokoho48
daf2fc2669
remove ccp issue in settings
...
prevent setCaptive if unit is wake up
2016-01-06 18:01:24 +01:00
jokoho48
6d49bbda28
add delay to Unconsciousness Captivity(posible fix for #3121 )
2016-01-06 17:46:59 +01:00
Glowbal
c042703786
Merge branch 'release'
2016-01-05 22:55:34 +01:00
commy2
7eaa55f9df
Merge pull request #3022 from acemod/bodybagevent
...
add event for placing units in body bags
2016-01-05 21:59:47 +01:00
Alessandro Foresi
c16d97cad0
Merge branch 'master' into translation/15bn/alef
2016-01-03 12:23:27 +01:00
PabstMirror
fb0738bd30
Merge branch 'master' into release
2015-12-31 20:27:26 -06:00
PabstMirror
cf27571b5a
Merge pull request #3007 from dudakov/master
...
Russian Translations - Update
2015-12-31 14:11:45 -06:00
PabstMirror
2e211c5a04
Fix Medical Triagecard Macro
...
Fix #3087
2015-12-31 01:46:24 -06:00
bux
0e8eb5fac4
Remove obsolete hotkey entries
2015-12-30 11:23:52 +01:00
Glowbal
c1fa81f28b
Fix tabs in sqf files
2015-12-21 17:05:48 +01:00
PabstMirror
74aec45921
Fix medical menu not closing on range, litter dir
...
- Medical Menu didn't close when target moved out of range
- Litter was always created in the same direction
2015-12-19 20:50:57 -06:00
PabstMirror
886c13f6a9
Merge pull request #3013 from acemod/bloodyLitter
...
Fix litter for adv - Add bloody p3d for Pack/qClot
2015-12-14 19:23:51 -06:00
commy2
7f63d51ccb
add event for placing units in body bags
2015-12-12 18:21:11 +01:00
PabstMirror
a501c7e1c3
Remove new models and just combine existing litter
2015-12-11 19:47:40 -06:00
PabstMirror
db50b5313d
getName can return raw or sanatized html tags
2015-12-11 12:01:50 -06:00
PabstMirror
e9be05209a
Fix litter for adv - Add bloody p3d for Pack/qClot
...
Fix #2950
Get correct bloodLossOnSelection for both basic and advanced
Adds bloody versions of packing bandage and quickClot
2015-12-10 22:58:44 -06:00
kaban
fd06472f4d
Russian Translations - Update
2015-12-10 20:32:16 +03:00
PabstMirror
cae9f436f6
Merge branch 'release'
2015-12-08 15:14:33 -06:00
PabstMirror
39edd205f0
Merge pull request #2942 from acemod/CzechTables
...
Czech Translations - Update
2015-12-07 09:32:00 -06:00
bux578
fbde1dd794
Merge pull request #2941 from acemod/DieStringtables
...
Update German Stringtables
2015-12-07 10:27:11 +01:00
PabstMirror
358228f5bb
Cleanup De Stringtables
2015-12-06 15:03:15 -06:00
gienkov
1132efaf48
ceil number of wounds
2015-12-06 02:57:21 +01:00
PabstMirror
b13656e54b
addDamageToUnit - Disable debug / testing code
2015-12-05 12:19:34 -06:00
ProfessorCZ
cf41ac5fba
Czech Translations - Update
2015-12-04 22:28:10 -06:00
licht-im-Norden87
291f4df072
Update German Stringtables
...
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
kommas...........................................................................................................................................................
Rallypoint
Update stringtable.xml
slideshow, not finished yet
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
What does Curator mean in this context?
l. 294, l 302
cargo
Update stringtable.xml
Update stringtable.xml
I left a few things out. I'd like if someone gives me advice
Z.698 Pionier oder Instandsetzer o.Ä. Was genau ist die deutsche Bezeichung der Klasse in ACE bzw Arma?
Z.707 Ich habe mich einfach mal auf Mechatroniker festgelegt, da Reperaturspezialist sich doch ein wenig ungelenk anhört...
Update stringtable.xml
Habe engineer als Pionier übersetzt (halte es selbst für etwas unpassend) Der specialist ist bei mir zum Mechatroniker geworden.
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Fix Mistakes from merge
Fix Empty Entries
Fix Mistake
Fix
2015-12-04 22:06:44 -06:00
PabstMirror
875b3980ac
Don't update openWounds if not bandaged
...
Fix #2921
2015-12-03 15:23:38 -06:00
commy2
411a8d58f3
fix more setVariable and getVariable capitalization
2015-11-30 17:53:57 +01:00
commy2
5a1aae6028
manual merge
2015-11-30 17:44:15 +01:00
commy2
a9ebcf8543
fix setVariable and getVariable capitalization
2015-11-30 17:27:09 +01:00
commy2
b3950bd7f0
fix forEach capitalization
2015-11-30 17:23:48 +01:00
commy2
2b05f6f451
fix isNil capitalization
2015-11-30 17:22:16 +01:00
commy2
5e41643cff
fix pushBack capitalization
2015-11-30 17:21:28 +01:00
commy2
d9b90258bc
fix typeOf capitalization
2015-11-30 17:19:57 +01:00
commy2
34d351c652
fix exitWith capitalization
2015-11-30 17:14:05 +01:00
commy2
0b84bb514b
fix Cfg capitalization
2015-11-30 17:09:26 +01:00
commy2
dcf0a68b80
Revert "fix Cfg capitalization"
...
This reverts commit 43bda9c462
2015-11-30 17:00:32 +01:00
commy2
43bda9c462
fix Cfg capitalization
2015-11-30 16:52:20 +01:00
commy2
ff4406e411
manual merge, more selectRandom command useage
2015-11-29 16:48:23 +01:00
commy2
e5c4d35969
1.55 use new selectRandom command
2015-11-29 16:33:25 +01:00
Thomas Kooi
5282e95668
Merge pull request #2876 from acemod/medicalTranslateHP
...
Medical Fixes
2015-11-28 20:58:08 +01:00
Thomas Kooi
cef01baf0b
Merge pull request #2856 from acemod/isEqualTypeRepalcement
...
1.54 - Replace typeName with isEqualType
2015-11-28 20:36:07 +01:00
Thomas Kooi
b807d1db48
Merge pull request #2886 from acemod/bandageReopen
...
Add all wound types to bandage treatment configs
2015-11-28 20:32:13 +01:00
PabstMirror
5850f78c1f
Merge branch 'master' into isEqualTypeRepalcement
2015-11-27 21:08:21 -06:00
PabstMirror
6031eb8c6e
Add all wound types to bandage treatment configs
...
Fix by adding all config entries;
instead of trying to modify classname
2015-11-27 14:19:26 -06:00
ViperMaul
8d4364350c
Fix for "double semicolon detected" error
2015-11-27 10:43:30 -08:00
PabstMirror
e51f658ce0
Try base wound class in bandage treatment configs
...
Gets the correct wound for the bandage treatment config
Used for selecting most effective bandage and reopening
_className was something like "velocityWoundMedium"
but configs only had base class "velocityWound"
2015-11-26 23:18:39 -06:00
PabstMirror
a5c45c137f
Medical - addDamageToUnit Helper
2015-11-26 09:53:12 -06:00
PabstMirror
988a5c76bb
Medical - 1.54 Changes
...
1.54 Armor
Translate selectiosn to hitpoints
Calc newDamage using hitIndex (because sel is translated)
Fix isFalling never being reset
Cache hitpointIndex to reset damage
Normalize Limb Armor to 1.54
Cleanup
Cleanup
2015-11-25 11:49:20 -06:00
PabstMirror
20bf90f3e9
Medical - Fix Hitpoints Macro when building
2015-11-24 16:30:09 -06:00
PabstMirror
c2564de5ef
Fix UBC for 1.54
...
Soldiers no longer inherit hitpoints from CaManBase
Adds a macro to deal with them
2015-11-20 23:27:29 -06:00
Thomas Kooi
801120fb39
Merge pull request #2841 from acemod/medicalAiBandage
...
Move bandage log before basic exit
2015-11-20 22:28:55 +01:00
PabstMirror
c4117e1283
Merge branch 'master' into settingsErrorChecking
...
Conflicts:
addons/map_gestures/stringtable.xml
2015-11-20 14:37:23 -06:00
PabstMirror
69b53af1d3
1.54 - Replace typeName with isEqualType
2015-11-20 11:40:31 -06:00
kaban
f8481ae5f2
Merge branch 'master' of https://github.com/acemod/ACE3.git into develop
...
Conflicts:
addons/captives/stringtable.xml
2015-11-18 06:39:58 +03:00
PabstMirror
5823749f0c
Merge branch 'master' into settingsErrorChecking
2015-11-17 14:00:22 -06:00
commy2
a57d1bca75
replace local keyword with private
2015-11-17 17:43:07 +01:00
PabstMirror
c3e6990d00
#2528 (6) - Move bandage log before basic exit
...
In advanced medical without enableFor AI. Bandaging an AI would exit
before adding log.
2015-11-12 01:06:29 -06:00
Thomas Kooi
ec1187e79b
Merge pull request #2830 from acemod/mixedMedicalDisplay
...
Display basicMed wounds for AI in mixed mode
2015-11-10 08:33:21 +01:00
PabstMirror
c91789f3c4
Merge remote-tracking branch 'refs/remotes/origin/master' into settingsErrorChecking
2015-11-06 20:30:12 -06:00
PabstMirror
c326bc2f87
#2772 - Display basicMed wounds for AI in mixed mode
2015-11-06 01:05:25 -06:00
kaban
e2763dde27
Russian Translations - Update
2015-11-05 03:28:53 +03:00
PabstMirror
1cebe613fa
Fix Capitialzation
2015-11-04 14:38:32 -06:00
PabstMirror
c5da32e470
Medical Handle Damage - check hitpoints if selection is weird
2015-11-04 14:36:26 -06:00
PabstMirror
a3443cae43
Merge pull request #2780 from acemod/fixTimeInComments
...
Changed ACE_time back to time in comments where appropriate
2015-11-04 13:04:05 -06:00
PabstMirror
cfba7c01e8
Merge branch 'master' into settingsErrorChecking
...
Conflicts:
addons/map_gestures/stringtable.xml
2015-11-03 12:09:36 -06:00
Glowbal
8f6e9be636
Add method to deal with new hitpoints
...
This addition tries to deal with the new hitpoints introduced in Arma3 v1.50 and above. It converts new selection names to by the current medical system usable selection names.
This is only a temporarily patch, while we are still working on a larger overhaul to account both the new hitpoints and any potential new features / polishing.
2015-11-01 16:35:25 +01:00
Jonathan Pereira
ce5364d7af
Added PT-BR translations
...
Added all remaining translations, including dagr, dragging, map,
map_gestures, medical, repair, tacticalladder and zeus.
2015-10-26 22:04:03 -02:00
Glowbal
b5539db27f
Merge pull request #2767 from acemod/canTreatLocation
...
Fix medical location check when set to disabled for PAK/Surgical
2015-10-24 00:55:51 +02:00
VKing
069169cc72
Changed ACE_time back to time in comments where appropriate
2015-10-21 22:52:21 +02:00
Glowbal
57abe3b885
Merge pull request #2743 from acemod/medicalStuff
...
Medical Menu Fixes
2015-10-19 22:47:13 +02:00
PabstMirror
cfde11d2fa
Fix medic treatment location check as well
2015-10-19 01:45:30 -05:00
PabstMirror
aad6cab896
#2765 - Fix location check when set to disabled
2015-10-19 01:20:11 -05:00
PabstMirror
64de91ed06
Add warning for duplicate setting modules.
2015-10-18 23:34:11 -05:00
Glowbal
76efdbcc1c
Merge pull request #2257 from jonpas/parseList
...
Parse List Common Function
2015-10-18 12:14:18 +02:00
Glowbal
94ed78a173
Merge pull request #2578 from alganthe/strings_fix
...
PAK and Surgical Kit strings normalized inside modules.
2015-10-11 12:05:11 +02:00
PabstMirror
4ba0d72bfd
#2580 (1) - Fix bandages always created at terrain level.
2015-10-10 23:09:52 -05:00
gienkov
b6d2cdee69
Merge remote-tracking branch 'origin/master' into pl-strings
2015-10-04 12:25:55 +02:00
Glowbal
58ea8d5e2c
Merge pull request #2543 from alef/feature/death_short_diagnose
...
Remove: pain diagnosis on dead patients
2015-10-04 09:34:10 +02:00
Glowbal
9ce4ce6cdd
Merge pull request #2582 from acemod/fixLitterFloating
...
fix Littergeneric fly over ground
2015-10-04 09:32:03 +02:00
Glowbal
e36df978ec
Merge pull request #2646 from DerekSauer/FixArmaInjury
...
Fix healHitPointAfterAdvBandage - Issue #2498 .
2015-10-04 09:28:47 +02:00
PabstMirror
b0b755720c
#2672 - Use ACE_gameTime for triage card
2015-10-03 12:28:54 -05:00
commy2
573279bd30
add selection, collision, fall and drowning damage events
2015-10-02 23:19:14 +02:00
Derek Sauer
f9352de489
Clarified comment slightly.
2015-09-30 20:34:51 -04:00
Derek Sauer
0a788a282e
Improved efficiency of wound counting.
...
Using a switch/case conditional since it offers early termination if a
matching condition is found before all conditions are checked. It also
unnecessary to use a conditional to confirm whether a limb is wounded or
not. Number of Wounds multiplied by Blood loss will return zero for
a fully bandaged body part, not incrementing the wound counter; or it will
return some other number which will increment the wound counter.
2015-09-30 20:27:40 -04:00
Derek Sauer
f69f4066e9
Fix capitalization on forEach and getVariable.
2015-09-30 06:17:54 -04:00
Derek Sauer
2824009317
Incorrectly retrieving list of current wounds.
...
Used the wrong method to retrieve the target's current wounds and was
getting an empty array. This caused bandaging any wound even once to
completely heal the target on the Arma side.
2015-09-29 17:00:49 -04:00
Derek Sauer
8d05214eb0
Resolve merge conflict from upstream pull.
2015-09-29 16:24:17 -04:00
gienkov
d88d2fe578
Merge remote-tracking branch 'origin' into pl-strings
2015-09-29 21:56:29 +02:00
Derek Sauer
954fad615a
Reformatted to follow ACE3 coding guidelines.
2015-09-29 06:36:36 -04:00
Derek Sauer
8619f02538
Take into account wounds that do no cause blood loss.
2015-09-29 06:19:49 -04:00
Derek Sauer
a864a3411c
Clarified a comment.
2015-09-28 21:32:04 -04:00
Derek Sauer
488541bba6
Fix for Arma wounds not being healed with healHitPointAfterAdvBandage.
2015-09-28 20:08:07 -04:00
jonpas
4521df0a57
Add synchronizedObjects vehicle support to assignObjectsInList with an optional parameter
2015-09-28 16:17:12 +02:00
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
gienkov
ef36b27fe2
medical pl translation
2015-09-11 23:49:41 +02:00
SilentSpike
17f9eab03a
Improve display name of medical heal hitpoints setting
...
ace_medical_healHitPointAfterAdvBandage had a slightly misleading display name that didn't quite convey what it is actually doing
2015-09-11 12:33:18 +01:00
KoffeinFlummi
63c2712360
Merge branch 'release' into portuguese
2015-09-10 21:59:30 +02:00
KoffeinFlummi
c2ffe7cad0
Merge branch 'release' into russian
2015-09-10 21:05:32 +02:00
KoffeinFlummi
83aa2cc68c
Merge branch 'release' into french
2015-09-10 19:36:56 +02:00
FreeZbe
fa7943c8be
Update French translations
2015-09-10 19:14:51 +02:00
jonpas
e07b71faf0
Merge branch 'master' into parseList
...
Conflicts:
addons/medical/functions/fnc_moduleAssignMedicRoles.sqf
addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf
2015-09-09 19:13:04 +02:00
jokoho48
defbdf1b1a
fix that HC throw a issue if PPEffect was used/applyed
2015-09-09 17:05:48 +02:00
Michael Braun
a5fb09a7e1
Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros
...
Conflicts:
addons/repair/functions/fnc_moduleRepairSettings.sqf
2015-09-09 02:55:12 +02:00
Glowbal
0c371ddf37
disabled debug for medical
2015-09-08 19:06:01 +02:00
gienkov
ad50c1ab4b
medical and repair translation
2015-09-07 16:15:18 +02:00
commy2
adb1a11211
increase leg and arm armor value, more TRACE debug
2015-09-06 11:49:08 +02:00
ViperMaul
98202f4f38
Additional debug statements for caching and wounds.
2015-09-05 15:31:14 -07:00
jonpas
8fc061bfd6
Merge branch 'master' into parseList
2015-09-05 20:16:59 +02:00
Jonathan Pereira
7147891710
Added latest ACE3 PT-BR translations
2015-09-05 15:12:31 -03:00
Glowbal
0a6b77b902
Removed more deprecated wound sync code
2015-09-05 14:10:28 +02:00
Glowbal
e4c246984f
Removed another debug trace that should not be there
2015-09-05 14:10:04 +02:00
Glowbal
d9af19df28
properly fixes unconscious weird behavior. Because it never registered any unconscious conditions.
2015-09-05 14:08:46 +02:00
Glowbal
dad96822be
Only add 1/4 of the new damage to pain instead of everything.
2015-09-05 13:27:02 +02:00
Glowbal
f15a1c033d
Added allowSelfTreatment attribute to treatment actions
2015-09-05 13:20:19 +02:00
Glowbal
a4e406658f
Reduced initial knockdown time for basic medical
2015-09-05 13:02:19 +02:00
Glowbal
17ad7ecb8c
replaced diag_logs by trace
2015-09-05 12:59:09 +02:00
Glowbal
9c0288cd3f
Removed debug message
2015-09-05 12:55:49 +02:00
Glowbal
c828544d02
Added init stacking
2015-09-05 12:50:32 +02:00
Glowbal
c673ea2cbb
Restored uniqueIds
2015-09-05 12:38:12 +02:00
Glowbal
17648739dd
Removed more deprecated wound sync code
2015-09-05 12:37:01 +02:00
Glowbal
6b73eafcce
Allow users to disable medical 3d interaction.
2015-09-05 12:31:52 +02:00
Glowbal
268220bbae
Possible fix for weird unconscious behavior in basic medical
2015-09-05 12:20:40 +02:00
Glowbal
4122b32dba
Removed deprecated wound sync code
2015-09-05 12:02:09 +02:00
Glowbal
e0db571e13
Minor adjustment to fatality change on torso damage
2015-09-05 12:00:45 +02:00
Glowbal
130569c485
Made basic medical bleeding information work with new damage system
2015-09-05 11:57:17 +02:00
Glowbal
39ff82e764
fixes for CPR condition in basic medical and improvements to lethalDamage
2015-09-05 11:52:12 +02:00
Glowbal
4514812523
Basic bandaging now works with new damage system
2015-09-05 11:51:46 +02:00
Glowbal
cd9e5df782
Clean up of handleDamage. Fixes some debug code
2015-09-05 11:25:56 +02:00
Glowbal
df3dbc9772
Removed deprecated fire handling
2015-09-05 11:25:31 +02:00
Glowbal
a25f640614
fixes #2114 No CPR available in basic medical when revive is enabled
2015-09-05 11:07:10 +02:00
Glowbal
3d342ece20
Fixes #2156 Animation is still played even if you cancel any treatment
2015-09-05 11:04:11 +02:00
ViperMaul
4c0c7bc290
debug change
2015-09-04 10:21:10 -07:00
ViperMaul
7f58d5a94d
Revert "Adding same ADV special case to BASIC handle damage." -Not Needed
...
This reverts commit bf267246bf
2015-09-04 10:20:34 -07:00
jonpas
644460ed96
Merge branch 'master' into parseList
...
Conflicts:
addons/slideshow/functions/fnc_makeList.sqf
2015-09-04 18:40:35 +02:00
ViperMaul
bf267246bf
Adding same ADV special case to BASIC handle damage.
2015-09-04 07:48:16 -07:00
ViperMaul
2bc20501bc
Adding more debug
2015-09-04 07:46:35 -07:00
ViperMaul
813e54a668
Fixing Debug for object variable hasPain
2015-09-04 07:37:20 -07:00
ViperMaul
89b0c05929
Fixed a debug statement.
2015-09-03 13:17:59 -07:00
commy2
b737f42777
fix error when opening triage card
2015-09-03 18:30:29 +02:00
commy2
795b7a893f
Merge branch 'medical-adjustments2' of https://github.com/acemod/ACE3 into medical-adjustments2
2015-09-03 17:18:32 +02:00
ViperMaul
6d28214287
Add some debug values.
2015-09-03 08:18:37 -07:00
commy2
0bd92af072
fix variables not inited, csat armor scaleing
2015-09-03 17:17:54 +02:00
commy2
e753131f2d
arms and legs to vulnerable, better scaling for pilots and csat
2015-09-03 16:17:48 +02:00
commy2
a84be46ed4
fix errors from cleanup
2015-09-03 15:49:49 +02:00
kaban
08b7110e58
Russian Translations - Update
2015-09-03 04:54:52 +03:00
kaban
91cae690c0
Russian Translations - Update
2015-09-03 03:36:15 +03:00
Glowbal
f38d245771
fixed bloodloss for basic medical
2015-09-02 21:56:00 +02:00
commy2
f939f9215e
stop flickering of wounds, fix #346
2015-09-02 20:49:17 +02:00
