511 commits

Author	SHA1	Message	Date
Anthony Thibault	c201b6a7f9	Merge pull request #9256 from druiz17/moreButtons ... all hub button now on tablet	2017-01-03 10:44:19 -08:00
Anthony J. Thibault	00980366d6	Merge branch 'master' into tablet-ui	2017-01-03 09:45:23 -08:00
Dante Ruiz	61277c0605	Stylus now works in edit mode	2016-12-22 17:33:25 +00:00
Stephen Birarda	ebd347fc15	only respect release of secondary for hold once pressed	2016-12-20 14:46:55 -08:00
Stephen Birarda	4fcccb5455	check for release of equip in this.nearGrabbing	2016-12-20 14:32:47 -08:00
Stephen Birarda	c3d736dd16	return after release, duh	2016-12-20 14:30:08 -08:00
Stephen Birarda	8cd13eaedf	always unequip on secondary release	2016-12-20 14:25:26 -08:00
Stephen Birarda	0a024616cc	add special equip for oculus style grab	2016-12-20 14:21:23 -08:00
Philip Rosedale	13e03b35cc	removed initial delay for seek beams	2016-12-20 14:11:52 -08:00
Philip Rosedale	250d071788	grip squeezes fingers too	2016-12-20 14:11:45 -08:00
Philip Rosedale	938734d3fc	Grip controllers can grab objects, slight delay on search beam	2016-12-20 14:11:33 -08:00
Seth Alves	36e843178a	diff minimization	2016-12-20 09:21:41 -08:00
Ryan Huffman	bf7066d4e3	Cleanup tutorial scripts	2016-12-20 07:45:35 -08:00
Ryan Huffman	e12ef0a187	Cleanup variable naming in touch controller config	2016-12-20 07:45:35 -08:00
Ryan Huffman	04efea7293	Cleanup implementation of touch controller config	2016-12-20 07:45:35 -08:00
Ryan Huffman	6e1459f4b3	Update Touch controller configuration	2016-12-20 07:45:35 -08:00
Ryan Huffman	3dfc3946ba	Fix positioning of Oculus Touch controller visual	2016-12-20 07:45:35 -08:00
Ryan Huffman	8aba8f7bf3	Remove cache buster from touchControllerConfiguration	2016-12-20 07:45:35 -08:00
Ryan Huffman	240dba5306	Fix oculus touch labels in tutorial	2016-12-20 07:45:35 -08:00
Ryan Huffman	74b07273d6	Update oculus touch labels to be emissive	2016-12-20 07:45:35 -08:00
Ryan Huffman	1ddc869c8e	Fix emissive channel on touch models	2016-12-20 07:45:35 -08:00
Ryan Huffman	ac33bf4d4a	Fix right touch joystick	2016-12-20 07:45:35 -08:00
Ryan Huffman	3879922e78	Reenable disabling of hand controllers	2016-12-20 07:45:35 -08:00
Ryan Huffman	53fb0a95fe	Update controller display to support non-string hardware resolution	2016-12-20 07:45:35 -08:00
Ryan Huffman	b835fc7ada	Add touch controller support to ControllerDisplay	2016-12-20 07:45:35 -08:00
Seth Alves	e5804dade0	get stylus working with web entities	2016-12-20 07:43:48 -08:00
Seth Alves	ae7af3e227	don't hide stylus so quickly	2016-12-20 07:43:48 -08:00
Seth Alves	e9c848bfe8	stylus for web overlays	2016-12-20 07:43:48 -08:00
David Rowe	25651800dd	Code review	2016-12-20 07:43:48 -08:00
Seth Alves	67093dc519	don't flutter tablet when menu button is pressed. start on a stylus	2016-12-20 07:43:48 -08:00
David Rowe	7a36e4eed8	Fix keyboard focus when switch highlight between overlays and entities	2016-12-20 07:42:21 -08:00
David Rowe	0accdddc8f	Fix Web overlay x, y coordinate calcs	2016-12-20 07:42:21 -08:00
David Rowe	f749c76ced	First pass at controller interaction with 3D Web overlay	2016-12-20 07:42:21 -08:00
Chris Collins	61c60fca2d	Merge pull request #8968 from ctrlaltdavid/21089 ... Clara.io marketplace improvements	2016-12-19 18:21:45 -08:00
Ryan Huffman	9730d07f59	Cleanup tutorial scripts	2016-12-16 16:01:44 -08:00
Ryan Huffman	46d8130782	Cleanup variable naming in touch controller config	2016-12-16 16:01:26 -08:00
Ryan Huffman	009c982cdf	Cleanup implementation of touch controller config	2016-12-16 15:05:17 -08:00
Ryan Huffman	19a3fdcc01	Update Touch controller configuration	2016-12-16 15:05:17 -08:00
Ryan Huffman	f7ebda6931	Fix positioning of Oculus Touch controller visual	2016-12-16 15:05:17 -08:00
Ryan Huffman	b599ccea9e	Remove cache buster from touchControllerConfiguration	2016-12-16 15:05:17 -08:00
Ryan Huffman	188bf600d1	Fix oculus touch labels in tutorial	2016-12-16 15:05:17 -08:00
Ryan Huffman	46251e805a	Update oculus touch labels to be emissive	2016-12-16 15:05:17 -08:00
Ryan Huffman	46f5494af8	Fix emissive channel on touch models	2016-12-16 15:05:17 -08:00
Ryan Huffman	3df1819086	Fix right touch joystick	2016-12-16 15:05:17 -08:00
Ryan Huffman	2b88935812	Reenable disabling of hand controllers	2016-12-16 15:05:17 -08:00
Ryan Huffman	6fb39080e2	Update controller display to support non-string hardware resolution	2016-12-16 15:05:17 -08:00
Ryan Huffman	674bbe7de5	Add touch controller support to ControllerDisplay	2016-12-16 15:05:17 -08:00
David Rowe	9459b967be	Merge branch 'master' into 21089	2016-12-16 20:02:43 +13:00
Anthony J. Thibault	8b99fa90e8	Merge branch 'master' into tablet-ui	2016-12-15 13:28:23 -08:00
Philip Rosedale	14c867fdbd	Can't resize if objects in both hands, avatar resize is seek + grips	2016-12-14 13:38:37 -08:00