Commit Graph

155 Commits

Author SHA1 Message Date
5c556647ab Some Cleanup 2015-05-03 02:06:49 -05:00
5147f9f584 Ladder Actions 2015-05-03 00:33:20 -05:00
d4225e03d2 Split into functions (for future caching) 2015-05-02 23:13:35 -05:00
d2fdeb5e96 Allow Skipping LOS Check (Because of doors) 2015-05-02 00:13:09 -05:00
334647fa60 Merge branch 'master' into userActionPrototype 2015-05-01 22:55:35 -05:00
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
fc02bb4e06 Stylistic changes 2015-05-01 00:32:16 -03:00
aa4a5539d4 Merge branch 'master' into interactMoreOptions
Conflicts:
	addons/interact_menu/functions/fnc_renderIcon.sqf
2015-05-01 00:04:22 -03:00
984a1fe337 Rename breakLine to break_line 2015-05-01 02:14:23 +02:00
090062153c Merge branch 'master' into interactMoreOptions
Conflicts:
	addons/interact_menu/config.cpp
2015-04-30 15:36:00 -05:00
ba18f8b430 Handle Scaling 2015-04-30 14:07:19 -05:00
8c8e310d66 handle cursor mode 2015-04-30 21:00:30 +02:00
5ec8b6d36c Merge branch 'master' of https://github.com/acemod/ACE3 into menuonclick 2015-04-30 20:01:58 +02:00
11aafe013b Localization 2015-04-29 23:53:00 -05:00
9aa2e3130a Options for Shadow/Outline and Text Size 2015-04-29 23:37:52 -05:00
e40a2a524d Merge branch 'master' into interactMoreOptions 2015-04-29 22:57:35 -05:00
47d4446520 Don't check intersection if distance < 1m
Related to #869
2015-04-29 02:34:47 -05:00
d7d43ce3b1 #828 - Private Variables for Interact Menu 2015-04-29 01:26:13 -05:00
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
5320f4c6b7 fix broken parse text cache in some cases 2015-04-26 19:33:08 +02:00
f96deadd20 imenu: remove shadow, fix caching 2015-04-26 12:41:15 +02:00
898d6c74a8 #854 - No canInteractWith check for Ace_MainAction
Was preventing subactions from showing.
2015-04-25 16:02:59 -05:00
ca6a559557 Fixed a typo 2015-04-25 21:18:09 +02:00
fc49814689 Use FUNC(ctrlSetParsedTextCached) for the selector too. Eliminates glitches 2015-04-25 10:52:52 -03:00
b7763331d6 the index 2015-04-25 14:34:09 +02:00
73b17efa2f cache ctrlSetStructedText parseText 2015-04-25 13:28:21 +02:00
73f387d3e3 outline interaction menu text 2015-04-25 11:55:39 +02:00
664d08d4aa add option to only use action when clicking 2015-04-25 08:23:54 +02:00
c8563ce484 Add LOS check for actions points. Close #785 2015-04-24 00:57:22 -03:00
96be881ea9 User changeable text/shadow colors for interaction 2015-04-20 18:28:01 -05:00
9295393dd6 Allow cursor for interactions 2015-04-20 13:54:51 -03:00
f928f37e26 Eliminate interact_menu fps drops due to high nearby object counts.
Instead of reanalizing every frame which actions points should be rendered based on distance, that job is now done only 5 times per second.
The rest of the frames the action points from the last frame are rerendered..
Close #434
2015-04-20 01:16:51 -03:00
8b389949bc Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-18 18:42:11 -03:00
bce0d84989 Fix interact menu object ordering 2015-04-18 18:41:36 -03:00
bdd3422150 Allow to dynamically modify actions at runtime. An optional code entry called modifierFunction can be added. That code is called before evaluating the action, allowing to dynamically change the actions name, icon, etc 2015-04-16 23:53:54 -03:00
dd09cc4d06 Update fnc_createAction.sqf
typo
2015-04-16 00:57:15 +03:00
1f13d229a8 Stagger creating actions over time 2015-04-15 00:13:23 -05:00
5faf4b7dfa Remove comment 2015-04-15 01:27:29 -03:00
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
7ad9238bbf Fixes 2015-04-14 23:32:03 -03:00
c397246534 Fix the fov test. Issue not fixed 2015-04-14 23:22:08 -03:00
53ce7d0be4 Increase the tolerance to 2m 2015-04-14 23:12:48 -03:00
ee34078960 Add early visibility check to interact menu 2015-04-14 22:53:10 -03:00
b39209cc28 BAD @esteldunedain! BAD DOGGY! 2015-04-14 17:09:13 -07:00
ee04ea2f41 Allow actions on coordinates instead of selections 2015-04-14 20:21:11 -03:00
85beb72a3a ASL Stuff 2015-04-13 23:27:03 -05:00
c6b4a57ee2 Pull Icon from config 2015-04-13 23:11:18 -05:00
5c994765ef Cleanup 2015-04-13 22:39:00 -05:00
e84c5f4bb3 Radius Distance 2015-04-13 22:26:38 -05:00
fda4f60a9e House UserAction Prototype 2015-04-13 22:19:38 -05:00