51759 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David Rowe	02a2bb6fc3	Rename QML file	2017-03-03 16:25:15 +13:00
David Rowe	2b53cb4722	Display audio stats in tablet	2017-03-03 11:31:41 +13:00
David Rowe	b985b348ec	Merge branch 'tablet-ui-edit-js' into 21199	2017-03-03 09:43:49 +13:00
David Rowe	4d624ad256	Merge branch 'menuFix' into 21199	2017-03-03 09:42:16 +13:00
Seth Alves	94b5e6333c	get handControllerGrab overlay lines working again	2017-03-02 11:02:06 -08:00
Ryan Huffman	1564c76ab4	Merge pull request #9792 from huffman/feat/hand-controller-drop ... Add Hifi-Hand-Drop so scripts can cause grabbed items to be dropped	2017-03-02 10:51:35 -08:00
Chris Collins	85f25fdfd1	Merge pull request #9800 from highfidelity/stable ... Sync Stable with Master	2017-03-02 10:45:51 -08:00
Seth Alves	9d4445fd61	Merge branch 'steady-hand-lasers' of github.com:sethalves/hifi into tablet-ui-edit-js	2017-03-02 10:07:37 -08:00
Seth Alves	cf37845f9e	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-02 10:06:38 -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
Seth Alves	93055a67a8	use new-style hand-lasers for both hands	2017-03-02 10:01:08 -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
Dante Ruiz	5ba89e67af	fixed message dialog bug	2017-03-02 16:50:42 +00:00
Andrew Meadows	6612d71f85	Merge pull request #9793 from thoys/fix_readme_links ... Prefer HTTPS links in readme/build docs	2017-03-02 08:25:33 -08:00
Dante Ruiz	ea804578ce	Merge branch 'master' into menuFix	2017-03-02 16:06:32 +00:00
David Kelly	79e440be81	fix unmute when ignoring in PAL (you can't)	2017-03-02 08:36:58 -07: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
Thijs Wenker	f42f8cf602	bullet moved	2017-03-02 02:39:34 +01: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
Dante Ruiz	58c1a2fb99	Merge branch 'master' into menuFix	2017-03-02 00:55:18 +00: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	48ad7fcaae	Merge pull request #9698 from davidkelly/dk/palVolumeSorting ... PAL average volume sorting	2017-03-01 15:34:05 -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
Thijs Wenker	c8911d14e6	http->https	2017-03-01 22:04:51 +01:00
David Kelly	dc754cff5f	magical new glyphs	2017-03-01 13:57:03 -07:00
Thijs Wenker	1d3be1607d	removed broken Faceshift domain from Build manual	2017-03-01 21:35:35 +01:00
Thijs Wenker	64240d3394	use https in readme/build documentation rather than http	2017-03-01 21:31:43 +01: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
Ryan Huffman	1c3840dc78	Add Hifi-Hand-Drop so scripts can cause grabbed items to be dropped	2017-03-01 10:25:16 -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
Dante Ruiz	accff0a37a	Merge branch 'master' into menuFix	2017-03-01 16:05:58 +00:00
Dante Ruiz	e2479a78bd	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix	2017-03-01 16:04:12 +00: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
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
Seth Alves	319c5f69e7	Merge pull request #8 from druiz17/tablet-edit-js ... fixed combobox and pushOntoStack	2017-02-28 13:53:59 -08:00
David Kelly	c10b0389de	Add a getAvatarGain method to NodeList and UsersScriptingInterface	2017-02-28 14:45:34 -07:00
Dante Ruiz	16d3f22e77	remove uncommented code	2017-02-28 21:39:33 +00:00
Dante Ruiz	606d618fe8	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into tablet-edit-js	2017-02-28 21:35:14 +00:00
Seth Alves	c2085ebb6e	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-28 13:33:51 -08:00
Dante Ruiz	f0f2b8c4da	fix comboBox and PushOntoStack	2017-02-28 21:30:25 +00: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
David Kelly	1fc57ce9a6	alan's feedback	2017-02-28 11:51:40 -07: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
Dante Ruiz	50471db376	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into tablet-edit-js	2017-02-28 17:12:41 +00:00
Chris Collins	dc61db37a1	Merge pull request #9746 from highfidelity/RC-34 ... Beta Release 34 - Includes up to Developer Release 6083	2017-02-28 09:09:38 -08:00