24912 commits

Author	SHA1	Message	Date
samcake	6d755a2127	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-04-25 17:36:02 -07:00
samcake	5db3eee4ad	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-04-25 15:21:43 -07:00
Stephen Birarda	956cc411d5	Merge branch 'RC66.1' of github.com:highfidelity/hifi into sixty-six-one-mergeback	2018-04-25 14:33:23 -07:00
MiladNazeri	0f87e53902	Merge pull request #12963 from MiladNazeri/docs/DocsToJSDocsUpdate ... Docs/docs to js docs update	2018-04-25 12:26:19 -07:00
samcake	32e83c256a	Adjusting the task::Engine run signature to appease gcc gods and other warnings	2018-04-25 12:23:30 -07:00
John Conklin II	f04200a620	Merge pull request #12976 from ctrlaltdavid/21856 ... Docs to JSDoc	2018-04-25 11:36:34 -07:00
samcake	5b5cad38e8	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-04-25 10:03:42 -07:00
Bradley Austin Davis	ea0ef20416	Revert "HOTFIX version of PR 12969: Attempt to shutdown web surfaces more consistently"	2018-04-25 09:43:20 -07:00
Olivier Prat	f332849d9a	Merge branch 'master' of http://github.com/highfidelity/hifi into taapre	2018-04-25 09:19:21 +02:00
milad nazeri	4c736b2d62	Fixed defaults	2018-04-24 21:38:48 -07:00
David Rowe	cae9447ac5	Doc review	2018-04-25 15:09:47 +12:00
samcake	f2c76abafa	Apply the noAA /popJittering on the WebOverlay	2018-04-24 14:18:44 -07:00
Brad Hefta-Gaub	497c3fac4d	Merge pull request #12971 from Atlante45/fix/crashes-hotfix ... Add memory corruption crash handler	2018-04-24 14:01:09 -07:00
John Conklin II	236e75b6c6	Merge pull request #12903 from druiz17/add-more-hmd-data ... Get the correct device name connect to OpenVr	2018-04-24 13:29:41 -07:00
milad nazeri	23d07fa292	fixed spacing issue	2018-04-24 13:14:55 -07:00
Clement	0804abcca6	Heap corruption crashes CR	2018-04-24 12:47:13 -07:00
samcake	33bbbcef83	Merging with master	2018-04-24 11:49:34 -07:00
Sam Gateau	da154d3e00	Merge pull request #12969 from jherico/fix/web_crash ... Attempt to shutdown web surfaces more consistently	2018-04-24 10:15:25 -07:00
Brad Davis	a144de54e7	Attempt to shutdown web surfaces more consistently	2018-04-24 10:06:20 -07:00
Sam Gateau	f50b2fab2b	Exposing timing and regulated radiuses	2018-04-23 22:38:50 -07:00
milad nazeri	1121fe8da0	fix tabs	2018-04-23 21:47:53 -07:00
samcake	f686ef1f25	Exposing more uniforms to ui for refining the controller	2018-04-23 18:02:09 -07:00
David Rowe	98f43b6a70	Interim JSDoc for MyAvatar - stubs for remainder	2018-04-24 10:47:33 +12:00
John Conklin II	5cf93ebd1f	Merge pull request #12966 from SamGondelman/audio ... Fix audio level meter	2018-04-23 14:56:57 -07:00
Brad Davis	861200db27	Attempt to shutdown web surfaces more consistently	2018-04-23 14:32:38 -07:00
David Rowe	719062dd9f	Interim JSDoc for MyAvatar - first pass	2018-04-24 09:10:59 +12:00
Atlante45	f2c471558c	CR	2018-04-23 13:14:21 -07:00
Atlante45	bc251115ed	Add special handler for heap corruption	2018-04-23 13:14:21 -07:00
Clement	fb496156ce	Fix threaded force crashes	2018-04-23 13:14:21 -07:00
John Conklin II	b3dbf7a025	Merge pull request #12943 from vladest/fix_spinbox ... Fix SpinBox.	2018-04-23 13:02:01 -07:00
SamGondelman	1deb38f06d	fix copy error	2018-04-23 12:05:30 -07:00
samcake	990ee83f04	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-04-23 10:07:58 -07:00
vladest	cf070e6e92	Cleanup	2018-04-23 18:56:16 +02:00
Sam Gateau	7842ee8eac	Merge pull request #12962 from SamGondelman/menu ... Android: Hide menu and fix shader compilation	2018-04-23 09:51:20 -07:00
Sam Gateau	97934fe563	Adjusting the regulators and moving task to use chrono nad interesting tests	2018-04-23 00:07:00 -07:00
milad nazeri	4ac06fe99f	Updating previous jsdocs	2018-04-22 22:22:33 -07:00
David Rowe	941e9360dd	JSDoc fixes	2018-04-23 16:09:56 +12:00
Sam Gateau	99a0e42b5d	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-04-22 20:26:49 -07:00
David Rowe	497cb4dab6	Interim JSDoc for Selection	2018-04-23 13:53:35 +12:00
David Rowe	96ddeb4e99	Interim JSDoc for SpeechRecognizer	2018-04-23 11:37:27 +12:00
milad nazeri	e9b9c05b5d	removed cruft	2018-04-22 08:51:47 -07:00
Sam Gateau	ec569b0e51	adjusting the bounding box for debug rendering	2018-04-21 12:05:27 -07:00
vladest	60115752ad	Fixed saving after editing	2018-04-21 20:18:24 +02:00
vladest	2e44220b80	Merge branch 'master' into fix_spinbox	2018-04-21 19:38:28 +02:00
David Rowe	34d0a892a0	Point to example using Hardware.Application item	2018-04-21 15:01:46 +12:00
samcake	b66ab6deaa	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-04-20 17:55:45 -07:00
samcake	d1b0e89fa3	merging with upstream correctly	2018-04-20 17:55:34 -07:00
samcake	b554aec317	Trying more drastic changes and learnign to use std::chrono the right way	2018-04-20 17:53:24 -07:00
David Rowe	748052614f	Doc review	2018-04-21 12:45:00 +12:00
SamGondelman	d59f368ad6	hide menu, fix shaders	2018-04-20 17:38:38 -07:00