452 commits

Author	SHA1	Message	Date
sabrina-shanman	be511378cd	Merge branch 'master' into hfm_serializer	2018-11-20 13:42:24 -08:00
Seth Alves	26a50e1820	don't log urls!	2018-11-19 15:38:12 -08:00
Seth Alves	cd177a4457	catch QString exceptions that ModelCache can throw	2018-11-19 15:25:14 -08:00
sabrina-shanman	e08bc7296f	Merge branch 'master' into hfm_serializer	2018-11-13 15:41:49 -08:00
Brad Hefta-Gaub	bb2239c0bd	Merge pull request #14359 from howard-stearns/no-url-logging ... remove urls from logs in Interface	2018-11-13 13:19:30 -08:00
sabrina-shanman	f971294d6d	Make HFMSerializer return a smart pointer to an HFMModel	2018-11-12 16:12:21 -08:00
sabrina-shanman	baa8cdb054	Remove combineParts from the Serializer interface	2018-11-12 16:12:21 -08:00
sabrina-shanman	00f2b4eeb9	Make the existing model serializers based on HFMSerializer	2018-11-12 16:12:20 -08:00
sabrina-shanman	83cc90ace0	Re-name GLTFReader to GLTFSerializer and do the same for other model readers	2018-11-12 16:12:20 -08:00
sabrina-shanman	753557736e	Merge branch 'master' into hfm_library	2018-11-12 15:03:30 -08:00
Howard Stearns	66ae01e0c3	Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging	2018-11-12 12:55:20 -08:00
Zach Fox	be5dc36ccd	Actually fix build error...hopefully!	2018-11-09 14:23:15 -08:00
Zach Fox	df7486d0f5	Remove unused variable, fixing unix build warning	2018-11-09 10:40:46 -08:00
Dante Ruiz	f5b89ee7aa	reverting previous change	2018-11-08 15:43:45 -08:00
Dante Ruiz	5d000495df	making requested changes	2018-11-08 15:33:18 -08:00
Dante Ruiz	2a16ba57ac	fix image entity crash	2018-11-08 15:24:57 -08:00
Jeff Clinton	ea8dc8ae68	Merge pull request #14334 from danteruiz/interstitial-bug-fixes ... Interstitial bug fixes	2018-11-08 11:43:38 -08:00
Zach Fox	1ab1cb95d8	Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging	2018-11-08 09:57:10 -08:00
Roxanne Skelly	cef7000a72	Case 19754 - Remove logging URLs and related file locations. ... The goal is to strip out data that can be used by untoward users in copying models, avatars, etc.	2018-11-06 16:24:32 -08:00
Zach Fox	58dd690c0a	Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech	2018-11-06 10:29:05 -08:00
sabrina-shanman	2801f324b7	Switch references to HFM to the HFM lib and remove HFM classes in FBX	2018-11-05 12:47:34 -08:00
sabrina-shanman	cbca77b12f	Rename HFMGeometry to HFMModel and adjust related variables	2018-11-01 17:17:48 -07:00
Dante Ruiz	a4b345bb58	fix interstitial domain loading due to bad texture url	2018-11-01 09:25:46 -07:00
sabrina-shanman	becee7f010	Re-name FBXGeometry to HFMGeometry and do the same for related classes	2018-10-30 17:28:42 -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	e7d1c2873a	Merge branch 'master' into log-resource-requests-2	2018-10-23 13:46:59 -07:00
Zach Fox	988bca201b	Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech	2018-10-23 13:36:46 -07:00
Brad Davis	c8e664a0a1	New SPIRV Shader toolchain	2018-10-23 10:40:12 -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
Zach Fox	1eca1bfd55	Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech	2018-10-22 11:18:10 -07:00
Seth Alves	2ce8ed25f8	Merge pull request #14125 from Atlante45/fix/mac-warnings ... Fix new Mac warnings	2018-10-20 13:40:53 -07:00
Brad Hefta-Gaub	e6ec32e515	Merge pull request #14222 from SamGondelman/material ... Fix material entity opacity maps	2018-10-19 16:45:31 -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	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	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
SamGondelman	c5a94a415d	fix material entity opacity maps	2018-10-17 09:59:43 -07:00
Zach Fox	7de784ce27	First steps (definitely not working)	2018-10-10 12:32:55 -07:00
Clement	8983fe2bcf	Fix new Mac warnings	2018-10-09 12:11:55 -07:00
Sam Gondelman	67662df760	Merge branch 'master' into scriptvec3	2018-10-08 12:59:34 -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
Sam Gondelman	5b6e7b2566	Merge branch 'master' into scriptvec3	2018-10-02 08:58:04 -07:00
Dante Ruiz	652ec2210d	fixing loading issues	2018-10-01 13:58:14 -07:00
Seth Alves	b69d0f3997	get interface building and working with clang-7 on ubuntu 18	2018-09-28 13:46:51 -07:00
SamGondelman	9b75c7e07f	trying to separate colors and vectors	2018-09-04 17:20:05 -07:00
Ryan Huffman	0fcf1517a5	Fix TextureCache not correctly choosing gl41 when gl45 is disabled	2018-08-13 16:35:21 -07:00
Ryan Huffman	44a9b1df0e	Fix choice of target backend in TextureCache on OSX	2018-08-09 12:30:42 -07:00
Ryan Huffman	2ba2c4b68a	Fix TextureCache not compressing textures on Android	2018-08-08 14:06:34 -07:00