276 commits

Author	SHA1	Message	Date
Dante Ruiz	0b3a7d90f1	removed committed code	2017-01-10 23:26:37 +00:00
Dante Ruiz	d0baa0e303	home button works with the stylus	2017-01-10 14:51:46 -08:00
Seth Alves	0fc1abc068	remember previous parentID in the script and try to put it back when releasing	2017-01-10 13:00:49 -08:00
Seth Alves	bff9e9be38	put back code that replaces previous parentID on release	2017-01-10 09:22:36 -08:00
Seth Alves	61f0c56a36	remove code that remembers previous state in userData	2017-01-09 14:20:03 -08:00
Seth Alves	fa803aebe9	use /~/ style to reference includes	2017-01-09 10:21:07 -08:00
Seth Alves	195b92d05d	lasers on webpage work again	2017-01-05 14:35:02 -08:00
Seth Alves	5e9c37777c	Merge branch 'fixMouseLasers' of github.com:ZappoMan/hifi into tablet-ui-reenable-web-lasers	2017-01-05 12:50:07 -08:00
Seth Alves	52ef22770b	make showing of stylus be proximity based rather than raypick based	2017-01-05 12:49:50 -08:00
Brad Hefta-Gaub	368f48f0a7	Merge pull request #9247 from huffman/feat/tutorial-touch-grip ... Add support for new Touch grip mappings to tutorial	2017-01-04 17:58:05 -08:00
Seth Alves	a585d43a5e	attempt to get laser-based web scrolling to work, again	2017-01-04 16:51:47 -08:00
Seth Alves	ed934c37ae	put code that allows lasers vs web entities or overlays back in	2017-01-04 15:23:55 -08:00
Brad Hefta-Gaub	d440532cff	make sure RPC is timely	2017-01-03 11:10:07 -08:00
Anthony Thibault	c201b6a7f9	Merge pull request #9256 from druiz17/moreButtons ... all hub button now on tablet	2017-01-03 10:44:19 -08:00
Anthony J. Thibault	00980366d6	Merge branch 'master' into tablet-ui	2017-01-03 09:45:23 -08:00
Brad Hefta-Gaub	82ab8635d7	debugging	2016-12-30 12:02:48 -08:00
Brad Hefta-Gaub	7c7d239e00	first cut at using wait signals to improve RPC timing	2016-12-30 09:13:21 -08:00
Dante Ruiz	61277c0605	Stylus now works in edit mode	2016-12-22 17:33:25 +00:00
Ryan Huffman	df0dfc761d	Add ability to disable avatar and object scaling in handController grab	2016-12-20 18:01:53 -08:00
Stephen Birarda	ebd347fc15	only respect release of secondary for hold once pressed	2016-12-20 14:46:55 -08:00
Stephen Birarda	4fcccb5455	check for release of equip in this.nearGrabbing	2016-12-20 14:32:47 -08:00
Stephen Birarda	c3d736dd16	return after release, duh	2016-12-20 14:30:08 -08:00
Stephen Birarda	8cd13eaedf	always unequip on secondary release	2016-12-20 14:25:26 -08:00
Stephen Birarda	0a024616cc	add special equip for oculus style grab	2016-12-20 14:21:23 -08:00
Philip Rosedale	13e03b35cc	removed initial delay for seek beams	2016-12-20 14:11:52 -08:00
Philip Rosedale	938734d3fc	Grip controllers can grab objects, slight delay on search beam	2016-12-20 14:11:33 -08:00
Seth Alves	36e843178a	diff minimization	2016-12-20 09:21:41 -08:00
Seth Alves	e5804dade0	get stylus working with web entities	2016-12-20 07:43:48 -08:00
Seth Alves	ae7af3e227	don't hide stylus so quickly	2016-12-20 07:43:48 -08:00
Seth Alves	e9c848bfe8	stylus for web overlays	2016-12-20 07:43:48 -08:00
David Rowe	25651800dd	Code review	2016-12-20 07:43:48 -08:00
Seth Alves	67093dc519	don't flutter tablet when menu button is pressed. start on a stylus	2016-12-20 07:43:48 -08:00
David Rowe	7a36e4eed8	Fix keyboard focus when switch highlight between overlays and entities	2016-12-20 07:42:21 -08:00
David Rowe	0accdddc8f	Fix Web overlay x, y coordinate calcs	2016-12-20 07:42:21 -08:00
David Rowe	f749c76ced	First pass at controller interaction with 3D Web overlay	2016-12-20 07:42:21 -08:00
David Rowe	9459b967be	Merge branch 'master' into 21089	2016-12-16 20:02:43 +13:00
Anthony J. Thibault	8b99fa90e8	Merge branch 'master' into tablet-ui	2016-12-15 13:28:23 -08:00
Philip Rosedale	14c867fdbd	Can't resize if objects in both hands, avatar resize is seek + grips	2016-12-14 13:38:37 -08:00
David Rowe	efb784f703	Code review	2016-12-13 13:11:21 +13:00
Philip Rosedale	9370c8af6b	Added ability to rescale avatar	2016-12-12 15:26:53 -08:00
Philip Rosedale	8572950a09	Both grip buttons enable rescale for a held object	2016-12-12 09:39:32 -08:00
David Rowe	e956608fa4	Fix keyboard focus when switch highlight between overlays and entities	2016-12-09 18:31:52 +13:00
David Rowe	7d8926c802	Fix Web overlay x, y coordinate calcs	2016-12-09 17:00:00 +13:00
Seth Alves	369f61e172	bring over some previous tablet-ui work	2016-12-08 16:54:39 -08:00
David Rowe	4c236b293e	First pass at controller interaction with 3D Web overlay	2016-12-09 01:47:40 +13:00
Dante Ruiz	08301d488d	clean up	2016-12-05 18:10:54 +00:00
Dante Ruiz	09d5dc382f	better solution	2016-12-05 18:08:36 +00:00
Dante Ruiz	1b24d373d2	fixed near grab issue	2016-12-01 10:18:34 -08:00
Dante Ruiz	dc7bb5b083	grip button fix	2016-12-01 10:17:54 -08:00
Ryan Huffman	aa1e813d72	Fix 'releaseGrab' not being called when using grip buttons	2016-11-29 15:04:14 -08:00