Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,533 Commits 73 Branches 88 Tags 752 MiB
a90f48efb9
Commit Graph

1395 Commits

Author SHA1 Message Date
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
commy2
7d2f1f52a4 remove protection, hitpoint config (fix ubc), some debug stuff 2015-09-02 20:13:51 +02:00
commy2
dc5e6b7c3c Merge branch '323medicalstrcturaldamage' into medical-adjustments 2015-09-02 20:02:19 +02:00
commy2
9665f73fa3 Merge branch 'master' of https://github.com/acemod/ACE3 into medical-adjustments 2015-09-02 17:03:36 +02:00
Michael Braun
035b3432c5 Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros 
Conflicts:
	addons/common/XEH_postInit.sqf
 2015-09-01 08:45:59 +02:00
commy2
5a164c5cdc fix UBC issues, simplify uniform hitpoint config 2015-08-31 23:36:59 +02:00
commy2
f15805d1f3 setStructuralDamage function 2015-08-31 20:05:38 +02:00
Glowbal
8c6f896164 fixed script error when canceling treatment actions 2015-08-31 13:00:17 +02:00
KoffeinFlummi
5f63290508 Merge branch 'ptbr' 2015-08-30 00:42:31 +02:00
KoffeinFlummi
a7f2a7fefc Merge branch 'translate-hu' of https://github.com/Harakhti/ACE3 2015-08-30 00:35:11 +02:00
Glowbal
4bde554854 Merge branch 'master' into medical-adjustments 
Conflicts:
	addons/medical/functions/fnc_actionCheckBloodPressure.sqf
	addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf
	addons/medical/functions/fnc_actionCheckPulse.sqf
	addons/medical/functions/fnc_actionCheckPulseLocal.sqf
 2015-08-29 23:49:58 +02:00
Glowbal
2fd30ba20c fixes #2274 2015-08-29 22:57:52 +02:00
Glowbal
602ef690fc Allow diagnose on torso #1879 2015-08-29 22:54:51 +02:00
Glowbal
ce42f5864f fix #2155 2015-08-29 22:53:08 +02:00
Glowbal
b291141d11 Should Be a better fix for #2298 2015-08-29 22:51:42 +02:00
Glowbal
183e872f1f Possible fix for #2298 2015-08-29 22:44:52 +02:00
Michael Braun
657157d767 Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros 
Conflicts:
	addons/hearing/functions/fnc_moduleHearing.sqf
 2015-08-29 22:38:26 +02:00
PabstMirror
321ca815a2 semi-colon 2015-08-29 09:52:28 -05:00
jokoho48
8916b70fe1 Improve some Code 2015-08-29 15:29:02 +02:00
Glowbal
6796b3126d Staged work on fixing updating base classes for hitpoints 2015-08-29 12:59:28 +02:00
Glowbal
1e08244f21 Removed debug output 2015-08-29 12:59:11 +02:00
Glowbal
1a4736e663 Clean up 2015-08-29 12:01:00 +02:00
Glowbal
1c9e88f213 fixes #1964 2015-08-29 11:58:28 +02:00
Glowbal
d56f3cea81 Added pain and unconsciousness handling for new basic medical code 2015-08-29 11:58:03 +02:00
Glowbal
354e4410d1 Merge pull request #2268 from gienkov/pulse-enhancement 
HR and BP enhancement
 2015-08-29 11:47:00 +02:00
Michael Braun
9e10aa86d7 Standardize logging format through ACE_LOG macros 2015-08-26 15:32:54 +02:00
Grzegorz
5ad0e192c3 Fix being able to TQ torso 2015-08-26 11:18:54 +02:00
Glowbal
0cfb492916 Fixes and removal of duplicate code 2015-08-26 10:04:51 +02:00
Glowbal
7a48f595be Merge branch 'basic-medical-test' into medical-adjustments 2015-08-26 09:13:12 +02:00
Glowbal
db96d42f25 Merge branch 'CodeCleanUpMedical' into medical-adjustments 2015-08-26 09:06:27 +02:00
gienkov
6a123020d2 fail to find BP on limbs with TQ on 2015-08-26 08:55:50 +02:00
Glowbal
ad7716a25e Merge pull request #2233 from gienkov/patch-27 
Increase "load in bodybag" action time to 15s
 2015-08-26 08:36:06 +02:00
Glowbal
a139a3cccc Merge pull request #2263 from gienkov/patch-30 
Bandage and tourniquet on adv. medical change proposal
 2015-08-26 08:30:59 +02:00
Grzegorz
b8a29bfd44 @jokoho482 suggestion 2015-08-26 03:00:43 +02:00
gienkov
cae5f828fb run check only on arms 2015-08-26 02:51:05 +02:00
gienkov
c3af5e81e7 fix my error 2015-08-26 02:41:12 +02:00
gienkov
5a9817322b remove tabs 2015-08-26 02:39:34 +02:00
gienkov
8498589920 pulse zero on limb with TQ on 2015-08-26 02:37:51 +02:00
Felix Wiegand
3098794951 Merge pull request #2194 from NemesisRE/patch-1 
Changed german strings for aid kit
 2015-08-25 23:18:21 +02:00
Grzegorz
5280ded680 Bandage and tourniquet on adv. medical change proposal 
Make bandaging longer as it is not very fast process.
Make putting on tourniquet faster cause it's should be easy to put one on limb, so it's actually useful now and with above change (putting it on before was longer than bandagin).
 2015-08-25 20:05:05 +02:00
jonpas
5b6429f23e Made more modules use assignObjectsInList common function 2015-08-24 21:55:48 +02:00
Steven Koeberich
d5a1a99f90 Update stringtable.xml 
corrected spelling
 2015-08-23 18:58:13 +02:00
jokoho48
260b048da4 some more Improvements 2015-08-23 14:13:55 +02:00
Grzegorz
33889fa46b Increase "load in bodybag" action time 
Around 15 seconds seems optimal (for dead bodies that are left in **one** piece).
 2015-08-23 00:13:09 +02:00
Grzegorz
07019ed928 Fix stitching action progress bar 2015-08-22 22:20:20 +02:00
jokoho48
fab4c6a67f fix Spelling Issues 2015-08-22 21:32:36 +02:00
jokoho48
19dd55147a Code Cleanup Medical Module (Part 4). 2015-08-22 19:47:23 +02:00
jokoho48
2d4ef16429 fix CTD 2015-08-22 18:54:51 +02:00
jokoho48
ff6c8a31be Code Cleanup Medical Module (Part 3). 2015-08-22 18:33:06 +02:00
jokoho48
10127ed957 Fix Typo 2015-08-22 17:10:19 +02:00
jokoho48
c2d94239a2 Code Cleanup Medical Module (Part 2). 2015-08-22 16:26:53 +02:00
jokoho48
d09ca9ec8b Code Cleanup Medical Module (Part 1). 2015-08-22 16:25:10 +02:00
gienkov
cf585790db fixes done 2015-08-22 11:41:15 +02:00
gienkov
cc430fc8c2 medical translation 2015-08-21 23:54:01 +02:00
Glowbal
bf8318530e Merge pull request #2081 from acemod/close-med-menus-distance 
Fixed #1893 - Menu closes when patient is more as 10 meters away
 2015-08-21 14:20:41 +02:00
Glowbal
2f0ed4fba1 Merge pull request #2207 from jonpas/readmes 
Added and Updated README.md files
 2015-08-21 14:07:30 +02:00
Glowbal
20918f2c70 Merge pull request #2183 from acemod/treatmentWhileDeployed 
Fix treatment when weapon deployed
 2015-08-21 14:04:51 +02:00
SzwedzikPL
a8c11a249d cargo sup for bodybag and concertina 2015-08-20 21:41:28 +02:00
SilentSpike
33ef60266b Fix medical CPR code and log message 
Performing CPR would never succeed when the patient was in revive state because the code was accidentally using `exitWith` instead of `then`. The log message string was also incorrect.
 2015-08-19 23:30:13 +01:00
jonpas
de033f0ff2 README.md files added to all modules 2015-08-19 04:18:33 +02:00
Steven Koeberich
b333fe0cd1 Changed german strings for aid kit 
Missed some.
 2015-08-17 17:42:03 +02:00
Steven Koeberich
f543cf2897 Changed german strings for aid kit 
The translation for Fielddressing and Aid kit are the same in the german translation which is missleading.

Changed to "Erste-Hilfe-Set" (first aid kit) which is less missleading.
 2015-08-17 17:31:40 +02:00
jokoho48
e14c640c6f Fix Some LandContactPoints 
Fix Positions of some Model
 2015-08-17 16:11:23 +02:00
PabstMirror
dd58eef415 Fix double weapon switch for standing treatment 2015-08-16 14:12:26 -05:00
PabstMirror
21f46f4401 #2178 - Fix treatment when weapon deployed 2015-08-16 13:58:58 -05:00
jonpas
5b0168efdb Fixed Atropine autoinjector display name 2015-08-16 14:14:49 +02:00
PabstMirror
763f793d0e Localize Catagoires in loadSettingsLocalizedText 
Minor, but allows us to use CSTRINGS in configs for consistancy
 2015-08-13 13:20:37 -05:00
Glowbal
17115b8846 test switch to adv medical handleDamage 2015-08-11 20:58:00 +02:00
Glowbal
9c8a03b0b3 fixes #2070 - medication is not translated on activity log 2015-08-09 20:12:31 +02:00
Glowbal
298f64a7bf fixes #2078 
1. Fixed incorrect activity string for tourniquet
2. Fixed incorrect macro usage, should have grabbed variables from medical module.
 2015-08-09 20:07:06 +02:00
Glowbal
3cac137851 Fixed #1893 - Menu closes when patient is more as 10 meters away 2015-08-09 09:14:42 +02:00
Glowbal
58fc69c2a6 Updated litter configuration. Closes #2002 2015-08-09 08:59:04 +02:00
PabstMirror
95d88b920e #2079 - RemoveTourniquet doesn't require any items 2015-08-08 21:25:36 -05:00
Glowbal
493254619c Merge pull request #2039 from acemod/medical-menu 
Medical menu
 2015-08-08 23:11:11 +02:00
Glowbal
696546de5c Finalized ACE medical menu settings 2015-08-08 20:22:19 +02:00
PabstMirror
c6be0bbb8c Merge branch 'master' into add-category-optionsmenu 
Conflicts:
	addons/optionsmenu/functions/fnc_serverSettingsMenuUpdateList.sqf
	addons/optionsmenu/functions/fnc_settingsMenuUpdateList.sqf
 2015-08-08 12:39:14 -05:00
Glowbal
bb79feeaf1 Clean up duplicate files 2015-08-08 18:16:11 +02:00
jonpas
8e3a961ee3 Fixed missing string 2015-08-08 18:11:28 +02:00
jonpas
1aecd54fc3 Removed duplicated Enabled/Disabled/Yes/No/DoNotForce strings as they were moved to common 2015-08-08 18:02:20 +02:00
Glowbal
364e0455ee Merge branch 'master' into medical-menu 2015-08-08 17:55:43 +02:00
Glowbal
65c06551a5 Merge pull request #1652 from gienkov/patch-22 
Fix checking vitals anim
 2015-08-08 14:32:36 +02:00
Glowbal
be00f7ffe4 Merge pull request #2000 from acemod/treatmentResetWeaponMode 
Treatment reset weapon mode
 2015-08-08 14:20:10 +02:00
Glowbal
872c257901 Used the wrong string macro. 2015-08-08 13:21:13 +02:00
Glowbal
e9151d921c Localized category names for medical settings 2015-08-08 11:52:37 +02:00
Glowbal
d125b9ad9c Add category to options menu. Initial work. 2015-08-07 21:14:45 +02:00
Glowbal
f21023b4ee Added logs for quick view and activity view separate from the activity log for medical menu 2015-08-07 19:11:57 +02:00
Glowbal
f21da3ead6 Merge pull request #2026 from acemod/cleanBandages 
Clean bandages if no damage on hitpoint
 2015-08-07 15:46:44 +02:00
Glowbal
abaf43be11 Selection restrictions 2015-08-07 00:09:40 +02:00
Glowbal
5ac2972573 Added local event upon successful treatment. 2015-08-06 23:50:44 +02:00
Glowbal
4b5632a8f6 Added categories and missing displayName entries 2015-08-06 23:50:23 +02:00
PabstMirror
e45bd43e5e CreateLitter / syncEvents performance fixes 2015-08-06 00:28:43 -05:00
PabstMirror
6ab72e905c #1807 - Clean bandages if no damage on hitpoint 2015-08-05 17:32:00 -05:00
Glowbal
275b0c4300 Merge branch 'release' 
Conflicts:
	README.md
	addons/finger/stringtable.xml
 2015-08-04 22:29:05 +02:00
Glowbal
43f8c87387 Merge pull request #1972 from jokoho48/MedicalModelUpdate 
Medical Litter model update
 2015-08-04 20:06:51 +02:00
PabstMirror
b3741f4036 Capitalization for macro CBA_fnc_addPerFrameHandler 2015-08-04 02:34:38 -05:00
PabstMirror
710135ae3f Opps 2015-08-03 21:49:16 -05:00
PabstMirror
fa49842c53 #1866 - Restore weapon mode after treatment 2015-08-03 19:57:49 -05:00
KoffeinFlummi
261cd42202 Merge branch 'pl-translation-4' of https://github.com/gienkov/ACE3 into polish-merge 2015-08-02 17:14:41 +02:00
KoffeinFlummi
8f848947ac Merge https://github.com/Clon1998/ACE3 into german-merge 2015-08-02 17:11:06 +02:00
jokoho48
ee11622cd5 Fix Position 2015-08-01 16:10:08 +02:00
jokoho48
9d8daf84a4 add New Medical Models 2015-08-01 15:46:25 +02:00
Glowbal
ca2a16af02 fix #1946 2015-07-30 18:21:24 +02:00
Glowbal
a4d5d9cb27 Possible improvement for handling minor levels of pain in advanced medical 2015-07-30 17:43:52 +02:00
Harakhti
d0f91c5ebf Row 1 
Not a miracle, but it's something.
 2015-07-30 14:40:51 +02:00
SilentSpike
16597515f0 Adding remaining missing English straings 2015-07-28 20:55:22 +01:00
gienkov
5bb1dded4b Merge remote-tracking branch 'origin' into pl-translation-4 2015-07-27 00:47:54 +02:00
Glowbal
d1809e597c Removed requirement for the medical dll 
Medical extension is now an optional requirement that improves performance for advanced medical when used.
 2015-07-26 20:54:49 +02:00
Glowbal
dfec850aa8 Merge pull request #1910 from SzwedzikPL/backpack_macro_in_cfgs 
addX macro in configs
 2015-07-26 08:37:47 +02:00
SzwedzikPL
6258e73290 addX macro in confgis 2015-07-25 21:59:52 +02:00
Glowbal
ea8dc0a5ec Merge pull request #1809 from SzwedzikPL/medical_fix_treat_at_attendant 
Fix for 'Treat at...' option
 2015-07-25 21:22:44 +02:00
Glowbal
3a53991ed0 fixed rvmat and texture paths 2015-07-25 21:21:31 +02:00
PabstMirror
40ed985d34 Config Fixes 2015-07-25 12:56:57 -05:00
Jonathan Pereira
5609ec7b6b Added PT-BR translations 
New PT-BR translations, including the slideshow and spectator module.
 2015-07-25 12:56:50 -03:00
gienkov
2f24b240b4 Fix end line marker 2015-07-23 13:59:50 +02:00
gienkov
61fa466a53 Medical and slideshow pl translation 2015-07-23 13:56:54 +02:00
PabstMirror
cbd74d768b Medical - Don't play *_medic anims at end 2015-07-23 02:43:19 -05:00
Joko
9bdb192c8a Add New LitterGloves 
Add New Litter/packingbandage
Change all Litter Model and Texture to a nomenclature (littergeneric_name)
 2015-07-19 15:31:15 +02:00
Glowbal
015fd1afb0 Merge pull request #1864 from jokoho48/TextureUpdate 
Update IV Blood and Plasma Texture
 2015-07-17 11:06:49 +02:00
Joko
1b9d02a8a5 Update IV Blood and Plasma Texture 2015-07-17 09:40:43 +02:00
Glowbal
0154dfc51e Merge pull request #1799 from jokoho48/3DModelUpdate 
Add and Update Some 3D Object and Textures
 2015-07-17 08:17:42 +02:00
Joko
c9a47ec053 Add LoDs for IVBag 250/500/1000 
Add LoDs for Kestrell
 2015-07-16 14:41:42 +02:00
Joko
b2b7015b8e Remove Unessesary Comments in RVMAT 2015-07-15 21:35:30 +02:00
Joko
9aa0285064 Revert LoD Changes 2015-07-15 21:13:05 +02:00
Joko
fd4d4abb73 Move UAV Battery form models to data 
change LoD Distance
Fix IVBag names(my issue)
 2015-07-15 20:51:06 +02:00
Joko
a72312738e Add to all Objects a LoD with nothing in for "hiding" Objects in Distance 
Remove Old Earplugs
Use 3 Object instead of 9 for IVBag with Using of Model Config
 2015-07-15 20:34:35 +02:00
Nicolás Badano
01d8d7957c Merge pull request #1824 from Legolasindar/master 
Update spanish translation
 2015-07-13 15:36:36 -03:00
PabstMirror
d4f70134e6 medical/setUnconscious header 2015-07-12 10:25:00 -05:00
Glowbal
d3bed7aedb fixed -1 to disable the revive timer does not work 2015-07-09 13:02:48 +02:00
Ivan Navarro Cabello
78529af60c Update spanish translation 2015-07-08 20:57:46 +02:00
SzwedzikPL
defc82694b Fix for 'Treat at...' option 2015-07-06 21:30:49 +02:00
Joko
fa900452ea Add DAGR (by Blackpixxel) 
Add QuikClot to Medical (by Blackpixxel)
Add QuikClot Litter (by Blackpixxel)
Update Blackpixxel at Author
Fix IRStrobe Texture Path
 2015-07-05 22:21:17 +02:00
Joko
0c099dc4d1 Add 3D Object IVBag Blood, Plasma and Saline with 1000ml, 500ml, 250ml(Made by PaxJaromeMalues) 
Add PaxJaromeMalues to AUTHORS
 2015-07-04 22:50:32 +02:00
ProfessorCZ
89a9218e59 CZ Translation - Update 2015-07-04 15:56:00 +02:00
Clon1998
c61a0f03cd Fixed german translation. 
Fixed german translation for Key STR_ACE_Medical_AssignMedicVehicle_EnableList_Description
 2015-07-04 09:43:42 +02:00
Glowbal
57c4bc453a Merge pull request #1779 from SzwedzikPL/zeus_no_paineffect 
disable pain effect in zeus camera
 2015-07-03 23:20:33 +02:00
Glowbal
44de95ea81 Merge pull request #1790 from acemod/medicalImprovements 
Medical improvements
 2015-07-03 22:21:20 +02:00
Glowbal
fd649aee38 Changed default value for surgical kit. Should be use anytime 2015-07-03 22:17:31 +02:00
Glowbal
9edf1b1adf Implemented use conditions for PAK and SurgicalKit 
It is now possible to only have a treatment action show up for stable (not bleeding) patients
 2015-07-03 22:16:18 +02:00
Glowbal
07303633e4 Merge pull request #1692 from acemod/fixVanillaDamageEffectsShowing 
Fix vanilla damage effects
 2015-07-03 21:41:26 +02:00
gienkov
70862c5de9 PL translation 2015-07-02 23:55:26 +02:00
SzwedzikPL
13999fdd31 finddisplay into curatorcamera 2015-07-02 19:36:34 +02:00
SzwedzikPL
c2e4ee431f no pain effect in zeus camera 2015-07-02 13:56:56 +02:00
ToasterBR
f4a51d57ef Translation to Brazilian Portuguese (PT-BR) 
Made all remaining translations, including new ones like the sitting
module, for example.
 2015-06-27 15:48:39 -03:00
ulteq
241e8acdd9 Merge pull request #1541 from jonpas/sitting 
Sitting
 2015-06-26 21:34:34 +02:00
Glowbal
e153e47bb2 Disabled litter on treatment failure. #1403 
We give back the items, so litter does not make sense at the moment.

In the future we need to expand this with conditions for success/failure.
 2015-06-20 12:54:00 +02:00