63 commits

Author	SHA1	Message	Date
Wayne Chen	b6c5ae2a68	staging changes	2018-09-11 15:23:40 -07:00
Wayne Chen	d9e0352028	removing debug comments	2018-09-11 11:44:32 -07:00
Wayne Chen	7aae536624	adding fix to allow web scroll	2018-09-11 11:41:24 -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
Dante Ruiz	9a8ebdd021	Merge pull request #13739 from dback2/cloneChildrenFix ... Fix cloning a parented entity	2018-08-09 13:05:28 -07:00
David Rowe	a7170a5892	Fix typo	2018-08-08 08:49:29 +12:00
David Rowe	c9c23b8db3	Fix entity stay highlighted after hand leaves when far grabbing another	2018-08-07 15:34:17 +12:00
David Back	0b9e520b53	fix grab cloning parented entitiy	2018-08-01 16:00:25 -07:00
Dante Ruiz	0f46001f9a	remove redundent variable	2018-07-30 10:29:53 -07:00
Dante Ruiz	4caf613269	making requested changes	2018-07-30 10:19:27 -07:00
Dante Ruiz	6320401308	somewhat better distance from bounding box	2018-07-27 17:49:49 -07:00
Dante Ruiz	74bb2301b0	minimize diff	2018-07-26 16:05:56 -07:00
Dante Ruiz	31d31af941	minimize diff	2018-07-26 16:05:18 -07:00
Dante Ruiz	6edd109dfe	revert back to the old way we checkForChildTooFarAway	2018-07-26 15:23:54 -07:00
Wayne Chen	eb7bde1bfc	switching near grab priority to be before web surface laser	2018-07-17 15:38:56 -07:00
Dante Ruiz	20a8275343	min diff	2018-07-16 11:43:29 -07:00
Dante Ruiz	fa2b975e8f	undo some wrong changes	2018-07-16 11:42:38 -07:00
Dante Ruiz	0fa2a71d0f	actually fix requested changes	2018-07-16 11:35:53 -07:00
Dante Ruiz	d81420542c	making PR requests	2018-07-16 11:00:27 -07:00
Dante Ruiz	ae03dcb57a	fix parent grab dropping and cullig flickering	2018-07-06 15:42:21 -07:00
Liv Erickson	604b3cac1c	check for null entities in grab, add conversion for old userdata cloneable	2018-05-21 16:19:43 -07:00
David Back	06fa4efe05	add comment	2018-05-16 11:39:53 -07:00
David Back	6c946d7ac5	prevent continuous clone calls	2018-05-16 11:36:57 -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	db374b8c6d	fixing adjusting equipped entities	2017-11-30 14:49:06 -08:00
Brad Hefta-Gaub	068b93fc30	Merge pull request #11838 from druiz17/fix-grabbing ... fixing setting incorrect parent when grabbing entities	2017-11-27 08:27:42 -08:00
Dante Ruiz	b66153b9cb	fixing setting incorrect parent	2017-11-16 15:07:00 -08: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	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	33e9a71000	grab attachments	2017-10-03 12:51:51 -07:00
druiz17	5a1242a1ac	fix spelling error	2017-09-26 15:06:31 -07:00
druiz17	76c1fe688c	fix auto dropping	2017-09-26 14:52:01 -07:00
Seth Alves	5da5b24894	unmangle merge	2017-09-25 15:18:22 -07:00
Seth Alves	5741782f45	merge from upstream	2017-09-25 09:16:43 -07:00
Seth Alves	3c22c9ea3a	back out bad change	2017-09-21 11:39:14 -07:00
Seth Alves	24bfb3f3b9	oops	2017-09-21 11:16:00 -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	e2921661e9	scaling entities	2017-09-19 09:35:22 -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
Anthony J. Thibault	7c725756f1	IPD Fixes for controllerDispatcher and controllerModules	2017-09-14 10:36:05 -07:00