874 commits

Author	SHA1	Message	Date
druiz17	cc7a222374	fixing Hifi-Hand-Drop for equipEntity	2017-09-06 17:15:05 -07:00
druiz17	0d66bfca05	added far trigger	2017-09-06 14:58:04 -07:00
Dante Ruiz	cefa65de5e	some more small changes	2017-09-05 12:06:32 -07:00
Dante Ruiz	28694dcf8a	small change to contextOVerlays in farActionGrab	2017-09-05 11:46:06 -07:00
Dante Ruiz	3b357ad61e	finshed handControllerGrab refactoring	2017-09-01 17:07:26 -07:00
druiz17	2948061904	code cleanup	2017-08-31 22:30:30 -07:00
Dante Ruiz	7cf27c18d3	code cleanup and fix broken features	2017-08-31 18:06:55 -07:00
Dante Ruiz	47699d4439	fixed edit.js	2017-08-30 16:52:59 -07:00
Dante Ruiz	3960ec7d5a	finish main handControllerGrab refactoring	2017-08-30 15:20:03 -07:00
Dante Ruiz	ed52136fc5	finished equiping locked clone-able entities	2017-08-29 15:18:28 -07:00
Dante Ruiz	4b592687b7	finished webEntityLaserInput, now working on cloning	2017-08-28 17:35:34 -07:00
Dante Ruiz	0eceb7b382	unviersial web3d vs laser	2017-08-25 17:40:30 -07:00
Dante Ruiz	b3ffa7b6b4	Working laser vs tablet	2017-08-25 14:20:31 -07:00
Dante Ruiz	fa676aaadf	lasers on tablet working	2017-08-24 17:42:27 -07:00
Dante Ruiz	eb6248400c	Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1	2017-08-24 13:41:54 -07:00
Dante Ruiz	dbe8aa77d7	working on laser v tablet	2017-08-23 17:32:41 -07:00
SamGondelman	d7b3686364	include noncollidable entities	2017-08-22 17:37:51 -07:00
Dante Ruiz	dc8d0c9604	disable far grab when on hud	2017-08-22 16:51:13 -07:00
Dante Ruiz	cdd184e32d	intergradted teleport	2017-08-22 11:06:11 -07:00
Dante Ruiz	f6151fae85	slowly intergrating teleport.js	2017-08-21 16:53:28 -07:00
Dante Ruiz	94dc942d79	Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1	2017-08-21 16:34:10 -07:00
Dante Ruiz	8d04047d8a	starting to integrate teleport.js	2017-08-18 13:23:44 -07:00
SamGondelman	c9f4958925	handControllerGrab fix, maybe, hopefully	2017-08-18 10:39:40 -07:00
Seth Alves	3082c357f9	cloning sort-of works... cloning an equipable doesn't	2017-08-15 17:54:04 -07:00
Seth Alves	4bfbab294d	near-trigger works?	2017-08-15 14:53:58 -07:00
Seth Alves	03977334a0	near-trigger works?	2017-08-15 14:50:39 -07:00
Seth Alves	3b61e8518f	near-trigger works? equip calls its entity methods now	2017-08-15 14:46:48 -07:00
Seth Alves	ddca25672f	trying to get near-triggering working	2017-08-15 14:14:28 -07:00
Seth Alves	1d24523be9	equip drop gesture works	2017-08-15 13:09:17 -07:00
Seth Alves	e6ac07d43d	equipping mostly works	2017-08-15 11:45:45 -07:00
Seth Alves	b2d7eefc97	equip highlight works now	2017-08-15 10:30:47 -07:00
Seth Alves	b52a406ff1	trying to get equipping working	2017-08-14 18:25:57 -07:00
Seth Alves	13424eb792	kinematic-grab defaults to true	2017-08-13 17:42:08 -07:00
Seth Alves	9015d69c71	fix pop at start of far-grab	2017-08-13 17:21:55 -07:00
Seth Alves	f10dc7cbd5	allow far to near-grab transition	2017-08-13 16:54:37 -07:00
Seth Alves	58b199e9f9	far-grab sort-of works	2017-08-13 15:54:03 -07:00
Seth Alves	c2861d29d2	trying to get highlighting to work	2017-08-13 13:49:17 -07:00
Seth Alves	327bc23b5c	get ready for highlighting	2017-08-13 11:41:12 -07:00
Seth Alves	e7437d66ef	if a raypick hits something that's very close, put it into the nearby-entities list	2017-08-12 17:49:02 -07:00
Seth Alves	ec93172676	far-search rays work, but nothing else about far-grab.	2017-08-12 17:27:48 -07:00
Seth Alves	505b564c62	sort plugins isReady calls by plugin priority. hook up pickrays in data-gathering phase	2017-08-12 13:14:00 -07:00
Seth Alves	9fb1835a26	grabbing overlays works, again	2017-08-12 12:38:36 -07:00
Seth Alves	7ae41064db	tablet stylus works again	2017-08-12 11:19:39 -07:00
Seth Alves	b4a54b017a	plugins occupy activity-slots and more than one plugin may run at a time, as long as their slots aren't in conflict	2017-08-11 12:15:41 -07:00
Seth Alves	0d0f147056	port action-near-grab to dispatcher	2017-08-09 17:48:35 -07:00
Seth Alves	5e3b573d19	Merge branch 'sharks' of github.com:SamGondelman/hifi into controller-dispatcher	2017-08-09 14:08:07 -07:00
Seth Alves	2c8aac53cd	Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher	2017-08-09 14:05:49 -07:00
SamGondelman	6157f4fa55	script fixes	2017-08-09 11:56:25 -07:00
SamGondelman	684001a756	workaround deadlock in editRenderState	2017-08-08 11:11:19 -07:00
SamGondelman	8b1c24e636	added setLockEndUUID, update handControllerGrab and grab	2017-08-04 18:26:11 -07:00