51825 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David Rowe	6403e51d20	Merge branch 'tablet-ui-edit-js' into 21199	2017-03-04 09:00:49 +13:00
Seth Alves	40caa1ea49	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-03 09:01:57 -08:00
Philip Rosedale	ac16d86835	Merge pull request #9788 from ctrlaltdavid/21186 ... Distance grab with second hand rotates entity	2017-03-03 08:39:22 -08:00
David Rowe	388a144af1	Tidying after merge	2017-03-03 18:44:50 +13:00
David Rowe	482c23ead5	Merge branch 'master' into 21186 ... # Conflicts: # scripts/system/controllers/handControllerGrab.js	2017-03-03 18:38:42 +13:00
David Rowe	854292b193	Merge branch 'tablet-ui-edit-js' into 21199	2017-03-03 17:51:12 +13:00
David Rowe	55963c4418	Style audio stats dialog button	2017-03-03 17:46:12 +13:00
David Rowe	b31cf23c8d	Fix tablet QML fonts path ... This is the path for running scripts from build/install directory rather than from source directory.	2017-03-03 17:45:23 +13:00
David Rowe	3285816fca	Fix up audio stats displayed in tablet	2017-03-03 16:45:35 +13:00
David Rowe	02a2bb6fc3	Rename QML file	2017-03-03 16:25:15 +13: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	f055711c76	refix	2017-03-02 16:47:19 -08:00
Seth Alves	3b581a8dfe	merge from upstream	2017-03-02 16:35:44 -08:00
Seth Alves	9f07079be6	Merge branch 'steady-hand-lasers' of github.com:sethalves/hifi into tablet-ui-edit-js	2017-03-02 16:34:06 -08:00
Seth Alves	155a310852	Merge pull request #9761 from Menithal/21166 ... WL#21166 Cloneable Equipment	2017-03-02 16:33:13 -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	6a4d477381	fix up bounds handling in Line3DOverlay	2017-03-02 16:15:41 -08:00
David Rowe	2b53cb4722	Display audio stats in tablet	2017-03-03 11:31:41 +13:00
Seth Alves	f321ffdf91	don't clear EDIT_SETTING flag when creating new entities	2017-03-02 13:00:52 -08:00
Seth Alves	bbfd373887	Merge branch 'steady-hand-lasers' of github.com:sethalves/hifi into tablet-ui-edit-js	2017-03-02 12:51:52 -08:00
Seth Alves	9b3c16d489	get handControllerGrab overlay lines working again	2017-03-02 12:48:37 -08:00
Seth Alves	2047e0194d	Merge branch 'master' of github.com:highfidelity/hifi into steady-hand-lasers	2017-03-02 12:44:10 -08: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
Menithal	91fa871d55	Merge branch 'parent-hotkey' of mgit:Menithal/hifi into parent-hotkey	2017-03-02 21:40:45 +02:00
Menithal	9c31f66b75	Addressed CR of 9684	2017-03-02 21:39:56 +02: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
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
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
Menithal	231ebef117	Removed stray debugPrint	2017-03-02 01:01:57 +02:00