67292 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David Back	3b251c0c49	Merge branch 'master' of https://github.com/highfidelity/hifi into desktopEquip	2018-04-24 14:09:29 -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
Dante Ruiz	29fce488e4	make some changes	2018-04-24 14:00:52 -07:00
Atlante45	d82333534c	Ensure the tree lock is always taken before the simulation lock	2018-04-24 13:46:05 -07:00
Dante Ruiz	b2925c5843	fixing attachments not being visible when coming out of first person	2018-04-24 13:32:30 -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
Brad Hefta-Gaub	e6f15c720f	Merge pull request #12973 from birarda/bug/no-node-stats ... 66.1: fix connection to start stats sending for assignments	2018-04-24 13:23:39 -07:00
milad nazeri	23d07fa292	fixed spacing issue	2018-04-24 13:14:55 -07:00
John Conklin II	47c983a004	Merge pull request #12978 from AndrewMeadows/fix-crash-createConvexHull-RC66.1 ... RC66.1: don't try to build convex hulls with nan data	2018-04-24 13:03:13 -07:00
Clement	0804abcca6	Heap corruption crashes CR	2018-04-24 12:47:13 -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
Brad Hefta-Gaub	c6f4e118ce	Merge pull request #12953 from huffman/hotfix/node-list-connections ... Hotfix, avatars disappear on quick reconnect	2018-04-24 12:38:21 -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
Brad Hefta-Gaub	e44a845dff	Merge pull request #12983 from jherico/fix/web_crash_66 ... HOTFIX version of PR 12969: Attempt to shutdown web surfaces more consistently	2018-04-24 10:51:27 -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	4228b4269f	Fixing PR build	2018-04-24 10:06:28 -07:00
Brad Davis	a144de54e7	Attempt to shutdown web surfaces more consistently	2018-04-24 10:06:20 -07:00
Olivier Prat	f5296e9d97	Merge branch 'master' of http://github.com/highfidelity/hifi into taapre	2018-04-24 17:17:52 +02: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
Andrew Meadows	95d07345d4	don't try to build convex hulls with nan data	2018-04-23 17:00:38 -07:00
David Back	e21c451815	ensure deleted or cleared entities properly unequipped	2018-04-23 16:56:18 -07:00
Stephen Birarda	005a2bce14	update to serverless content for RC67	2018-04-23 16:29:40 -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
John Conklin II	2e6a563c87	Merge pull request #12959 from davidkelly/dk/14375 ... Don't populate user list in pal until you connect the events up	2018-04-23 14:47:31 -07:00
Andrew Meadows	ae186d46c6	don't try to build convex hulls with nan data	2018-04-23 14:46:23 -07:00
John Conklin II	6af6423056	Merge pull request #12905 from dback2/desktopEquip ... Desktop equip/unequip	2018-04-23 14:35:29 -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
Stephen Birarda	02c1cd2d50	optionally use campaign serverless content during install	2018-04-23 13:54:47 -07:00
Stephen Birarda	0de1a49c78	Merge pull request #12949 from birarda/feat/installer-marketing-images ... add default or campaigned marketing slideshow during install	2018-04-23 13:52:53 -07: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
Stephen Birarda	a6509f5ea7	fix connection to start stats sending for assignments	2018-04-23 13:25:18 -07:00
Seth Alves	6d8f769cf8	fix linux clang build	2018-04-23 13:18:36 -07: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
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
Simon Walton	2f72b789a3	Fix for null sourceNode use	2018-04-23 12:13:31 -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