1756 commits

Author	SHA1	Message	Date
Brad Hefta-Gaub	38668b6ce5	Merge pull request #9812 from sethalves/dont-auto-ungrab-overlays ... don't automatically unhook overlays from hands unless they were grabbable overlays	2017-03-06 12:32:18 -08:00
Thijs Wenker	6ded937b25	Merge pull request #9809 from Menithal/21201 ... WL#21201 Snap-together Magnetic blocks	2017-03-06 21:30:53 +01:00
Seth Alves	a2d2c41f02	remove debug print	2017-03-06 11:45:49 -08:00
Seth Alves	6ac576c9e6	Merge branch 'master' of github.com:highfidelity/hifi into dont-auto-ungrab-overlays	2017-03-06 10:43:43 -08:00
Seth Alves	19a31d7630	don't automatically unhook overlays from hands unless they were grabbable overlays	2017-03-06 10:15:53 -08:00
Brad Hefta-Gaub	781e0be0e3	Merge pull request #9806 from howard-stearns/preserve-audio-data-during-pal-refresh ... preserve audio data during pal refresh	2017-03-06 08:45:46 -08:00
Seth Alves	c677326025	Merge pull request #9754 from hyperlogic/feature/fingers-on-tablet ... Touch the tablet with your finger	2017-03-04 11:58:47 -08:00
Menithal	ea3f7f0274	Initial Magnetic block	2017-03-04 18:50:30 +02:00
howard-stearns	15d680d4f9	preserve audio data during pal refresh	2017-03-03 16:56:12 -08:00
Anthony J. Thibault	e56f02d94f	Changed default for preferFingerOverStylus to false.	2017-03-03 14:12:04 -08:00
Seth Alves	bccfa79e8b	Merge pull request #9749 from ctrlaltdavid/21176 ... If someone else is grabbing entity you want to grab show their grab beam	2017-03-03 13:43:28 -08:00
Anthony J. Thibault	45febe8565	Merge branch 'master' into feature/fingers-on-tablet	2017-03-03 09:04:43 -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
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	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
Anthony J. Thibault	644e29a43d	disable WANT_STATE_DEBUG in handControllerGrab.js	2017-03-02 14:15:05 -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
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
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
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
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
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
Menithal	231ebef117	Removed stray debugPrint	2017-03-02 01:01:57 +02:00
Menithal	fd1fded276	Fixed Clone instancing issues	2017-03-02 00:59:45 +02:00
Anthony J. Thibault	d142c3d69b	eslint fix	2017-03-01 13:29:24 -08:00
Anthony J. Thibault	f418457100	Index finger touch support for the tablet-ui.	2017-03-01 13:28:17 -08:00
Menithal	82236bdcb9	Merge remote-tracking branch 'upstream/master' into 21166	2017-03-01 22:09:29 +02:00
Menithal	f538ac24f3	Various Properties	2017-03-01 22:07:02 +02:00
David Kelly	45293ab130	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/palVolumeSorting	2017-03-01 12:55:54 -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
David Kelly	efe44425a6	cr feedback, plus something I missed	2017-03-01 09:26:03 -07: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
Matti Lahtinen	d0c2c26a8e	One last gotcha from the conflict resolution.	2017-02-28 16:37:08 +02:00
Matti Lahtinen	e21785d5ec	Merge branch 'master' into 21166	2017-02-28 16:34:28 +02:00
David Rowe	d8d17be0e0	Rotate about translation grab position	2017-02-28 23:22:07 +13:00
David Rowe	e3f2f3c5bc	Tidying	2017-02-28 23:04:23 +13:00
David Rowe	28768d4a78	Rotate the entity by twice the rotating controller's rotation	2017-02-28 22:22:34 +13:00
David Rowe	5b6f953ac2	Add hand controller state of distance-rotating for second grab hand	2017-02-28 17:35:13 +13:00
Seth Alves	117be16c31	pull from upstream	2017-02-27 16:48:23 -08:00
Ryan Huffman	f5f7cc5266	Fix teleport seat beam color to match model	2017-02-27 16:38:55 -08:00
Ryan Huffman	aa94106229	Update teleport to sit in invisible seats	2017-02-27 16:38:55 -08:00
Ryan Huffman	40b238c12e	Add new teleport seat model + beam	2017-02-27 16:38:53 -08:00
Ryan Huffman	c632884aac	Update teleport script to handle detecting seats	2017-02-27 16:38:53 -08:00