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,461 Commits 73 Branches 88 Tags 752 MiB
f6567841a2
Commit Graph

1394 Commits

Author SHA1 Message Date
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
Glowbal
9e00fc479b CPR local is now also only executed when the target is still alive. 
Otherwise it's quite useless
 2015-06-20 12:51:42 +02:00
Glowbal
c4283404e8 Changed CPR to be available for all unconscious units 
Including dead
 2015-06-20 12:51:01 +02:00
Glowbal
ea0be1f563 Only execute the local handling of CPR when in a valid state 2015-06-20 12:46:26 +02:00
Glowbal
385baf1331 Using CPR while in revive state will extend the life timer 2015-06-20 12:44:52 +02:00
Glowbal
9795647d9c While in revive state, ensure vitals are never above 0 for adv medical 2015-06-20 12:44:29 +02:00
Glowbal
3f5a050745 Fixed #1693 2015-06-20 12:38:12 +02:00
Glowbal
c3e2d1bf9c Removed always unconscious for basic medical 2015-06-20 12:23:40 +02:00
Glowbal
5887c59c05 Made fix properly for advanced medical 2015-06-19 23:03:31 +02:00
Glowbal
300a33ea0a Initial work 2015-06-19 22:53:25 +02:00
Grzegorz
1de569656d Fix checking vitals anim 
It uses animations that don't match at all what you are doing anyway so I think it's better to just disable anim for that actions which are:
* Checking pulse
* Checking BP
* Checking response
 2015-06-17 14:58:35 +02:00
ulteq
82d80359d1 Fixes: https://github.com/acemod/ACE3/issues/1646 2015-06-16 21:57:12 +02:00
Glowbal
f8aa9a3171 Merge pull request #1621 from acemod/hrIncrease 
Medical - change hrIncrease random min/max
 2015-06-15 10:42:43 +02:00
Ivan Navarro Cabello
76f7962dac Updated spanish stringatable 
Updated spanish stringatable for (Common, Medical, Optionsmenu,
Tacticalladder).
 2015-06-14 13:52:55 +02:00
PabstMirror
1c5788baab Medical - change hrIncrease random min/max 2015-06-14 03:54:50 -05:00
Glowbal
91b54bfc3a Adds a back up function in sqf to assign open wounds. 2015-06-13 23:20:01 +02:00
ViperMaul
1322da5537 Merge pull request #1587 from acemod/fixVehicleUnconcious 
fix animation and consistently unload units from vehicle
 2015-06-13 12:44:34 -07:00
jonpas
29ce8f635e Merge branch 'master' into sitting 
Conflicts:
	addons/kestrel4500/CfgVehicles.hpp
	addons/microdagr/CfgVehicles.hpp
 2015-06-13 21:43:42 +02:00
ulteq
c459a80bcb Merge pull request #1613 from ProfessorCZ/master 
CZ - Translation (medical, tacticalladder)
 2015-06-13 20:48:34 +02:00
Glowbal
5013254769 Merge pull request #1530 from legman/akalegman_zeus_unconscious 
Fixed Zeus Unconscious
 2015-06-13 20:48:18 +02:00
Glowbal
1c066a0b3f Merge pull request #1586 from acemod/dynamicPAKtreatmentTime 
PAK treatment time based on total amount of damage.
 2015-06-13 20:14:57 +02:00
ProfessorCZ
c9f29aefa2 CZ - Translation (medical, tacticalladder) 2015-06-13 19:49:59 +02:00
ProfessorCZ
bf464ffe00 CZ - Translation (medical, tacticalladder) 2015-06-13 19:46:31 +02:00
ulteq
6d6c3a4285 Fixed function header 2015-06-13 19:17:26 +02:00
ViperMaul
cb1d016a39 Merge pull request #1592 from ProfessorCZ/master 
CZ - Translation
 2015-06-13 07:39:18 -07:00
Glowbal
e0bb3c0a4e Merge pull request #1602 from acemod/medicalFallingFix2 
[Adv. Medical] Improved falling damage
 2015-06-13 13:39:22 +02:00
Glowbal
ce908f0fb3 Merge pull request #1579 from acemod/medicalModuleOptions 
[Adv. Medical]  New module options
 2015-06-13 13:37:02 +02:00
ulteq
1c4566984f Removed debug output 2015-06-13 12:13:58 +02:00
ulteq
84d20f9794 Further improved the handling of falling damage: 
* Makes sure _projectile is always "falling"
* Enables the creation of wounds in multiple body parts at once
* Caches the initial impact velocity for later damage calculation
* Adjusts the maxDamage value of Large Abrasions
 2015-06-13 11:53:30 +02:00
ulteq
234b62b409 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into medicalFallingFix2 2015-06-13 11:12:37 +02:00
PabstMirror
affe323435 Fix bodybag string macro 2015-06-12 23:19:17 -05:00
ViperMaul
1c0811aa31 Change from globalEvent to targetEvent 
#1575 and #1577
 2015-06-12 16:56:13 -07:00
ProfessorCZ
531372b2a3 CZ - Translation 
Already in README
 2015-06-12 14:50:50 +02:00
ulteq
604cd122d3 Experiment 2015-06-12 13:54:52 +02:00
ulteq
6ac2ca9208 Fixes _projectile not being updated 2015-06-12 11:48:49 +02:00
ulteq
46a73f3177 Added a function to calculate the PAK treatmentTime 2015-06-12 11:42:49 +02:00
ViperMaul
072f2cc3a7 fix animation and consistently unload units from vehicle 
#1575 and #1577
 2015-06-11 15:56:11 -07:00
ulteq
99b13a584a PAK treatment time based on total amount of damage. 2015-06-11 22:54:08 +02:00
ulteq
be6d72606a Pain is always suppressed again 2015-06-11 22:35:50 +02:00
ulteq
eef7c1295a Added new adv. medical module option 'painIsOnlySuppressed' 2015-06-11 17:36:18 +02:00
ulteq
0c40c1b439 Added Adv. Medical module option 'healHitPointAfterAdvBandage': 
* Changed the default value to '0'
 2015-06-11 15:30:39 +02:00
Glowbal
9d82b9a1f3 Merge pull request #1550 from acemod/medicalVanillaDamageFix 
Attempt to fix #1465 and #1354
 2015-06-11 10:25:50 +02:00
Glowbal
b6ed944123 Merge pull request #1563 from acemod/medicalCleanup 
Cleanup
 2015-06-11 10:25:28 +02:00
AKALegman
5431ab5e01 fixed conflicts 2015-06-10 20:03:00 +01:00
ulteq
8a7d3e9ede handleDamage_advanced cleanup 2015-06-10 17:10:09 +02:00
ulteq
91ce327580 Newline 2015-06-10 17:07:35 +02:00
ulteq
caae62b2af Reverted handleDamage_advanced 2015-06-10 17:07:00 +02:00
ulteq
245151d8c2 Removed spaces 2015-06-10 17:03:09 +02:00
ulteq
1c2c7ef8d7 Fixed empty selectionNames in vehicle crashes 2015-06-10 17:02:14 +02:00
ulteq
9336e7c9e1 [WIP] Various handleDamage_caching fixes 2015-06-10 16:51:46 +02:00
ulteq
772a1e508b Cleanup 2015-06-10 16:07:09 +02:00
ulteq
0661d25ae3 Removed debug output 2015-06-10 16:06:46 +02:00
ulteq
0f6c93852c Fixed handling of falling damage 2015-06-10 12:59:55 +02:00
ulteq
8bb3dbbaf6 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into medicalVanillaDamageFix 2015-06-10 12:59:11 +02:00
ulteq
7318aae629 Cleanup 2015-06-10 12:47:22 +02:00
Glowbal
efa9cf4709 Fix handleDamage caching return value 
Should never return nil. Instead, return a 0 as it's expecting new damage. this may fix the random vanilla damage kicking in.
 2015-06-10 12:21:06 +02:00
PabstMirror
e2890b0699 #1473 - Fix Medical Log Localization 
also swap some common EFUNCs
 2015-06-09 17:30:02 -05:00
jonpas
332afb2174 Allow certain self-interactions while sitting 2015-06-09 16:17:05 +02:00
ulteq
d454a2ccfc Attempt to fix #1465 and #1354 2015-06-09 15:46:00 +02:00
AKALegman
1ae8e29ac2 updated isPlayer v2 2015-06-08 19:12:16 +01:00
AKALegman
96fccbedf9 updated isPlayer 2015-06-08 11:09:49 +01:00
Glowbal
610f74d9d6 Merge pull request #1523 from AgentRev/onSetDead 
Added "medical_onSetDead" local event in fnc_setDead.sqf
 2015-06-07 23:58:22 +02:00
AgentRev
f7007b4175 Fixed "medical_onSetDead" event 2015-06-07 17:52:42 -04:00
PabstMirror
6b612a9890 Merge pull request #1520 from acemod/hideFakeWeapon 
Hide fake weapon
 2015-06-07 16:37:26 -05:00
PabstMirror
fb9c1e14a3 Merge branch 'master' into allStringtableMacros 
Conflicts:
	addons/kestrel4500/CfgWeapons.hpp
 2015-06-07 12:24:40 -05:00
AKALegman
d3eae58237 Fixed Zeus Unconscious 2015-06-07 12:17:52 +01:00
KoffeinFlummi
c47e0ce796 Merge https://github.com/ODK-Bn/ACE3 into russian-merge 2015-06-06 21:13:03 +00:00
AgentRev
4a416a12a2 Added "medical_onSetDead" local event in fnc_setDead.sqf 2015-06-05 22:03:27 -04:00
PabstMirror
32ce0aa6fd Macroize all stringtables 2015-06-05 21:02:24 -05:00
PabstMirror
84428e5e6c Medical - unconsciousness: fix exitWith scope 2015-06-05 15:43:09 -05:00
PabstMirror
4e8fc49b5e Always remove fakeWeapon after adding 
Should fix #1500
 2015-06-05 15:38:45 -05:00
PabstMirror
e01ba64683 Fix Missing Strings 2015-06-04 22:51:40 -05:00
Glowbal
e103007ae7 Merge pull request #1492 from GitHawk/master 
Disabled pain effect while unconscious
 2015-06-04 21:45:48 +02:00
IngoKauffmann
ede8d74c54 Disabled pain effect while unconscious 
If the player is unconscious the pain effect is disabled.
 2015-06-03 17:53:09 +02:00
IngoKauffmann
e60cfddc77 Limited strength of pain effect while unconscious 
Limited _strength to 0.1 so a player does not have to watch a flashing
screen while he can't do anything about it. Otherwise we need to include
a serious epilepsy warning!
 2015-06-03 17:17:35 +02:00
jonpas
5496333c26 Merge branch 'master' into macroSTR 
Conflicts:
	addons/nametags/ACE_Settings.hpp
	addons/nametags/CfgVehicles.hpp
	addons/nametags/stringtable.xml
 2015-06-02 22:22:51 +02:00
jonpas
541f1010a7 Merge branch 'master' into macroSTR 
Conflicts:
	addons/attach/functions/fnc_attach.sqf
	addons/captives/functions/fnc_moduleSurrender.sqf
	addons/common/CfgVehicles.hpp
	addons/explosives/CfgModule.hpp
	addons/hearing/CfgVehicles.hpp
	addons/interaction/CfgVehicles.hpp
	addons/map/CfgVehicles.hpp
	addons/microdagr/CfgVehicles.hpp
	addons/mk6mortar/CfgVehicles.hpp
	addons/nametags/CfgVehicles.hpp
	addons/nightvision/functions/fnc_changeNVGBrightness.sqf
	addons/respawn/CfgVehicles.hpp
	addons/switchunits/CfgVehicles.hpp
	addons/vehiclelock/CfgVehicles.hpp
	addons/winddeflection/stringtable.xml
 2015-06-02 22:14:32 +02:00
ulteq
048e5b6f6d Body bag cleanup: 
* Increased the treatment time to match the animation duration
* Fixed the body bag alignment with the dead unit
 2015-06-01 22:33:25 +02:00
ulteq
14607f7aba Fixes random body bag teleports 2015-06-01 21:23:00 +02:00
PabstMirror
f57427ec96 switch waitAndExecute with 0 delay to execNextFrame 
Should Fix #1463
 2015-06-01 13:14:05 -05:00
Glowbal
1c0c73be54 Merge pull request #1433 from acemod/fixSettingsFromModules 
Delay initialization of modules until settings are properly setup
 2015-06-01 19:18:11 +02:00
KoffeinFlummi
fa73aec15b Merge https://github.com/Macusercom/ACE3 into german-merge 2015-06-01 14:27:49 +02:00
Macusercom
5d1f2eafaa Fix German Translation 2015-05-30 23:34:19 +02:00
jonpas
d934c25b78 Merge branch 'master' into macroSTR 
Conflicts:
	addons/interact_menu/ACE_Settings.hpp
 2015-05-30 19:54:32 +02:00
PabstMirror
84d940e69d Fix circular dependency - ModuleDescription 2015-05-30 00:31:07 -05:00
Glowbal
552b2f390f Merge pull request #1256 from acemod/medicalExtension 
Medical Extension for handleDamage wounds
 2015-05-29 23:16:00 +02:00
jonpas
763cb07629 Macro STRING to LSTRING 2015-05-28 21:59:04 +02:00
Glowbal
d34c96038e Merge branch 'master' of github.com:acemod/ACE3 2015-05-28 20:56:35 +02:00
Glowbal
9135d956f0 Merge branch 'surgicalkit' 2015-05-28 20:54:52 +02:00
Glowbal
27106ce59f minor refactor 2015-05-28 20:54:13 +02:00
PabstMirror
3a4a02e524 #1407 - Make Saline 500ml match mass blood/plasma 2015-05-27 16:23:25 -05:00
jonpas
b85ae8f194 Fixed missed external strings 2015-05-27 22:34:57 +02:00
jonpas
0b0f7274d7 Applied ESTRING and ECSTRING macros 2015-05-27 22:04:41 +02:00
jonpas
1c58ff823d Stringtable fixes medical 2015-05-27 21:58:35 +02:00
Glowbal
7dd01ebb69 Merge pull request #1389 from acemod/possibleFixMedicalUnloadPatient 
Possible fix medical unload patient
 2015-05-27 19:34:23 +02:00
jonpas
6072e14077 Changed all strings to macros (except external) 2015-05-27 19:04:25 +02:00
Ivan Navarro Cabello
047a2ee736 added spansih translate 
added spansih translate for (advanced_ballistics, ballistics, captives,
common, explosives, frag, hearing, interaction, map, medical, microdagr,
missileguidance, missionmodules, mk6mortar, nametags, optionsmenu,
respawn, switchunits, vehiclelock, weather, winddeflection).

I used the Pull request of #1251 for complete my commit, because #1251
is outdated now.
 2015-05-27 15:27:04 +02:00
BaerMitUmlaut
f2e6a98eb4 Killed tabs 2015-05-27 13:51:22 +02:00
BaerMitUmlaut
6894a7433a Removed duplicate private var 2015-05-27 13:51:15 +02:00
BaerMitUmlaut
f7578a92c9 Reverted in favour of onProgress treatment 2015-05-27 00:52:16 +02:00
BaerMitUmlaut
30df0e8dc9 Switched to callbackPogress for treatment 2015-05-27 00:45:50 +02:00
BaerMitUmlaut
890b568225 Implemented dynamic treatment time 2015-05-27 00:45:22 +02:00
Glowbal
4945f22f3e Merge branch 'master' into medicalExtension 2015-05-26 22:42:26 +02:00
Macusercom
7eeddfbd65 German translations 
Added a lot of German translations and fixed even more typos.
 2015-05-26 17:04:53 +02:00
ViperMaul
388d6c3519 Change to the proper isAwake function 
#1375
 2015-05-25 20:47:28 -07:00
BaerMitUmlaut
41892fd6df Added surgicalKit treatment 2015-05-26 00:33:20 +02:00
ViperMaul
3bdb27386c removing obsolete drag code 
#1375
 2015-05-25 10:25:28 -07:00
ViperMaul
7141d251c7 create unloadPersonLocal 
#1375
 2015-05-25 09:41:24 -07:00
ViperMaul
cafaef9612 revert missing actionDragUnit file 
#1375
 2015-05-25 09:39:12 -07:00
ViperMaul
06932f0c03 Restore missing actionDragUnit function file 
#1375
 2015-05-24 15:14:11 -07:00
PabstMirror
d82fcd1f96 Advanced - Bloodbag lookup by treatment not item 2015-05-23 01:26:13 -05:00
PabstMirror
d752dd50d0 Basic - Bloodbag size matters 2015-05-23 01:16:18 -05:00
PabstMirror
8fd0aef7d4 Medical - Fix Handle Damage 
{} were unmatched so nothing ran.
I think this is just leftover from a merge.
 2015-05-22 16:35:48 -05:00
PabstMirror
537bba1382 Medical - Fix Unconscious Condition 2015-05-22 13:56:45 -05:00
jaynus
582ea318d4 Merge remote-tracking branch 'origin/superTime' 
Conflicts:
	addons/frag/functions/fnc_fired.sqf
	addons/frag/functions/fnc_trackFragRound.sqf
 2015-05-22 07:24:55 -07:00
jaynus
c924baefd7 All instances of time and diagTicktime changed to ACE_time / ACE_diagTime. 2015-05-21 09:42:44 -07:00
PabstMirror
1aa9520adb Fix Script Error when treating with bincos 2015-05-20 23:24:44 -05:00
Alessandro Foresi
67319b6808 Fixed: Removed § at the end of EH call 2015-05-20 22:04:19 +02:00
KoffeinFlummi
f16f282abd Merge remote-tracking branch 'origin/release' into master-fix 
Conflicts:
	addons/medical/functions/fnc_handleDamage.sqf
	extensions/common/p3d/animation.cpp
	extensions/common/p3d/compressed.cpp
	extensions/common/p3d/compressed.hpp
	extensions/common/pbo/archive.cpp
	extensions/common/pbo/search.cpp
	extensions/common/pbo/search.hpp
	extensions/common/shared.hpp
	extensions/common/simplepipe_win32.cpp
	extensions/common/simplepipe_win32.hpp
	extensions/common/simulation/object.cpp
	extensions/common/simulation/object.hpp
	extensions/common/targetver.h
	extensions/common/vector.hpp
 2015-05-20 19:31:55 +02:00
PabstMirror
0d00894d9f #1318 - isInMedicalVehicle - medicClass is number 2015-05-20 17:17:09 +02:00
Glowbal
694a24c970 Only change the color if bleeding (adv) 2015-05-20 17:15:25 +02:00
Glowbal
0a2679846c Changed: morphine works 15 minutes 2015-05-20 17:15:24 +02:00
Glowbal
e8d169248f Made atropine less effective 2015-05-20 17:15:23 +02:00
Glowbal
82260e5090 Changed: Made Morphine suppress more pain 2015-05-20 17:15:23 +02:00
Glowbal
2b1468db24 Added pain suppression instead of removal 2015-05-20 17:15:22 +02:00
Glowbal
429c85c9f1 fixed missing parameters for non local unit 2015-05-20 17:15:22 +02:00
Glowbal
913c938a9d Added force unconscious parameter #1205 2015-05-20 17:15:21 +02:00
Glowbal
6439bf4e3a Adjusted item mass #1226 2015-05-20 17:15:20 +02:00
Glowbal
808bb6d048 fixes #1195 units do not display injuries 
Is caused because the system thinks medical is disabled for basic units, while this obviously is not the case.
 2015-05-20 17:15:20 +02:00
Glowbal
104fcdc589 fixes #1155 2015-05-20 17:15:19 +02:00
PabstMirror
4d877196e4 Missing Parenthesissies 2015-05-19 00:36:54 -05:00
Glowbal
572b46a473 fix for #1297 Being near Campfires messes up basic medical and causes large fps lag 
Should only do a max of 1 PFH at a time. If new damage is received before the PFH is completed, it will reset.
 2015-05-19 07:23:44 +02:00
Glowbal
5b65d4117d fixed wrong macro for addEventhandler 2015-05-18 23:02:46 +02:00
Glowbal
539ed2dc79 Fix debug message and prevent Instant death inside vehicles 2015-05-18 22:22:57 +02:00
Glowbal
771b62ed04 Fix medical vehicle return value 
Could fix #1142
 2015-05-18 21:33:35 +02:00
PabstMirror
c6991fde54 re-add brackets 2015-05-18 21:33:24 +02:00
Glowbal
2621c5a36c fixed incorrect private var name 2015-05-18 21:33:12 +02:00
Glowbal
c76e22463a consistent usage of brackets 2015-05-18 21:32:58 +02:00
PabstMirror
5a4ef610ec Use PFEH array instead of setVariable 2015-05-18 21:32:47 +02:00
PabstMirror
2c3a5b0603 Start vital tracking after treatment 2015-05-18 21:32:22 +02:00
PabstMirror
f511de0a49 Calculate vitals interval on first run 2015-05-18 21:32:05 +02:00
Glowbal
853c654b4d fixes #1195 units do not display injuries 
Is caused because the system thinks medical is disabled for basic units, while this obviously is not the case.
 2015-05-18 21:00:32 +02:00
Glowbal
fc99d07f7c fixes #1155 2015-05-18 21:00:18 +02:00
jaynus
c17df2acb8 Change to execNextFrame. 2015-05-18 21:00:06 +02:00
jaynus
1c69f4faa4 Fixed: Litter spawning at huge radius, floating litter over water. Fixes #1112 2015-05-18 20:59:56 +02:00
ODK-Bn
13740d9f32 translated the missing strings into Russian 2015-05-17 13:25:08 +02:00
Glowbal
d9da4211f7 Merge branch 'master' into medicalExtension 2015-05-17 09:51:41 +02:00
Glowbal
2b91d398f0 added extension to config 2015-05-17 09:51:34 +02:00
Glowbal
556b9ad7d8 removed debug prints 2015-05-17 00:47:42 +02:00
Glowbal
4d8f24d2ae Removed old sqf version. 2015-05-17 00:44:45 +02:00
Glowbal
1d7bfa239f Temp added old sqf version for easy performance comparison 2015-05-17 00:08:34 +02:00
Glowbal
e3dd1eaf47 Using extension for handleDamage wounds instead of sqf 2015-05-16 23:21:03 +02:00
Glowbal
23a1bc86ca Loading config data to extension 2015-05-16 23:20:38 +02:00
Glowbal
f02314e996 Merge pull request #1217 from acemod/medicalFixes2 
Medical Vitals Fixes
 2015-05-16 15:35:42 +02:00
PabstMirror
dabd11b9c5 MedicalStringtable - Fill missing languages 2015-05-15 16:01:39 -05:00
Grzegorz
1e552496d5 Missing strings 
They need to be here otherwise few options are blank inside medical modules.
 2015-05-15 19:23:49 +02:00
PabstMirror
1d64e5917f re-add brackets 2015-05-15 02:32:19 -05:00
Glowbal
56aec85616 fixed incorrect private var name 2015-05-15 09:25:57 +02:00
Glowbal
4b245c0fc4 consistent usage of brackets 2015-05-15 09:25:00 +02:00
PabstMirror
39bc7d06be Use PFEH array instead of setVariable 2015-05-15 02:15:03 -05:00
PabstMirror
8dbca1d3de Start vital tracking after treatment 2015-05-14 22:18:53 -05:00
PabstMirror
8abd3c1fef Calculate vitals interval on first run 2015-05-14 22:16:44 -05:00
Glowbal
d42d0ef69d Merge pull request #1164 from acemod/litterFixes 
Litter distribution fix and "floating litter over water" fix (medical)
 2015-05-14 16:17:10 +02:00
jaynus
20bd5957e3 Change to execNextFrame. 2015-05-14 07:15:52 -07:00
Glowbal
abadf05342 Merge remote-tracking branch 'gienkov/module-translations' 
Conflicts:
	addons/medical/stringtable.xml
 2015-05-14 16:01:41 +02:00
Ivan Navarro Cabello
43c5afac55 fixed some spanish translation 
I fixed some spanish translation.
 2015-05-14 14:32:35 +02:00
jaynus
b13d44fb6b Fixed: Litter spawning at huge radius, floating litter over water. Fixes #1112 2015-05-13 17:29:09 -07:00
Glowbal
a4d0af4b67 Fix medical vehicle return value 
Could fix #1142
 2015-05-13 15:55:03 +02:00
GieNkoV
1610221a70 Remove duplicated strings 2015-05-12 20:01:10 +02:00
GieNkoV
bc72c71e8e Fix small errors inside stringtables 2015-05-12 19:11:56 +02:00
Grzegorz Sikora
44466e8be8 Remove tabs and repair errors @Glowbal found 
Conflicts:
	addons/map/CfgVehicles.hpp
	addons/medical/CfgVehicles.hpp

Conflicts:
	addons/map/CfgVehicles.hpp
	addons/medical/CfgVehicles.hpp
	addons/optionsmenu/stringtable.xml
 2015-05-12 18:27:27 +02:00
Grzegorz Sikora
156bba3321 Yes/No to BOOL 
Conflicts:
	addons/common/CfgVehicles.hpp
	addons/common/stringtable.xml
	addons/explosives/stringtable.xml
	addons/hearing/CfgVehicles.hpp
	addons/hearing/stringtable.xml
	addons/interaction/stringtable.xml
	addons/map/CfgVehicles.hpp
	addons/map/stringtable.xml
	addons/medical/CfgVehicles.hpp
	addons/medical/stringtable.xml
	addons/nametags/stringtable.xml
	addons/respawn/stringtable.xml
	addons/switchunits/CfgVehicles.hpp
	addons/switchunits/stringtable.xml

Conflicts:
	addons/common/CfgVehicles.hpp
	addons/common/stringtable.xml
	addons/explosives/stringtable.xml
	addons/hearing/stringtable.xml
	addons/interaction/stringtable.xml
	addons/map/CfgVehicles.hpp
	addons/map/stringtable.xml
	addons/medical/CfgVehicles.hpp
	addons/medical/stringtable.xml
	addons/nametags/stringtable.xml
	addons/respawn/stringtable.xml
	addons/switchunits/CfgVehicles.hpp
	addons/switchunits/stringtable.xml
 2015-05-12 18:26:24 +02:00
Grzegorz Sikora
6a821715a0 Stringtable modules 
Conflicts:
	addons/missionmodules/CfgVehicles.hpp
	addons/respawn/CfgVehicles.hpp
 2015-05-12 18:25:40 +02:00
Glowbal
e6a8f0b295 Merge pull request #1103 from SilentSpike/medical_typofix 
Trivial variable name fix for moduleAssignMedicalVehicle function
 2015-05-10 22:37:54 +02:00
SilentSpike
eff5ce03d6 false -> 0 2015-05-10 20:58:17 +01:00
SilentSpike
518cfdab9e isMedic -> medicClass 2015-05-10 20:19:32 +01:00
SilentSpike
d321ed2753 Changed function variable to match other medical vehicle functions 2015-05-10 19:56:35 +01:00
Alessandro Foresi
2dd06babec Added: Italian translations completed. 
Fixed: BOM markers where missing
 2015-05-10 11:44:46 +02:00
Alessandro Foresi
643df71932 Added: Italian translation from Blackedsoul p#20 2015-05-10 11:05:16 +02:00
Glowbal
e674229dde enabledFor > enableFor 2015-05-08 20:10:40 +02:00
Josuan Albin
dd2ea99d15 pak 
pak anim
 2015-05-05 19:26:11 +02:00
Josuan Albin
f063e45e60 medical advanced added 
animations added for advanced
 2015-05-05 19:04:08 +02:00
Josuan Albin
b781264212 New anim update 
new healing animation added to animationCaller, animationCallerSelf
stays the same
 2015-05-05 18:53:17 +02:00
bux578
bd69405cf4 fix czech typo in medical, fix #1010 2015-05-05 08:37:41 +02:00
Glowbal
f6e815fbaf Merge pull request #1003 from acemod/fixMedicalLitterError 
Fix treatment script error
 2015-05-04 00:25:46 +02:00
Glowbal
ae47c78552 Make treatment execute before createLitter 2015-05-04 00:20:28 +02:00
Glowbal
b86012a6b1 Ensure that litterCondition is always code #1000 2015-05-04 00:16:12 +02:00
ProfessorCZ
a0e443cfc6 Czech translation - Update 2015-05-03 11:48:56 +02:00
KoffeinFlummi
e918e1d661 Merge https://github.com/ruPaladin/ACE3 into russian-merge 
Conflicts:
	addons/interaction/stringtable.xml
	addons/medical/stringtable.xml
 2015-05-02 23:43:33 +02:00
KoffeinFlummi
d0c7fce7f3 Merge https://github.com/adam3adam/ACE3 into czech-merge 
Conflicts:
	addons/interaction/stringtable.xml
	addons/medical/stringtable.xml
	addons/mk6mortar/stringtable.xml
 2015-05-02 23:29:45 +02:00
KoffeinFlummi
298e1d88bd Merge branch 'hu-catchup' of https://github.com/Harakhti/ACE3 into hungarian-merge 
Conflicts:
	addons/ballistics/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/laser/stringtable.xml
	addons/medical/stringtable.xml
	addons/respawn/stringtable.xml
 2015-05-02 23:17:39 +02:00
Harakhti
6c2717be7f More more translations 
Stope.
 2015-05-02 18:06:01 +02:00
adam3adam
05a6389acd Czech translation v2 
mk6mortar and some medical translation
 2015-05-02 12:46:28 +02:00
ruPaladin
3aad0904cd medical2 2015-05-02 12:45:27 +03:00
ruPaladin
ca03637a54 medical 2015-05-02 12:42:02 +03:00
ToasterBR
021b00c722 Translation to Portuguese 
Done all remaining portuguese translations, including some minor
corrections
 2015-05-02 03:38:53 -03:00
PabstMirror
436e50411a Medical - Fix Uncon PFEH argument changes 2015-05-01 22:42:43 -05:00
Felix Wiegand
07ec7b96c4 Merge pull request #954 from acemod/medicalFixVehAnimation 
Medical fix veh animation
 2015-05-02 00:35:13 +02:00
KoffeinFlummi
f1ba0cff26 Merge https://github.com/ProfessorCZ/ACE3 into czech-merge 
Conflicts:
	AUTHORS.txt
	addons/advanced_ballistics/stringtable.xml
	addons/ballistics/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/kestrel4500/stringtable.xml
	addons/laserpointer/stringtable.xml
	addons/medical/stringtable.xml
	addons/respawn/stringtable.xml
 2015-05-02 00:26:25 +02:00
KoffeinFlummi
13b99ed53f Merge https://github.com/adam3adam/ACE3 into czech-merge 
Conflicts:
	AUTHORS.txt
	addons/interact_menu/stringtable.xml
 2015-05-02 00:17:01 +02:00
Lukas
1d3f5cc312 Czceh translation 2015-05-02 00:04:50 +02:00
FreeZbe
d1da3a82d7 French : update / fix stringtable 2015-05-01 23:08:36 +02:00