1153 commits

Author	SHA1	Message	Date
Dante Ruiz	fa761af1a6	update#2	2016-12-20 15:39:17 -08:00
Dante Ruiz	8698ee61cd	commit update	2016-12-20 15:39:17 -08:00
Anthony J. Thibault	ec38c4e319	Merge remote-tracking branch 'upstream/tablet-ui' into tablet-ui	2016-12-20 13:43:06 -08:00
Anthony Thibault	9d964042c9	Merge pull request #9243 from sethalves/tablet-ui-overlay-stylus-rebase ... use overlays for tablet-ui, use a stylus rather than lasers	2016-12-20 13:42:22 -08:00
Anthony J. Thibault	84db58dbc6	Make tablet.qml work on Web3DOverlay	2016-12-20 12:16:11 -08:00
Anthony Thibault	bb56701fdb	Merge pull request #9241 from druiz17/tabletMenu ... Moved some hud menus to tablet	2016-12-20 11:13:03 -08:00
Dante Ruiz	bee6e230ae	made requested changes	2016-12-20 18:28:07 +00:00
Seth Alves	ab3c833dd5	diff minimization	2016-12-20 09:23:21 -08:00
Seth Alves	36e843178a	diff minimization	2016-12-20 09:21:41 -08:00
Seth Alves	d8ee4d86b0	merge from upstream	2016-12-20 08:43:19 -08:00
Seth Alves	dc996bee95	merge from upstream	2016-12-20 08:06:01 -08:00
Dante Ruiz	fe4fa351d1	clean up 3	2016-12-20 16:04:18 +00:00
Dante Ruiz	31decffb31	clean up 2	2016-12-20 15:59:52 +00:00
Dante Ruiz	7251fa6c18	clean up	2016-12-20 15:54:14 +00:00
Dante Ruiz	74092d8714	removed commented code	2016-12-20 15:46:15 +00:00
Zach Fox	ba240854a7	Comments and clarity	2016-12-20 07:45:35 -08:00
Zach Fox	95e2f0687d	It's working! Untested on human avatars.	2016-12-20 07:45:35 -08:00
Zach Fox	54774950d2	Super close	2016-12-20 07:45:35 -08:00
Zach Fox	42127e4e0f	Another checkpoint, getting closer	2016-12-20 07:45:35 -08:00
Zach Fox	9c09ec6755	Checkpoint	2016-12-20 07:45:35 -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
David Rowe	8ef8de7891	Move Clara download button when displaying on tablet	2016-12-20 07:45:35 -08:00
David Rowe	2a2e8a424b	Fix flash of old desktop window content if reopen after closing with "x"	2016-12-20 07:45:35 -08:00
David Rowe	df5d115db7	Fix auto-downloads not happening after forced log in	2016-12-20 07:45:35 -08:00
David Rowe	0ddc1271b2	Continuously update Clara pages because content can change dynamically	2016-12-20 07:45:35 -08:00
howard-stearns	658ae48d3f	fix selection and hud-hiding issues	2016-12-20 07:45:35 -08:00
David Rowe	446a7c6a79	Reduce whitespace in Clara categories	2016-12-20 07:45:35 -08:00
howard-stearns	c60a78d727	clean up avatar nodes properly (and add some logging)	2016-12-20 07:45:35 -08:00
Howard Stearns	3ac10f5f79	deal with bubble-bounces (and comment the code a bit)	2016-12-20 07:43:48 -08:00
David Rowe	1f8323fb8f	Improve robustness of navigation footer	2016-12-20 07:43:48 -08:00
David Rowe	c4ff129f86	Inform user if can't do Clara.io download because can't write to ATP	2016-12-20 07:43:48 -08:00
howard-stearns	db68a6adcd	fix broken search for myself	2016-12-20 07:43:48 -08:00
Seth Alves	e5804dade0	get stylus working with web entities	2016-12-20 07:43:48 -08:00
howard-stearns	3610d5ddeb	people.svg	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
howard-stearns	5a97156151	no debug printing	2016-12-20 07:43:48 -08:00
howard-stearns	946d9aa346	checkpoint	2016-12-20 07:43:48 -08:00