50 commits

Author	SHA1	Message	Date
Seth Alves	898dec29cb	don't cache value of getControllerJointIndex at startup, because the script may run before the data is available. Instead, refresh the data every few seconds	2018-05-11 17:07:51 -07:00
David Back	8950c31378	fix mouse equipping while someone else far grabbing	2018-04-19 16:29:49 -07:00
David Back	d1bb11562b	Merge branch 'master' of https://github.com/highfidelity/hifi into desktopEquip	2018-04-19 09:36:19 -07:00
David Back	666653dd96	tabs	2018-04-18 15:01:14 -07:00
David Back	4a37c4ba18	add entityIsEquipped utils for grab.js check	2018-04-18 15:00:10 -07:00
Dante Ruiz	43b92299d6	changing highlighting percentage	2018-04-12 10:35:29 -07:00
Dante Ruiz	cc341e8ad7	highlight nearby entities	2018-04-05 15:38:56 -07:00
Dante Ruiz	42149e295d	editing seletion style	2018-04-04 12:55:28 -07:00
Dante Ruiz	c9c3d8f332	adding entity selection for far grabbing	2018-04-04 08:07:35 -07:00
Dante Ruiz	5dc336bfae	remove dead code and eslint files	2018-03-02 14:23:35 -08:00
Dante Ruiz	05fb3cfd9a	fixing hyper link for entities	2018-03-02 14:03:24 -08:00
Dante Ruiz	1f4aed31f1	adding hyperlink	2018-03-01 16:16:47 -08:00
David Rowe	6e43497e14	Merge tag 'RELEASE-7602' into 21661 ... Jenkins Git plugin tagging with RELEASE-7602	2018-01-03 16:46:10 +13:00
Dante Ruiz	70820e6075	laser allways on prototype	2017-11-28 15:37:36 -08:00
SamGondelman	52039e022b	merge from master, get rid of resolution in RayPick	2017-11-27 13:11:35 -08:00
SamGondelman	393ad0079c	home button is circle instead of sphere, fixed positioning, fix lasers on tablet	2017-11-17 15:24:21 -08:00
Dante Ruiz	b779c33a1b	fixed lockEndUUID offset for scripts	2017-11-13 16:42:16 -08:00
Dante Ruiz	6173c33b51	fixing merge conflict	2017-11-13 15:02:25 -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	3b15897b12	fixed farGrab parent grabbing and laser LockEndUUID	2017-11-06 15:21:20 -08:00
Dante Ruiz	539cf35f30	saving work	2017-11-03 17:14:27 -07:00
Dante Ruiz	e5600e4f1e	one universal controller pointer for all modules	2017-10-30 16:58:14 -07:00
David Rowe	ed1c974f75	Use MyAvatar.SELF_ID instead of Uuid.SELF	2017-10-17 15:58:51 +13:00
David Rowe	fc4e440dc4	Update system scripts to use new properties	2017-10-14 08:32:14 +13:00
Seth Alves	23f41457be	Revert "Revert "fix importing of avatar entities"" ... This reverts commit 28a8b18060.	2017-10-09 11:52:43 -07:00
Seth Alves	28a8b18060	Revert "fix importing of avatar entities"	2017-10-07 16:54:05 -07:00
Seth Alves	53a49272dc	fix importing of avatar-entities	2017-10-05 11:43:19 -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	0b60928dd3	fix rollup-to-parent code to only roll up to entity parents	2017-09-25 19:07:40 -07:00
druiz17	dda20c1ef5	fixing merge conflict	2017-09-25 09:45:29 -07:00
Seth Alves	5741782f45	merge from upstream	2017-09-25 09:16:43 -07:00
druiz17	b8ee60a394	fix scripting error	2017-09-22 17:13:48 -07:00
druiz17	ee9ac3e7f9	undo unnessary changes	2017-09-22 15:38:39 -07:00
druiz17	53efe6bfb2	working on fix	2017-09-21 18:17:05 -07:00
Seth Alves	24bfb3f3b9	oops	2017-09-21 11:16:00 -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	2d7d6f85ba	fixing merge conflicts	2017-09-21 09:04:13 -07:00
druiz17	9c66a25d83	fixing and cleanup tablet inputs	2017-09-19 17:03:53 -07:00
druiz17	e2921661e9	scaling entities	2017-09-19 09:35:22 -07:00
Seth Alves	39e6605f6f	fix grab entity methods + jshint cleanups	2017-09-15 10:50:46 -07:00
druiz17	1b288ef860	make garbbing radius the same as master	2017-09-13 16:15:36 -07:00
druiz17	b3ff5c86f7	fixed secondary triggers and chest lid	2017-09-12 14:43:06 -07:00
Dante Ruiz	d90f6320a9	Merge pull request #8 from sethalves/controller-dispatcher-1 ... Controller dispatcher 1	2017-09-12 10:54:10 -07:00
druiz17	b634292261	fixing some small issues	2017-09-12 10:53:04 -07: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	2850029f26	add profiling to controller-dispatcher	2017-09-12 10:00:32 -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

Renamed from scripts/system/controllers/controllerDispatcherUtils.js (Browse further)