17 commits

Author	SHA1	Message	Date
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