4764 commits

Author	SHA1	Message	Date
David Rowe	883479d654	Merge branch 'master' into M17428-c	2018-08-23 10:43:44 +12:00
John Conklin II	32562511e8	Merge pull request #13782 from ElderOrb/FB17184 ... Add Support for Managing Avatar Entities to the Avatar App	2018-08-22 10:20:04 -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
David Rowe	4b12e18c27	Merge branch 'master' into M17428-c	2018-08-21 16:52:30 +12:00
David Rowe	536db64123	Mitigate against UI overlay possibly getting rotated	2018-08-21 16:48:35 +12:00
David Rowe	e25b2f6e0f	Support stylus input on the mini tablet	2018-08-21 16:47:40 +12:00
David Rowe	f6a607efcc	Expand / shrink mini-tablet when showing / hiding	2018-08-21 15:43:37 +12:00
David Rowe	5e7f68d4b7	Use a smaller near grab radius for tablet and mini-tablet	2018-08-21 14:00:20 +12:00
David Rowe	67eb03ba7d	Reduce strength of teleport parabola	2018-08-21 11:18:00 +12:00
David Rowe	69e5eb9b1c	Move tablet towards fingertips as it expands	2018-08-21 10:46:48 +12:00
David Rowe	dc86230e40	Make "..." expand tablet per display hand rather than centered	2018-08-21 10:33:13 +12:00
David Rowe	f4a8dc49e9	Add button sounds	2018-08-21 10:28:23 +12:00
David Rowe	4268297769	Mini tablet button actions	2018-08-21 09:17:53 +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
David Rowe	6791d3f1b6	Mini tablet button icons and states	2018-08-21 08:36:04 +12: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	4e23caf46d	Fix tablet proper not being grabbed once mini tablet has expanded	2018-08-20 17:57:59 +12:00
David Rowe	ff54516790	Maintain overlays ready for display in HMD mode	2018-08-20 17:46:07 +12:00
David Rowe	aca343330f	Base UI elements	2018-08-20 16:00:02 +12:00
David Rowe	94041291d5	Add web3d overlay for UI surface	2018-08-20 10:58:01 +12:00
Alexander Ivash	9f92ff5de9	fix for duplicating wearables on saving ... note: the issue was caused by newly-introduced code converting between attachments & entities fix removes attachments-related code because attachments are deprecated and converted into entities on the fly	2018-08-18 16:38:35 +03:00
David Rowe	26576fa760	Fix Vive left/right buttons not disabling teleport	2018-08-18 09:34:16 +12:00
David Rowe	2c389af751	Display mini tablet only if camera is also looking at the hand	2018-08-17 16:18:22 +12:00
David Rowe	846f38584f	Merge branch 'master' into M17428	2018-08-17 15:01:35 +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	40f7914aae	Expand from lower left/right of proxy tablet	2018-08-16 19:11:03 +12:00
David Rowe	7a1a86f182	Expand proxy tablet immediately it is grabbed; grab with either hand	2018-08-16 16:20:28 +12:00
David Rowe	cb9b7f567a	Move update functions into state machine	2018-08-16 16:08:36 +12:00
David Rowe	8d1b947bbd	Fix variable names	2018-08-16 13:35:36 +12:00
elderorb	ea22fdb400	Merge branch 'master' into FB17184	2018-08-16 02:08:47 +03:00
David Rowe	a86fdeafc0	Merge branch 'master' into M17248-a	2018-08-16 10:38:30 +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
Thijs Wenker	876079bb81	deactivate Create App when desktop windows are closed	2018-08-11 00:41:50 +02:00
David Rowe	2a177e04e1	Misc. tweaks	2018-08-11 10:11:56 +12: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 Rowe	b4ec1f4310	Reorient tablet proxy	2018-08-11 06:18:26 +12:00