30622 commits

Author	SHA1	Message	Date
sam gateau	21577ba311	fixing warnings and the debug of shadows	2018-12-20 09:27:15 -08:00
Sam Gateau	8fba8062c3	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-12-19 20:01:48 -08:00
Sam Gateau	80a55e2ae9	Compiling	2018-12-19 20:01:14 -08:00
sam gateau	253a71a20c	updating some code and probably broken in this version	2018-12-19 18:22:01 -08:00
Adam Smith	828672343a	Merge pull request #14523 from SamGondelman/NOverlays2 ... Case 20131: Cleanup some Entity Properties	2018-12-19 11:33:24 -08:00
sam gateau	9c436bc28c	Merge branch 'master' of github.com:highfidelity/hifi into punk	2018-12-19 09:31:41 -08:00
Jeff Clinton	16c7619aa7	Merge pull request #14608 from SamGondelman/zone ... Case 19080: Fix zone with invalid script not loading	2018-12-19 08:49:33 -08:00
Jeff Clinton	16e3914cd7	Merge pull request #14598 from amantley/ripOutCruft ... Fix for Camera-perspective-is-off-in-first-person-view, master branch	2018-12-18 17:15:58 -08:00
sam gateau	b8d96d98b8	fixing warnings from the build	2018-12-18 16:25:24 -08:00
sam gateau	5b50b0332d	more fixes	2018-12-18 15:30:45 -08:00
sam gateau	265b1591d6	Merge branch 'master' of github.com:highfidelity/hifi into punk	2018-12-18 14:43:12 -08:00
sam gateau	2f18555ee0	removing comments and dead code, rewiring the debug	2018-12-18 14:42:45 -08:00
SamGondelman	7231116e43	fix zone with invalid script not loading	2018-12-18 13:04:56 -08:00
Jeff Clinton	889f110357	Merge pull request #13925 from sethalves/fix-polyvox-texture-and-single-setter ... fix a bug that broke Entities.setVoxel(). Fix polyvox textures	2018-12-18 12:15:07 -08:00
Sam Gateau	d0d771ce1e	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-12-17 18:48:07 -08:00
sam gateau	237fb4dc4c	Shadows are completely working with settings on both pipeline	2018-12-17 17:34:47 -08:00
amantley	42a17980cb	fixed mac build conflict, unused variable	2018-12-17 16:21:22 -08:00
Adam Smith	14ab53571f	Merge pull request #14564 from sabrina-shanman/hfm_prep ... (case 20274) Create the HFM Preparation Step	2018-12-17 15:17:19 -08:00
amantley	3e1beb2dca	removed white space and stray semi colon	2018-12-17 15:05:51 -08:00
amantley	defdc9fbcb	removed humanIK joint name code from fbx serializer	2018-12-17 10:56:53 -08:00
amantley	6e5c52972a	removed member declarations in hfm.h and debug print statements	2018-12-17 10:42:08 -08:00
Sam Gateau	318bf20ede	Shadow is working correctly in both pipelines	2018-12-17 00:27:07 -08:00
Angus Antley	77fa4e7d13	took out the unnecessary hfm.jointindex code	2018-12-16 17:29:16 -08:00
sam gateau	a4b9ec50e9	one step closer	2018-12-14 17:00:58 -08:00
sabrina-shanman	a36e75672e	Remove dependency on VaryingSet1	2018-12-14 10:40:28 -08:00
sabrina-shanman	c7022988ea	Revert "Add VaryingSet1 to Task aliases" ... This reverts commit 25e3d49941.	2018-12-14 09:14:07 -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
sabrina-shanman	c41174a823	Re-name baker::ImportContext to baker::BakeContext	2018-12-13 10:33:03 -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
sabrina-shanman	9e63caa84a	Fix linker error for model-baker on Android/Linux	2018-12-11 12:54:44 -08:00
sabrina-shanman	566d09dc9c	Add model preparation step to ModelCache using new library model-baker	2018-12-11 11:15:54 -08:00
sabrina-shanman	25e3d49941	Add VaryingSet1 to Task aliases	2018-12-11 11:15:54 -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