40 commits

Author	SHA1	Message	Date
danteruiz	5f5e7d5f4e	a better fix	2019-04-03 10:45:40 -07:00
SamGondelman	609c4ab52e	try to fix audio injector threading issues	2019-03-12 18:41:43 -07:00
Shannon Romano	76958ffda2	Merge pull request #15102 from danteruiz/keyboard-for-web-entities ... Case 21144: Can't enter text in a Web Entity with the new keyboard	2019-03-07 15:46:31 -08:00
danteruiz	e6a63a9a69	add keyboard for html content	2019-03-05 14:24:38 -08:00
danteruiz	a026933819	keyboard handle scaling	2019-03-04 10:56:14 -08:00
SamGondelman	15064f0097	fix lasers and keyboard on reload	2019-02-28 14:04:22 -08:00
danteruiz	6bdf51a460	limit number of include items for mallets	2019-02-19 16:25:38 -08:00
SamGondelman	934abb3d52	fix keyboard focus and image overlays	2019-02-04 13:33:03 -08:00
SamGondelman	391cca787f	fix keyboard textures and text display	2019-02-01 15:33:53 -08:00
SamGondelman	50bfe84aa7	fix keyboard intersection, laser alpha	2019-02-01 12:11:00 -08:00
SamGondelman	2db45b3ec9	dante's keyboard changes + getProperty + some fixes	2019-01-28 14:03:43 -08:00
SamGondelman	8f0bd2449b	pointerevents are working!	2019-01-26 21:53:46 -08:00
SamGondelman	abd7d6bddf	some stuff is working!	2019-01-26 01:39:13 -08:00
SamGondelman	5ce8f566cc	more overlay wip	2019-01-25 11:10:11 -08:00
SamGondelman	b5a2642b6a	updated entityscriptinginterface API and related functions ... (cherry picked from commit 6aac596698)	2018-12-22 00:55:10 -05:00
Sam Gondelman	097d2d9503	Revert "Case 20200: Update EntityScriptingInterface to not find local entities"	2018-12-20 16:53:33 -08:00
Shannon Romano	b6d1607acd	Merge pull request #14547 from SamGondelman/NOverlays5 ... Case 20200: Update EntityScriptingInterface to not find local entities	2018-12-20 19:10:22 +00:00
Wayne Chen	34130778ec	fixing merge bug	2018-12-12 18:41:28 -08:00
Wayne Chen	4116f6ca9a	Merge branch 'master' into loginInitiative2	2018-12-12 18:00:07 -08:00
Dante Ruiz	089a223c2d	more CR changes	2018-12-12 15:29:01 -08:00
Dante Ruiz	f3fad52e1d	make CR changes	2018-12-12 13:29:32 -08:00
Dante Ruiz	51bdf1bf78	adding keyboards settings	2018-12-12 11:55:13 -08:00
SamGondelman	6aac596698	updated entityscriptinginterface API and related functions	2018-12-07 15:25:21 -08:00
Wayne Chen	09bc886c20	Merge branch 'master' into loginInitiative2	2018-11-30 13:05:17 -08:00
Shannon Romano	dacf43d70c	Merge pull request #14483 from danteruiz/keyboard-toggle-option ... Keyboard menu option in general settings	2018-11-30 09:43:10 -08:00
Wayne Chen	9deb15b9f6	Merge branch 'master' into loginInitiative2	2018-11-28 19:10:20 -08:00
Dante Ruiz	29028386c8	Keyboard menu option in general settings	2018-11-27 11:56:07 -08:00
Wayne Chen	5f658b90ff	Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2	2018-11-20 10:44:29 -08:00
Wayne Chen	d55c9467e7	fixing keyboard offset	2018-11-20 10:37:30 -08:00
Dante Ruiz	db607e564f	fixing keyboard mallets dimensions	2018-11-20 09:13:07 -08:00
Wayne Chen	e0eba2135a	Merge branch 'master' into loginInitiative2	2018-11-19 15:23:43 -08:00
Dante Ruiz	a77121a588	keyboard touch ups	2018-11-16 14:20:17 -08:00
Wayne Chen	a2a09bc2b9	fixing compile error	2018-11-16 11:16:24 -08:00
Wayne Chen	27f02c072a	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-11-15 18:49:49 -08:00
Wayne Chen	02248e77e4	got the overlay to start recentering	2018-11-15 17:03:55 -08:00
Clement	7f910a38e3	Update keyboard injector to new interface	2018-11-14 14:46:08 -08:00
Wayne Chen	7375840eda	adding 3d keyboard/get anchor id wip for reposition	2018-11-13 17:09:47 -08:00
Dante Ruiz	358aa547b1	feedback changes	2018-11-08 09:58:53 -08:00
Dante Ruiz	f664421fe0	addressing code review feedback	2018-11-08 09:58:53 -08:00
Dante Ruiz	501746b156	3D Keyboard	2018-11-08 09:58:53 -08:00