2491 commits

Author	SHA1	Message	Date
Sam Gateau	b24a2d33bf	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-12-06 19:51:05 -08:00
Sam Gondelman	b690faeb12	Merge branch 'master' into NOverlays	2018-12-06 11:29:06 -08:00
Adam Smith	08d6e35d4d	Merge pull request #14372 from SamGondelman/decals ... Case 19798: 3D projected Material Entities and materialRepeat option	2018-12-06 11:13:46 -08:00
sam gateau	a267c3115a	drafting more factorisation of render tasks	2018-12-05 17:47:33 -08:00
Adam Smith	653974ca30	Merge pull request #14293 from SamGondelman/branching ... Case 19473: Reduce branching in our shaders	2018-12-05 16:42:42 -08:00
SamGondelman	e282d51883	CR	2018-11-26 01:15:07 -05:00
sabrina-shanman	be511378cd	Merge branch 'master' into hfm_serializer	2018-11-20 13:42:24 -08:00
Sam Gondelman	968ffe7ec3	Merge branch 'master' into branching	2018-11-16 10:25:02 -08:00
Sam Gondelman	a206d9e25a	Merge branch 'master' into branching	2018-11-14 17:08:08 -08:00
Clement	7192aed131	Rework audio data memory ownership model	2018-11-14 14:45:18 -08:00
SamGondelman	079d1dcbd6	convert clientOnly to entityHost and add local entities	2018-11-14 11:25:37 -08:00
sabrina-shanman	e08bc7296f	Merge branch 'master' into hfm_serializer	2018-11-13 15:41:49 -08:00
Sam Gondelman	13f650d514	Merge pull request #14093 from SamGondelman/police ... Case 19409, Case 19468: Fading fixes and shader cleanup	2018-11-13 15:00:23 -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
Brad Hefta-Gaub	22dd958582	Merge pull request #14297 from jherico/feature/vcpkg ... Case 19807: Switch to vcpkg for many dependencies on all non-mobile platforms	2018-11-12 09:52:02 -08:00
SamGondelman	1d1510e18e	Merge remote-tracking branch 'upstream/master' into police	2018-11-09 13:32:41 -08:00
Jeff Clinton	b9c11aad7b	Merge pull request #14259 from SamGondelman/webLock ... Case 18986: Enable interaction with locked web entity	2018-11-09 12:21:13 -08:00
SamGondelman	b3abd97707	projected materials and repeat property	2018-11-09 10:47:07 -08:00
Brad Davis	8c4237b520	Fix warnings	2018-11-08 12:27:56 -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	cbca77b12f	Rename HFMGeometry to HFMModel and adjust related variables	2018-11-01 17:17:48 -07:00
Zach Fox	b43ad15fa7	Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech	2018-11-01 11:32:38 -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
SamGondelman	dc9405775f	more branching removal	2018-10-29 16:42:46 -07:00
Bradley Austin Davis	95d160a170	Working on mac GL issues	2018-10-26 11:23:29 -07:00
SamGondelman	0efbdc1ab5	merge with master	2018-10-23 14:33:57 -07:00
Zach Fox	988bca201b	Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech	2018-10-23 13:36:46 -07:00
SamGondelman	2755cbcf4f	enable interaction with locked web entity	2018-10-23 12:00:50 -07:00
Brad Davis	c8e664a0a1	New SPIRV Shader toolchain	2018-10-23 10:40:12 -07:00
Zach Fox	1eca1bfd55	Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech	2018-10-22 11:18:10 -07:00
SamGondelman	5652fa0b1e	merge with master	2018-10-22 10:18:52 -07:00
Sam Gateau	6005b934ad	Merge pull request #13979 from AndrewMeadows/game-loop-optimizations-001 ... minor bug fix and optimization in ModelEntity animation	2018-10-19 17:02:48 -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
John Conklin II	9c841db9fb	Merge pull request #14184 from SamGondelman/blendshape ... Move blendshape buffers to render thread	2018-10-19 11:55:44 -07:00
Zach Fox	2a9e0041b2	Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech	2018-10-18 10:16:07 -07:00
Sam Gondelman	e3543cf098	Merge branch 'master' into scriptvec3	2018-10-17 13:10:29 -07:00
Andrew Meadows	3b1b64b057	fix logic in readyToAnimate()	2018-10-17 11:45:39 -07:00
Andrew Meadows	da0d70af3f	don't use string comparison when polling for changed animation URL	2018-10-17 11:45:39 -07:00
Andrew Meadows	0c61779331	remove deprecated cruft; stub setAnimationURL() override	2018-10-17 11:45:39 -07:00
Andrew Meadows	148944814b	consolidate two bad string checks into one	2018-10-17 11:45:39 -07:00
SamGondelman	cce0981d6c	Merge remote-tracking branch 'upstream/master' into police	2018-10-17 11:40:01 -07:00
John Conklin II	7b226aa559	Merge pull request #14124 from SamGondelman/particle ... Don't render particles without textures	2018-10-17 11:17:23 -07:00
John Conklin II	eb088772d0	Merge pull request #14156 from sabrina-shanman/bug_dynamic-hulls ... Fix "Good" collision not honoring mesh groups in OBJ files	2018-10-17 11:12:21 -07:00
SamGondelman	c5a94a415d	fix material entity opacity maps	2018-10-17 09:59:43 -07:00
SamGondelman	327c2f4e3d	move blendshape buffers to render thread	2018-10-10 15:32:53 -07:00
Zach Fox	7de784ce27	First steps (definitely not working)	2018-10-10 12:32:55 -07:00
Sam Gondelman	67662df760	Merge branch 'master' into scriptvec3	2018-10-08 12:59:34 -07:00
sabrina-shanman	57f67ffe91	Do not have additional compoundMeshes variable in computeShapeInfo	2018-10-08 11:46:46 -07:00
sabrina-shanman	e15a41c839	Fix model being loaded before dimensions are initialized	2018-10-08 09:26:35 -07:00
sabrina-shanman	c8cccc5ec7	Fix "good" collision not subdividing OBJ meshes by group	2018-10-08 09:24:33 -07:00