124 Commits

Author	SHA1	Message	Date
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
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	362753209e	Merge branch 'master' of https://github.com/acemod/ACE3	2015-04-12 05:40:24 +02:00
KoffeinFlummi	c6efd4e546	Merge https://github.com/EpMAK/ACE3 into russian-merge	2015-04-12 05:39:46 +02:00
PabstMirror	350a79c8a4	#498 - Use cursor mode when scoped	2015-04-11 19:44:42 -05: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	56681e632d	Merge branch 'master' of https://github.com/acemod/ACE3	2015-04-11 16:36:31 +02:00
Kllrt	38adfbcb70	Added missing CZ strings and made little revision	2015-04-11 16:33:00 +02:00
esteldunedain	b8e0388581	Fix nearestObjects with getPos choking over seawater. Fix #465	2015-04-11 11:12:40 -03:00
esteldunedain	d6e70cfe6b	Merge branch 'patch-3' of https://github.com/Legolasindar/ACE3 into Legolasindar-patch-3 ... Conflicts: addons/common/stringtable.xml addons/explosives/stringtable.xml addons/frag/stringtable.xml addons/interact_menu/stringtable.xml addons/interaction/stringtable.xml addons/inventory/stringtable.xml addons/laser_selfdesignate/stringtable.xml addons/logistics_wirecutter/stringtable.xml addons/medical/stringtable.xml	2015-04-10 16:20:18 -03: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
Jo David	33a14076fc	Merge branch 'master' of https://github.com/acemod/ACE3 into translations ... Conflicts: addons/captives/stringtable.xml addons/medical/stringtable.xml	2015-04-10 09:01:24 +02:00
Anthariel	81122e0839	Update stringtable.xml ... Added: French Translation (100%)	2015-04-10 06:30:49 +02:00
Grzegorz	e907553abc	interact_menu PL translation	2015-04-10 03:28:14 +02:00
Legolasindar	b8b151e62e	Update stringtable.xml ... added spanish terms	2015-04-10 01:20:39 +02:00
licht-im-Norden87	7d71d360b0	Update stringtable.xml ... Not quite convinced by my translation ... Flummi you better have a look	2015-04-09 23:45:33 +02:00
licht-im-Norden87	2373e78245	Update stringtable.xml	2015-04-09 23:43:58 +02:00
PabstMirror	2bc0976979	Merge pull request #277 from KoffeinFlummi/revert-276-revert-272-142menudeploy ... Revert "Revert "1.42 - cursor mode when bipod deployed""	2015-04-08 13:26:05 -05:00
bux578	92da20ce62	translations ... #367	2015-04-07 10:02:33 +02:00
jaynus	1bb6be5654	Cleaning up of all tabs in source code files.	2015-04-06 09:22:43 -07:00
jaynus	e3ad83e109	Merge pull request #286 from KoffeinFlummi/lasers ... Self designating lasers, Javelin Guidance, DAGR laser guidance, Comanche updated HUDS	2015-04-05 13:26:54 -07:00
esteldunedain	848b5133ef	Remove debug chats for interact_menu	2015-04-04 19:15:29 -03:00
Nicolás Badano	5f4030469f	Merge pull request #309 from KoffeinFlummi/closeInteractMenu ... Close interact menu when knocked out	2015-04-04 15:35:00 -03:00
esteldunedain	d090b3328c	- Close interact_menu when the player falls unconscious ... - Prevent all types of interactions while unconscious	2015-04-04 12:25:49 -03:00
esteldunedain	06f6039dca	Stronger shadow for the interact_menu text	2015-04-04 01:04:32 -03:00
esteldunedain	a5ff34e1d8	Keep cursored menus always centered. Fix #299.	2015-04-03 20:49:40 -03:00
Nou	fff8a240e3	Remove compensation for movement, instead use modelToWorldVisual	2015-04-03 15:31:44 -07:00
Nou	6541600d44	Switch everything to use modelToWorldVisual instead of modelToWorld.	2015-04-03 15:26:27 -07:00
PabstMirror	33ee7dc07c	iMenu - Add some localization and fix veh icons	2015-04-03 00:42:25 -05:00
PabstMirror	0daa029622	Show Vehicle Name/Icon for interaction	2015-03-31 23:56:41 -05:00
Nicolás Badano	e38f48d7ad	Remove debug stuff	2015-03-31 18:16:53 -03:00
Nicolás Badano	4381f164d1	Fix the self interaction menu of vehicles	2015-03-31 18:09:23 -03:00
Nicolás Badano	149fd13fce	Prevent the interact menu from closing dialogs opened by the actions	2015-03-31 18:09:20 -03:00
Nicolás Badano	1e0ece9fa2	Revert "Revert "1.42 - cursor mode when bipod deployed""	2015-03-30 17:32:55 -03:00
Nicolás Badano	d9bfb84675	Revert "1.42 - cursor mode when bipod deployed"	2015-03-30 17:31:50 -03:00
Nicolás Badano	a7f1e58dcf	Merge pull request #272 from KoffeinFlummi/142menudeploy ... 1.42 - cursor mode when bipod deployed	2015-03-30 17:26:18 -03:00
PabstMirror	24b47584a2	InteractMenu - Fix Actions Added to Objects	2015-03-29 12:04:57 -05:00
PabstMirror	95a9daf18b	Minor Header Correction	2015-03-28 19:08:25 -05:00
commy2	e574d19844	1.42 - cursor mode when bipod deployed	2015-03-28 16:24:17 +01:00
Nicolás Badano	77dc50f10f	Some more fixes for self interaction inside vehicles	2015-03-24 16:06:03 -03:00
Nicolás Badano	a1d6c052ba	Refactored interaction key handling while boarded: ... - Self-interaction key opens up your own self interaction menu - Interaction key opens interaction options of the vehicle and passengers	2015-03-24 12:27:27 -03:00
Nicolás Badano	5e79970740	Switching nicknames	2015-03-24 01:18:00 -03:00
Nicolás Badano	8767a0d6ac	Fix #206	2015-03-24 00:30:15 -03:00
Nicolás Badano	17d0c0ae38	Various tweaks on interact_menu styling to improve usability	2015-03-24 00:15:22 -03:00
Nicolás Badano	70ffefde10	Possibly close multiple dialogs when interact_menu is opened	2015-03-23 21:26:40 -03:00