129 commits

Author	SHA1	Message	Date
Thijs Wenker	77a36bf788	Merge pull request #10892 from ctrlaltdavid/vr-edit-a ... VR edit app	2017-10-07 02:19:00 +02:00
druiz17	3139f5ef2a	improve mouseHMD exit logic	2017-10-05 15:12:58 -07:00
druiz17	ba50fcc509	fix mouse dissapearing in desktop mode	2017-10-05 15:07:49 -07:00
David Rowe	b526ec0d93	Code review	2017-10-05 18:21:04 +13:00
David Rowe	63e7521711	Merge branch 'master' into vr-edit-a	2017-10-05 11:29:49 +13:00
Clément Brisset	74fd69ac2d	Merge pull request #11523 from Atlante45/new-master ... RC56 into Master	2017-10-04 15:17:52 -07:00
Brad Hefta-Gaub	a1979a2600	Merge branch 'master' into RC-56	2017-10-03 18:16:21 -07:00
druiz17	13feec89c2	remove update stylus	2017-10-03 16:12:37 -07:00
druiz17	ad9677f63e	fixing grabbing and tablet bugs	2017-10-03 16:11:51 -07:00
druiz17	6b3d89d18f	fix hudlaser module	2017-10-03 14:13:37 -07:00
druiz17	33e9a71000	grab attachments	2017-10-03 12:51:51 -07:00
Howard Stearns	22f0ef33ed	Merge pull request #11496 from howard-stearns/certificate-properties ... Certificate properties	2017-10-03 10:06:48 -07:00
David Rowe	5145107f8c	2D overlays can no longer be lasered	2017-10-03 21:36:40 +13:00
David Rowe	a59d590111	ESLint	2017-10-03 13:33:20 +13:00
druiz17	8a0ecf4e6f	propertly determine is laser intersects with HUD UI	2017-10-02 16:46:43 -07:00
druiz17	20918641f4	saving work	2017-09-29 16:48:25 -07:00
Howard Stearns	73c8da99dc	Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-properties	2017-09-29 16:46:43 -07:00
David Rowe	75365847a1	Merge branch 'master' into vr-edit-a	2017-09-30 09:30:38 +13:00
Howard Stearns	d1350a03c2	working checkpoint, but with a lot of debug/development stuff	2017-09-28 17:06:07 -07:00
druiz17	1947f2ba99	remove update stylus	2017-09-28 13:23:28 -07:00
druiz17	3b05317db6	fixing grabbing and tablet bugs	2017-09-28 11:18:40 -07:00
David Rowe	30c4a22441	Merge branch 'master' into vr-edit-a	2017-09-28 16:10:26 +13:00
Seth Alves	3016ce0a2b	Merge pull request #11470 from sethalves/fix-grab-vs-trigger ... set grabbable and other checkboxes correctly if userData is blank	2017-09-27 15:24:37 -07:00
druiz17	cea3c002dd	improving far rotate	2017-09-27 11:47:26 -07:00
Seth Alves	eb6c99456d	Merge branch 'master' of github.com:highfidelity/hifi into fix-grab-vs-trigger	2017-09-27 10:01:24 -07:00
David Rowe	6b3b2beae0	Merge branch 'master' into vr-edit-a	2017-09-27 15:34:52 +13:00
Seth Alves	ae42d56cd6	Merge pull request #11465 from hyperlogic/bug-fix/teleporter-near-scale ... Teleport.js: can now teleport small distances with small avatar scale	2017-09-26 19:05:14 -07:00
Seth Alves	ce3e5eb1a3	set grabbable and other checkboxes correctly if userData is blank or malformed. near-trigger blocks near-grab	2017-09-26 18:56:27 -07:00
Seth Alves	f384cde471	Merge pull request #11467 from sethalves/fix-near-trigger ... Fix near trigger	2017-09-26 17:27:05 -07:00
Seth Alves	8180acbffc	use same trigger test as in isReady	2017-09-26 16:29:22 -07:00
Seth Alves	a478506da3	Merge branch 'master' of github.com:highfidelity/hifi into fix-near-trigger	2017-09-26 15:52:22 -07:00
Seth Alves	644532dd59	only send startNearTrigger once	2017-09-26 15:17:23 -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
Anthony J. Thibault	a7cfb5d635	teleport.js: fix for TELEPORT_CANCEL_RANGE with large/small avatar scale	2017-09-26 14:21:25 -07:00
Anthony J. Thibault	c26d04dca1	Teleport.js: Fix message bugs, and made eslint clean ... * 'Hifi-Teleport-Ignore-Add' and 'Hifi-Teleport-Ignore-Remove' messages should now should work * 'Hifi-Teleport-Disabler' message should now work	2017-09-26 13:58:00 -07:00
Seth Alves	a871a6db1d	Merge pull request #11430 from sethalves/fix-parent-grab ... Fix parent grab	2017-09-26 13:00:16 -07:00
Seth Alves	81f74f9297	Merge pull request #11444 from druiz17/module-handcontrollerPointer ... Made handControllerPointer into modules in hope of preventing mouse cursor interference with tablet	2017-09-26 12:21:03 -07:00
druiz17	2cc8a55151	fix cloning equiping	2017-09-26 10:37:36 -07:00
druiz17	6332a53ee2	able to grab tablet in 3rd person	2017-09-25 16:36:29 -07:00
Seth Alves	5da5b24894	unmangle merge	2017-09-25 15:18:22 -07:00
David Rowe	428efa571e	Merge branch 'master' into vr-edit-a	2017-09-26 10:40:07 +13:00
druiz17	ec40df711d	fix tablet grabbing and eslint changes	2017-09-25 14:31:13 -07:00
druiz17	b1b31444f0	fix mouse visiblity	2017-09-25 11:34:18 -07:00
druiz17	dda20c1ef5	fixing merge conflict	2017-09-25 09:45:29 -07:00
Seth Alves	5741782f45	merge from upstream	2017-09-25 09:16:43 -07:00
Brad Hefta-Gaub	030da7d850	Merge pull request #11401 from druiz17/module-scale-entities ... ScaleEntity Module	2017-09-25 09:10:32 -07:00
Seth Alves	90954a4e4f	Merge branch 'master' of github.com:highfidelity/hifi into fix-parent-grab	2017-09-25 09:09:58 -07:00
Zach Fox	921ebc221e	Merge pull request #11431 from zfox23/contextOverlayInterface_fixEnabled ... Enable Inspection Mode for all; change Commerce setting name	2017-09-22 17:52:27 -07:00
druiz17	2c7b8cdb4f	fixing script issues	2017-09-22 16:26:41 -07:00