283 Commits

Author	SHA1	Message	Date
gienkov	de13985492	interact_menu translation	2015-06-05 09:55:13 +02:00
gienkov	c1a7374404	Merge remote-tracking branch 'upstream/master' into pl-translation-1 ... Conflicts: addons/interact_menu/stringtable.xml	2015-06-05 09:40:50 +02:00
PabstMirror	1cb1468183	Remove unused control	2015-06-04 15:40:56 -05:00
PabstMirror	cecc133a59	Missing </Key> in stringtable	2015-06-04 13:22:55 -05:00
jonpas	9fbf256acd	Merge branch 'master' into macroSTR ... Conflicts: addons/hearing/functions/fnc_putInEarplugs.sqf addons/interact_menu/ACE_Settings.hpp	2015-06-04 17:13:09 +02:00
gienkov	46dbd3113c	Fix	2015-06-04 01:38:57 +02:00
gienkov	fb10961a9b	PL translation for new things	2015-06-04 01:34:58 +02:00
SzwedzikPL	18940d0787	Interaction menu background options	2015-06-03 06:04:47 +02:00
Nicolás Badano	8f15856084	Merge pull request #1415 from GitHawk/master ... runOnHover can now be CODE & SurgicalKits	2015-06-02 18:07:36 -03:00
jonpas	d934c25b78	Merge branch 'master' into macroSTR ... Conflicts: addons/interact_menu/ACE_Settings.hpp	2015-05-30 19:54:32 +02:00
Glowbal	00acbaf44d	Added blur background client setting	2015-05-29 21:56:07 +02:00
jonpas	763cb07629	Macro STRING to LSTRING	2015-05-28 21:59:04 +02:00
IngoKauffmann	ab31891b8d	runOnHover can now be CODE ... Expanded render, compileMenu, compileMenuSelfAction so runOnHover can be CODE	2015-05-28 18:16:05 +02:00
jonpas	87db721d4f	Stringtable fixes up to medical	2015-05-27 21:19:14 +02:00
jonpas	6072e14077	Changed all strings to macros (except external)	2015-05-27 19:04:25 +02:00
PabstMirror	d2eb08594b	Merge branch 'master' into fixUAVandInteractionInhert ... Conflicts: addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf	2015-05-27 00:36:43 -05:00
jaynus	c924baefd7	All instances of time and diagTicktime changed to ACE_time / ACE_diagTime.	2015-05-21 09:42:44 -07:00
esteldunedain	22b83826f0	Bandaid for #1281, until we properly solve unreliable init handlers. 1- Menus for CAManBase are precomputed on preInit 2- Class action menus for all men are supposed to be equal to those of CAManBase Note: we loose the capability of defining actions for specific classes from config (which we don't do on ACE annyway)	2015-05-20 17:15:25 +02:00
PabstMirror	3daec7d98d	Fix UAV and Interaction Compile Inheritance	2015-05-17 13:51:59 -05:00
Nicolás Badano	d9b6636221	Merge pull request #1196 from Winter259/common-cleanup ... Cleanup of nearly all common functions	2015-05-14 18:31:19 -03:00
PabstMirror	2158f467f4	#1171 - Safe get variables if settings not defined	2015-05-14 15:29:09 -05:00
esteldunedain	f17c7c12a6	Fixed object actions not working	2015-05-14 16:56:32 -03:00
SAM	31adb5a9fc	Second batch of settings files	2015-05-14 20:59:25 +02:00
esteldunedain	4a074d4e31	Replace BIS_fnc_sortBy by sort for interact_menu occlusion	2015-05-14 10:54:22 -03:00
esteldunedain	5ef29c2354	Merge remote-tracking branch 'origin/master' into interactionOclusion ... Conflicts: addons/interact_menu/functions/fnc_keyDown.sqf	2015-05-14 10:39:02 -03:00
PabstMirror	1827d8ad95	Fix #1024 - Adjust self iMenu for wave height	2015-05-12 16:04:42 -05:00
KoffeinFlummi	2bb3a0f139	Cleanup #1095 ... - Fix tabs - Remove tabler comments - Restore one removed Russian string	2015-05-10 16:19:46 +02:00
Alessandro Foresi	2dd06babec	Added: Italian translations completed. ... Fixed: BOM markers where missing	2015-05-10 11:44:46 +02:00
Alessandro Foresi	6695a8793b	Added: Some italian translastions	2015-05-09 23:43:03 +02:00
ViperMaul	996c342087	Merge pull request #994 from acemod/imenumisclick ... don't close menu when no action is selected	2015-05-06 13:31:07 -07:00
Glowbal	50cc5db92f	fixes #1017	2015-05-05 20:05:31 +02:00
ViperMaul	032424b23e	Merge pull request #1006 from acemod/skipLOSCheckBodyparts ... Interact menu: Increase the minimum distance required for LOS checks to 1.5m	2015-05-04 10:14:59 -07:00
esteldunedain	d07b69aca4	Increase the minimum distance required to perform LOS checks to 1.5m; should avoid LOS checks for medical bodyparts entirely, thus avoiding problems with weaponholders obstructing actions.	2015-05-04 13:37:14 -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
commy2	f44aaee7c7	also in cursor mode	2015-05-02 23:02:40 +02:00
commy2	0fd783082d	don't close menu when no action is selected	2015-05-02 22:53:23 +02:00
esteldunedain	aad108a6a3	Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into interactionOclusion	2015-05-02 14:55:35 -03:00
esteldunedain	e6c333bff4	Fix oclusion when self-interacting	2015-05-02 14:54:57 -03:00
esteldunedain	1735047e3c	Make closer action points oclude farther ones. Improves the clutter of the interact menu when interating with a person from the side. Close #738	2015-05-02 14:37:58 -03:00
Harakhti	6c2717be7f	More more translations ... Stope.	2015-05-02 18:06:01 +02:00
ToasterBR	021b00c722	Translation to Portuguese ... Done all remaining portuguese translations, including some minor corrections	2015-05-02 03:38:53 -03:00
esteldunedain	fae10aa731	Replace dialog by display.	2015-05-02 01:33:28 -03: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	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
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
adam3adam	f5303d455c	Translation of some stuff into czech language ... adv. ballistics, atragmx, interaction menu, kestrel4500, laser pointer and little part of medical	2015-05-01 22:23:03 +02:00
KoffeinFlummi	c9ff497c83	Merge branch 'master' into polish-merge ... Conflicts: addons/respawn/stringtable.xml	2015-05-01 21:13:36 +02:00