49183 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Ryan Huffman	495a61ced4	Update right joystick mesh	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	335e91e4a6	Update touch controller tips	2016-12-20 07:45:35 -08:00
Ryan Huffman	61c1d79cf5	Swap tutorialZone key for skipping step	2016-12-20 07:45:35 -08:00
Ryan Huffman	268ef925cb	Add support to tutorial for touch	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
Ryan Huffman	b6759fb1d1	Extend HMD scripting interface to check subdevices	2016-12-20 07:45:35 -08:00
Ryan Huffman	4e29d7a2b8	Add send-to-tutorial logic for Oculus Touch	2016-12-20 07:45:35 -08:00
Ryan Huffman	9d3d56d4eb	Remove unused stepWelcome from tutorial	2016-12-20 07:45:35 -08:00
Ryan Huffman	80356bd02d	Remove name parameter from tutorial steps	2016-12-20 07:45:35 -08:00
Ryan Huffman	4f2e6ba09b	Cleanup tutorial.js	2016-12-20 07:45:35 -08:00
Ryan Huffman	6f2a6c76e1	Remove unused triggerHapticPulse in tutorial.js	2016-12-20 07:45:35 -08:00
Brad Davis	d0d6b1f87e	tracing polish	2016-12-20 07:45:35 -08:00
Andrew Meadows	e03e57a480	adding profile stats relating to avatar CPU costs	2016-12-20 07:45:35 -08:00
Ryan Huffman	24834f5987	Adjust positioning of avatar hands to match touch controller position	2016-12-20 07:45:35 -08:00
David Kelly	82b0b40285	Expose Machine Fingerprint perms in DS settings page ... Should be about same as MAC or IP for now, applies whenever you are not logged in.	2016-12-20 07:45:35 -08:00