48 commits

Author	SHA1	Message	Date
David Back	8d49d1c118	change to not left button	2018-04-27 13:32:05 -07:00
David Back	78436ebcbf	ignore right clicks	2018-04-27 11:30:45 -07:00
David Back	71dc75b208	fix disconnect clear entities	2018-04-24 14:25:33 -07:00
David Back	e21c451815	ensure deleted or cleared entities properly unequipped	2018-04-23 16:56:18 -07:00
David Back	8950c31378	fix mouse equipping while someone else far grabbing	2018-04-19 16:29:49 -07:00
David Back	8cbe0f4633	safer clear grab actions	2018-04-19 11:17:26 -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	bf21a4cf56	tabs	2018-04-18 15:05:29 -07:00
unknown	278a6b763f	ensure target mouse entity has equip data	2018-04-17 16:26:33 -07:00
unknown	9e4914975b	missing reset flag on end equip, remove mouseEquip check on unequip via U	2018-04-17 16:13:10 -07:00
David Back	e86ef1c2d6	fix bracket	2018-04-16 13:33:17 -07:00
David Back	ad85e2b053	pre PR adjustments	2018-04-16 13:12:33 -07:00
David Back	78c0ec5770	remove animations	2018-04-16 12:56:22 -07:00
Dante Ruiz	ba9d5d18bc	make requested changes	2018-04-11 13:30:21 -07:00
David Back	59971869f5	desktop equip	2018-04-10 19:06:27 -07:00
Dante Ruiz	447163bd07	clean up scripts	2018-04-10 09:23:40 -07:00
Dante Ruiz	2e1ebac03f	clean up functionality	2018-04-09 18:07:03 -07:00
Dante Ruiz	1113202a90	reverting file	2018-04-09 16:51:20 -07:00
Dante Ruiz	2c20593b6d	editing equip code	2018-04-06 16:30:45 -07:00
Dante Ruiz	fd47832857	saving changes	2018-04-06 11:47:09 -07:00
Dante Ruiz	07b1a6be01	saving work	2018-04-06 11:01:40 -07:00
Seth Alves	c4f57877dd	if hand is already in 'drop gesture' position when equipping something, don't unequip until the hand has been upright	2018-01-31 10:06:20 -08:00
Dante Ruiz	32fca16c85	fix radius equiping	2017-12-06 14:16:32 -08:00
Dante Ruiz	bbc022da2d	fix-far-to-equip	2017-12-05 14:09:46 -08:00
Dante Ruiz	66f07cb21b	eslint controller modules	2017-11-01 11:36:36 -07:00
Dante Ruiz	bea0df8e60	implemented remebering equiping entities offset	2017-10-27 14:46:04 -07:00
David Rowe	8d4e979dc8	Replace usages of AVATAR_SELF_ID previously missed	2017-10-17 16:38:05 +13:00
David Rowe	1e3a2b3e4e	Merge branch 'master' into 21568	2017-10-17 15:15:49 +13:00
David Rowe	fc4e440dc4	Update system scripts to use new properties	2017-10-14 08:32:14 +13:00
druiz17	e77ac9fd10	include release message	2017-10-10 13:47:33 -07:00
druiz17	3b05317db6	fixing grabbing and tablet bugs	2017-09-28 11:18:40 -07:00
druiz17	2cc8a55151	fix cloning equiping	2017-09-26 10:37:36 -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
Seth Alves	39e6605f6f	fix grab entity methods + jshint cleanups	2017-09-15 10:50:46 -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	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	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	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
Seth Alves	3082c357f9	cloning sort-of works... cloning an equipable doesn't	2017-08-15 17:54:04 -07:00
Seth Alves	3b61e8518f	near-trigger works? equip calls its entity methods now	2017-08-15 14:46:48 -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