49203 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Zach Fox	e940daf5b4	Comments and clarity	2016-12-19 10:20:08 -08:00
Zach Fox	aa837d8858	It's working! Untested on human avatars.	2016-12-19 10:20:08 -08:00
Zach Fox	2c5db54b08	Super close	2016-12-19 10:20:08 -08:00
Zach Fox	802e283508	Another checkpoint, getting closer	2016-12-19 10:20:08 -08:00
Zach Fox	c9dc91900f	Checkpoint	2016-12-19 10:20:08 -08:00
howard-stearns	9d9345cb65	Merge branch 'master' of https://github.com/highfidelity/hifi into sessionDisplayNames	2016-12-19 09:19:14 -08:00
Brad Davis	ee3c8e6efd	Merge pull request #9225 from jherico/chrome_tracing ... Additional work on tracing	2016-12-16 17:53:55 -08:00
Brad Davis	2d73588361	Fix stat tracker missing in agents	2016-12-16 17:34:00 -08:00
David Kelly	0553dbdcb7	CR feedback	2016-12-16 17:17:10 -08:00
Stephen Birarda	59f6c8857d	Merge pull request #9180 from huffman/feat/tutorial-touch ... Add touch support to tutorial	2016-12-16 17:12:22 -08:00
Ryan Huffman	0962494522	Revert "Temporarily replace content set URL" ... This reverts commit 37c0f7658d.	2016-12-16 16:40:21 -08:00
Ryan Huffman	1d9a32c528	Add FIXME comment to texture setting in Model.cpp	2016-12-16 16:32:53 -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	217d46704d	Update req tutorial version for Oculus Touch	2016-12-16 15:41:04 -08:00
Ryan Huffman	37c0f7658d	Temporarily replace content set URL	2016-12-16 15:40:20 -08:00
David Kelly	b68a07e930	Merge pull request #9197 from davidkelly/dk/injectorVolume ... No longer applying volume when reading audio injector buffer	2016-12-16 15:11:33 -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	ece781748f	Update position of tutorial to be closer to user	2016-12-16 15:05:17 -08:00
Ryan Huffman	7c85709628	Update tutorial to run far grab before near grab	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	b9598a28f3	Update to only send users to tutorial if they have Vive or Touch	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	280c5d2460	Add back step names in tutorial	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	571020ac7a	Disable starting of tutorial in tutorial.js	2016-12-16 15:05:17 -08:00
Ryan Huffman	c09ddfdbb8	Update unequip model 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	fb12c86ed8	Fix orient-oculus entity id in tutorial	2016-12-16 15:05:17 -08:00
Ryan Huffman	18a166bee8	Fix models not settings textures if not loaded	2016-12-16 15:05:17 -08:00
Ryan Huffman	938b22f1c7	Fix showing of orient step entities in tutorial	2016-12-16 15:05:17 -08:00
Ryan Huffman	8f536fcf5e	Fix syntax error in UserActivityLogger	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	f3f6317c91	Add controller name and update version in tutorial user stats	2016-12-16 15:05:17 -08:00
Ryan Huffman	a1fea65aa5	Update right joystick mesh	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	cde558fb94	Update touch controller tips	2016-12-16 15:05:17 -08:00
Ryan Huffman	b85399308d	Swap tutorialZone key for skipping step	2016-12-16 15:05:17 -08:00
Ryan Huffman	70e6cce113	Add support to tutorial for touch	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
Ryan Huffman	90e121ba47	Extend HMD scripting interface to check subdevices	2016-12-16 15:05:17 -08:00
Ryan Huffman	c953ceb58b	Add send-to-tutorial logic for Oculus Touch	2016-12-16 15:05:17 -08:00
Ryan Huffman	efbf55c0d7	Remove unused stepWelcome from tutorial	2016-12-16 15:05:17 -08:00
Ryan Huffman	273ba5e948	Remove name parameter from tutorial steps	2016-12-16 15:05:17 -08:00
Ryan Huffman	bdcdceb5df	Cleanup tutorial.js	2016-12-16 15:05:17 -08:00
Ryan Huffman	4a7f88886f	Remove unused triggerHapticPulse in tutorial.js	2016-12-16 15:05:17 -08:00
howard-stearns	70af96669c	update pal	2016-12-16 14:59:54 -08:00