21296 commits

Author	SHA1	Message	Date
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
humbletim	2505a89b5e	Per CR feedback bump to strong ref	2017-02-28 00:41:35 -05: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
humbletim	654c72fb7e	Add weakRef guard to detect ScriptEngine deletion during ScriptCache::getScriptContents	2017-02-27 22:58:59 -05: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
Seth Alves	6227db9fc0	optimize RenderablePolyVoxEntityItem::setSphere	2017-02-26 08:30:29 -08:00
Seth Alves	422b0bb952	don't set _dirtyFlags if polyvox is collisionless	2017-02-25 21:14:13 -08:00
Seth Alves	7a31a99e3c	back out previous experiment	2017-02-25 21:13:20 -08:00
Seth Alves	1e81edbaea	make a copy of volData before computing the visual mesh	2017-02-25 15:32:08 -08:00
sam	7a4ec35b99	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-02-25 13:01:09 -08:00
sam	a53d5e8fbd	adjusted the PLumber shape keys to coever non material shapes in main pass	2017-02-25 13:00:37 -08:00
Seth Alves	0e4b0332dd	avoid a rare crash	2017-02-25 11:35:27 -08:00
Seth Alves	76c873ce81	don't compute polyvox shapes if they are collisionless	2017-02-25 11:34:48 -08:00
Seth Alves	0c84ddc503	fix indentation	2017-02-25 11:33:10 -08:00
samcake	9ffdc03dc9	setting the shaeKeys for the overly properly because most of them are CustomPipleline	2017-02-24 18:25:24 -08:00
humbletim	5b11c0e00a	remove unused consts	2017-02-24 20:45:12 -05:00
humbletim	731c01985b	switch from autos	2017-02-24 19:21:17 -05:00
samcake	1b501487fd	simple shader checks	2017-02-24 16:03:28 -08:00
humbletim	cdbb13ecff	Log cleanup	2017-02-24 17:40:06 -05:00
humbletim	3ac116545e	* Switch trigger for deferred loads from timer to using leading entity completion ... * Bring back notion of tracking "bad scripts" to fail stampeding entities as a set * Update stampede JS tests to highlight/troubleshoot preexisting unload issue	2017-02-24 16:05:11 -05:00
Seth Alves	6e9854cad0	don't crash if geometry fails to load	2017-02-24 13:01:01 -08:00
Seth Alves	eedc5c1647	don't allow tablet to get stuck to a hand when passing it back and forth between hands	2017-02-24 12:10:52 -08:00
Seth Alves	73774a6590	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay	2017-02-24 11:34:59 -08:00
Howard Stearns	a9b8045697	Merge pull request #9720 from howard-stearns/filter-pal-by-view-distance ... Filter pal by view distance	2017-02-24 11:10:13 -08:00
humbletim	c89d203f94	Adapt from std::map locks to simple QHash for flagging busy scriptURLs	2017-02-24 12:27:33 -05:00
sam	5257194c48	SImplify the overlay PLumber	2017-02-24 01:11:59 -08:00
sam	e1aad8bd63	Deep dive into the shape key and filters and the PLumber construction	2017-02-24 00:35:10 -08:00
sam	67031850aa	Deep dive into the shape key and filters and the PLumber construction	2017-02-24 00:05:54 -08:00
sam	8e122b3357	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-02-23 21:24:47 -08:00
samcake	6d59144a4f	Trying to fix the emissive for overlay in front ?	2017-02-23 17:42:02 -08:00
Andrew Meadows	faa272c67c	don't blend animations for otherAvatars	2017-02-23 17:36:45 -08:00
Andrew Meadows	0657ca1e5e	remove unnecessary context brackets	2017-02-23 17:36:45 -08:00
Andrew Meadows	e54812430e	avoid unnecessary copy of priority_queue	2017-02-23 17:36:45 -08:00
Andrew Meadows	ee5971c39e	no need to calc length of normalized vector	2017-02-23 17:36:45 -08:00
humbletim	3ad3fd472e	* Inline / duplicate exception checking per CR feedback ... * Coding standards	2017-02-23 19:46:28 -05:00
humbletim	1eeb25a9eb	Increase deferred batch processing.	2017-02-23 19:09:27 -05:00
Seth Alves	0a2a1b1637	include visible_to_others in UserActivityLoggerScriptingInterface::openedTablet	2017-02-23 15:25:09 -08:00
humbletim	f82a0196a8	Always consume exceptions thrown by include's	2017-02-23 18:12:12 -05:00
Brad Hefta-Gaub	1b7ec7d61e	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarBandwidthBudgetImprovements ... Conflicts: libraries/avatars/src/AvatarData.cpp	2017-02-23 13:50:16 -08:00
samcake	baff13d6d1	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-02-23 11:05:48 -08:00
kunalgosar	3af05ece7d	Made QScript Object more JS friendly	2017-02-23 10:57:06 -08:00
kunalgosar	99e51e88ae	Add QMetaObject for AvatarEntityMap	2017-02-23 10:57:06 -08:00
Brad Hefta-Gaub	dde9640c66	remove old full rate distance code	2017-02-23 10:29:17 -08:00
Chris Collins	de84e07281	Merge pull request #9714 from thoys/fix-recorder-js-playback ... Fix recorder.js playback in interface	2017-02-23 09:59:37 -08:00
Thijs Wenker	5033e7be11	CR fixes	2017-02-23 18:22:36 +01:00
Howard Stearns	cddba43837	Merge branch 'master' into filter-pal-by-view-distance	2017-02-23 08:25:16 -08:00
Brad Hefta-Gaub	4f17498daf	fix warning	2017-02-23 00:19:06 -08:00
Brad Hefta-Gaub	06f0087459	wire up radius properly	2017-02-22 22:36:37 -08:00
Brad Hefta-Gaub	edf7c016a1	more cleanup	2017-02-22 22:06:28 -08:00
samcake	c7b164d8f2	Adding differenciation for the Material shapeKey bit	2017-02-22 18:21:18 -08:00
Chris Collins	b295a146e0	Merge pull request #9715 from hyperlogic/bug-fix/tablet-ui-toolbar-highlight ... More consistent highlights/toggle for toolbar buttons	2017-02-22 18:07:38 -08:00
humbletim	132a889f74	* Add Qt::DirectConnection to signalHandlerException ... * CR feedback / coding standards	2017-02-22 20:36:49 -05:00
humbletim	417587dcda	* Update per CR feedback / code standards ... * Cull log spam * Add tryLock to deferred processor to preempt unnecessary loadEntityContent round-trips	2017-02-22 15:22:56 -05:00
Chris Collins	c967f9383a	Merge pull request #9706 from ZappoMan/avatarMixerLoopImprovements ... Multi-core Avatar Mixer	2017-02-22 11:20:28 -08:00
Brad Hefta-Gaub	618f37eb06	fix crash in recording playback when clip loader fails	2017-02-22 11:14:22 -08:00
Anthony J. Thibault	71b569a697	Bug-fix for crash on tablet when going from web -> home.	2017-02-22 10:22:12 -08:00
Brad Hefta-Gaub	05995163cf	add support for tuning sorting	2017-02-22 09:49:47 -08:00
Brad Hefta-Gaub	01fd0860bf	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarBandwidthBudgetImprovements ... Conflicts: interface/src/avatar/AvatarManager.cpp	2017-02-22 08:47:03 -08:00
Brad Hefta-Gaub	4c42e95607	add some debugging	2017-02-22 08:13:37 -08:00
samcake	a00216cb4f	debugging the emissive issue for verlay in front	2017-02-21 18:20:55 -08:00
Chris Collins	04d8c78089	Merge pull request #9707 from hyperlogic/bug-fix/mac-os-deadlock ... MacOS: Fix for audio, toolbar and tablet.	2017-02-21 17:39:07 -08:00
Brad Hefta-Gaub	8cc0b383c4	wire up bandwidth buget to sorting	2017-02-21 16:22:22 -08:00
howard-stearns	2b9c69926b	Merge branch 'master' of https://github.com/highfidelity/hifi into filter-pal-by-view-distance	2017-02-21 15:42:00 -08:00
samcake	3cd422e508	Last clean up	2017-02-21 15:02:12 -08:00
samcake	55611d2373	Backing up to master	2017-02-21 14:56:07 -08:00