4186 commits

Author	SHA1	Message	Date
David Rowe	ad838c6b3c	Adjust position of wrist icon	2017-09-27 21:53:26 +13:00
David Rowe	c2471e340a	Reduce number of calls to Script.resolvePath	2017-09-27 21:49:02 +13:00
David Rowe	e623b1e0a5	Alternative, more robust handle scaling method	2017-09-27 19:21:07 +13:00
David Rowe	6b3b2beae0	Merge branch 'master' into vr-edit-a	2017-09-27 15:34:52 +13:00
David Rowe	d4fc26f3b7	Fix header highlighting if close and reeopen app with tool selected	2017-09-27 15:22:33 +13:00
David Rowe	895ffaf1f9	Fix group clear button messing up select-in-box state	2017-09-27 15:09:10 +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	f384cde471	Merge pull request #11467 from sethalves/fix-near-trigger ... Fix near trigger	2017-09-26 17:27:05 -07:00
Dante Ruiz	410baaf7bc	Merge pull request #11464 from druiz17/controller-dispatacher-bugs ... fix auto dropping and re-grabbing loop	2017-09-26 16:46:34 -07:00
Seth Alves	8180acbffc	use same trigger test as in isReady	2017-09-26 16:29:22 -07:00
Andrew Meadows	dafadf82bb	Merge pull request #11458 from jherico/fix/tablet_latency ... Fix long tablet lag on first load	2017-09-26 16:18:31 -07:00
David Rowe	76889d1b67	Improve handle scaling of entity with near-zero dimension	2017-09-27 12:04:05 +13: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
David Rowe	0f5adb488c	Merge branch 'vr-edit-footer' into vr-edit-a ... # Conflicts: # scripts/vr-edit/modules/toolsMenu.js	2017-09-27 10:04:31 +13: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
David Rowe	8bd0e464aa	Merge branch 'vr-edit-group-box' into vr-edit-a	2017-09-27 08:48:44 +13: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
Seth Alves	91f5f61ea3	Merge pull request #11456 from druiz17/bugs-handControllerGrab ... Correctly grab tablet in 3rd person	2017-09-26 12:19:20 -07:00
Seth Alves	913d3c4d12	Merge pull request #11422 from hyperlogic/feature/ant-man2 ... Secondary IPD fixes	2017-09-26 11:53:45 -07:00
Seth Alves	216888aa03	Merge branch 'fix-parent-grab' of github.com:sethalves/hifi into fix-parent-grab	2017-09-26 11:08:40 -07:00
Seth Alves	737b583745	avoid unequipping things during a HMD snap-turn	2017-09-26 11:08:33 -07:00
Dante Ruiz	e397d49564	Merge pull request #11159 from vladest/modal_dialogs_async ... Modal dialogs async	2017-09-26 11:07:42 -07:00
druiz17	2cc8a55151	fix cloning equiping	2017-09-26 10:37:36 -07:00
David Rowe	9b7197cf3f	Don't highlight entity you're inside unless you laser it	2017-09-26 15:36:40 +13:00
Seth Alves	0b60928dd3	fix rollup-to-parent code to only roll up to entity parents	2017-09-25 19:07:40 -07:00
Brad Davis	40c42d35a5	Fix long tablet lag on first load	2017-09-25 17:50:04 -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	d64e3aca55	Polyvoxels don't have a color property	2017-09-26 11:10:05 +13: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
Andrew Meadows	cf0dd6f8c3	Merge pull request #11371 from cain-kilgore/21542 ... WL 21542 - Allow Scripts to change Avatar Gravity [Experimental]	2017-09-23 22:20:52 -07:00
David Rowe	bbc6e5d1b5	Fix bounding box isn't cleared when exit tool with header or grip click	2017-09-24 17:06:42 +13:00
David Rowe	4e0efdaa1a	Automatically add entities in bounding box to currently selected groups	2017-09-24 16:55:15 +13:00
David Rowe	2afc84cf0b	Display bounding box of currently selected groups	2017-09-24 12:06:04 +13:00
David Rowe	8976befaeb	Use emissive FBX model for highlighted Tools menu header	2017-09-23 14:20:53 +12:00
David Rowe	64acc0d0a3	Press undo/redo and menu buttons when click them	2017-09-23 13:01:38 +12: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	b8ee60a394	fix scripting error	2017-09-22 17:13:48 -07:00
David Rowe	bc5cd7415b	Use emissive FBX models for header bars	2017-09-23 11:56:42 +12:00