67 commits

Author	SHA1	Message	Date
Dante Ruiz	5dc336bfae	remove dead code and eslint files	2018-03-02 14:23:35 -08:00
Dante Ruiz	1f4aed31f1	adding hyperlink	2018-03-01 16:16:47 -08:00
Dante Ruiz	0dac851def	fixing case when grabbed target is destroyed	2018-02-08 17:08:51 -08:00
Dante Ruiz	d88ff701b5	reduce calls to isPointOnDesktopWindow	2018-01-18 10:48:35 -08:00
Dante Ruiz	fd83e00df4	fix tablet interaction and far grab functionallity	2018-01-08 11:30:21 -08:00
Zach Fox	0c38a5598f	Merge pull request #12085 from zfox23/commerce_fixHandControllerInspection ... Fix bugs related to inspecting entities with hand controllers	2018-01-05 15:50:00 -08:00
Zach Fox	ff4f582c7d	Thanks Howard	2018-01-03 17:23:35 -08:00
Zach Fox	8d4a6f01cb	Fix bugs related to inspecting entities with hand controllers	2018-01-03 16:03:37 -08:00
Dante Ruiz	70820e6075	laser allways on prototype	2017-11-28 15:37:36 -08:00
Dante Ruiz	8779d52ad3	making requested changes	2017-11-14 13:04:09 -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
SamGondelman	2fb1981c4a	merge with master	2017-11-13 14:34:39 -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	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	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
SamGondelman	a44e8efb99	merge from master	2017-10-26 12:14:53 -07:00
Dante Ruiz	2ec8f3f625	made non-dynamic entities collisionless during far-grab	2017-10-25 11:29:32 -07:00
Brad Davis	befe583c5e	Merge remote-tracking branch 'upstream/master' into HEAD	2017-10-24 11:50:07 -07:00
SamGondelman	7686948daf	resolve conflicts and cleanup	2017-10-20 15:23:17 -07:00
SamGondelman	fb969964f3	generalized scripting interfaces	2017-10-20 14:37:10 -07:00
Melissa Brown	1a3821e984	Merge pull request #11591 from ctrlaltdavid/21568 ... Add some Quat and Uuid JavaScript helper properties	2017-10-18 22:07:06 -07:00
David Rowe	8d4e979dc8	Replace usages of AVATAR_SELF_ID previously missed	2017-10-17 16:38:05 +13:00
SamGondelman	aee817fbbc	scale end sphere in c++ for controller modules	2017-10-16 13:31:25 -07:00
David Rowe	fc4e440dc4	Update system scripts to use new properties	2017-10-14 08:32:14 +13:00
Atlante45	6dd49f5c32	Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master	2017-10-10 16:53:34 -07:00
druiz17	013e15c9a2	made requested changes	2017-10-10 10:54:56 -07:00
druiz17	d0eb6a3ad0	remove comments	2017-10-10 09:45:41 -07:00
druiz17	003395b256	removing whitespace	2017-10-10 09:43:02 -07:00
druiz17	fc41155ce1	saving work	2017-10-10 09:17:01 -07:00
druiz17	347645329e	fixing laser staying on in edit mode	2017-10-05 09:11:02 -07:00
druiz17	ad9677f63e	fixing grabbing and tablet bugs	2017-10-03 16:11:51 -07:00
druiz17	8a0ecf4e6f	propertly determine is laser intersects with HUD UI	2017-10-02 16:46:43 -07:00
druiz17	3b05317db6	fixing grabbing and tablet bugs	2017-09-28 11:18:40 -07:00
druiz17	cea3c002dd	improving far rotate	2017-09-27 11:47:26 -07:00
druiz17	dda20c1ef5	fixing merge conflict	2017-09-25 09:45:29 -07:00
druiz17	e965b7fff1	hand controller pointer	2017-09-22 15:32:40 -07:00
Zach Fox	bb9db3ef6d	Updates to behavior and shader appearance	2017-09-22 11:24:30 -07:00
druiz17	53efe6bfb2	working on fix	2017-09-21 18:17:05 -07:00
Anthony J. Thibault	0757f513af	Merge branch 'master' into feature/ant-man	2017-09-18 11:36:39 -07:00
Seth Alves	0816a8af27	fix grab entity methods	2017-09-15 12:07:50 -07:00
Seth Alves	39e6605f6f	fix grab entity methods + jshint cleanups	2017-09-15 10:50:46 -07:00
Anthony J. Thibault	9a9f4a0d24	Fix controllerModules with appropriate IPD scale changes	2017-09-13 18:23:54 -07:00
druiz17	b634292261	fixing some small issues	2017-09-12 10:53:04 -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	405d8c3afc	fixing cloning and laser	2017-09-08 17:07:27 -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