63 commits

Author	SHA1	Message	Date
Seth Alves	3a00d31c15	oops	2017-12-12 12:59:35 -08:00
Seth Alves	dba05ae8e2	try harder to keep setTimeout loop going in controller-dispatcher	2017-12-12 12:38:01 -08:00
Dante Ruiz	6fd8fb1e5b	Merge branch 'master' of github.com:highfidelity/hifi into controllerDispatcher-interval	2017-11-30 11:52:41 -08:00
Dante Ruiz	9622fef149	fix controllerDispatcher time step	2017-11-21 09:48:19 -08:00
Dante Ruiz	cabe3819a3	fixing crash	2017-11-17 10:20:34 -08:00
Dante Ruiz	c82798673f	change controllerDispatcher to setTimeOut update	2017-11-16 10:42:28 -08:00
Dante Ruiz	9564b7567b	fixing tablet in 3d person	2017-11-15 13:39:21 -08:00
Dante Ruiz	54075d4c9a	make hud laser relative to camera	2017-11-14 13:09:16 -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	ef55e3181d	moveing controllerDispatchaer pointers to pointerUtils.js	2017-11-09 16:48:52 -08:00
Dante Ruiz	bdd31b63ed	update functions call names to match pointer API changes	2017-11-06 17:23:40 -08:00
Dante Ruiz	0580e23686	fixed edit mode and allow to scroll off tablet	2017-11-01 15:16:02 -07:00
Dante Ruiz	66f07cb21b	eslint controller modules	2017-11-01 11:36:36 -07:00
Dante Ruiz	abb6f786fa	added homebutton message and scripts cleanup	2017-11-01 11:03:48 -07:00
Dante Ruiz	f44025a8b1	completely removed non-need laserPointers	2017-10-31 15:57:57 -07:00
Dante Ruiz	30332c3d00	removing more laserPointers	2017-10-31 14:13:42 -07:00
Dante Ruiz	e5600e4f1e	one universal controller pointer for all modules	2017-10-30 16:58:14 -07:00
Brad Davis	befe583c5e	Merge remote-tracking branch 'upstream/master' into HEAD	2017-10-24 11:50:07 -07:00
SamGondelman	fb969964f3	generalized scripting interfaces	2017-10-20 14:37:10 -07:00
Brad Hefta-Gaub	26ea8bea6a	Merge pull request #11612 from highfidelity/pointers ... Fix tablet intersection bug and start of Pointer migration work (WIP)	2017-10-20 13:53:52 -07:00
luiscuenca	6e8756e8af	Debug mode has been turned off	2017-10-18 15:40:03 -07:00
SamGondelman	429905de51	update scripts to use ignoreItems, fix caching bug	2017-10-16 15:52:17 -07:00
Seth Alves	a871a6db1d	Merge pull request #11430 from sethalves/fix-parent-grab ... Fix parent grab	2017-09-26 13:00:16 -07:00
Seth Alves	737b583745	avoid unequipping things during a HMD snap-turn	2017-09-26 11:08:33 -07:00
druiz17	b1b31444f0	fix mouse visiblity	2017-09-25 11:34:18 -07:00
Seth Alves	5741782f45	merge from upstream	2017-09-25 09:16:43 -07:00
Seth Alves	fc3e259f6f	remove debug prints	2017-09-21 11:42:30 -07:00
Seth Alves	3c22c9ea3a	back out bad change	2017-09-21 11:39:14 -07:00
Seth Alves	363a2a3a7a	merge from upstream	2017-09-21 11:08:29 -07:00
Seth Alves	473db92a8e	fix some parent-grab bugs, re-enable adjusting equipped entities, don't trigger guns right when they are equipped	2017-09-21 11:07:47 -07:00
druiz17	9c66a25d83	fixing and cleanup tablet inputs	2017-09-19 17:03:53 -07:00
Anthony J. Thibault	f534ee5ad9	laser offset fix	2017-09-14 16:37:45 -07:00
Anthony J. Thibault	7c725756f1	IPD Fixes for controllerDispatcher and controllerModules	2017-09-14 10:36:05 -07:00
druiz17	1b288ef860	make garbbing radius the same as master	2017-09-13 16:15:36 -07:00
Seth Alves	e9918ca599	add profiling to controller-dispatcher	2017-09-12 10:52:52 -07:00
Seth Alves	2850029f26	add profiling to controller-dispatcher	2017-09-12 10:00:32 -07:00
Seth Alves	a1ffc7abd0	distance from controller to object is sometimes decided by pickray	2017-09-08 17:04:09 -07:00
druiz17	42ef397b5e	fixed include path	2017-09-08 15:13:19 -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
Dante Ruiz	3b357ad61e	finshed handControllerGrab refactoring	2017-09-01 17:07:26 -07:00
Dante Ruiz	7cf27c18d3	code cleanup and fix broken features	2017-08-31 18:06:55 -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	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
Seth Alves	ddca25672f	trying to get near-triggering working	2017-08-15 14:14:28 -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