236 Commits

Author	SHA1	Message	Date
KoffeinFlummi	fb807cbb86	Merge branch 'master' into spanish-merge ... Conflicts: addons/interact_menu/stringtable.xml addons/respawn/stringtable.xml	2015-05-01 22:44:10 +02:00
Dimaslg	6f2caec6ec	Last touches to Spanish translation	2015-05-01 22:42:09 +02:00
KoffeinFlummi	c9ff497c83	Merge branch 'master' into polish-merge ... Conflicts: addons/respawn/stringtable.xml	2015-05-01 21:13:36 +02:00
Lubomír Blažek	dcb3196e58	Czech strings	2015-05-01 20:52:41 +02:00
Grzegorz	e36fbe9da7	Update stringtable.xml	2015-05-01 19:32:43 +02:00
Grzegorz Sikora	4668869959	PL translation	2015-05-01 19:30:30 +02:00
ruPaladin	2aa788bba2	Update stringtable.xml	2015-05-01 19:26:23 +03:00
KoffeinFlummi	48e59f0d71	Merge branch 'master' of https://github.com/acemod/ACE3 ... Conflicts: addons/interact_menu/stringtable.xml addons/medical/stringtable.xml	2015-05-01 17:46:58 +02:00
KoffeinFlummi	1e786d4a92	Merge https://github.com/FreeZbe/ACE3 into french-merge ... Conflicts: addons/ballistics/stringtable.xml addons/interact_menu/stringtable.xml addons/medical/stringtable.xml	2015-05-01 17:45:00 +02:00
KoffeinFlummi	e46eba673f	Merge branch 'master' into german-translation ... Conflicts: addons/interact_menu/stringtable.xml addons/medical/stringtable.xml	2015-05-01 17:36:40 +02:00
KoffeinFlummi	954e4ef549	Merge branch 'master' of https://github.com/acemod/ACE3 ... Conflicts: addons/interact_menu/stringtable.xml addons/medical/stringtable.xml	2015-05-01 17:32:19 +02:00
KoffeinFlummi	e96f23c197	Merge branch 'en-to-hu' of https://github.com/Harakhti/ACE3 into hungarian-merge ... Conflicts: addons/atragmx/stringtable.xml addons/interact_menu/stringtable.xml addons/laserpointer/stringtable.xml addons/medical/stringtable.xml addons/mk6mortar/stringtable.xml addons/realisticnames/stringtable.xml addons/respawn/stringtable.xml	2015-05-01 17:30:59 +02:00
Felix Wiegand	526b0a2d59	Merge pull request #931 from gienkov/master ... PL translation	2015-05-01 17:15:22 +02:00
KoffeinFlummi	5f60321a69	Merge https://github.com/Legolasindar/ACE3 into spanish-merge ... Conflicts: addons/ballistics/stringtable.xml addons/interact_menu/stringtable.xml addons/medical/stringtable.xml addons/mk6mortar/stringtable.xml	2015-05-01 17:12:00 +02:00
FreeZbe	acf74dd2ae	Update stringtable.xml	2015-05-01 14:13:32 +02:00
bux578	2acc10ba70	meh	2015-05-01 12:19:42 +02:00
bux578	aa2e5077e4	missing german translation	2015-05-01 12:17:28 +02:00
commy2	b859956604	rename category ace <blank> to ace common	2015-05-01 10:19:47 +02:00
esteldunedain	324b9510e3	Allow positions for actions to be computed dynamically. Also leverage that for the position of the "Weapon" action, instead of hard coding an exception for that.	2015-05-01 01:56:39 -03:00
esteldunedain	fc02bb4e06	Stylistic changes	2015-05-01 00:32:16 -03:00
esteldunedain	aa4a5539d4	Merge branch 'master' into interactMoreOptions ... Conflicts: addons/interact_menu/functions/fnc_renderIcon.sqf	2015-05-01 00:04:22 -03:00
KoffeinFlummi	984a1fe337	Rename breakLine to break_line	2015-05-01 02:14:23 +02:00
Grzegorz	1e0eaa1971	Update stringtable.xml	2015-04-30 22:55:43 +02:00
Grzegorz Sikora	03973f3dcf	PL translation	2015-04-30 22:54:15 +02:00
PabstMirror	090062153c	Merge branch 'master' into interactMoreOptions ... Conflicts: addons/interact_menu/config.cpp	2015-04-30 15:36:00 -05:00
PabstMirror	ba18f8b430	Handle Scaling	2015-04-30 14:07:19 -05:00
commy2	8c8e310d66	handle cursor mode	2015-04-30 21:00:30 +02:00
commy2	5ec8b6d36c	Merge branch 'master' of https://github.com/acemod/ACE3 into menuonclick	2015-04-30 20:01:58 +02:00
Harakhti	4e165e2572	Update Hungarian translations ... Let us match the current revision. At the time of making, the Ballistics XML was broken.	2015-04-30 13:25:25 +02:00
Bla1337	5d1478b733	interact and medical system localization upd	2015-04-30 14:01:22 +03:00
PabstMirror	11aafe013b	Localization	2015-04-29 23:53:00 -05:00
PabstMirror	9aa2e3130a	Options for Shadow/Outline and Text Size	2015-04-29 23:37:52 -05:00
PabstMirror	e40a2a524d	Merge branch 'master' into interactMoreOptions	2015-04-29 22:57:35 -05:00
ulteq	4e171c2988	Merge pull request #916 from FreeZbe/master ... French: update and fix stringtable	2015-04-29 16:46:49 +02:00
FreeZbe	5ec6bea71d	French: update stringtable	2015-04-29 16:19:23 +02:00
KoffeinFlummi	a1e709047e	Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge ... Conflicts: AUTHORS.txt addons/aircraft/stringtable.xml addons/attach/stringtable.xml addons/captives/stringtable.xml addons/common/stringtable.xml addons/disposable/stringtable.xml addons/dragging/stringtable.xml addons/explosives/stringtable.xml addons/fcs/stringtable.xml addons/frag/stringtable.xml addons/grenades/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/markers/stringtable.xml addons/medical/stringtable.xml addons/microdagr/stringtable.xml addons/movement/stringtable.xml addons/nametags/stringtable.xml addons/nightvision/stringtable.xml addons/optionsmenu/stringtable.xml addons/overheating/stringtable.xml addons/parachute/stringtable.xml addons/realisticnames/stringtable.xml addons/reload/stringtable.xml addons/reloadlaunchers/stringtable.xml addons/respawn/stringtable.xml addons/safemode/stringtable.xml addons/switchunits/stringtable.xml addons/vehiclelock/stringtable.xml addons/weaponselect/stringtable.xml addons/wep_javelin/stringtable.xml addons/winddeflection/stringtable.xml	2015-04-29 12:52:55 +02:00
Bla1337	cfbf3bd053	Localization update	2015-04-29 11:20:21 +03:00
PabstMirror	47d4446520	Don't check intersection if distance < 1m ... Related to #869	2015-04-29 02:34:47 -05:00
PabstMirror	d7d43ce3b1	#828 - Private Variables for Interact Menu	2015-04-29 01:26:13 -05:00
PabstMirror	1512e4c367	isClientSettable spelling	2015-04-28 14:09:26 -05:00
PabstMirror	9e8b13cd2b	Merge branch 'master' into altSelfInteract ... Conflicts: addons/interact_menu/functions/fnc_renderIcon.sqf addons/interact_menu/functions/fnc_renderSelector.sqf addons/interact_menu/stringtable.xml	2015-04-28 14:02:03 -05:00
ulteq	2a759aba70	Merge branch 'master' of https://github.com/NukeDev/ACE3 into NukeDev-master ... Conflicts: addons/interact_menu/stringtable.xml addons/medical/stringtable.xml	2015-04-28 18:55:23 +02:00
NukeDev	db82df6214	Italian's Translation's Changes v2	2015-04-28 18:10:35 +02:00
Ivan Navarro Cabello	8a55c69cd7	added spanish translation ... added spanish translation	2015-04-28 17:03:49 +02:00
simon84	8ac6f61fcf	added some translations ... added some translations	2015-04-28 00:36:37 +02:00
Josuan Albin	e8dec708bc	Some french entries and a german duplicate ... Added some french entries and removed a german duplicate	2015-04-27 16:18:28 +02:00
commy2	5320f4c6b7	fix broken parse text cache in some cases	2015-04-26 19:33:08 +02:00
commy2	f96deadd20	imenu: remove shadow, fix caching	2015-04-26 12:41:15 +02:00
PabstMirror	898d6c74a8	#854 - No canInteractWith check for Ace_MainAction ... Was preventing subactions from showing.	2015-04-25 16:02:59 -05:00
ulteq	ca6a559557	Fixed a typo	2015-04-25 21:18:09 +02:00