21245 commits

Author	SHA1	Message	Date
Thijs Wenker	2f51e63554	Since the deck is currently only capable of handling one clip, add temporary _length reset in FIXME section	2017-03-07 01:29:20 +01:00
Zach Fox	5223f872c1	Merge pull request #9753 from zfox23/FB_3234_TakeTwo ... Optimize AvatarMixer with respect to Identity and Avatar Data	2017-03-06 13:37:29 -08:00
Andrew Meadows	1b8f6b9835	Merge pull request #9784 from samcake/blue ... Fixing Emissive on overlay for models (opaque and transparent)	2017-03-06 13:24:00 -08:00
samcake	21f36d7212	removing comments and restoring the correct behavior for Pal.js	2017-03-06 12:41:00 -08:00
Andrew Meadows	6ea6477c73	Merge pull request #9683 from jherico/cache_flush ... Clear caches on domain switch	2017-03-06 11:05:44 -08:00
Zach Fox	718ecea404	Potential non-spammy solution using pseudo-state	2017-03-06 10:03:41 -08:00
Zach Fox	cfb8534d71	Comment	2017-03-06 10:03:41 -08:00
Zach Fox	c9c07c4269	Basically rebase and squash	2017-03-06 10:03:41 -08:00
sam	cffd838d1d	merging with master	2017-03-05 12:57:13 -08:00
Ken Cooke	a5571bd49d	redo unsafe optimization	2017-03-04 16:02:39 -08:00
Ken Cooke	44c1f8500d	redo unsafe optimization	2017-03-04 15:55:53 -08:00
Ken Cooke	0bababf1f5	Safe replacement of glm_mat4_mul() for unaligned arguments instead of __m128	2017-03-04 14:53:07 -08:00
Anthony J. Thibault	45febe8565	Merge branch 'master' into feature/fingers-on-tablet	2017-03-03 09:04:43 -08:00
Seth Alves	807e15ade9	Merge pull request #9798 from AndrewMeadows/faster-avatar-updates-2 ... avoid animation blending for other avatars	2017-03-02 18:37:18 -08:00
Seth Alves	5f570c1ba8	fix up bounds handling in Line3DOverlay	2017-03-02 16:16:48 -08:00
Anthony J. Thibault	bc256f3e8f	Fix for multi-threaded access to maps in DebugDraw.	2017-03-02 14:42:06 -08:00
Andrew Meadows	a55ab94cd9	other avatars use jointData no Rig animation	2017-03-02 07:52:02 -08:00
Stephen Birarda	b586926d09	Merge pull request #9755 from birarda/master ... increase max renderable web entity FPS to 30 for Youtube.com	2017-03-01 18:09:16 -08:00
Anthony J. Thibault	01abb4bdb6	Exposed DebugDraw interface to Java Script	2017-03-01 13:14:29 -08:00
Howard Stearns	8424f151bf	Merge pull request #9789 from davidkelly/dk/3313 ... Remember gain settings when pal is closed and reopened	2017-03-01 10:21:02 -08:00
David Kelly	efe44425a6	cr feedback, plus something I missed	2017-03-01 09:26:03 -07:00
samcake	664163eb17	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-02-28 18:13:01 -08:00
samcake	6ac85aee7e	Adding support for the unliti materials too for overlay's	2017-02-28 18:12:35 -08:00
Seth Alves	0d0c26ef64	Merge pull request #9759 from sethalves/voxel-paint-opti ... no bullet shape for collisionless polyvox	2017-02-28 13:54:44 -08:00
David Kelly	c10b0389de	Add a getAvatarGain method to NodeList and UsersScriptingInterface	2017-02-28 14:45:34 -07:00
Stephen Birarda	8562a294fa	cleanup some extra spacing	2017-02-28 13:24:41 -08:00
Andrew Meadows	c6730f7c58	Merge pull request #9745 from AndrewMeadows/faster-avatar-updates ... Faster avatar updates	2017-02-28 10:55:21 -08:00
Clément Brisset	7f9437dcc5	Merge pull request #9690 from Atlante45/feat/sit ... Add hips pinning / Sit script	2017-02-28 10:41:22 -08:00
Seth Alves	6b230bad14	oops	2017-02-27 20:56:25 -08:00
Seth Alves	3b669089e4	Merge branch 'master' of github.com:highfidelity/hifi into voxel-paint-opti	2017-02-27 20:56:16 -08:00
Atlante45	e03368414e	CR	2017-02-27 18:57:44 -08:00
samcake	576660f6ef	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-02-27 18:17:28 -08:00
Seth Alves	117be16c31	pull from upstream	2017-02-27 16:48:23 -08:00
Atlante45	2d8b71810e	remove hips swing	2017-02-27 16:38:57 -08:00
Andrew Meadows	6991970044	relax lower spine for head IK when sitting ... also: fix crash bug for bad parentJointIndex also: reduce limit leakage for IK rotation	2017-02-27 16:38:57 -08:00
Atlante45	d9e2b3a20d	Remove lower spine constrain while sitting, losen head	2017-02-27 16:38:56 -08:00
Atlante45	fcc924ce8e	Add downward force on the hips to strech the spine.	2017-02-27 16:38:56 -08:00
Atlante45	36dc2dc49d	Compute spine length on skeleton load	2017-02-27 16:38:56 -08:00
Atlante45	e9316d30d0	More IK smoothing experimentation	2017-02-27 16:38:56 -08:00
Atlante45	8c232b5abb	Initialize max offset to infinity	2017-02-27 16:38:55 -08:00
Atlante45	187cd0d5cf	Get IK error and stand up based on it	2017-02-27 16:38:55 -08:00
Atlante45	6821c8621f	More sit work	2017-02-27 16:38:54 -08:00
Atlante45	cc5967e8f9	Pull part of the Out Of Body Exp code	2017-02-27 16:38:53 -08:00
samcake	f050cc31f2	Backing up from the rgba format to go back to a rgb 888 just to repair the broken normals on Seth's Avatar	2017-02-27 13:32:24 -08:00
Stephen Birarda	80af749b69	change max FPS for youtube on URL change	2017-02-27 11:09:17 -08:00
Stephen Birarda	d18936ea18	only force youtube web entities to 30 FPS	2017-02-27 09:44:34 -08:00
Stephen Birarda	2ceb3d85bd	increase max renderable web entity FPS to 30	2017-02-27 09:33:49 -08:00
sam	709c2e4240	Fixing the emissive on overlayfor models	2017-02-27 02:52:00 -08:00
Seth Alves	88c850afa2	voxel-paint paints with capsules rather than spheres	2017-02-26 12:56:17 -08:00
Seth Alves	542cb7ab85	optimize RenderablePolyVoxEntityItem::compressVolumeDataAndSendEditPacket	2017-02-26 09:03:34 -08:00