27698 commits

Author	SHA1	Message	Date
John Conklin II	cb7b03652b	Merge pull request #12796 from MiladNazeri/feature/add-findByName ... added Entities.findbyName	2018-04-25 14:00:10 -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
John Conklin II	748c8cdc58	Merge pull request #12861 from Zvork/taapre ... Bloom and Temporal Anti-Aliasing improvements	2018-04-25 11:16:56 -07:00
John Conklin II	91b93db0c5	Merge pull request #12981 from birarda/bug/revert-hmac ... revert HMAC packet verification for now	2018-04-25 10:07:36 -07:00
Olivier Prat	e37b18336a	Improved anti-aliasing on text	2018-04-25 12:08:08 +02: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
John Conklin II	6062f21da1	Merge pull request #12961 from Atlante45/fix/es-deadlock ... Enforce correct lock order between EntityTree and EntitySimulation	2018-04-24 15:40:32 -07:00
John Conklin II	ce14dfb9a4	Merge pull request #12974 from AndrewMeadows/dont-feed-bullet-garbage ... don't try to build convex hulls with nan data	2018-04-24 14:11:25 -07:00
Atlante45	d82333534c	Ensure the tree lock is always taken before the simulation lock	2018-04-24 13:46:05 -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
Stephen Birarda	63491588cb	Revert "Merge pull request #12690 from SimonWalton-HiFi/hmac-auth" ... This reverts commit 7378c87ade, reversing changes made to 92bf99f436.	2018-04-24 12:44:51 -07:00
samcake	382161659e	Merge branch 'master' of https://github.com/highfidelity/hifi into taa-zvork	2018-04-24 11:37:00 -07:00
Sam Gateau	b342b16857	Fixing the crash on mac	2018-04-24 11:25:40 -07:00
Sam Gateau	2cae294ab4	Merge pull request #12904 from AndrewMeadows/lhf-needsToCallUpdate ... LHF optimiaztion: only call ModelEntityItem::update() on instances that actually need it	2018-04-24 11:22:48 -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
milad nazeri	1121fe8da0	fix tabs	2018-04-23 21:47:53 -07:00
Brad Davis	ecaf162afb	Fixing PR build	2018-04-23 20:41:36 -07:00
David Rowe	98f43b6a70	Interim JSDoc for MyAvatar - stubs for remainder	2018-04-24 10:47:33 +12:00
Andrew Meadows	ae186d46c6	don't try to build convex hulls with nan data	2018-04-23 14:46:23 -07:00
Brad Davis	861200db27	Attempt to shutdown web surfaces more consistently	2018-04-23 14:32:38 -07:00
John Conklin II	91197cadcf	Merge pull request #12967 from SimonWalton-HiFi/hmac-shortid-merge-fix ... Fix for null sourceNode use	2018-04-23 14:11:06 -07:00
David Rowe	719062dd9f	Interim JSDoc for MyAvatar - first pass	2018-04-24 09:10:59 +12:00
John Conklin II	70689dd297	Merge pull request #12968 from birarda/bug/wrong-domain-local-id ... fix setting of domain local ID from domain list	2018-04-23 13:50:21 -07:00
John Conklin II	5a3f44fa15	Merge pull request #12965 from NissimHadar/bug12979 ... Fix for bug #12979: Setting colors [0, 0, 254] from js api ends up as black color	2018-04-23 13:49:41 -07:00
Sam Gateau	d3fccc4104	Merge pull request #12881 from SamGondelman/scaleAssert ... Minimum entity dimension (1mm)	2018-04-23 13:40:53 -07:00
John Conklin II	b3dbf7a025	Merge pull request #12943 from vladest/fix_spinbox ... Fix SpinBox.	2018-04-23 13:02:01 -07:00
Stephen Birarda	779386fbc4	fix setting of domain local ID from domain list	2018-04-23 12:29:02 -07:00
Simon Walton	f849d6f937	Change packetSourceAndHashMatchAndTrackBandwidth logging in same manner	2018-04-23 12:26:02 -07:00
Andrew Meadows	577f9a03e6	fix bug: animation reset on 'hold'	2018-04-23 12:08:40 -07:00
Andrew Meadows	748af5a65f	worry about multi-threads when updating animation props	2018-04-23 12:08:40 -07:00
Andrew Meadows	8e51d66092	fix bug: animation should reset on start running	2018-04-23 12:08:40 -07:00
Andrew Meadows	b48e9495a5	rollback change to MaterialEntityItem, we'll fix later	2018-04-23 12:08:40 -07:00
Andrew Meadows	75508385cf	more correct needsToCallUpdate() implementations	2018-04-23 12:08:40 -07:00
Andrew Meadows	e36dbab838	remove unused data member	2018-04-23 12:08:40 -07:00
NissimHadar	ea6585a0b9	Corrected tosRGBFloat() computation.	2018-04-23 11:53:35 -07:00
Sam Gateau	d1e2e9ce71	Merge pull request #12921 from SamGondelman/precisionq ... Fix AMD shader compilation	2018-04-23 10:17:35 -07: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	d65f66a73d	Interim JSDoc for Recording	2018-04-23 14:13:29 +12:00
David Rowe	6a2b7244eb	Interim JSDoc for Tablet	2018-04-23 11:06:17 +12:00
David Rowe	eeb511c359	Reticle JSDoc fix	2018-04-23 10:20:04 +12:00
David Rowe	4fb55ec2af	Interim JSDoc for Users	2018-04-23 09:59:14 +12:00
David Rowe	8e22941ad7	Interim JSDoc for Reticle	2018-04-23 09:22:45 +12:00
milad nazeri	e9b9c05b5d	removed cruft	2018-04-22 08:51:47 -07:00
David Rowe	2c39f2dbad	Interim JSDoc for Scene	2018-04-22 17:37:06 +12:00