4185 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ulteq	d07cb0e6ed	Got rid of the newline braces	2015-05-03 11:51:30 +02:00
ulteq	e5a81bfe37	Deterministic random numbers for the transonic instability calculation	2015-05-03 11:46:30 +02:00
ulteq	4d4604da28	Fixed two typos in the ATragMX gun profile list	2015-05-03 10:47:49 +02:00
ulteq	3acde5be08	Merge pull request #992 from acemod/ballisticsTranslationFix ... Fixed some inconsistencies in the stringtable	2015-05-03 10:22:11 +02:00
ulteq	d653aa262a	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ballisticsTranslationFix ... Conflicts: addons/ballistics/stringtable.xml	2015-05-03 10:21:57 +02:00
KoffeinFlummi	f678fb8fbf	Merge branch 'spanish-merge'	2015-05-03 02:40:56 +02:00
KoffeinFlummi	7633f406ae	Merge branch 'patch-2' of https://github.com/Dimaslg/ACE3 into spanish-merge ... Conflicts: addons/laser/stringtable.xml	2015-05-03 02:40:44 +02:00
PabstMirror	d0975b4c0f	Laserpointer Stringtable - fix swapped eng/czk	2015-05-02 18:55:23 -05:00
KoffeinFlummi	697656da92	Merge branch 'master' of https://github.com/acemod/ACE3	2015-05-03 01:08:39 +02:00
KoffeinFlummi	a1d2bd62a4	Merge branch 'patch-1' of https://github.com/FreeZbe/ACE3 into french-merge ... Conflicts: addons/interaction/stringtable.xml	2015-05-03 01:08:22 +02:00
jaynus	27c66ba631	Merge pull request #993 from acemod/clipboardExtension ... ACE clipboard extension to bypass clipboard limit of arma. Close #991	2015-05-02 15:29:18 -07:00
jaynus	717d7c874f	Data chunking. Feature complete.	2015-05-02 15:28:40 -07:00
KoffeinFlummi	e918e1d661	Merge https://github.com/ruPaladin/ACE3 into russian-merge ... Conflicts: addons/interaction/stringtable.xml addons/medical/stringtable.xml	2015-05-02 23:43:33 +02:00
KoffeinFlummi	d0c7fce7f3	Merge https://github.com/adam3adam/ACE3 into czech-merge ... Conflicts: addons/interaction/stringtable.xml addons/medical/stringtable.xml addons/mk6mortar/stringtable.xml	2015-05-02 23:29:45 +02:00
esteldunedain	8d92d9cc7d	Add ace_clipboard to ACE_Extensions	2015-05-02 18:25:35 -03:00
jaynus	bb429e7704	i hate @esteldunedain	2015-05-02 14:20:37 -07:00
jaynus	c192d7eadc	Return version.	2015-05-02 14:18:42 -07:00
KoffeinFlummi	298e1d88bd	Merge branch 'hu-catchup' of https://github.com/Harakhti/ACE3 into hungarian-merge ... Conflicts: addons/ballistics/stringtable.xml addons/interact_menu/stringtable.xml addons/interaction/stringtable.xml addons/laser/stringtable.xml addons/medical/stringtable.xml addons/respawn/stringtable.xml	2015-05-02 23:17:39 +02:00
esteldunedain	233ca37219	Export settings to clipboard using ace_clipboard. Deprecate exporting through diag_log	2015-05-02 17:52:37 -03:00
jaynus	433bb21ccc	ACE clipboard extension to bypass clipboard limit of arma. Close #991	2015-05-02 13:13:24 -07:00
ulteq	e6187adfc7	Removed a trailing space	2015-05-02 22:09:38 +02:00
ulteq	b5ec13b992	Fixed some inconsistencies in the stringtable	2015-05-02 22:07:25 +02:00
Felix Wiegand	7678919e8d	Merge pull request #982 from ToasterBR/master ... Translation to Portuguese	2015-05-02 21:40:14 +02:00
ulteq	d080414c84	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-05-02 18:22:12 +02:00
ulteq	3bfbf8b64e	Got rid of the math include in the ab extension	2015-05-02 18:22:06 +02:00
Harakhti	6c2717be7f	More more translations ... Stope.	2015-05-02 18:06:01 +02:00
jaynus	980be9f55b	Merge pull request #972 from acemod/javFixInheritanceCheck ... Javelin - Fix configProperties	2015-05-02 08:50:18 -07:00
adam3adam	05a6389acd	Czech translation v2 ... mk6mortar and some medical translation	2015-05-02 12:46:28 +02:00
adam3adam	3f86b846b2	Merge pull request #1 from acemod/master ... Update	2015-05-02 12:20:38 +02:00
ruPaladin	219735611f	interaction2	2015-05-02 12:47:06 +03:00
ruPaladin	3aad0904cd	medical2	2015-05-02 12:45:27 +03:00
ruPaladin	3b6e491f5c	interaction	2015-05-02 12:42:44 +03:00
ruPaladin	ca03637a54	medical	2015-05-02 12:42:02 +03:00
FreeZbe	66f39fc1dc	French : update / fix stringtable	2015-05-02 10:12:28 +02:00
ViperMaul	d9bd98bf60	Merge pull request #983 from acemod/setVersionMakeCFG ... set new default key for make.cfg	2015-05-01 23:50:52 -07:00
ViperMaul	12e05cc526	set new default key	2015-05-01 23:46:22 -07:00
ToasterBR	1ae2b640c2	Added myself to Authors ... Nick and real email included	2015-05-02 03:45:57 -03:00
ToasterBR	021b00c722	Translation to Portuguese ... Done all remaining portuguese translations, including some minor corrections	2015-05-02 03:38:53 -03:00
PabstMirror	436e50411a	Medical - Fix Uncon PFEH argument changes	2015-05-01 22:42:43 -05:00
Felix Wiegand	4dce2b8841	Merge pull request #978 from licht-im-Norden87/patch-7 ... Added german strings to interaction	2015-05-02 04:08:37 +02:00
Felix Wiegand	1ca737ffb6	Merge pull request #979 from licht-im-Norden87/patch-8 ... Added german strings to laser	2015-05-02 04:08:18 +02:00
licht-im-Norden87	f93ac12807	Added german strings to laser	2015-05-02 03:28:54 +02:00
licht-im-Norden87	106f2ab89b	Added german strings to interaction	2015-05-02 03:25:28 +02:00
Dimas	b350d234e2	Addes spanish translation ... Added spanish translation for three strings. Did it manually here.	2015-05-02 02:44:39 +02:00
esteldunedain	b8d8aeae5c	Merge branch 'master' of github.com:KoffeinFlummi/ACE3	2015-05-01 20:32:51 -03:00
esteldunedain	be07fd2c82	Avoid ACE_Comanche_Test from showing on Zeus. #943	2015-05-01 20:32:20 -03:00
PabstMirror	34016a2776	Merge pull request #975 from gienkov/patch-13 ... Update CfgVehicles.hpp	2015-05-01 18:30:07 -05:00
Grzegorz	c9cf1d2455	Update CfgVehicles.hpp ... another typo few lines below	2015-05-02 01:26:54 +02:00
PabstMirror	02262a54b9	Merge pull request #974 from gienkov/patch-12 ... Update CfgVehicles.hpp - fix spulling	2015-05-01 18:25:43 -05:00
Grzegorz	5b9e6de6f1	Update CfgVehicles.hpp ... missing "s"	2015-05-02 01:21:49 +02:00