195 Commits

Author	SHA1	Message	Date
PabstMirror	6f90185f18	#1939 - Fix Remove Action From Class	2015-07-28 17:26:23 -05:00
Nicolás Badano	67d83d0d49	Merge pull request #1862 from acemod/disappearingActionsFix ... Cache the objects actions for nearby objects and set the GVAR(objectA…	2015-07-16 18:24:55 -03:00
esteldunedain	8da43d25c6	Cache the objects actions for nearby objects and set the GVAR(objectActionList) correctly.	2015-07-16 17:28:27 -03:00
PabstMirror	5e80f9d8d3	Merge branch 'master' into userActionPrototype	2015-07-01 15:04:40 -05:00
SilentSpike	f2e5f729e8	Merge branch 'master' into gm_revamp	2015-06-27 18:26:30 +01:00
PabstMirror	4a8344e1a4	Merge branch 'master' into userActionPrototype ... Conflicts: addons/interact_menu/ACE_Settings.hpp addons/interact_menu/stringtable.xml extensions/CMakeLists.txt	2015-06-13 15:05:57 -05:00
jonpas	951f9d32c3	Allow interaction menu while sitting	2015-06-09 16:04:37 +02:00
SilentSpike	f193204195	Simplify the renderZeus code	2015-06-08 13:12:27 +01:00
SilentSpike	246d303943	menuClosed event before variable clearing	2015-06-08 13:00:03 +01:00
SilentSpike	cb1b0c6262	Added zeus exception for interaction conditions	2015-06-07 20:21:51 +01:00
SilentSpike	5cc6abd49a	Open menu over zeus inerface	2015-06-06 16:20:22 +01:00
SilentSpike	25f613b712	Initial implementation of static zeus menu	2015-06-04 23:24:57 +01: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
jonpas	d934c25b78	Merge branch 'master' into macroSTR ... Conflicts: addons/interact_menu/ACE_Settings.hpp	2015-05-30 19:54:32 +02:00
PabstMirror	b0bfb7dd43	Fix Ladders - Add User Setting	2015-05-29 13:00:04 -05: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
PabstMirror	08aeda11df	Merge branch 'master' into userActionPrototype	2015-05-27 12:33:20 -05: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
PabstMirror	78dec5debc	Merge branch 'master' into userActionPrototype ... Conflicts: addons/interact_menu/XEH_preInit.sqf	2015-05-16 22:49:09 -05: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
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	58ee797a94	Merge branch 'master' into userActionPrototype	2015-05-13 00:00:55 -05:00
PabstMirror	1827d8ad95	Fix #1024 - Adjust self iMenu for wave height	2015-05-12 16:04:42 -05: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
PabstMirror	6c45292e89	Merge branch 'master' into userActionPrototype ... Conflicts: addons/interact_menu/functions/fnc_renderBaseMenu.sqf	2015-05-04 14:23:21 -05:00
PabstMirror	6c5d72640c	Caching, Optimzations	2015-05-04 14:06:33 -05: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
PabstMirror	bdc967d3a9	Extension to parse text for image path	2015-05-03 13:44:02 -05:00
PabstMirror	5c556647ab	Some Cleanup	2015-05-03 02:06:49 -05:00
PabstMirror	5147f9f584	Ladder Actions	2015-05-03 00:33:20 -05:00
PabstMirror	d4225e03d2	Split into functions (for future caching)	2015-05-02 23:13:35 -05: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	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
PabstMirror	d2fdeb5e96	Allow Skipping LOS Check (Because of doors)	2015-05-02 00:13:09 -05:00
esteldunedain	fae10aa731	Replace dialog by display.	2015-05-02 01:33:28 -03:00
PabstMirror	334647fa60	Merge branch 'master' into userActionPrototype	2015-05-01 22:55:35 -05: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
PabstMirror	090062153c	Merge branch 'master' into interactMoreOptions ... Conflicts: addons/interact_menu/config.cpp	2015-04-30 15:36:00 -05:00