30591 commits

Author	SHA1	Message	Date
sam gateau	237fb4dc4c	Shadows are completely working with settings on both pipeline	2018-12-17 17:34:47 -08:00
Sam Gateau	318bf20ede	Shadow is working correctly in both pipelines	2018-12-17 00:27:07 -08:00
sam gateau	a4b9ec50e9	one step closer	2018-12-14 17:00:58 -08:00
Sam Gateau	0b03012e5e	introducing the Shadow Stage	2018-12-14 06:55:34 -08:00
Sam Gateau	e07bc208f3	introducing the Shadow Stage	2018-12-14 00:58:07 -08:00
Sam Gateau	30277213c6	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-12-13 20:40:50 -08:00
sam gateau	8bfca612e3	Separating the state view dependant from the shadow to be able to have several versions in flight	2018-12-13 17:56:14 -08:00
sam gateau	94ae345daf	Merge branch 'master' of github.com:highfidelity/hifi into punk	2018-12-13 08:45:29 -08:00
Sam Gateau	7f193d0e7c	WEll it sn not going to be that simple....	2018-12-13 00:32:59 -08:00
Wayne Chen	4116f6ca9a	Merge branch 'master' into loginInitiative2	2018-12-12 18:00:07 -08:00
Jeff Clinton	5a81d8c093	Merge pull request #14453 from danteruiz/keyboard-menus ... Keyboard interaction menus	2018-12-12 17:53:59 -08:00
Dante Ruiz	f3fad52e1d	make CR changes	2018-12-12 13:29:32 -08:00
Dante Ruiz	51bdf1bf78	adding keyboards settings	2018-12-12 11:55:13 -08:00
Wayne Chen	2f07a0eb5d	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-12-11 20:01:19 -08:00
Sam Gateau	8599a340ed	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-12-11 19:02:48 -08:00
Shannon Romano	a3c870ed90	Merge pull request #14479 from sabrina-shanman/hfm_mimetype ... (case 20037) Add robust MIME type detection for loading models in ModelCache	2018-12-11 18:41:55 +00:00
Brad Hefta-Gaub	43bbba6635	Merge pull request #14554 from sethalves/break-parenting-loops ... fix some parenting loops crashes	2018-12-11 10:02:17 -08:00
Sam Gateau	d5b127d258	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-12-10 21:35:41 -08:00
Shannon Romano	bb9a764855	Merge pull request #14517 from luiscuenca/getEntityJointParent ... Add method to check entities joint hierarchy	2018-12-11 01:06:38 +00:00
sabrina-shanman	79e9bff225	Nest if statement for invalid id checking in hfm::FormatRegistry::getSerializerForMediaType	2018-12-10 16:18:11 -08:00
sabrina-shanman	31d1512701	Simplify url empty check in GeometryReader::run	2018-12-10 16:12:23 -08:00
sabrina-shanman	b960b66542	Fix mac warning for std::move on temporary object	2018-12-10 11:10:29 -08:00
sabrina-shanman	8792824960	Remove FormatSerializerRegister as it is unused	2018-12-10 09:58:59 -08:00
sam gateau	4ab003091a	Merge branch 'master' of github.com:highfidelity/hifi into punk	2018-12-10 08:30:53 -08:00
Wayne Chen	4c9c785c24	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-12-10 07:57:44 -08:00
Sam Gateau	b09d0b10e9	cleaning light clusters	2018-12-09 22:54:49 -08:00
Brad Hefta-Gaub	a005f9e9ab	Merge pull request #14546 from danteruiz/fix-reload-scripts ... fix realod all scripts functionality broken by PR14478	2018-12-09 17:30:36 -08:00
Brad Hefta-Gaub	0425ae1231	Merge pull request #14239 from ElderOrb/FB19219 ... FB19219 - Make avatarapp to handle wearables update via drag&drop	2018-12-09 17:20:13 -08:00
Sam Gateau	653370e284	Assemble lighting stage works	2018-12-09 11:39:35 -08:00
Sam Gateau	79cad36c58	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-12-08 19:14:21 -08:00
Seth Alves	c1e2653526	check for and break parenting loops in hasAncestorOfType, findAncestorOfType, isParentPathComplete	2018-12-08 07:42:03 -08:00
Jamil Akram	4e7a777fda	Merge pull request #14486 from amantley/jointNameMapping ... FST File Joint Name Mapping From FBX Joint Names to Hifi Skeleton Joint Names	2018-12-07 17:07:37 -08:00
sam gateau	28d36c81e0	there and back , trying to converge with the new Assemble Lighting Stage task	2018-12-07 16:24:51 -08:00
sabrina-shanman	031085b384	Remove now unused HFMSimpleFormat	2018-12-07 16:17:33 -08:00
John Conklin II	69876bdec2	Merge pull request #14548 from SamGondelman/mirrorFix ... Case 19473 (#2): Fix Mirror tonemapping	2018-12-07 16:11:59 -08:00
John Conklin II	0a80c16686	Merge pull request #14419 from SamGondelman/splash ... Case 19740: Improve startup times by pre-compiling shaders with splash screen	2018-12-07 16:10:52 -08:00
sabrina-shanman	f2e69aec5e	Fix mac warning for OBJSerializer::getFactory not marked with override	2018-12-07 13:41:33 -08:00
Jeff Clinton	998ec20854	Merge pull request #14539 from Atlante45/fix/script-loading ... Fix ESS scripts getting stuck on load	2018-12-07 12:07:44 -08:00
sabrina-shanman	7cbe3776f5	Simplify serializer registration process	2018-12-07 12:05:27 -08:00
Stephen Birarda	e3e400c86f	Merge pull request #14549 from birarda/bug/no-initial-send ... fix for initial send of non-instanced trait	2018-12-07 12:02:08 -08:00
Brad Hefta-Gaub	9428f1de33	Merge pull request #14529 from SimonWalton-HiFi/avatar-mixer-downloads-fst ... Don't fetch avatars' .fst files from within the AvatarData class	2018-12-07 12:01:58 -08:00
Dante Ruiz	177a94b9a9	fix realod all scripts functionality	2018-12-07 11:48:03 -08:00
birarda	51fd742722	fix for initial send of non-instanced trait	2018-12-07 11:17:44 -08:00
SamGondelman	8431b3b0c1	correct order of mixes	2018-12-07 10:39:10 -08:00
Wayne Chen	4e6f162e01	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-12-07 10:12:46 -08:00
Alexander Ivash	600d09e533	relax 'isWearable()' condition to match latest changes in 'master'	2018-12-07 11:23:17 +03:00
Alexander Ivash	72a91668a5	FB19219 Make avatarapp to handle wearables update via drag&drop	2018-12-07 11:23:17 +03:00
Sam Gateau	50fcd7f40a	trying...	2018-12-06 22:45:44 -08:00
amantley	f8ae0227c3	added the lean joint back and fixed a name mapping reversal in fbxserializer.cpp	2018-12-06 20:16:03 -08:00
Sam Gateau	b24a2d33bf	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-12-06 19:51:05 -08:00