55 commits

Author	SHA1	Message	Date
SamGondelman	7eb22b372f	merge with master	2017-11-15 14:35:30 -08:00
SamGondelman	2fb1981c4a	merge with master	2017-11-13 14:34:39 -08:00
luiscuenca	7dfdc8da59	Redesign and clean of unused lineWidths	2017-11-09 17:50:38 -07:00
Luis Cuenca	6fb47eef85	Merge branch 'master' into case7587	2017-11-07 17:19:39 -07:00
luiscuenca	332cb48a41	Lasers and teleport scale with avatar	2017-11-07 16:57:55 -07: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
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
druiz17	0d66bfca05	added far trigger	2017-09-06 14:58:04 -07:00
Dante Ruiz	cefa65de5e	some more small changes	2017-09-05 12:06:32 -07:00
Dante Ruiz	28694dcf8a	small change to contextOVerlays in farActionGrab	2017-09-05 11:46:06 -07:00
Dante Ruiz	3b357ad61e	finshed handControllerGrab refactoring	2017-09-01 17:07:26 -07:00
Dante Ruiz	7cf27c18d3	code cleanup and fix broken features	2017-08-31 18:06:55 -07:00
Dante Ruiz	3960ec7d5a	finish main handControllerGrab refactoring	2017-08-30 15:20:03 -07:00
Dante Ruiz	4b592687b7	finished webEntityLaserInput, now working on cloning	2017-08-28 17:35:34 -07:00
Dante Ruiz	0eceb7b382	unviersial web3d vs laser	2017-08-25 17:40:30 -07:00
Dante Ruiz	dbe8aa77d7	working on laser v tablet	2017-08-23 17:32:41 -07:00
Dante Ruiz	dc8d0c9604	disable far grab when on hud	2017-08-22 16:51:13 -07:00
Seth Alves	e6ac07d43d	equipping mostly works	2017-08-15 11:45:45 -07:00
Seth Alves	b52a406ff1	trying to get equipping working	2017-08-14 18:25:57 -07:00