36 commits

Author	SHA1	Message	Date
Seth Alves	834699fa12	Move grab pseudo-properties (userData) into first-class EntityItemProperties.	2018-10-02 08:54:12 -07:00
Dante Ruiz	d4450ac780	fix equip and keeping new functionallity	2018-09-21 15:59:00 -07:00
Wayne Chen	222391532a	Merge branch 'master' of https://github.com/highfidelity/hifi into fixGrabWebSurface-case-16192	2018-08-21 11:18:17 -07:00
David Back	0b9e520b53	fix grab cloning parented entitiy	2018-08-01 16:00:25 -07:00
Wayne Chen	eb7bde1bfc	switching near grab priority to be before web surface laser	2018-07-17 15:38:56 -07:00
David Back	f8fc7bedd7	Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables	2018-05-15 17:31:43 -07:00
David Back	f74e219029	rename properties, add clone avatar entity, remove worldEntityProps arg, fix clone ID cleanup on delete	2018-05-15 17:24:14 -07:00
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
Dante Ruiz	ba9d5d18bc	make requested changes	2018-04-11 13:30:21 -07:00
Dante Ruiz	447163bd07	clean up scripts	2018-04-10 09:23:40 -07:00
Dante Ruiz	cc341e8ad7	highlight nearby entities	2018-04-05 15:38:56 -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
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
Seth Alves	5da5b24894	unmangle merge	2017-09-25 15:18:22 -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
Anthony J. Thibault	0757f513af	Merge branch 'master' into feature/ant-man	2017-09-18 11:36:39 -07:00
Seth Alves	b67c571aaa	fix grab entity methods	2017-09-15 12:05:49 -07:00
Seth Alves	39e6605f6f	fix grab entity methods + jshint cleanups	2017-09-15 10:50:46 -07:00
Anthony J. Thibault	7c725756f1	IPD Fixes for controllerDispatcher and controllerModules	2017-09-14 10:36:05 -07:00
druiz17	b3ff5c86f7	fixed secondary triggers and chest lid	2017-09-12 14:43:06 -07:00
druiz17	b634292261	fixing some small issues	2017-09-12 10:53:04 -07:00
Seth Alves	9c098f1a0c	Merge branch 'controller-dispatcher-1' of github.com:druiz17/hifi into controller-dispatcher-1	2017-09-08 17:10:02 -07:00
druiz17	405d8c3afc	fixing cloning and laser	2017-09-08 17:07:27 -07:00
Seth Alves	a1ffc7abd0	distance from controller to object is sometimes decided by pickray	2017-09-08 17:04:09 -07:00
druiz17	f0c12e50dd	some small bug fixes	2017-09-08 11:50: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
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	c2861d29d2	trying to get highlighting to work	2017-08-13 13:49:17 -07:00
Seth Alves	327bc23b5c	get ready for highlighting	2017-08-13 11:41:12 -07:00
Seth Alves	b4a54b017a	plugins occupy activity-slots and more than one plugin may run at a time, as long as their slots aren't in conflict	2017-08-11 12:15:41 -07:00
Seth Alves	0d0f147056	port action-near-grab to dispatcher	2017-08-09 17:48:35 -07:00