297 commits

Author	SHA1	Message	Date
Anthony J. Thibault	2c3c96b600	Fix for broken entity scrolling introduced by 23ea65e2 ... this.grabbedEntity was being cleared before entityTouchingExit transition could send the release event.	2017-01-19 14:23:43 -08:00
Seth Alves	18e9b476c5	Merge pull request #9439 from hyperlogic/tablet-ui ... Improved stylus and laser input deadspot	2017-01-19 12:43:02 -08:00
Seth Alves	41ddfbfd27	clean up grab.js. provide a way to delete old tablets that got saved into Settings on exit	2017-01-19 11:34:38 -08:00
Anthony J. Thibault	2fd691d844	Improved stylus and laser input deadspot	2017-01-18 18:23:00 -08:00
Seth Alves	7c938728e5	don't do constant haptics if stylus touches tablet frame. home button triggers only once per click	2017-01-18 16:56:39 -08:00
Anthony J. Thibault	56c897cc2f	Process the tablet stylus even when reticle is over 2d HUD overlay.	2017-01-18 15:36:09 -08:00
Anthony J. Thibault	fc5c2c8def	Fix for glitchy scrolling	2017-01-18 15:32:38 -08:00
Anthony J. Thibault	28dac9d802	Lasers now interact with the tablet in edit mode.	2017-01-18 15:32:36 -08:00
Seth Alves	a8038ce64e	cleanups	2017-01-18 10:50:02 -08:00
Seth Alves	1f92b57bf2	switch to model stylus	2017-01-18 10:46:18 -08:00
Seth Alves	89d7b8bfc6	call releaseEquip when an equipped entity is dropped with a secondary press	2017-01-17 13:27:01 -08:00
Seth Alves	5c205f5800	avoid an unhook loop if two different hands have passed something back and forth more than once	2017-01-17 10:24:30 -08:00
Seth Alves	6bace4f451	merge from upstream	2017-01-17 09:29:30 -08:00
Seth Alves	23ea65e2b5	more changes to handle camera-relative-controller joints.	2017-01-16 10:26:16 -08:00
Seth Alves	b617b3a114	put code to delete prim-stylus tip back in	2017-01-16 07:50:36 -08:00
Seth Alves	756d96c368	fix search ray getting left on. started adding stylus models	2017-01-16 07:46:12 -08:00
Seth Alves	4a451e95dc	don't call release when off state is entered. don't attempt to unhook stylus as a stray child	2017-01-15 11:29:29 -08:00
Seth Alves	b8234ad75c	try a different way of keeping track of original parentIDs of grabbed entities	2017-01-15 10:16:28 -08:00
Seth Alves	e00814dd53	auto-end a near-grab if the parentID is changed to something else	2017-01-13 14:21:44 -08:00
Seth Alves	611a926894	if something dynamic is release and it's not moving, give it a little velocity so that it doesn't end up non-active in bullet	2017-01-12 13:45:03 -08:00
Seth Alves	c93d83dadd	update lasers when distance-scrolling a web entity/overlay	2017-01-10 16:41:07 -08:00
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