33313 commits

Author	SHA1	Message	Date
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
Sam Gateau	acf51ad217	Merge pull request #16137 from jherico/fix/bugz-1398 ... BUGZ-1398: Tablet access to local HTML	2019-09-06 09:59:22 -07:00
Anthony J. Thibault	aa848df227	warning fixes	2019-09-05 17:43:07 -07:00
Anthony J. Thibault	c35640f739	Warning fixes and small bug fix to anim stats	2019-09-05 14:54:19 -07:00
Brad Davis	0511f87bad	BUGZ-1398: Tablet access to local HTML https://youtu.be/7EWQOeQf32U	2019-09-05 11:43:43 -07:00
Anthony J. Thibault	29de8a8d9f	remove ajt comment	2019-09-05 11:11:10 -07:00
Anthony J. Thibault	b6f28a6732	Switch additive animation deltas from a pre multiply to a post multiply.	2019-09-05 11:09:03 -07:00
Anthony J. Thibault	92df5cccdc	AnimBlendDirectional node	2019-09-05 11:09:02 -07:00
Anthony J. Thibault	6274ab4aa7	3x3 blend wip	2019-09-05 11:09:00 -07:00
Seth Alves	404b42c41e	remove unneeded call to tellNeighborsToRecopyEdges	2019-09-05 08:04:09 -07:00
Seth Alves	d86944baf4	rework polyvox state-machine	2019-09-04 20:14:11 -07:00
Shannon Romano	96f6793a87	Merge pull request #16118 from hyperlogic/feature/aim-offset-blend ... Additive animation support	2019-09-04 16:55:50 -07:00
jennaingersoll	afad148894	Merge pull request #16134 from ctrlaltdavid/DOC-134 ... DOC-134: Fix some miscellaneous JSDoc issues	2019-09-04 15:21:14 -07:00
David Rowe	672e61c49d	Fix typo in Entities.EntityProperties-Material example	2019-09-04 21:06:49 +12:00
David Rowe	6474705ca2	Reformat "supported script types" in Entities and Scripts signals	2019-09-04 21:06:30 +12:00
David Rowe	4e274347b4	Fix typo in Entities.getAbsoluteJointRotationInObjectFrame() JSDoc	2019-09-04 21:05:36 +12:00
David Rowe	cf01d9f1af	Script.require() JSDoc fixes	2019-09-04 21:04:03 +12:00
Sam Gateau	df0eb901a2	REverting the change in the jittering sequence length	2019-09-03 17:01:03 -07:00
Sam Gateau	03c5dfad3d	propagating the Bloom on off correctly and fixing the problem where Luci prevents from seeing the zone and finally, update the luci.js with the newer version	2019-09-03 16:28:32 -07:00
Sam Gateau	cda2943b9a	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-09-03 12:01:12 -07:00
Shannon Romano	5f4b2a0080	Merge pull request #16109 from sethalves/fix-saccade-override ... apply fake eye saccades if eye joints aren't overridden	2019-09-03 11:34:02 -07:00
jennaingersoll	037ad36262	Merge pull request #16103 from ctrlaltdavid/DOC-64 ... DOC-64: ScriptDiscoveryService API JSDoc	2019-08-30 22:35:39 -07:00
Bradley Austin Davis	8e3b337a6e	Merge pull request #16120 from jherico/fix/bugz-1365 ... BUGZ-1365: prevent server scripts from accessing local files in HTML controls	2019-08-30 13:10:09 -07:00
Bradley Austin Davis	29424ca971	Merge pull request #16113 from jherico/fix/bugz-1363 ... BUGZ-1363: crash when checking for web content restrictions	2019-08-30 13:09:49 -07:00
Anthony J. Thibault	c814176d6a	Fix initialization order of members warning	2019-08-29 16:16:19 -07:00
Howard Stearns	c4c29dd093	Merge pull request #16116 from SimonWalton-HiFi/efficient-remaining-token-time ... BUGZ-1274: Use UTC with QDateTime rather than local time in AccountManager	2019-08-29 15:20:30 -07:00
Brad Davis	428a58710d	BUGZ-1365: Ensure that by default web views can't access local content	2019-08-29 13:44:49 -07:00
Brad Davis	36be00bf97	Fix android build again	2019-08-29 10:25:57 -07:00
Anthony J. Thibault	52ed0bcb71	additive blending work	2019-08-29 10:17:51 -07:00
Shannon Romano	b4d0c87654	Merge pull request #16117 from ctrlaltdavid/BUGZ-1316 ... BUGZ-1316: Fix crashes in Assets API	2019-08-29 09:07:37 -07:00
Brad Davis	af22ab55bb	PR feedback	2019-08-29 08:46:46 -07:00
David Rowe	fb818c0726	Fix crash in Assets.setBakingEnabled() when callback undefined	2019-08-29 13:33:22 +12:00
David Rowe	746f97a0e0	Fix crash in Assets.getAsset() when callback undefined	2019-08-29 13:33:04 +12:00
Anthony J. Thibault	16a20a5ead	AddAbsolute now works! added blendType to AnimClip	2019-08-28 18:19:35 -07:00
Simon Walton	784903fe33	Use UTC with QDateTime rather than local time	2019-08-28 17:57:09 -07:00
Shannon Romano	f63fc15d4f	Merge pull request #16115 from sabrina-shanman/crash_shutdown_running-script ... Attempt to fix crash from script running too late	2019-08-28 15:54:10 -07:00
Shannon Romano	e07e8abc0d	Merge pull request #16106 from AndrewMeadows/less-MyAvatar-mesh-tuneling-2 ... BUGZ-1325 prevent MyAvatar from pushing through mesh barrier	2019-08-28 15:51:42 -07:00
sabrina-shanman	437f6b4096	Only say we're throwing a script error when we mean it	2019-08-28 14:58:57 -07:00
David Rowe	d52bb66048	Add missing JSDoc	2019-08-29 09:38:43 +12:00
sabrina-shanman	67a06b3a74	Attempt to fix crash from script running too late	2019-08-28 14:28:12 -07:00
Anthony J. Thibault	adda7774d3	WIP checkpoint addAbsolute still broken	2019-08-28 14:08:21 -07:00
Andrew Meadows	b7ae55ca3e	smaller CCD proxy for MyAvatar	2019-08-28 11:33:51 -07:00
Brad Davis	5a6e2e5daf	Add caching to the restricted value	2019-08-28 10:13:32 -07:00
Brad Davis	954773124a	BUGZ-1363: crash when checking for web content restrictions	2019-08-28 09:56:45 -07:00