19392 commits

Author	SHA1	Message	Date
Zach Fox	beb848373b	Update from zfox23/PALv2 branch	2017-03-13 10:15:06 -07:00
Brad Hefta-Gaub	a38965d628	add more audio stats	2017-03-11 09:50:30 -08:00
Brad Hefta-Gaub	6ce50269ac	add audio mixer in/out stats to the client stats	2017-03-10 18:42:18 -08:00
Brad Hefta-Gaub	aa65f03509	fix mac warning and remove accidentally added whitespace	2017-03-10 18:14:00 -08:00
Brad Hefta-Gaub	23e47f2fdc	added icons to the audioScope app	2017-03-10 18:13:35 -08:00
Brad Hefta-Gaub	7eb4b8f5f7	expose AudioScope to QML	2017-03-10 17:38:13 -08:00
Brad Hefta-Gaub	eaea718de1	add various scriping interfaces for managing the audio scope and detecting noise gate transitions	2017-03-10 17:08:19 -08:00
kunalgosar	a974282bdf	bolding timestamps on log	2017-03-10 11:55:36 -08:00
Andrew Meadows	8ddcae2a15	restore transform of deactivated entities	2017-03-09 17:26:53 -08:00
Andrew Meadows	d4abdcb6c8	comments, namechange, and temporary debug code	2017-03-09 17:26:53 -08:00
Dante Ruiz	c6c0c6d382	toolbar becomes visible after taking a snapshot	2017-03-09 22:54:22 +00:00
Brad Davis	e94f803b84	Merge remote-tracking branch 'upstream/master' into HEAD	2017-03-08 09:03:21 -08:00
Seth Alves	adc3581d63	remove override of locationChanged which was keeping the render-bounds of Line3DOverlays from updating during calls to editOverlay	2017-03-07 19:32:34 -08:00
Brad Hefta-Gaub	8ae6f2727d	add support for double click messages to overlays and entities	2017-03-07 17:52:55 -08:00
Thijs Wenker	b54d6cb0e1	stop avatar controller while playing back a recording, which makes it not collide anymore	2017-03-08 00:07:49 +01:00
howard-stearns	cb41b9135b	fix broken merge	2017-03-07 12:10:52 -08:00
howard-stearns	8a489f36f4	Merge branch 'master' of https://github.com/highfidelity/hifi into fix-ban-remove-from-pal	2017-03-07 10:49:53 -08:00
Howard Stearns	f0fd29abd3	Merge pull request #9815 from davidkelly/dk/3377 ... Retain selection in PAL when sorting or reloading	2017-03-07 09:38:07 -08:00
David Kelly	b760e86226	rest of cr feedback	2017-03-07 10:17:32 -07:00
David Kelly	c6dbfc85f0	cr feedback	2017-03-07 09:54:00 -07:00
Vladyslav Stelmakhovskyi	2d2b2094fd	Adding ability for QML/JS file to be visible in QtCreator. Also changed files will be installed to destination	2017-03-07 10:11:09 +01:00
Brad Hefta-Gaub	b111bcb826	Merge pull request #9818 from ctrlaltdavid/21205 ... Remove Developer > Network > Bandwith Details dialog	2017-03-06 22:02:33 -08:00
David Rowe	51739f2f99	Remove Developer > Network > Bandwith Details dialog	2017-03-07 15:02:26 +13:00
Brad Davis	8782fe1d93	Merge branch 'master' into smarter_textures ... Conflicts: libraries/model-networking/src/model-networking/TextureCache.cpp	2017-03-06 15:29:41 -08: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
howard-stearns	632cdc1b38	semicolons and whitespace per coding standard	2017-03-06 11:04:12 -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
howard-stearns	a715a694f0	fix 'banned user doesn't disappear from pal until refresh'	2017-03-03 16:27:38 -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
Bradley Austin Davis	efad7da508	Merge remote-tracking branch 'upstream/master' into HEAD	2017-03-03 08:59:24 -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
Bradley Austin Davis	fa5b315e09	Merge remote-tracking branch 'upstream/master' into smarter_textures	2017-03-01 15:16:18 -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
howard-stearns	c04fd0ec66	smaller glyph size	2017-02-27 16:07:05 -08:00
David Kelly	3bf3f16a6a	whitespace	2017-02-27 12:56:03 -07:00
David Kelly	e7c8085bc8	switch to using glyph button	2017-02-27 12:44:23 -07:00
Seth Alves	df034ea6da	remove commented-out code	2017-02-27 11:27:59 -08:00
Seth Alves	8110921abf	git rid of _mouseToOverlays until I remember why I thought I needed it	2017-02-27 11:11:04 -08:00
Ryan Huffman	5b59939195	Merge pull request #9602 from huffman/feat/shortbow-entity-server ... Add shortbow to marketplace scripts	2017-02-27 11:09:52 -08:00
samcake	699d177b20	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-02-27 09:18:20 -08:00
Seth Alves	1864975c51	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay	2017-02-27 06:35:22 -08:00
Andrew Meadows	dbd1526d56	Merge pull request #9757 from kunalgosar/EntityFocusFix ... Fix for Web Entity not leaving Focus	2017-02-26 16:35:55 -08:00
Philip Rosedale	4925b3c47c	Merge pull request #9756 from ctrlaltdavid/21122 ... Point index finger and raise thumb if not touching controller	2017-02-25 14:59:48 -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	36bcaa8d0f	delete tablet overlays when switching domains	2017-02-25 08:43:06 -08:00
David Kelly	baa7f81d79	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/palVolumeSorting	2017-02-24 18:38:57 -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
kunalgosar	d6c1f1c99a	Fixed Wed Entity not leaving Focus	2017-02-24 18:18:48 -08:00
David Rowe	0cc499b08b	Point index fingers and raise thumbs if not touching controls	2017-02-25 14:20:23 +13:00
David Rowe	a205d2a00c	Use animation for pointing index finger instead of setting joint angles	2017-02-25 11:36:06 +13:00
Seth Alves	34755dd75d	notify children of an overlay when the parent overlay moves	2017-02-24 13:57:49 -08:00
Brad Davis	cd8bba47cf	Add pending texture transfer size to tracked stats	2017-02-24 12:39:38 -08:00
David Kelly	d6f0d8c960	styling changes, first pass	2017-02-24 11:45:03 -08:00
Seth Alves	71ab6a1a84	fix a couple of problems related to grabbing tablet while edit.js is active ... Conflicts: scripts/system/controllers/handControllerGrab.js	2017-02-24 11:38:42 -08:00
Seth Alves	70060eb464	in 2d mode, clicks on tablet don't get used for other things ... Conflicts: scripts/system/libraries/entitySelectionTool.js	2017-02-24 11:37:04 -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
David Kelly	d399f648d5	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/palVolumeSorting	2017-02-24 10:32:43 -08:00
sam	8e122b3357	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-02-23 21:24:47 -08:00
David Kelly	4a4c914ca8	First cut at new styling	2017-02-23 18:53:22 -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	4bbbcb61be	expand avatar update time budget	2017-02-23 17:36:45 -08:00
Andrew Meadows	14e7392a89	minor cleanup	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
Brad Davis	61e341db75	Merge remote-tracking branch 'upstream/master' into smarter_textures	2017-02-23 17:22:03 -08:00
Seth Alves	a286c72b3b	cleanups	2017-02-23 15:12:45 -08: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
Seth Alves	2c42309aaa	perfer tablet over other overlays for mouse-clicks	2017-02-23 13:32:24 -08:00
Seth Alves	84d9af14b0	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay	2017-02-23 10:40:18 -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
Seth Alves	37004e4347	steps toward making mouse work on tablet	2017-02-23 08:11:31 -08:00
Brad Hefta-Gaub	06f0087459	wire up radius properly	2017-02-22 22:36:37 -08:00
Seth Alves	41ef7b8dbb	add setting to control if tablet is an entity or overlay	2017-02-22 21:13:42 -08:00
Seth Alves	1b26c3469f	fix signed/unsigned joint index problem	2017-02-22 20:39:34 -08:00
Seth Alves	b4be942348	trying to get tablet overlay to show up in the right place	2017-02-22 19:18:03 -08:00
Seth Alves	273f0130f3	fix sphere vs box check for grabbing overlays. fix newly introduced equipping bug.	2017-02-22 17:43:09 -08:00
Andrew Meadows	6ac33dbf61	count avatar joint updates and non-updates	2017-02-22 17:23:36 -08:00
Seth Alves	bfc4853947	make overlays near-grabbable. make tablet be an overlay	2017-02-22 16:50:02 -08:00
howard-stearns	de3a0d3d0c	button styling	2017-02-22 13:02:05 -08:00
howard-stearns	023a32563c	work around .qml settings issues	2017-02-22 12:59:40 -08:00
samcake	6938948501	Merge branch 'master' of https://github.com/highfidelity/hifi into texmex	2017-02-22 12:00:11 -08: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	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
Seth Alves	a8de6c8c93	Merge pull request #9723 from hyperlogic/bug-fix/tablet-ui-reload-script-bug ... Fix for system toolbar hiding when scripts are reloaded	2017-02-22 07:34:20 -08:00
Anthony J. Thibault	379b7bc56d	Fix for system toolbar hiding when scripts are reloaded	2017-02-21 17:24:22 -08:00
Brad Hefta-Gaub	97fc88491f	Merge pull request #9718 from AndrewMeadows/sort-avatars-correctly ... fix sorting algorithm for avatar render updates	2017-02-21 16:14:12 -08:00
howard-stearns	a20590a2f9	fixed myCard width in all cases (admin or not)	2017-02-21 16:03:59 -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
howard-stearns	1ddc7de581	remove debugging (and fix missing brace)	2017-02-21 15:41:17 -08:00
howard-stearns	f21e17d512	new buttons	2017-02-21 15:32:41 -08:00
Andrew Meadows	dd447689e0	expose avatar sort coefficients for fine tuning	2017-02-21 15:09:44 -08:00
Brad Hefta-Gaub	2017ea4491	hacking on using sorted avatars for bandwidth budget	2017-02-21 14:18:00 -08:00
Seth Alves	3b181eb803	code review	2017-02-21 13:56:28 -08:00
howard-stearns	aff44d682e	Merge branch 'master' of https://github.com/highfidelity/hifi into filter-pal-by-view-distance	2017-02-21 13:45:25 -08:00
Andrew Meadows	27dd82b517	fix sorting algorithm for avatar render updates	2017-02-21 13:34:07 -08:00
howard-stearns	15d8041683	snapshot working, before button change	2017-02-21 13:14:45 -08:00
Thijs Wenker	13b2b6086f	Fix recorder.js playback in interface	2017-02-21 19:47:26 +01:00
David Kelly	76229905f2	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/palVolumeSorting	2017-02-21 09:24:22 -08:00
Brad Hefta-Gaub	ec8a95037d	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMixerLoopImprovements	2017-02-20 17:01:29 -08:00
Seth Alves	70c9853189	Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid	2017-02-20 12:38:13 -08:00
Seth Alves	4a650ff2bb	Overlays::getOverlayAtPoint was depending on the order in which the overlays were added	2017-02-19 18:37:35 -08:00