Commit Graph

61 Commits

Author SHA1 Message Date
mharis001
e9af086454 Interaction Menu - Add ability to change selector color (#6292)
* Add selector color changing

* Setup colors once at init
2018-04-28 17:23:44 -05:00
PabstMirror
c001be5b09 Add keybind to toggle interaction menu (#5095) 2017-05-05 13:20:54 -05:00
PabstMirror
dfca4fdcf8 Pass functions by "reference" to bis event handlers (#4898)
* Pass functions by "reference" to bis event handlers

* Add Doc

* Fix
2017-02-14 10:54:37 -06:00
PabstMirror
919c8469de Add interaction action on demand (#4079)
* Only use addActionEventHandler when needed

-Only install addActionEventHandler when the interaction menu is
actually open
-Less SQF running each frame,
-it should help with issue #4066

* Cleanup debug
2016-08-05 12:05:15 -05:00
commy2
89ecc81111 convert common events to CBA playerEvents 2016-06-22 01:39:20 +02:00
jonpas
bd5f6107a0 Merge branch 'master' into eol-lf 2016-06-09 14:24:45 +02:00
Glowbal
694503c01b Fix medical events 2016-06-03 20:57:21 +02:00
Glowbal
fa2cf55156 Fix medical related events 2016-06-03 20:22:34 +02:00
jonpas
816da2aef1 Normalize to LF line endings 2016-05-30 18:37:03 +02:00
jonpas
b54d1985f1 QGVAR and fix gforces, goggles, grenades, hearing, interact_menu 2016-05-25 01:57:41 +02:00
SilentSpike
c4b75160a4 Run event renaming script 2016-05-24 14:13:11 +01:00
SilentSpike
108ff4f644 Replace ACE event system calls with CBA counterparts
Regex used:

\[(.+?),(.+?),(.+?)\]\s+call\s+E?FUNC\((common,)?(target|object)Event\)
[$1,$3,$2] call CBA_fnc_targetEvent

E?FUNC\((common,)?(server|global|local)Event\)
CBA_fnc_$2Event

E?FUNC\((common,)?(add|remove)EventHandler\)
CBA_fnc_$2EventHandler
2016-05-22 16:47:39 +01:00
commy2
f5ef7b6b2d displayLoad xeh for imenu 2016-02-21 00:36:46 +01:00
PabstMirror
276aea04c1 Changes for CBA 2.3 2016-01-24 11:41:10 -06:00
PabstMirror
ed4cc42897 Cleanup Interaction Menu 2016-01-08 23:29:32 -06:00
PabstMirror
fb0738bd30 Merge branch 'master' into release 2015-12-31 20:27:26 -06:00
PabstMirror
1e29c0286f Remove Keybinds/Events for Zeus now handeld in CBA
Close #2937
2015-12-30 01:07:55 -06:00
commy2
ca9b909e75 fix CBA_fnc capitalization 2015-11-30 16:45:20 +01:00
PabstMirror
174d8ac306 #2486 - Run color setup on settingsInit 2015-09-26 22:02:05 -05:00
PabstMirror
6702a1faa4 Fix warnings for WeaponHolderSimulated 2015-09-21 16:34:02 -05:00
PabstMirror
79d985a648 Fix XEH Warning Debug
Wait 5 to let supMon run first, and only show visual error if actually
missing pbo.
2015-09-19 10:43:29 -05:00
PabstMirror
88f89b8d76 also check allDeadMen 2015-09-15 13:30:04 -05:00
PabstMirror
a8688609d7 Typo 2015-09-15 13:10:06 -05:00
PabstMirror
0e32c28552 #2437 - Warn users when mods break XEH 2015-09-15 12:55:08 -05:00
SilentSpike
04269831e8 Consider modifier keys for zeus interaction hack
The hacky keybind detection method should consider modifier keys also to prevent keybinds on the same key with different modifiers from firing
2015-08-31 14:40:31 +01:00
SilentSpike
5b8708a179 Prevent CBA keybindings in zeus interface
Checks if the key pressed matches the zeus menu keybind and only fires the code to handle CBA keybinds if true. Should fix the majority of weirdness with keybinds in zeus. However, not perfect as shared keybinds with different modifiers will still fire and it's really an un-ideal workaround.
2015-08-20 18:17:37 +01:00
PabstMirror
5e80f9d8d3 Merge branch 'master' into userActionPrototype 2015-07-01 15:04:40 -05: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
SilentSpike
cb1b0c6262 Added zeus exception for interaction conditions 2015-06-07 20:21:51 +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
SzwedzikPL
18940d0787 Interaction menu background options 2015-06-03 06:04:47 +02: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
jonpas
6072e14077 Changed all strings to macros (except external) 2015-05-27 19:04:25 +02:00
PabstMirror
58ee797a94 Merge branch 'master' into userActionPrototype 2015-05-13 00:00:55 -05:00
Glowbal
50cc5db92f fixes #1017 2015-05-05 20:05:31 +02:00
PabstMirror
6c5d72640c Caching, Optimzations 2015-05-04 14:06:33 -05:00
PabstMirror
d4225e03d2 Split into functions (for future caching) 2015-05-02 23:13:35 -05:00
PabstMirror
334647fa60 Merge branch 'master' into userActionPrototype 2015-05-01 22:55:35 -05:00
commy2
b859956604 rename category ace <blank> to ace common 2015-05-01 10:19:47 +02:00
PabstMirror
090062153c Merge branch 'master' into interactMoreOptions
Conflicts:
	addons/interact_menu/config.cpp
2015-04-30 15:36:00 -05:00
commy2
5ec8b6d36c Merge branch 'master' of https://github.com/acemod/ACE3 into menuonclick 2015-04-30 20:01:58 +02:00
PabstMirror
11aafe013b Localization 2015-04-29 23:53:00 -05:00
PabstMirror
d7d43ce3b1 #828 - Private Variables for Interact Menu 2015-04-29 01:26:13 -05:00
commy2
73b17efa2f cache ctrlSetStructedText parseText 2015-04-25 13:28:21 +02:00
commy2
664d08d4aa add option to only use action when clicking 2015-04-25 08:23:54 +02:00
PabstMirror
96be881ea9 User changeable text/shadow colors for interaction 2015-04-20 18:28:01 -05:00
esteldunedain
a9f44530c9 Move the function that prevents firing while the interact_menu is open to the interact_menu pbo 2015-04-15 01:20:20 -03:00