18598 commits

Author	SHA1	Message	Date
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
samcake	28ed61cc97	Introducing a fix for the overlayered model drawn in front	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	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
Ryan Huffman	9a517d7257	Update req tutorial version for Oculus Touch	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	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	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	335e91e4a6	Update touch controller tips	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
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	21bab49f79	Add chrome tracing support	2016-12-20 07:45:35 -08:00
David Rowe	1b8108bfba	Update from Seth	2016-12-20 07:45:35 -08:00
David Rowe	898372e841	Fix crash after manually closing Clara download status message box	2016-12-20 07:45:35 -08:00
David Rowe	6d0bb3bdc7	Make manually closing message box code more correct	2016-12-20 07:45:35 -08:00
Zach Pomerantz	13d3ffd47c	change render forward flag to HIFI_...	2016-12-20 07:45:35 -08:00
David Rowe	3ebfc130c0	Scale all imported Clara models to have max dimension of exactly 1m	2016-12-20 07:45:35 -08:00
David Rowe	d933b3506f	Fix Clara download status message box not auto-closing	2016-12-20 07:45:35 -08:00
David Rowe	fa9aef8b22	Fix crashing if manually close Clara download status message box	2016-12-20 07:45:35 -08:00
David Rowe	7a9cf498dc	Increase resize timeout to 5 mins to improve the odds of model rezzing ... Model needs to rez in order for its initial dimensions to be obtained from FBX.	2016-12-20 07:45:35 -08:00
David Rowe	a63beedff4	Rescale models if necessary to have their largest dimension be 1m ... Models are still rescaled beforehand if thought to be in cm.	2016-12-20 07:45:35 -08:00
David Rowe	e9dbb32277	Handle unzip failure	2016-12-20 07:45:35 -08:00
David Rowe	77676436a2	Missing comment close	2016-12-20 07:45:35 -08:00
David Rowe	5bb497d258	Initial fix for detaching tablet UI	2016-12-20 07:45:35 -08:00
David Rowe	0ec1dc6c85	Log requested ATP mapping of model upload	2016-12-20 07:45:35 -08:00
David Rowe	d02e217b49	Don't make downloaded Clara.io models dynamic	2016-12-20 07:45:35 -08:00
David Rowe	932b05c1ba	Rework Clara.io download user messaging to have no user interaction	2016-12-20 07:45:35 -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
David Rowe	6680395e97	Add scriptEvent message to web3d overlay event bridge	2016-12-20 07:43:48 -08:00
howard-stearns	641f98589a	don't keep selection while things are disappearing	2016-12-20 07:43:48 -08:00
howard-stearns	db68a6adcd	fix broken search for myself	2016-12-20 07:43:48 -08:00
howard-stearns	07ab771c2b	update canKick whenever we get new data, instead of just at first use.	2016-12-20 07:43:48 -08:00
howard-stearns	d0cdd4d5c1	missing the ban button	2016-12-20 07:43:48 -08:00
howard-stearns	0e9b1b45f4	Don't show admin columns if you can't kick.	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
howard-stearns	7e7ce0c103	checkpoint	2016-12-20 07:43:48 -08:00
Howard Stearns	b6b80fb9c1	checkpoint	2016-12-20 07:43:48 -08:00
David Rowe	f3899736e8	Auto-close Clara model download progress box when model added to world	2016-12-20 07:43:48 -08:00