2738 Commits

Author	SHA1	Message	Date
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
PabstMirror	9c9136ae91	Stringtable cleanup	2015-04-16 02:54:50 -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
commy2	4169351b1a	fix addActionEH didn't work after respawn	2015-04-16 02:00:37 +02:00
Glowbal	59ae4623ff	Derp	2015-04-16 00:17:17 +02:00
Glowbal	f3ca1a85b9	Merge branch 'master' of github.com:acemod/ACE3	2015-04-16 00:15:57 +02:00
Glowbal	0f4b7d0977	fixes #347 ... Please??	2015-04-16 00:14:05 +02:00
PabstMirror	0076be6a86	Fix stringtables	2015-04-15 17:08:35 -05:00
PabstMirror	c0c5af2957	ballistics - fix ubc	2015-04-15 17:07:06 -05:00
PabstMirror	361efe4147	Missing NoVoice words ... Protocol bin\config.bin/ACE_RadioProtocolNoRadio/: Missing word RallyUp / UnderFireE	2015-04-15 17:04:03 -05:00
Tachii	dd09cc4d06	Update fnc_createAction.sqf ... typo	2015-04-16 00:57:15 +03:00
ulteq	0b7ceea64e	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-04-15 22:50:19 +02:00
ulteq	25e1fd2df3	Completely overworked the ATragMX gun list	2015-04-15 22:50:04 +02:00
ulteq	60c54733cc	Polished the ammo classes some more	2015-04-15 22:49:47 +02:00
KoffeinFlummi	8aeeff616e	Merge branch 'master' of https://github.com/acemod/ACE3	2015-04-15 22:21:21 +02:00
KoffeinFlummi	1b67b2df26	Merge branch 'master' of https://github.com/ramius86/ACE3 into italian-merge ... Conflicts: addons/disposable/stringtable.xml addons/explosives/stringtable.xml addons/fcs/stringtable.xml addons/frag/stringtable.xml addons/hearing/stringtable.xml addons/interact_menu/stringtable.xml addons/interaction/stringtable.xml addons/inventory/stringtable.xml addons/javelin/stringtable.xml addons/kestrel4500/stringtable.xml addons/laser_selfdesignate/stringtable.xml addons/laserpointer/stringtable.xml addons/magazinerepack/stringtable.xml addons/maptools/stringtable.xml addons/markers/stringtable.xml addons/microdagr/stringtable.xml addons/movement/stringtable.xml	2015-04-15 22:20:47 +02:00
commy2	fb3ba51fe5	port alternative wirecutter sound	2015-04-15 22:19:43 +02:00
commy2	6f6d080dbd	port inject sound	2015-04-15 22:16:54 +02:00
KoffeinFlummi	f020ff7c53	Merge branch 'patch-7' of https://github.com/ramius86/ACE3 into italian-merge ... Conflicts: addons/disarming/stringtable.xml	2015-04-15 22:08:15 +02:00
KoffeinFlummi	9e6ae52ca5	Merge branch 'patch-6' of https://github.com/ramius86/ACE3 into italian-merge ... Conflicts: addons/captives/stringtable.xml	2015-04-15 22:07:42 +02:00
KoffeinFlummi	5c3b06b1bf	Merge branch 'patch-1' of https://github.com/ramius86/ACE3 into italian-merge ... Conflicts: addons/medical/stringtable.xml	2015-04-15 22:06:18 +02:00
KoffeinFlummi	234e8e5c40	Merge branch 'patch-1' of https://github.com/Clon1998/ACE3 into german-merge ... Conflicts: addons/interaction/stringtable.xml	2015-04-15 21:55:52 +02:00
jaynus	ea3475d388	Merge pull request #631 from FreeZbe/patch-9 ... French : update / fix stringtable	2015-04-15 12:31:03 -07:00
jaynus	9c4e217822	Merge pull request #633 from FreeZbe/patch-10 ... French : update stringtable	2015-04-15 12:29:56 -07:00
jaynus	185f9379fd	Merge pull request #639 from FreeZbe/patch-16 ... French : update stringtable	2015-04-15 12:29:37 -07:00
jaynus	ddaf05262e	Merge pull request #638 from FreeZbe/patch-15 ... French : update stringtable	2015-04-15 12:29:02 -07:00
jaynus	0a3a650437	Merge pull request #634 from FreeZbe/patch-11 ... French : update stringtable	2015-04-15 12:28:26 -07:00
FreeZbe	5a7ad82170	French : update stringtable	2015-04-15 21:26:12 +02:00
jaynus	2d189e6199	Merge branch 'master' of github.com:acemod/ACE3	2015-04-15 12:26:03 -07:00
jaynus	10cf02e856	Slower climb phase.Refs #630	2015-04-15 12:25:57 -07:00
FreeZbe	18c65108c3	French : update stringtable	2015-04-15 21:24:24 +02:00
Nicolás Badano	3e205a70d8	Merge pull request #636 from FreeZbe/patch-13 ... French : update stringtable	2015-04-15 16:18:58 -03:00