49413 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Anthony J. Thibault	01a96347a5	Updated Web3dOverlay.cpp to work with TabletRoot.qml	2016-12-20 14:40:29 -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	5ecf3ebce3	Merge pull request #9242 from sethalves/update-tablet-ui ... Update tablet ui	2016-12-20 08:35:57 -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
samcake	28ed61cc97	Introducing a fix for the overlayered model drawn in front	2016-12-20 07:45:35 -08:00
Zach Fox	4e32c59118	Small CR changes	2016-12-20 07:45:35 -08:00
Zach Fox	4b2c6dfcb0	Fix username display bug	2016-12-20 07:45:35 -08:00
Zach Fox	a18f9dbe90	PR comments; need particular fix on Master for full QA	2016-12-20 07:45:35 -08: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
Brad Davis	bfc4a6e038	Fix stat tracker missing in agents	2016-12-20 07:45:35 -08:00
David Kelly	122a70cbb2	CR feedback	2016-12-20 07:45:35 -08:00
Ryan Huffman	9963d8cbe7	Revert "Temporarily replace content set URL" ... This reverts commit 37c0f7658d.	2016-12-20 07:45:35 -08:00
Ryan Huffman	d1f14e46fb	Add FIXME comment to texture setting in Model.cpp	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	9a517d7257	Update req tutorial version for Oculus Touch	2016-12-20 07:45:35 -08:00
Ryan Huffman	57ef73833e	Temporarily replace content set URL	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	59efc15db2	Update position of tutorial to be closer to user	2016-12-20 07:45:35 -08:00
Ryan Huffman	080bc738ea	Update tutorial to run far grab before near grab	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	a72f8cac0e	Update to only send users to tutorial if they have Vive or Touch	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	9cd00d063e	Add back step names in tutorial	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	098eff396e	Disable starting of tutorial in tutorial.js	2016-12-20 07:45:35 -08:00
Ryan Huffman	aea693c3f0	Update unequip model 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	d84383e047	Fix orient-oculus entity id in tutorial	2016-12-20 07:45:35 -08:00
Ryan Huffman	baa70dd1c0	Fix models not settings textures if not loaded	2016-12-20 07:45:35 -08:00
Ryan Huffman	6f98e2f055	Fix showing of orient step entities in tutorial	2016-12-20 07:45:35 -08:00
Ryan Huffman	6527997057	Fix syntax error in UserActivityLogger	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	26067acaca	Add controller name and update version in tutorial user stats	2016-12-20 07:45:35 -08:00