730 Commits

Author	SHA1	Message	Date
Glowbal	80162627ec	Fixed spelling of enableUnconsciousnessAI	2015-05-01 18:49:59 +02:00
ruPaladin	a883517a5e	Update stringtable.xml	2015-05-01 19:18:06 +03:00
KoffeinFlummi	30e90a377e	Fix duplicate entries	2015-05-01 17:51:31 +02:00
KoffeinFlummi	48e59f0d71	Merge branch 'master' of https://github.com/acemod/ACE3 ... Conflicts: addons/interact_menu/stringtable.xml addons/medical/stringtable.xml	2015-05-01 17:46:58 +02:00
KoffeinFlummi	1e786d4a92	Merge https://github.com/FreeZbe/ACE3 into french-merge ... Conflicts: addons/ballistics/stringtable.xml addons/interact_menu/stringtable.xml addons/medical/stringtable.xml	2015-05-01 17:45:00 +02:00
KoffeinFlummi	e46eba673f	Merge branch 'master' into german-translation ... Conflicts: addons/interact_menu/stringtable.xml addons/medical/stringtable.xml	2015-05-01 17:36:40 +02:00
KoffeinFlummi	954e4ef549	Merge branch 'master' of https://github.com/acemod/ACE3 ... Conflicts: addons/interact_menu/stringtable.xml addons/medical/stringtable.xml	2015-05-01 17:32:19 +02:00
KoffeinFlummi	e96f23c197	Merge branch 'en-to-hu' of https://github.com/Harakhti/ACE3 into hungarian-merge ... Conflicts: addons/atragmx/stringtable.xml addons/interact_menu/stringtable.xml addons/laserpointer/stringtable.xml addons/medical/stringtable.xml addons/mk6mortar/stringtable.xml addons/realisticnames/stringtable.xml addons/respawn/stringtable.xml	2015-05-01 17:30:59 +02:00
Felix Wiegand	526b0a2d59	Merge pull request #931 from gienkov/master ... PL translation	2015-05-01 17:15:22 +02:00
KoffeinFlummi	5f60321a69	Merge https://github.com/Legolasindar/ACE3 into spanish-merge ... Conflicts: addons/ballistics/stringtable.xml addons/interact_menu/stringtable.xml addons/medical/stringtable.xml addons/mk6mortar/stringtable.xml	2015-05-01 17:12:00 +02:00
KoffeinFlummi	761e23001f	Merge https://github.com/Dimaslg/ACE3 into spanish-merge ... Conflicts: addons/medical/stringtable.xml addons/missileguidance/stringtable.xml addons/optionsmenu/stringtable.xml	2015-05-01 16:51:20 +02:00
bux578	bfb68fe368	fix spelling errors	2015-05-01 14:19:30 +02:00
FreeZbe	80ae016021	Update stringtable.xml	2015-05-01 14:19:15 +02:00
Glowbal	e9a86da8e0	Should be in same order as the module	2015-05-01 12:18:21 +02:00
bux578	aa2e5077e4	missing german translation	2015-05-01 12:17:28 +02:00
Glowbal	5beca63ae2	Added missing private	2015-05-01 11:51:23 +02:00
KoffeinFlummi	e06e1a2f89	Make preventDeath work	2015-05-01 01:38:36 +02:00
KoffeinFlummi	cb82b20464	Let setUncon handle AI unconsciousness	2015-05-01 01:38:16 +02:00
KoffeinFlummi	48770f77d2	Rename caching variables in basic HD	2015-05-01 01:37:58 +02:00
KoffeinFlummi	67bd2b4e2f	Reduce animation forcing delay	2015-05-01 01:36:09 +02:00
KoffeinFlummi	98e44e86d8	Offload ejecting to unloadPerson	2015-05-01 01:35:50 +02:00
KoffeinFlummi	f7f416c8d3	Proper privates and alignment	2015-05-01 01:34:38 +02:00
KoffeinFlummi	aa9f1c53c7	Whoops	2015-05-01 01:34:18 +02:00
KoffeinFlummi	53835605ea	Merge remote-tracking branch 'origin/master' into basic-med-options ... Conflicts: addons/medical/functions/fnc_getBloodLoss.sqf addons/medical/functions/fnc_handleDamage_basic.sqf	2015-05-01 01:25:16 +02:00
Grzegorz	3f932c0a93	Update stringtable.xml	2015-04-30 22:55:51 +02:00
Grzegorz Sikora	03973f3dcf	PL translation	2015-04-30 22:54:15 +02:00
KoffeinFlummi	d59436c588	Only force animation when necessary	2015-04-30 22:19:31 +02:00
KoffeinFlummi	8fda984903	Fix missing semicolon	2015-04-30 22:17:25 +02:00
KoffeinFlummi	965a976daf	Reorganize AI unconsciousness	2015-04-30 22:16:45 +02:00
KoffeinFlummi	f28a806938	Remove max unconsciousness time again	2015-04-30 22:15:40 +02:00
KoffeinFlummi	270c3adc1e	Do it again, but properly this time	2015-04-30 22:06:10 +02:00
KoffeinFlummi	85669a9e92	Convert Medical stringtable key names to lowercase	2015-04-30 22:01:09 +02:00
Glowbal	e7290feaa2	disabled radial option, so it isn't server selectable either	2015-04-30 21:20:04 +02:00
Glowbal	2f763a2310	Disabled client setting for menu style	2015-04-30 21:17:33 +02:00
Glowbal	1bee48214e	Merge branch 'master' into medicalMenuClientSetting ... Conflicts: addons/medical/ACE_Medical_Actions.hpp addons/medical/CfgVehicles.hpp addons/medical/stringtable.xml	2015-04-30 21:08:46 +02:00
Glowbal	432a0102e8	Improved unloadPerson function ... Removed caller parameter.	2015-04-30 20:44:43 +02:00
KoffeinFlummi	fd152c580b	Merge branch 'master' into basic-med-options ... Conflicts: addons/medical/ACE_Settings.hpp addons/medical/functions/fnc_setUnconscious.sqf	2015-04-30 18:39:33 +02:00
PabstMirror	9c02f915ec	Merge pull request #922 from acemod/medicalPrivates ... Medical Private Variables	2015-04-30 11:34:33 -05:00
ulteq	ac33ad109f	Merge pull request #923 from Bla1337/master ... Localization update (Russian)	2015-04-30 13:44:54 +02:00
Harakhti	4e165e2572	Update Hungarian translations ... Let us match the current revision. At the time of making, the Ballistics XML was broken.	2015-04-30 13:25:25 +02:00
ulteq	2c97b20781	Merge branch 'master' of https://github.com/NukeDev/ACE3 into NukeDev-master ... Conflicts: addons/atragmx/stringtable.xml addons/ballistics/stringtable.xml addons/medical/stringtable.xml addons/missileguidance/stringtable.xml addons/overheating/stringtable.xml addons/realisticnames/stringtable.xml addons/vehiclelock/stringtable.xml	2015-04-30 13:20:31 +02:00
Bla1337	5d1478b733	interact and medical system localization upd	2015-04-30 14:01:22 +03:00
PabstMirror	48f7455ef1	Opps2	2015-04-30 01:23:23 -05:00
PabstMirror	d71bba0359	opps	2015-04-30 01:21:41 -05:00
PabstMirror	eb5af0cd89	Medical Private Variables	2015-04-30 01:17:26 -05:00
PabstMirror	f90834eeab	Unused	2015-04-29 16:57:24 -05:00
PabstMirror	5fef446c00	EFUNC for dragging calls	2015-04-29 16:53:09 -05:00
PabstMirror	a39e869728	Fix extra {} wraped ... Error position: <if ({[_unit] call ace_medical_fnc_setDea> Error if: Type code, expected Bool File z\ace\addons\medical\functions\fnc_handleDamage.sqf, line 50	2015-04-29 16:44:47 -05:00
Glowbal	581c64f66f	Implemented unloading from vehicles #740	2015-04-29 23:12:47 +02:00
Glowbal	943d2cbd72	Merge branch 'master' into medicalImprovements	2015-04-29 23:01:38 +02:00