19248 commits

Author	SHA1	Message	Date
David Kelly	c6dbfc85f0	cr feedback	2017-03-07 09:54:00 -07:00
David Kelly	3d39aae35b	minor tweak - just in case	2017-03-06 15:52:33 -07:00
David Kelly	f23f882595	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/3377	2017-03-06 15:26:21 -07:00
David Kelly	e14a1ad1af	minor cleanup	2017-03-06 15:26:03 -07:00
David Kelly	db036d997c	first pass	2017-03-06 15:18:35 -07: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
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	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	50f92cb934	redo unsafe optimization	2017-03-04 15:29:23 -08:00
Ken Cooke	46c5f96113	redo unsafe optimization	2017-03-04 15:24:03 -08:00
Ken Cooke	117bba8b6a	redo unsafe optimization	2017-03-04 15:17:09 -08:00
Anthony J. Thibault	e56f02d94f	Changed default for preferFingerOverStylus to false.	2017-03-03 14:12:04 -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
Brad Hefta-Gaub	e655e442a0	Merge pull request #9799 from sethalves/steady-hand-lasers ... Steady hand lasers	2017-03-02 18:27:39 -08:00
Seth Alves	10cb7aab06	Merge pull request #9684 from Menithal/parent-hotkey ... WL#20856 Added Parenting Hotkeys to Edit.js Among Visual tweaks	2017-03-02 16:30:43 -08:00
Seth Alves	88d6fe6a04	fix offset relative to endParent	2017-03-02 16:26:56 -08:00
Seth Alves	5f570c1ba8	fix up bounds handling in Line3DOverlay	2017-03-02 16:16:48 -08:00
Seth Alves	8893c4770e	Merge branch 'master' of github.com:highfidelity/hifi into steady-hand-lasers	2017-03-02 10:02:33 -08:00
Howard Stearns	50cf7b00fd	Merge pull request #9797 from davidkelly/dk/3348 ... fix unmute when ignoring in PAL (you can't)	2017-03-02 09:32:38 -08:00
Andrew Meadows	a55ab94cd9	other avatars use jointData no Rig animation	2017-03-02 07:52:02 -08:00
David Kelly	79e440be81	fix unmute when ignoring in PAL (you can't)	2017-03-02 08:36:58 -07:00
Anthony J. Thibault	4f03c06a94	Added General Preference to control stylus vs finger usage ... By default the finger is preferred over the stylus.	2017-03-01 18:07:53 -08:00
Seth Alves	7f6b803652	3d-line-overlays can now have an endParentID and endParentJointIndex	2017-03-01 17:27:32 -08:00
Andrew Meadows	96bb01e5f9	Merge pull request #9790 from AndrewMeadows/fix-avatar-transform ... fix bug drawing avatar above ground	2017-03-01 17:20:21 -08:00
Seth Alves	7c4869eb73	fix up parenting for 3d line overlays, have handControllerGrab use a child overlay for search/far-grab so the updates are smoother	2017-03-01 16:10:07 -08:00
howard-stearns	5be952c4e8	persist sort info for tablet re-opening, and start with column 1	2017-03-01 14:51:48 -08:00
Anthony J. Thibault	465a9e2008	Responsiveness improvement to tablet ... PointerEvents sent from handControllerGrab.js to the Qml window are now direct connections, instead of queued. This should reduce latency of laser and finger pressed onto the tablet.	2017-03-01 14:31:04 -08:00
David Kelly	dc754cff5f	magical new glyphs	2017-03-01 13:57:03 -07:00
David Kelly	45293ab130	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/palVolumeSorting	2017-03-01 12:55:54 -07:00
David Kelly	55d049ff5c	style updates	2017-03-01 12:43:45 -07: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
Andrew Meadows	148100b26f	fix bug drawing avatar above ground	2017-02-28 15:10:20 -08:00
David Kelly	678020fed6	now use it (plus a bit of cleanup)	2017-02-28 15:03:45 -07: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
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	9ce10742ec	Move avatar not joint	2017-02-27 16:38:57 -08:00
Atlante45	e9316d30d0	More IK smoothing experimentation	2017-02-27 16:38:56 -08:00
Atlante45	cbaaaa21c6	Use head orientation for sitting	2017-02-27 16:38:56 -08:00
Atlante45	e503542b6a	Fix transform computation	2017-02-27 16:38:55 -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	69ce0a383e	Add sitting animations	2017-02-27 16:38:54 -08:00
Atlante45	7132969083	Add hips pinning capability to MyAvatar	2017-02-27 16:38:54 -08:00
Atlante45	6821c8621f	More sit work	2017-02-27 16:38:54 -08:00