56 Commits

Author	SHA1	Message	Date
KoffeinFlummi	65fd6b0937	Merge https://github.com/EpMAK/ACE3 into russian-merge ... Conflicts: addons/ballistics/stringtable.xml addons/medical/stringtable.xml addons/nametags/stringtable.xml addons/respawn/stringtable.xml	2015-04-19 01:04:32 +02:00
PabstMirror	caef5c105f	More Privates	2015-04-17 22:40:37 -05:00
EpMAK	c88bda487b	Merge remote-tracking branch 'upstream/master' ... Conflicts: addons/weaponselect/stringtable.xml	2015-04-17 19:48:01 +03:00
EpMAK	31a2f1b279	Russian translations ... Again, filling strings, fixing errors	2015-04-17 19:36:07 +03:00
Marco	500098d061	Update stringtable.xml ... IT	2015-04-16 10:25:39 +02:00
KoffeinFlummi	8b915380b7	Merge branch 'hungarian-merge'	2015-04-15 13:55:02 +02:00
KoffeinFlummi	2ffbccbf20	Merge branch 'hu-translate' of https://github.com/Harakhti/ACE3 into hungarian-merge	2015-04-15 12:59:56 +02:00
KoffeinFlummi	ebcdafe610	Fix spelling of "isClientSetable"	2015-04-14 21:43:19 +02:00
KoffeinFlummi	63fe4118d4	Merge https://github.com/FreeZbe/ACE3 into french-merge	2015-04-14 14:48:13 +02:00
Harakhti	8bfd915ec4	Translation: N to R ... This was a lot more fun than the previous two were. 12 folders left...	2015-04-13 23:45:44 +02:00
bux578	8c24d9ec35	fix invalid xml, fix duplicate keys	2015-04-13 15:25:30 +02:00
KoffeinFlummi	8d4003a396	Merge https://github.com/HerrStein/ACE3 into german-merge	2015-04-13 14:21:00 +02:00
KoffeinFlummi	f6c7d444e1	Merge https://github.com/Anthariel/ACE3 into french-merge	2015-04-13 13:31:48 +02:00
KoffeinFlummi	118b5509ea	Merge https://github.com/gienkov/ACE3 into polish-merge	2015-04-13 13:00:59 +02:00
KoffeinFlummi	614afa8537	Merge https://github.com/Kllrt/ACE3 into czech-merge ... Conflicts: addons/attach/stringtable.xml addons/captives/stringtable.xml addons/common/stringtable.xml addons/dragging/stringtable.xml addons/explosives/stringtable.xml addons/goggles/stringtable.xml addons/grenades/stringtable.xml addons/hearing/stringtable.xml addons/interact_menu/stringtable.xml addons/interaction/stringtable.xml addons/inventory/stringtable.xml addons/kestrel/stringtable.xml addons/laser_selfdesignate/stringtable.xml addons/laserpointer/stringtable.xml addons/logistics_uavbattery/stringtable.xml addons/logistics_wirecutter/stringtable.xml addons/magazinerepack/stringtable.xml addons/maptools/stringtable.xml addons/medical/stringtable.xml addons/microdagr/stringtable.xml addons/nametags/stringtable.xml addons/optionsmenu/stringtable.xml addons/overheating/stringtable.xml addons/realisticnames/stringtable.xml addons/reload/stringtable.xml addons/reloadlaunchers/stringtable.xml addons/weaponselect/stringtable.xml addons/wep_javelin/stringtable.xml addons/winddeflection/stringtable.xml	2015-04-12 14:27:59 +02:00
FreeZbe	45ff6c7ce9	French: (Nearly) Complete French translations ... Some entries (3 or 4) are still missing. I dont understand what you mean / what the input is related to.	2015-04-12 14:15:45 +02:00
KoffeinFlummi	59952441d8	Merge branch 'patch-2' of https://github.com/licht-im-Norden87/ACE3 into german-merge	2015-04-12 06:22:17 +02:00
KoffeinFlummi	c6efd4e546	Merge https://github.com/EpMAK/ACE3 into russian-merge	2015-04-12 05:39:46 +02:00
FreeZbe	3ff6abde71	Update stringtable.xml	2015-04-11 23:18:51 +02:00
EpMAK	21abff3713	Revert "Revert "Russian Translation"" ... This reverts commit ea04f4ab3e.	2015-04-11 21:33:34 +03:00
EpMAK	ea04f4ab3e	Revert "Russian Translation" ... This reverts commit 17a552bb80.	2015-04-11 21:33:07 +03:00
Kllrt	38adfbcb70	Added missing CZ strings and made little revision	2015-04-11 16:33:00 +02:00
EpMAK	17a552bb80	Russian Translation ... Russian translation of stringtables: new lines + old lines fixed a bit, realistic names for armory are not yet filled.	2015-04-10 19:55:57 +03:00
EpMAK	68d08b8c7b	Revert "Translation" ... This reverts commit fab5605ad5.	2015-04-10 19:46:18 +03:00
EpMAK	fab5605ad5	Translation ... Russian translation of the texts	2015-04-10 17:51:48 +03:00
Asgar	16b2311376	Added German translation for a couple of things,	2015-04-10 14:21:55 +02:00
Legolasindar	6f69361a73	Update stringtable.xml ... added spanish translation	2015-04-10 13:34:16 +02:00
Anthariel	d9986c6959	Update stringtable.xml ... Added: French Translation (75%)	2015-04-10 05:40:22 +02:00
Grzegorz	f61832f735	reload PL translation	2015-04-10 01:44:43 +02:00
licht-im-Norden87	7e78a7de18	Reload	2015-04-10 00:41:39 +02:00
PabstMirror	43a9e7bfc8	#176 - Belt Repacking	2015-04-01 11:21:30 -05:00
Nicolás Badano	5e79970740	Switching nicknames	2015-03-24 01:18:00 -03:00
Nicolás Badano	bc0dae63ca	Fix #173	2015-03-24 00:57:03 -03:00
Nicolás Badano	58ea333b42	Fix #236	2015-03-24 00:34:41 -03:00
Nicolás Badano	83d9aa4bb6	Replace tap shoulder and check (others) ammo animations by PutDown	2015-03-21 10:23:36 -03:00
PabstMirror	7e383dc10e	#198 canInteractWith EGVAR -> EFUNC	2015-03-20 17:55:39 -05:00
commy2	c23c0788f6	tweaks, carry static weapons	2015-03-18 13:36:22 +01:00
commy2	b5f307919e	replace canInteract with canInteractWith	2015-03-15 13:00:10 +01:00
Glowbal	f08f8beeff	Merge branch 'master' into Additional_UI_Client_settings ... Conflicts: addons/reload/CfgEventHandlers.hpp addons/reload/functions/fnc_checkAmmo.sqf	2015-03-08 17:03:25 +01:00
Glowbal	d919c2436d	Clientside display text option for weapon reload	2015-03-08 16:56:57 +01:00
PabstMirror	3940ba9a62	opps	2015-03-07 10:58:34 -06:00
PabstMirror	e191105200	Merge Changes	2015-03-07 10:36:01 -06:00
PabstMirror	3690f1a733	Pull reload changes from master	2015-03-07 10:32:31 -06:00
Nicolás Badano	5d68969b63	Added action for checking ammo on others MG's belts and on Static Weapons	2015-03-06 01:34:38 -03:00
Nicolás Badano	7b4487e8fc	Split checkammo function	2015-03-06 01:32:47 -03:00
Nicolás Badano	342b3c3a4c	Make reload require ace_interaction	2015-03-06 01:30:51 -03:00
Nicolás Badano	5b4fa6b503	Remove debug stuff	2015-03-05 22:52:37 -03:00
Nicolás Badano	c8f320d501	Fix action hierarchy	2015-03-05 22:52:29 -03:00
PabstMirror	4018742f26	Return False on keyUp Code	2015-03-05 02:51:24 -06:00
PabstMirror	0919e59719	Key Bind Redo (except vector)	2015-03-05 01:32:26 -06:00