3600 Commits

Author	SHA1	Message	Date
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
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
Felix Wiegand	7678919e8d	Merge pull request #982 from ToasterBR/master ... Translation to Portuguese	2015-05-02 21:40:14 +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
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
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
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
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
Grzegorz	c9cf1d2455	Update CfgVehicles.hpp ... another typo few lines below	2015-05-02 01:26:54 +02:00
Grzegorz	5b9e6de6f1	Update CfgVehicles.hpp ... missing "s"	2015-05-02 01:21:49 +02:00
PabstMirror	ce1255bb2f	Fix configProperties	2015-05-01 17:56:04 -05:00
KoffeinFlummi	97a9bffe98	Set version number to 3.0.0.2	2015-05-02 00:49:43 +02:00
ulteq	4239772ce9	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-05-02 00:36:34 +02:00
ulteq	884da7742e	Disabled AB terrain init, if AB is not enabled	2015-05-02 00:36:23 +02:00
Felix Wiegand	07ec7b96c4	Merge pull request #954 from acemod/medicalFixVehAnimation ... Medical fix veh animation	2015-05-02 00:35:13 +02:00
KoffeinFlummi	f1ba0cff26	Merge https://github.com/ProfessorCZ/ACE3 into czech-merge ... Conflicts: AUTHORS.txt addons/advanced_ballistics/stringtable.xml addons/ballistics/stringtable.xml addons/interact_menu/stringtable.xml addons/kestrel4500/stringtable.xml addons/laserpointer/stringtable.xml addons/medical/stringtable.xml addons/respawn/stringtable.xml	2015-05-02 00:26:25 +02:00
KoffeinFlummi	e05f1b557a	Merge branch 'master' of https://github.com/acemod/ACE3	2015-05-02 00:19:39 +02:00
KoffeinFlummi	debfe990e8	Fix duplicates	2015-05-02 00:19:10 +02:00
KoffeinFlummi	13b99ed53f	Merge https://github.com/adam3adam/ACE3 into czech-merge ... Conflicts: AUTHORS.txt addons/interact_menu/stringtable.xml	2015-05-02 00:17:01 +02:00
Lukas	1d3f5cc312	Czceh translation	2015-05-02 00:04:50 +02:00
Felix Wiegand	f16e02b003	Merge pull request #959 from licht-im-Norden87/patch-6 ... Update Stringtable: missileguidance	2015-05-02 00:03:13 +02:00
Grzegorz	c1d87f2a75	PL translation ... interaction	2015-05-01 23:50:27 +02:00
Felix Wiegand	a211bcfacf	Merge pull request #689 from acemod/group ... Reword the group action names	2015-05-01 23:30:10 +02:00
Tachii	60c02f4051	added 2 missing ru strings	2015-05-02 00:21:00 +03:00
FreeZbe	6f5e64b4a5	French : update / fix stringtable	2015-05-01 23:10:06 +02:00
FreeZbe	7e12c97317	French : update / fix stringtable	2015-05-01 23:09:09 +02:00
FreeZbe	d1da3a82d7	French : update / fix stringtable	2015-05-01 23:08:36 +02:00
Felix Wiegand	58a67a2f77	Merge pull request #962 from gienkov/patch-10 ... PL translation	2015-05-01 22:51:36 +02:00
KoffeinFlummi	cc627b4a92	Merge branch 'master' of https://github.com/acemod/ACE3	2015-05-01 22:50:11 +02:00
Dimaslg	339cd8febd	Add spanish translation for removing tournis	2015-05-01 22:49:52 +02:00
Glowbal	937b20f551	Merge branch 'master' of github.com:acemod/ACE3	2015-05-01 22:49:24 +02:00
Glowbal	09a0158fa4	This should not be 1	2015-05-01 22:49:13 +02:00