33374 commits

Author	SHA1	Message	Date
Sam Gateau	c0660329a3	Exposing the REsource Caches through a bit of ui, adding MaterialCache to the family	2019-09-17 18:06:08 -07:00
Sam Gateau	3d199ff444	Merge branch 'master' of https://github.com/highfidelity/hifi into yellow	2019-09-16 21:34:56 -07:00
Sam Gateau	18226e64f8	Add a read lock where we think it s needed and banging my head on the problem	2019-09-16 18:06:43 -07:00
Sam Gateau	3ec812d5c3	Cleaner way maybe	2019-09-13 18:45:16 -07:00
Maia Hansen	9811f54c94	Merge pull request #16189 from AndrewMeadows/ess-with-simulation-fallout-001 ... BUGZ-1459: don't rely on final simulation update for kinematic entities	2019-09-13 13:16:05 -07:00
Shannon Romano	79d845d127	Merge pull request #16190 from danteruiz/fix-html ... BUGZ-1398: HMD Tablet Apps blocked by Web access error	2019-09-13 12:35:29 -07:00
danteruiz	8491a37923	fixing WebEntities html	2019-09-13 09:57:51 -07:00
Sam Gateau	f76b6da96e	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-09-13 09:34:59 -07:00
Shannon Romano	bb7813631d	Merge pull request #16183 from luiscuenca/allowLeaningWhileSeated ... BUGZ-1435: Re-enable head IK when seated on HMD	2019-09-13 09:03:17 -07:00
MiladNazeri	b8e3873e96	Merge pull request #16182 from MiladNazeri/BUGZ-1452/entity-link-property-right-button-disable ... Bugz 1452/entity link property right button disable	2019-09-13 08:08:29 -07:00
Andrew Meadows	bc119d6c85	don't expect final kinematic simulation update	2019-09-12 17:02:19 -07:00
Sam Gateau	802326d4da	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-09-12 17:01:37 -07:00
Sam Gateau	68b754fc0c	Changes driven by the alpha mode	2019-09-12 17:01:16 -07:00
Shannon Romano	36bc538354	Merge pull request #16181 from SimonWalton-HiFi/connection-addr-change-logic ... BUGZ-1432: Fix logic for address-change to address already being used builds failing, now android is failing for nothing related to this PR	2019-09-12 15:54:55 -07:00
luiscuenca	3c043309be	Detect HMD mode properly from rig, in order to enable head IK	2019-09-12 14:03:17 -07:00
Maia Hansen	53aed1e6bf	Merge pull request #16171 from sabrina-shanman/bug_oven_draco ... (BUGZ-1446) Fix oven error when baking FBX mesh with no indices	2019-09-12 12:37:49 -07:00
Simon Walton	2d68cfa5e7	Use unique_lock::unlock() instead of unique_lock::release() ... ... which actually has the opposite effect	2019-09-12 12:04:24 -07:00
sabrina-shanman	00f7b75f34	Fix draco errors being added to wrong part of list	2019-09-12 10:45:35 -07:00
Sam Gateau	133a8b7d5e	a bunch of changes to debug why...	2019-09-11 18:21:44 -07:00
Shannon Romano	fa8c959699	Merge pull request #16133 from ctrlaltdavid/DOC-59 ... DOC-59: Assets JSDoc	2019-09-11 17:19:45 -07:00
jennaingersoll	c439358626	Merge pull request #16180 from ctrlaltdavid/DOC-163 ... DOC-163: Fix up Workload JSDoc stubs	2019-09-11 17:16:09 -07:00
milad	e56d0066a3	Merge branch 'master' of github.com:highfidelity/hifi into BUGZ-1452/entity-link-property-right-button-disable	2019-09-11 17:08:39 -07:00
milad	12b980d99d	about to test if this new right click disable is working	2019-09-11 17:08:35 -07:00
David Rowe	fad1296180	Fix up Workload JSDoc stubs	2019-09-12 11:02:10 +12:00
Simon Walton	639beee6cb	Fix logic for reliable service address-change when new add already used	2019-09-11 15:21:49 -07:00
Shannon Romano	65d0bb1342	Merge pull request #15906 from kasenvr/kpi-v1-modkit-rc ... Kasen Plugin Infrastructure v½ Codename "Modkit Mini"	2019-09-11 13:04:01 -07:00
dante ruiz	b969a9b1e0	fix tablet html loading errors	2019-09-10 16:50:50 -07:00
sabrina-shanman	65d85138cc	TIL that std::vector<bool> is a bit field ... https://howardhinnant.github.io/onvectorbool.html	2019-09-10 16:31:30 -07:00
sabrina-shanman	384b7fd629	Fix FBXBaker failing when an unbaked mesh is empty ... Error early for all model bakers for draco errors	2019-09-10 15:22:54 -07:00
Zach Fox	b39e527b5b	DEV-555: Ensure 'href' entity property supports relative paths (coordinates and named paths)	2019-09-10 11:57:02 -07:00
sabrina-shanman	5171b660ae	Give better error message when draco part of model baking fails	2019-09-09 17:32:27 -07:00
Sam Gateau	a290723583	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-09-09 13:43:52 -07:00
Sam Gateau	3c34443f24	where possible (in OpenGLDisplayPLugin) remove the need for the eye specific function and keep it in the HMD display plugin for the case of the POinter drawcall	2019-09-09 13:43:32 -07:00
Sabrina Shanman	3c35433f86	Merge pull request #16159 from sabrina-shanman/oven_stall ... (BUGZ-143) Fix Oven not finishing when Re-bake originals checked	2019-09-09 13:12:49 -07:00
Shannon Romano	826fb061a4	Merge pull request #16158 from luiscuenca/offsetRotationMMDFix ... BUGZ-1394: Fix avatars with rotation offsets	2019-09-09 11:47:43 -07:00
Sam Gateau	760eac6f83	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-09-09 11:33:27 -07:00
Sam Gateau	3509a797a1	Avoiding to rely on the display plugin resource in the getHUDOperator to avoid a case of unallocated resource	2019-09-09 11:33:05 -07:00
sabrina-shanman	01b29c3aac	Fix DomainBaker not finishing when Re-bake originals checked and ... .baked.fbx present	2019-09-09 10:43:08 -07:00
Shannon Romano	e1dac580b6	Merge pull request #16121 from luiscuenca/audioPosesSyncFix ... BUGZ-1234: Mitigate the effect of audio noise on talking animations	2019-09-09 10:37:07 -07:00
luiscuenca	94e1707ab9	Fix avatars with rotation offsets	2019-09-09 10:33:51 -07:00
sabrina-shanman	0a97f2535b	Fix missing return on handling TextureBaker error	2019-09-06 17:46:59 -07:00
Andrew Meadows	7a5cb0d555	fix typo	2019-09-06 17:23:38 -07:00
Andrew Meadows	e97d3df637	bump version number	2019-09-06 17:23:38 -07:00
Andrew Meadows	e546ef23a8	don't bid for sim ownership of kinematic unless grabbed	2019-09-06 17:23:38 -07:00
Andrew Meadows	227b99859d	fix api for checking EntityItem grab status	2019-09-06 17:23:38 -07:00
Andrew Meadows	580b6a3b2c	small optimization: check before lock	2019-09-06 17:23:38 -07:00
Sam Gateau	9c14838443	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-09-06 12:41:11 -07:00
Anthony Thibault	2857086861	Merge pull request #16136 from hyperlogic/feature/3x3-blend ... Directional Blending Support	2019-09-06 11:10:56 -07:00
Sam Gateau	bc0f719b71	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-09-06 10:58:35 -07:00
Sam Gateau	85c18f1033	Adding a clamp to 0 to the computed y coordinate while unpacking the normal map	2019-09-06 10:57:54 -07:00