41 commits

Author	SHA1	Message	Date
Seth Alves	527b27da96	pseudo-joints for far-grab positions	2018-08-14 08:55:20 -07:00
Alexander Ivash	5990d2725a	disallow to scale avatar with controllers	2018-07-06 21:00:55 +03:00
luiscuenca	df32fe60e4	using RayPick API	2018-06-07 11:44:59 -07:00
luiscuenca	5403db6d51	Merge branch 'master' into handTouchToDefault	2018-06-07 11:42:26 -07:00
luiscuenca	acd1721c88	Load handTouch.js as a default script	2018-05-14 17:26:03 -07:00
Dante Ruiz	ba9d5d18bc	make requested changes	2018-04-11 13:30:21 -07:00
Dante Ruiz	cc341e8ad7	highlight nearby entities	2018-04-05 15:38:56 -07:00
Dante Ruiz	05fb3cfd9a	fixing hyper link for entities	2018-03-02 14:03:24 -08:00
Dante Ruiz	8779d52ad3	making requested changes	2017-11-14 13:04:09 -08:00
Dante Ruiz	5852224a31	clean up code and finialize changes	2017-11-13 13:37:53 -08:00
Dante Ruiz	43c6d71236	fix stylus module	2017-11-10 17:28:55 -08:00
Dante Ruiz	0580e23686	fixed edit mode and allow to scroll off tablet	2017-11-01 15:16:02 -07:00
Dante Ruiz	f44025a8b1	completely removed non-need laserPointers	2017-10-31 15:57:57 -07:00
David Rowe	6b3b2beae0	Merge branch 'master' into vr-edit-a	2017-09-27 15:34:52 +13:00
David Rowe	428efa571e	Merge branch 'master' into vr-edit-a	2017-09-26 10:40:07 +13:00
druiz17	dda20c1ef5	fixing merge conflict	2017-09-25 09:45:29 -07:00
druiz17	2c7b8cdb4f	fixing script issues	2017-09-22 16:26:41 -07:00
druiz17	e965b7fff1	hand controller pointer	2017-09-22 15:32:40 -07:00
druiz17	53efe6bfb2	working on fix	2017-09-21 18:17:05 -07:00
druiz17	e2921661e9	scaling entities	2017-09-19 09:35:22 -07:00
David Rowe	6c5a1c0460	Address laser and controller interactions with HUD overlays and tablet	2017-09-16 15:45:44 +12:00
Seth Alves	a9aa6df93e	Merge branch 'controller-dispatcher-1' of github.com:sethalves/hifi into controller-dispatcher-1	2017-09-12 10:44:29 -07:00
Seth Alves	315f874824	add profiling to controller-dispatcher	2017-09-12 10:44:09 -07:00
druiz17	a46e41607c	fixed teleport, added avatar scaling, allow laser to be used on tablet when stylus is shown	2017-09-11 15:07:14 -07:00
druiz17	ef050a09f9	made requested changes and also allow entities/overlays to be grabbed by the grip button	2017-09-07 14:42:46 -07:00
druiz17	0d66bfca05	added far trigger	2017-09-06 14:58:04 -07:00
Dante Ruiz	3b357ad61e	finshed handControllerGrab refactoring	2017-09-01 17:07:26 -07:00
Dante Ruiz	3960ec7d5a	finish main handControllerGrab refactoring	2017-08-30 15:20:03 -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	dbe8aa77d7	working on laser v tablet	2017-08-23 17:32:41 -07:00
Dante Ruiz	8d04047d8a	starting to integrate teleport.js	2017-08-18 13:23:44 -07:00
Seth Alves	3082c357f9	cloning sort-of works... cloning an equipable doesn't	2017-08-15 17:54:04 -07:00
Seth Alves	ddca25672f	trying to get near-triggering working	2017-08-15 14:14:28 -07:00
Seth Alves	b52a406ff1	trying to get equipping working	2017-08-14 18:25:57 -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	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	0d0f147056	port action-near-grab to dispatcher	2017-08-09 17:48:35 -07:00
Seth Alves	f0c9f1d120	starting on controller-dispatcher experiment	2017-07-27 15:32:13 -07:00
David Rowe	cb4bd58381	Load controller scripts in their own script engine	2017-03-15 14:31:13 +13:00