4742 commits

Author	SHA1	Message	Date
Dante Ruiz	78458d62de	revert some changes and fix toolbar issue	2018-08-22 15:20:56 -07:00
Dante Ruiz	535fdf32cf	saving changes	2018-08-22 13:13:00 -07:00
Dante Ruiz	26a30edec9	trying to fix loading bar	2018-08-21 18:27:21 -07:00
Dante Ruiz	71e8ccd190	Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page	2018-08-21 16:20:16 -07:00
John Conklin II	1b4314ae45	Merge pull request #13846 from ctrlaltdavid/M17652-b ... Reduce strength of teleport parabola	2018-08-21 11:32:40 -07:00
Dante Ruiz	db3d3d3d93	Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page	2018-08-21 09:56:59 -07:00
David Rowe	67eb03ba7d	Reduce strength of teleport parabola	2018-08-21 11:18:00 +12:00
Seth Alves	c876cda89d	Merge pull request #13826 from ctrlaltdavid/M17615 ... Disable Vive teleport button if transitioning from direction button	2018-08-20 14:05:45 -07:00
Dante Ruiz	2261ad2bcb	clean up the interstitial page	2018-08-20 11:14:48 -07:00
Ryan Huffman	ead0126365	Merge pull request #13815 from thoys/fix/create/createZeroRotationEntities ... MS17562: CreateApp - newly created Entity rotation should be zero	2018-08-20 09:07:38 -07:00
David Rowe	26576fa760	Fix Vive left/right buttons not disabling teleport	2018-08-18 09:34:16 +12:00
David Rowe	5328b48acc	Make Vive snap turn buttons lock teleport, also	2018-08-17 09:09:11 +12:00
David Rowe	bf733ded0f	Handle Vive controller not being available at start-up	2018-08-17 09:08:28 +12:00
John Conklin II	96fd4704ac	Merge pull request #13829 from huffman/fix/edit-zoom-stuck ... Fix edit orbit camera getting stuck zooming	2018-08-16 08:21:31 -07:00
David Rowe	8d1b947bbd	Fix variable names	2018-08-16 13:35:36 +12:00
Ryan Huffman	2f833f16d8	Force entity list tool to refresh when opened	2018-08-15 14:19:20 -07:00
Ryan Huffman	24af22a52f	Fix edit orbit camera getting stuck zooming	2018-08-15 13:56:44 -07:00
Seth Alves	83718ca06d	Merge pull request #13746 from alexiamandeville/emoteIcon ... updating emote app icon	2018-08-15 08:29:48 -07:00
David Rowe	2034162c76	Disable Vive teleport button if transitioning from direction button	2018-08-15 21:31:53 +12:00
Seth Alves	3623590e90	Merge pull request #13784 from sethalves/far-point-joints ... Far point joints	2018-08-14 15:40:07 -07:00
John Conklin II	8c5344ad1a	Merge pull request #13781 from thoys/fix/localAngularVelocityZeroesOut ... MS17380: Create App fix for angularVelocity zeroing out on duplication or undo	2018-08-14 11:37:33 -07:00
Seth Alves	527b27da96	pseudo-joints for far-grab positions	2018-08-14 08:55:20 -07:00
Seth Alves	54fa7dd0b6	Merge pull request #13817 from sethalves/fix-desktop-handshake ... fix desktop press-x handshake	2018-08-14 08:42:10 -07:00
John Conklin II	73ef2ff09c	Merge pull request #13804 from thoys/fix/create/cantMoveFocusCameraOutPastLowLimit ... MS17291: Create-app increase focus distance limit	2018-08-13 14:58:17 -07:00
Seth Alves	4fa0c96046	fix desktop press-x handshake	2018-08-13 11:57:48 -07:00
Thijs Wenker	221dfb8979	typo fix	2018-08-11 05:46:48 +02:00
Thijs Wenker	a20be5b50d	remove rotation for newly created entities	2018-08-11 02:28:01 +02:00
Thijs Wenker	f26188d5b8	added comment for limit choice	2018-08-11 01:54:13 +02:00
Dante Ruiz	75cc1c62c0	mostly done interstitial page	2018-08-10 16:53:34 -07:00
Thijs Wenker	876079bb81	deactivate Create App when desktop windows are closed	2018-08-11 00:41:50 +02:00
Ryan Huffman	c0ac76bf4a	Merge pull request #13797 from dback2/rotationRingSize ... Edit handle rotation ring size	2018-08-10 13:53:10 -07:00
David Back	1d0da4042a	Merge pull request #13771 from dback2/entityListCtrlReselection ... Reselecting same entity in list will unselect it	2018-08-10 10:41:57 -07:00
Dante Ruiz	46297c6b22	interstitial page	2018-08-10 10:20:39 -07:00
John Conklin II	de0cdf6d8d	Merge pull request #13793 from wayne-chen/fixWebTabletJSBug ... Fixing web tablet JavaScript error	2018-08-10 09:31:17 -07:00
Thijs Wenker	925cfc9b23	Set a max focus distance value of 14km to not lose the edit handles by far-clipping	2018-08-10 16:45:27 +02:00
John Conklin II	6c647c8185	Merge pull request #13768 from thoys/fix/create/triggerable-reset ... MS17413 Triggerable value does not reset on entity deselect	2018-08-09 17:13:34 -07:00
Dante Ruiz	353121be7d	making some changes	2018-08-09 16:29:37 -07:00
Alexia Mandeville	38973f0840	Adding icon states to emote app, active state	2018-08-09 16:00:36 -07:00
John Conklin II	6447bcab5b	Merge pull request #13765 from dback2/serverScriptStatus ... Fix server script status	2018-08-09 14:51:17 -07:00
John Conklin II	f31776516b	Merge pull request #13791 from dback2/editHandlesAlpha ... Alpha 1 for edit handles	2018-08-09 14:50:43 -07:00
David Back	cc953ab691	Merge branch 'master' of https://github.com/highfidelity/hifi into rotationRingSize	2018-08-09 13:36:13 -07:00
David Back	e36e9aa68f	tweak rotation ring size	2018-08-09 13:35:55 -07:00
John Conklin II	6481aea2f4	Merge pull request #13715 from SamGondelman/parabolic ... Enable parabolic teleport	2018-08-09 13:12:17 -07:00
Dante Ruiz	9a8ebdd021	Merge pull request #13739 from dback2/cloneChildrenFix ... Fix cloning a parented entity	2018-08-09 13:05:28 -07:00
John Conklin II	f4f0c5fcad	Merge pull request #13767 from ctrlaltdavid/M15772 ... Fix entity stay highlighted after hand leaves when far grabbing another	2018-08-09 12:53:41 -07:00
Wayne Chen	2a6ff90a2c	fixing web tablet error	2018-08-09 11:30:10 -07:00
David Back	a6d944e034	use alpha 1 for edit handles	2018-08-09 10:32:34 -07:00
John Conklin II	34697b6b07	Merge pull request #13770 from huffman/fix/edit-duplicate-fix ... Fix duplicating multiple entities causing infinite looping	2018-08-09 09:07:37 -07:00
Dante Ruiz	faa5411757	Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page	2018-08-09 08:42:14 -07:00
Dante Ruiz	0fed48bd0e	improving interstitial page	2018-08-08 18:15:27 -07:00