4310 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Tachii	caf301ac99	Update stringtable.xml ... Added 1 RU string	2015-05-01 20:15:35 +03:00
PabstMirror	8d1ac26e24	Save and replay valid awake animations	2015-05-01 12:12:13 -05:00
Glowbal	80162627ec	Fixed spelling of enableUnconsciousnessAI	2015-05-01 18:49:59 +02:00
Felix Wiegand	23bb96e514	Merge pull request #948 from ruPaladin/patch-7 ... Russian translation (interact_menu)	2015-05-01 18:39:34 +02:00
Felix Wiegand	fc96737557	Merge pull request #947 from ruPaladin/patch-6 ... Russian translation (medical)	2015-05-01 18:39:18 +02:00
ruPaladin	2aa788bba2	Update stringtable.xml	2015-05-01 19:26:23 +03: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
Felix Wiegand	59697344d2	Merge pull request #941 from acemod/german-translation ... missing german translation	2015-05-01 17:37:17 +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
Nicolás Badano	65dcbce25e	Merge pull request #945 from acemod/revert-937-fcsMuzzleVelocityCorrection ... Revert "Takes negative initSpeed values into account"	2015-05-01 11:07:57 -03:00
jaynus	ce6e59b25e	Merge pull request #926 from acemod/guidanceClassFixes ... Limit Titan & Javelin optic configs to only those weapons and disable inheritance for LAZY MOD MAKERS	2015-05-01 07:00:08 -07:00
jaynus	e4567fb59f	Merge remote-tracking branch 'origin/master' into guidanceClassFixes ... Conflicts: addons/javelin/functions/fnc_onOpticDraw.sqf	2015-05-01 06:59:28 -07:00
jaynus	9997b6d464	action is select 1	2015-05-01 06:57:49 -07:00
Nicolás Badano	cde80b2901	Revert "Takes negative initSpeed values into account"	2015-05-01 10:38:41 -03:00
commy2	b255d1040b	scope 1 for ACE_Comanche_Test, #943	2015-05-01 15:30:11 +02:00
FreeZbe	68d62b0005	Update stringtable.xml	2015-05-01 14:20:21 +02:00
FreeZbe	518614ec0b	Update stringtable.xml	2015-05-01 14:20:03 +02:00
FreeZbe	79ac41bd95	Update stringtable.xml	2015-05-01 14:19:43 +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
FreeZbe	acf74dd2ae	Update stringtable.xml	2015-05-01 14:13:32 +02:00
FreeZbe	7a397459ae	Update stringtable.xml	2015-05-01 14:13:08 +02:00
FreeZbe	371aa381ec	Update stringtable.xml	2015-05-01 14:12:45 +02:00
FreeZbe	820c841b35	Update stringtable.xml	2015-05-01 14:12:10 +02:00
FreeZbe	53be70f661	French : update stringtable	2015-05-01 14:07:08 +02:00
ulteq	a6f4c68ef4	Removed obsolete comment	2015-05-01 13:50:01 +02:00
ulteq	6d0e2cc464	Merge pull request #936 from acemod/explosivesSleepReplacement ... Replaced sleep with waitAndExecute	2015-05-01 12:55:14 +02:00
Glowbal	fbaf3ace90	Merge pull request #932 from acemod/modNameChange ... ACE3 Name Adjustment	2015-05-01 12:44:41 +02:00
Glowbal	f0efba09e5	Merge pull request #814 from acemod/basic-med-options ... Basic medical module options	2015-05-01 12:27:22 +02:00
ulteq	a9cde188ea	Merge pull request #937 from acemod/fcsMuzzleVelocityCorrection ... Takes negative initSpeed values into account	2015-05-01 12:24:22 +02:00
bux578	2acc10ba70	meh	2015-05-01 12:19:42 +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
ulteq	4c0bed609e	Fixed a typo	2015-05-01 11:53:53 +02:00
Glowbal	5beca63ae2	Added missing private	2015-05-01 11:51:23 +02:00
ulteq	940f8e8349	Cleanup++: ... *Removed spawn *Added, moved and renamed some privates	2015-05-01 11:38:09 +02:00
commy2	437c3c0526	Merge pull request #939 from acemod/fixubc ... fix ubc, fix #938	2015-05-01 11:22:53 +02:00
commy2	a97c934688	fix ubc, fix #938	2015-05-01 11:01:07 +02:00
ulteq	d3b36c2b56	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-05-01 10:26:48 +02:00
ulteq	723ffc21d1	Removed unneeded TODO	2015-05-01 10:26:37 +02:00
ulteq	2219339e24	Fixed a typo	2015-05-01 10:25:59 +02:00
ulteq	965e45a53c	Takes negative initSpeed values into account	2015-05-01 10:25:33 +02:00