3000 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
jaynus	743a6d82a5	Merge branch 'master' of github.com:acemod/ACE3	2015-04-15 10:11:18 -07:00
jaynus	25b7f779f1	Difficulty magic.	2015-04-15 10:11:13 -07:00
ruPaladin	26d53d255f	Update stringtable.xml	2015-04-15 20:08:39 +03:00
ulteq	396bd3954e	Fixed a typo	2015-04-15 19:04:41 +02:00
ruPaladin	fe72eef3da	Update stringtable.xml	2015-04-15 20:02:41 +03:00
ulteq	b5a82e313e	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-04-15 19:00:24 +02:00
ulteq	0c4734637b	Fixed the GM6 barrel length and updated the magazines array	2015-04-15 19:00:14 +02:00
ruPaladin	92031cc354	Update stringtable.xml	2015-04-15 19:59:45 +03:00
ulteq	f8061922f7	Added ACE_10Rnd_338_API526_Mag, ACE_5Rnd_127x99_Mag, ACE_5Rnd_127x99_AMAX_Mag	2015-04-15 18:59:41 +02:00
ulteq	e0c34f22bf	Added ACE_338_Ball_API526 and updated some airFriction values	2015-04-15 18:59:11 +02:00
ruPaladin	3773238e25	Update stringtable.xml	2015-04-15 19:56:34 +03:00
jaynus	2e3545f3d0	Merge branch 'master' of github.com:acemod/ACE3	2015-04-15 09:55:48 -07:00
jaynus	ea2281616e	Enable all variants of Titan. Can now vanilla-lock in cadet mode.	2015-04-15 09:55:40 -07:00
ulteq	64d6bbaf26	Fixed an incorrect BC in an ATragMX gun profile	2015-04-15 18:55:20 +02:00
ruPaladin	7051152d93	Update stringtable.xml	2015-04-15 19:53:42 +03:00
ruPaladin	d8eb564c65	Update stringtable.xml	2015-04-15 19:52:29 +03:00
ruPaladin	252fb67119	Update stringtable.xml	2015-04-15 19:50:32 +03:00
PabstMirror	e84689a771	#544 - Change ERROR warning to debug trace	2015-04-15 11:46:06 -05:00
bux578	8ca4a8a932	Merge pull request #625 from ramius86/patch-8 ... Update AUTHORS.txt	2015-04-15 18:46:16 +02:00
PabstMirror	6ea38a9946	Only check A3 VON if no radio mods running	2015-04-15 11:34:27 -05:00
Nicolás Badano	fecb2f37c0	Merge pull request #621 from ruPaladin/patch-5 ... Kestrel 4500NV translation to Russian	2015-04-15 13:28:44 -03:00
Nicolás Badano	0a6604a94f	Merge pull request #622 from ruPaladin/patch-6 ... addons/interact_menu translation to Russian	2015-04-15 13:28:33 -03:00
jaynus	a5700540bb	Merge pull request #623 from ruPaladin/patch-7 ... addons/weather/ translation to Russian	2015-04-15 09:28:04 -07:00
Nicolás Badano	7589b8b13d	Merge pull request #626 from ruPaladin/patch-11 ... addons/medical translation to Russian	2015-04-15 13:27:22 -03:00
jaynus	5923f246fd	Fixed: only exit on shooter.	2015-04-15 09:25:19 -07:00
jaynus	c793df4848	Changed: Safety mode on Titan, it now doesnt show as unloaded Fixed: Some TOP shots would miss, Fixed: Lock constraints would show on fast weapon switch.	2015-04-15 09:10:00 -07:00
ruPaladin	a3965424b9	addons/medical translation to Russian	2015-04-15 19:09:10 +03:00
Marco	ead2b1f064	Update AUTHORS.txt	2015-04-15 17:52:12 +02:00
Marco	ad67fca8f4	Update stringtable.xml	2015-04-15 17:45:48 +02:00
ruPaladin	9caba1e3a3	addons/weather/ translation to Russian	2015-04-15 18:29:38 +03:00
ruPaladin	64504a9515	addons/interact_menu translation to Russian	2015-04-15 18:27:28 +03:00
ruPaladin	6fca601759	Kestrel 4500NV translation to Russian	2015-04-15 18:24:57 +03:00
jaynus	0d28a890e1	Fixes: Cycle fire mode on Titan was not working. Closes #603	2015-04-15 08:19:21 -07:00
commy2	9c1b40f5a3	preparing for improved positions of action points	2015-04-15 16:40:20 +02:00
ulteq	98d0c06ce3	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-04-15 16:22:50 +02:00
ulteq	95b04d0840	Added custom airFriction values for the new marksmen ammo types.	2015-04-15 16:22:42 +02:00
commy2	6710040633	toLower in, always follow your own advice	2015-04-15 16:13:53 +02:00
KoffeinFlummi	250d6acb22	Merge https://github.com/Legolasindar/ACE3 into spanish-merge	2015-04-15 16:09:40 +02:00
commy2	bf8f9b4818	all I need is a $	2015-04-15 15:34:01 +02:00
KoffeinFlummi	def6c9135b	Fix typos in devenv doc	2015-04-15 15:31:10 +02:00
KoffeinFlummi	1fc546a700	Merge branch 'polish-merge'	2015-04-15 15:10:41 +02:00
KoffeinFlummi	79934cfb78	Merge https://github.com/Coren4/ACE3 into polish-merge	2015-04-15 15:10:28 +02:00
ulteq	1e326c17ad	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-04-15 15:06:35 +02:00
commy2	eecf405fda	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rallypointfix	2015-04-15 15:06:29 +02:00
ulteq	238cf1cc63	Added keybinds for ATragMX and Kestrel 4500 (empty by default)	2015-04-15 15:06:28 +02:00
Coren4	9b94692ca5	Update AUTHORS.txt	2015-04-15 15:02:36 +02:00
Nicolás Badano	69489df910	Merge pull request #610 from ramius86/patch-3 ... Update stringtable.xml	2015-04-15 09:57:27 -03:00
Nicolás Badano	527385e6e1	Merge pull request #609 from ramius86/patch-2 ... Update stringtable.xml	2015-04-15 09:57:15 -03:00
Felix Wiegand	3032c84eda	Merge pull request #577 from nomisum/patch-3 ... added myself to authors.txt as requested	2015-04-15 14:54:15 +02:00
KoffeinFlummi	21305629ed	Merge branch 'patch-1' of https://github.com/nomisum/ACE3 into german-merge	2015-04-15 14:53:27 +02:00