4154 commits

Author	SHA1	Message	Date
SamGondelman	b3abd97707	projected materials and repeat property	2018-11-09 10:47:07 -08:00
Zach Fox	48d3450c5a	Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech	2018-11-07 14:59:23 -08:00
Sam Gateau	e28560a9c7	Merge pull request #14311 from SamGondelman/interstitial ... Case 19682: Disable interstitial on android	2018-11-07 10:47:31 -08:00
Sam Gateau	5d0be31fe7	Merge pull request #14354 from SamGondelman/deadlock ... Case 19735: Fix ResourceCache mutex issues	2018-11-07 09:55:41 -08:00
SamGondelman	1444b3a186	resource mutex issues ... (cherry picked from commit 750629a6194ec98534746a377b3ba027c1dcc20e) (cherry picked from commit fc5ab3289a5f88f245c2825edd085532bd4c97ca)	2018-11-06 11:57:57 -08:00
Zach Fox	58dd690c0a	Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech	2018-11-06 10:29:05 -08:00
Zach Fox	a87142b8b7	Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce	2018-11-02 16:49:20 -07:00
Zach Fox	d0854ca2ab	Use AccountManager instead of settings	2018-11-02 16:42:18 -07:00
Zach Fox	b43ad15fa7	Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech	2018-11-01 11:32:38 -07:00
Stephen Birarda	41ec026f8d	cleanup packet times, avoid ambiguous RTT calcs, allow fast re-transmit	2018-10-31 13:32:27 -07:00
SamGondelman	8633dc0f66	disable interstitial on android	2018-10-31 12:34:20 -07:00
Zach Fox	d1556ae4e8	Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech	2018-10-23 15:51:34 -07:00
Kerry Ivan Kurian	3cf000a71b	Merge pull request #14232 from kkurian/log-resource-requests-2 ... Display resource-access events in marketplace item tester	2018-10-23 15:18:30 -07:00
John Conklin II	7019439356	Merge pull request #14260 from SamGondelman/resourceCrash ... Fix ResourceCache crash on shutdown	2018-10-23 15:03:55 -07:00
Stephen Birarda	5cbddfe0c4	consider all sockets in findNodeWithAddr	2018-10-23 13:35:07 -07:00
SamGondelman	78f0afd39f	fix crash on shutdown	2018-10-23 12:13:41 -07:00
Kerry Ivan Kurian	a2a6acd45c	Improve code formatting	2018-10-22 14:04:59 -07:00
Zach Fox	bccca94111	Prevent duplicate resources in logs. Thanks to Roxanne!	2018-10-22 13:59:55 -07:00
Zach Fox	493262052c	Remove extraneous code changes; remove QUrlAncestry code; remove extra logging	2018-10-22 13:59:52 -07:00
Zach Fox	7be5d5674d	Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2	2018-10-22 13:59:35 -07:00
Stephen Birarda	3aac294a92	optimize sockAddrBelongsToNode and reduce connection filter usage	2018-10-22 13:57:30 -07:00
Zach Fox	1eca1bfd55	Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech	2018-10-22 11:18:10 -07:00
Stephen Birarda	3c79a79487	Merge pull request #14163 from Atlante45/fix/bw-recorder ... Fix crash with BandwidthRecorder	2018-10-22 10:11:26 -07:00
Stephen Birarda	ea3bdeb26e	Merge pull request #14181 from Atlante45/feat/timebox-packet-processing ... Timebox packet processing	2018-10-22 09:43:30 -07:00
Brad Hefta-Gaub	219302a9b6	Merge pull request #14157 from SimonWalton-HiFi/domain-checkin-limit ... Cap the number of domain-server duplicate check-ins sent upon retransmission	2018-10-19 16:41:09 -07:00
Brad Davis	2687c024eb	Fix light color / serialization	2018-10-19 14:47:02 -07:00
Zach Fox	2df9d28c5b	Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech	2018-10-19 09:42:06 -07:00
John Conklin II	5095a4e0eb	Merge pull request #14196 from sethalves/interstitial-domain-full ... go to error-room when failing to connect to a full domain	2018-10-18 17:49:35 -07:00
Zach Fox	2f37a2b1a1	Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2	2018-10-18 11:12:26 -07:00
Zach Fox	2a9e0041b2	Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech	2018-10-18 10:16:07 -07:00
Kerry Ivan Kurian	89a5da80e0	Do not display incomplete metadata	2018-10-18 01:39:20 -07:00
Kerry Ivan Kurian	3b15548ea3	Display resource-access events in marketplace item tester ... Includes refactoring marketplace item tester into a single-page app.	2018-10-18 01:04:47 -07:00
Sam Gondelman	3f117cd3e0	Merge branch 'master' into scriptvec3	2018-10-17 13:57:21 -07:00
Brad Hefta-Gaub	0e0542ec6e	Merge pull request #13890 from sethalves/grab-properties-1 ... move grab pseudo-properties (userData) into first-class EntityItemProperties	2018-10-17 13:29:20 -07:00
Sam Gondelman	e3543cf098	Merge branch 'master' into scriptvec3	2018-10-17 13:10:29 -07:00
John Conklin II	e59e3720fe	Merge pull request #14139 from SamGondelman/animation ... Fix various ResourceCache bugs	2018-10-17 11:13:35 -07:00
Seth Alves	47d3c9ba27	go to error-room when failing to connect to a full domain	2018-10-12 11:28:54 -07:00
Clement	bcbbe884c7	Timebox readPendingDatagrams	2018-10-10 12:56:41 -07:00
Zach Fox	7de784ce27	First steps (definitely not working)	2018-10-10 12:32:55 -07:00
Clement	8a95c58f86	Revert packet processing split	2018-10-10 11:46:53 -07:00
Clement	3eb7c80af3	Fix BandwidthRecorder storage concurrent accesses	2018-10-08 13:45:34 -07:00
Sam Gondelman	67662df760	Merge branch 'master' into scriptvec3	2018-10-08 12:59:34 -07:00
Simon Walton	12db6a4d10	Limit number of domain-checkin duplicates	2018-10-08 10:58:46 -07:00
divya	91df342ae9	Merge pull request #14094 from wayne-chen/interstitialMerged ... Merged interstitial page/redirect domain improvements	2018-10-08 10:32:29 -07:00
Stephen Birarda	88f76ac760	suppress traits larger than INT16_MAX bytes	2018-10-05 09:46:55 -07:00
Dante Ruiz	651f37aceb	Merge branch 'interstitialMerged' of github.com:wayne-chen/hifi into interstitialMerged	2018-10-04 15:01:39 -07:00
Dante Ruiz	bda9735b5d	fix loading progress	2018-10-04 15:01:16 -07:00
SamGondelman	4024f2a180	fix various resourcecache bugs	2018-10-04 11:29:22 -07:00
Wayne Chen	0a7102b4d3	Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged	2018-10-04 08:59:26 -07:00
Wayne Chen	d6af09ca62	ignoring entities in interstitial/saving address on 404 error	2018-10-03 17:40:42 -07:00