2875 Commits

Author	SHA1	Message	Date
ulteq	4ef80ab3a3	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-04-16 20:14:33 +02:00
PabstMirror	fa6cb3e75c	#672 - Don't show speaking icon for unconc players	2015-04-16 12:58:54 -05:00
ulteq	a7507fefef	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-04-16 19:55:48 +02:00
ulteq	1794606304	Got rid of the __DSP macro	2015-04-16 19:52:20 +02:00
PabstMirror	638433614c	Some missing private defines.	2015-04-16 12:36:16 -05:00
Nicolás Badano	95cab9d0e7	Merge pull request #671 from Legolasindar/master ... added spanish translation	2015-04-16 14:18:41 -03:00
jaynus	3d7ae5e3a1	Merge branch 'master' of github.com:acemod/ACE3	2015-04-16 10:10:31 -07:00
jaynus	6a942ac820	Fixed: ACE_Fake**** Was showing in arsenal. Fixes #670	2015-04-16 10:10:24 -07:00
jaynus	8837355d29	Merge remote-tracking branch 'origin/master' into guidanceHandoff	2015-04-16 10:04:57 -07:00
Ivan Navarro Cabello	61d1e6854e	added spanish translation ... added spanish translation to ballistics and respawn	2015-04-16 19:03:15 +02:00
ulteq	668888de81	Fixed constant name not following the coding-guideline	2015-04-16 19:00:37 +02:00
ulteq	aeffc55859	Added missing privates	2015-04-16 18:52:48 +02:00
jaynus	bce4f14cc8	Merge remote-tracking branch 'origin/laserCodes' into guidanceHandoff	2015-04-16 09:40:47 -07:00
jaynus	6d93fe45a6	Guidance handoff to guiding unit/laser shooter. This needs LOBL vs. LOAL capability.	2015-04-16 09:35:21 -07:00
KoffeinFlummi	bf0aa6f344	Merge branch 'spanish-merge'	2015-04-16 18:32:37 +02:00
KoffeinFlummi	11f9478035	Merge https://github.com/Legolasindar/ACE3 into spanish-merge ... Conflicts: addons/advanced_ballistics/stringtable.xml addons/atragmx/stringtable.xml addons/ballistics/stringtable.xml addons/javelin/stringtable.xml addons/kestrel4500/stringtable.xml addons/laserpointer/stringtable.xml addons/medical/stringtable.xml addons/scopes/stringtable.xml addons/weather/stringtable.xml	2015-04-16 18:31:31 +02:00
ulteq	4e4dee18df	Added missing privates / Removed unused privates	2015-04-16 18:21:19 +02:00
ulteq	fa39e8f001	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-04-16 18:14:42 +02:00
ulteq	e35d3dab49	Overworked the ATragMX target slot logic: ... *Added missing privates *Solutions are now automatically calculated on target/gun selection	2015-04-16 18:14:32 +02:00
ulteq	5117595ecc	Minor performance improvement	2015-04-16 17:52:21 +02:00
ulteq	defe46b769	Added new PFH abort condition (velocity < 100 m/s)	2015-04-16 17:30:50 +02:00
Tachii	2466d83cac	Update stringtable.xml	2015-04-16 18:19:11 +03:00
Tachii	def2f9c28e	Update stringtable.xml	2015-04-16 18:13:53 +03:00
Tachii	dca11e523b	Update stringtable.xml	2015-04-16 18:08:58 +03:00
Nicolás Badano	8cb167d1be	Merge pull request #663 from ruPaladin/patch-1 ... addons/realisticnames translation to Russian	2015-04-16 10:06:12 -03:00
Coren4	4ff68eabd4	Update stringtable.xml	2015-04-16 14:59:19 +02:00
ulteq	55d9f7a3da	The previous GUI state is now restored when you open the ATragMX	2015-04-16 13:46:32 +02:00
ulteq	d6cadb593a	Enabled the ATragMX to use the advanced ballistics extension	2015-04-16 13:44:54 +02:00
ulteq	ca3293aa1a	Added ACE_Box_Ammo (WIP): ... *TODO: Define a model	2015-04-16 13:43:41 +02:00
ulteq	15240ac87c	Minor code change in the extension detection logic	2015-04-16 13:42:28 +02:00
ruPaladin	e00dd1c2f2	addons/realisticnames translation to Russian	2015-04-16 14:10:48 +03:00
ulteq	aa724129d1	Tuned down the default timeToLive value.	2015-04-16 10:51:33 +02:00
Marco	00c0839ce5	Update stringtable.xml ... IT	2015-04-16 10:33:15 +02:00
Marco	ba510facbd	Update stringtable.xml ... IT	2015-04-16 10:29:17 +02:00
Marco	23cb1058fc	Update stringtable.xml ... IT	2015-04-16 10:26:55 +02:00
Marco	500098d061	Update stringtable.xml ... IT	2015-04-16 10:25:39 +02:00
Marco	66ba74e79d	Update stringtable.xml ... IT	2015-04-16 10:24:17 +02:00
Marco	13de953aab	Update stringtable.xml ... IT	2015-04-16 10:23:34 +02:00
Marco	0655c3f3b6	Update stringtable.xml ... IT	2015-04-16 10:22:32 +02:00
Marco	fda1febc30	Update stringtable.xml ... IT	2015-04-16 10:21:49 +02:00
Marco	59643152bd	Update stringtable.xml ... IT	2015-04-16 10:19:43 +02:00
Marco	5e7fb0fb64	Update stringtable.xml ... IT	2015-04-16 10:18:49 +02:00
Marco	c1655aa9a9	Update stringtable.xml ... IT	2015-04-16 10:16:17 +02:00
Marco	b3d4e2f48f	Update stringtable.xml ... IT	2015-04-16 10:14:18 +02:00
Marco	a129f18a2a	Update stringtable.xml ... Italian	2015-04-16 10:13:50 +02:00
PabstMirror	9c9136ae91	Stringtable cleanup	2015-04-16 02:54:50 -05:00
PabstMirror	58dfc6aa97	Add item to ace misc box	2015-04-15 22:34:24 -05:00
PabstMirror	80516f4f61	Increase Sound Volume	2015-04-15 22:27:12 -05:00
PabstMirror	b2625c43e7	#644 - Extra Space in macro	2015-04-15 20:30:09 -05:00
commy2	8d8ae3dadb	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-04-16 02:00:55 +02:00