24796 commits

Author	SHA1	Message	Date
David Rowe	b8063840e7	Miscellaneous fixes	2018-04-26 21:17:05 +12:00
David Rowe	08dc9b133f	Docs to JSDoc review	2018-04-26 21:10:28 +12: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
John Conklin II	f04200a620	Merge pull request #12976 from ctrlaltdavid/21856 ... Docs to JSDoc	2018-04-25 11:36:34 -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
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
milad nazeri	1121fe8da0	fix tabs	2018-04-23 21:47:53 -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
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
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
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
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
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
David Rowe	7087abd201	Merge branch 'master' into 21815	2018-04-21 10:49:56 +12:00
John Conklin II	39ad8be1b8	Merge pull request #12743 from SimonWalton-HiFi/short-id ... Use 16-bit local IDs for Nodes in NL packets	2018-04-20 15:28:18 -07:00
John Conklin II	4705472960	Merge pull request #12889 from Atlante45/fix/threaded-crashes ... Fix threaded force crashes	2018-04-20 13:20:40 -07:00
Seth Alves	c20346ca53	Merge pull request #12937 from SamGondelman/startup ... Make Audio.cpp threadsafe	2018-04-20 11:36:08 -07:00
Simon Walton	9f9a68188d	Merge remote-tracking branch 'upstream/master' into short-id	2018-04-20 11:10:21 -07:00
Seth Alves	512b1911eb	Merge pull request #12858 from ctrlaltdavid/21836 ... Update location.hostname JSDoc per serverless domains	2018-04-20 10:27:09 -07:00
SamGondelman	3b4b43cf66	try to fix audio crash on startup	2018-04-20 10:23:47 -07:00
vladest	0e28e41107	Fix various issues with SpinBox-es and Sliders	2018-04-20 19:15:29 +02:00
vladest	b8577bd791	Merge branch 'master' into fix_spinbox	2018-04-20 18:09:16 +02:00
Ken Cooke	a9c5edcb2f	Merge pull request #12942 from kencooke/audio-devices-crfix ... Minor changes to meet coding standard	2018-04-20 08:20:32 -07:00
David Rowe	08defea755	Merge branch 'master' into 21836	2018-04-20 09:20:56 +12:00
milad	42471c539b	initial fixes from ctralt david's comments	2018-04-19 13:40:57 -07:00