417 commits

Author	SHA1	Message	Date
Seth Alves	834699fa12	Move grab pseudo-properties (userData) into first-class EntityItemProperties.	2018-10-02 08:54:12 -07:00
John Conklin II	9cbd819a39	Merge pull request #13965 from ctrlaltdavid/M17428-f ... Mini tablet in palm	2018-10-01 16:56:36 -07:00
John Conklin II	130e8dfbe9	Merge pull request #14023 from dback2/selectEntityEveryFrameFix ... Only call selectEntity once triggered when using edit handles	2018-09-28 16:38:10 -07:00
David Rowe	7b7447739a	Remove unused code noticed in passing	2018-09-28 14:23:20 +12:00
David Rowe	45993ba475	Provide mini tablet details via API instead of messages	2018-09-28 14:23:08 +12:00
David Rowe	d98e7cea4e	Fix not being able to grab tablet with other hand	2018-09-28 11:09:16 +12:00
David Rowe	2456fd0e99	Merge branch 'master' into M17428-f	2018-09-28 08:41:57 +12:00
Dante Ruiz	d4450ac780	fix equip and keeping new functionallity	2018-09-21 15:59:00 -07:00
David Rowe	eac1666e01	Disable grabbing the mini tablet with the grip button	2018-09-21 12:44:55 +12:00
David Rowe	5719b7020d	Merge branch 'master' into M17428-f	2018-09-21 10:47:56 +12:00
David Back	46c8083fb9	only call selectEntity one time per trigger	2018-09-19 10:13:15 -07:00
John Conklin II	65ef04ae75	Merge pull request #13937 from luiscuenca/stt_teleport_wip ... Safe Teleport Target	2018-09-14 15:11:18 -07:00
luiscuenca	04e6225a95	Threshold back	2018-09-14 11:22:47 -07:00
luiscuenca	8c9173b639	Safe landing for discrepancies	2018-09-14 11:06:30 -07:00
luiscuenca	fb37e13aae	fix hat stand fail	2018-09-13 18:21:22 -07:00
David Rowe	bbfb2b1374	Merge branch 'master' into M17428-f	2018-09-14 10:36:49 +12:00
luiscuenca	b517808bc2	Fix smaller size avatar capsule and land on detailed mesh	2018-09-12 21:24:19 -07:00
Wayne Chen	521361293a	moving comment locations inside conditionals	2018-09-12 11:03:00 -07:00
Wayne Chen	acf34dcfdf	one more unused variable	2018-09-12 10:58:05 -07:00
Wayne Chen	8bef0d0de4	removing unused variables	2018-09-12 10:55:40 -07:00
Wayne Chen	b9f0af63e1	changing check for near grabbing modules - fixes grabbing for dynamic	2018-09-12 10:38:21 -07:00
Wayne Chen	045ac4cb0d	allowing grip button for interrupting web scroll	2018-09-11 17:43:03 -07:00
Wayne Chen	b6c5ae2a68	staging changes	2018-09-11 15:23:40 -07:00
luiscuenca	fedea6e84d	Comply with review comments	2018-09-11 12:23:25 -07:00
Wayne Chen	d9e0352028	removing debug comments	2018-09-11 11:44:32 -07:00
Wayne Chen	7aae536624	adding fix to allow web scroll	2018-09-11 11:41:24 -07:00
luiscuenca	82b662d08e	Add pick offset	2018-09-11 09:34:36 -07:00
luiscuenca	13de22adb3	Fix radius scale	2018-09-11 07:22:59 -07:00
luiscuenca	a9f676354b	Only invisible pointers and scale fix	2018-09-10 08:54:53 -07:00
David Rowe	7dba2e6a2e	Merge branch 'master' into M17428-f	2018-09-08 12:45:11 +12:00
luiscuenca	d09391faa5	Fix invisible error	2018-09-07 12:17:40 -07:00
Wayne Chen	fc4c728181	Merge branch 'master' of https://github.com/highfidelity/hifi into fixGrabWebSurface-case-16192	2018-09-07 10:11:34 -07:00
luiscuenca	01424b8179	Head Collision Pick added	2018-09-06 09:39:33 -07:00
luiscuenca	abb632afda	Update capsule when scale/load and teleport without safe landing	2018-09-05 16:51:34 -07:00
luiscuenca	99e6e3d112	Collision Pick added to teleport.js	2018-09-04 17:18:26 -07:00
Seth Alves	52bbb4d2ab	fix ray-pick results on entities with non-default registration point. clean up grab scripts to correctly use this fix.	2018-08-27 16:21:01 -07:00
David Rowe	883479d654	Merge branch 'master' into M17428-c	2018-08-23 10:43:44 +12:00
Wayne Chen	7360629d31	modifying variable naming to fit convention	2018-08-21 14:13:55 -07:00
Wayne Chen	5b4eb92281	adding fix	2018-08-21 14:04:29 -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
Wayne Chen	222391532a	Merge branch 'master' of https://github.com/highfidelity/hifi into fixGrabWebSurface-case-16192	2018-08-21 11:18:17 -07:00
David Rowe	4b12e18c27	Merge branch 'master' into M17428-c	2018-08-21 16:52:30 +12:00
David Rowe	e25b2f6e0f	Support stylus input on the mini tablet	2018-08-21 16:47:40 +12:00
David Rowe	67eb03ba7d	Reduce strength of teleport parabola	2018-08-21 11:18:00 +12: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
David Rowe	8d1b947bbd	Fix variable names	2018-08-16 13:35:36 +12:00
David Rowe	2034162c76	Disable Vive teleport button if transitioning from direction button	2018-08-15 21:31:53 +12:00
Seth Alves	527b27da96	pseudo-joints for far-grab positions	2018-08-14 08:55:20 -07:00