21143 commits

Author	SHA1	Message	Date
Zach Fox	7d125f44e4	Set parentID even when overlay already exists	2017-07-21 09:35:49 -07:00
David Kelly	875d0eb815	Merge branch 'context-overlays' of https://github.com/highfidelity/hifi into context-overlays	2017-07-21 07:20:19 -07:00
David Kelly	6db2e2c6c9	Merge branch 'master' of https://github.com/highfidelity/hifi into context-overlays	2017-07-21 07:18:33 -07:00
Stephen Birarda	7cfdf7d5ae	Merge pull request #11000 from highfidelity/bug/6219 ... made changes to size of content to display 'choose file' button	2017-07-20 17:46:15 -07:00
Zach Fox	e68f9499fa	Add hover/unhover handlers to context overlays	2017-07-20 16:51:00 -07:00
Zach Fox	3698fe9b6b	Merge branch 'master' of https://github.com/highfidelity/hifi into context-overlays	2017-07-20 15:10:06 -07:00
David Kelly	c8015e4eb6	cleanup, fixed build issue	2017-07-20 14:52:58 -07:00
David Kelly	c1de09c7f6	whitespace issue	2017-07-20 14:24:16 -07:00
David Kelly	10503c3a16	registration point	2017-07-20 14:18:07 -07:00
Zach Fox	e18fec140a	Merge branch 'context-overlays' of https://github.com/highfidelity/hifi into contextOverlays_improvements2	2017-07-20 13:03:34 -07:00
Zach Fox	a1a7ab945a	Make dimensions better	2017-07-20 12:58:15 -07:00
Zach Fox	f515a24568	UX improvements	2017-07-20 12:00:13 -07:00
David Kelly	b7be727b4c	turn off ContextOverlay for pal, edit. Improve clicks too	2017-07-20 11:30:55 -07:00
David Kelly	0544c1e561	build issue	2017-07-20 08:18:37 -07:00
David Kelly	110efd63c8	enabled property so we can turn it off during edit, etc...	2017-07-20 08:08:49 -07:00
David Kelly	b236a21adc	no clicks on 'highlight' overlay	2017-07-20 07:28:45 -07:00
David Kelly	0023832938	simple fixes	2017-07-19 17:38:19 -07:00
David Kelly	ebce1ce9de	Merge branch 'context-overlays' of https://github.com/highfidelity/hifi into dk/placeholderHighlighting	2017-07-19 17:13:11 -07:00
Zach Fox	2dce254928	Actually increase target size	2017-07-19 17:11:45 -07:00
David Rowe	091b666d7e	Fix noise reduction checkbox not always working	2017-07-20 12:06:19 +12:00
David Kelly	40ec770bc1	Highlight using simple yellow bounding box	2017-07-19 17:06:17 -07:00
utkarshgautamnyu	ce5ff23e70	made changes to size of content to dosplay 'choose file' button	2017-07-19 16:15:34 -07:00
David Kelly	920ac17caf	minor renaming	2017-07-19 15:46:28 -07:00
David Kelly	5f82a76cc9	Merge branch 'context-overlays' of https://github.com/highfidelity/hifi into dk/marketplaceItemsOnly	2017-07-19 15:41:36 -07:00
David Kelly	ecd419e0d3	cr feedback	2017-07-19 15:32:03 -07:00
Zach Fox	4374d4d1e5	Small improvements to overlay	2017-07-19 15:27:48 -07:00
David Kelly	44c9f0e65e	Overlay appears only on marketplace items	2017-07-19 15:13:26 -07:00
David Kelly	f0091f16a1	cr feedback	2017-07-19 14:46:10 -07:00
David Kelly	a8ab115b12	Open marketplace when we know the marketplaceID of an entity	2017-07-19 14:11:14 -07:00
Zach Fox	c866bd814d	Make clicks work right	2017-07-19 12:24:20 -07:00
Zach Fox	f06ec715f2	Quick bugfix	2017-07-19 09:59:44 -07:00
Zach Fox	1d26a268c1	Merge branch 'master' of https://github.com/highfidelity/hifi into HoverOverlay_CubeOverlay	2017-07-19 09:53:51 -07:00
Zach Fox	761d35d633	Getting there!	2017-07-18 17:10:23 -07:00
Zach Fox	8f6af3a1ab	ContextOverlay	2017-07-18 16:28:24 -07:00
Zach Fox	265f978a06	It's working!	2017-07-18 15:57:26 -07:00
Zach Fox	084f4d2ab0	Why were Web3DOverlays done this way?	2017-07-18 14:42:59 -07:00
Zach Fox	2b1a0921da	Initial work on clickable overlays	2017-07-18 14:01:16 -07:00
Brad Davis	1aee8f1f4d	Ensure we continue calling idle when minimized	2017-07-18 13:44:58 -07:00
Chris Collins	e99683fdcf	Merge pull request #10985 from jherico/audio_deadlock ... Trying to resolve QML / Audio deadlocks	2017-07-18 12:40:03 -07:00
Dante Ruiz	976fec66f8	fixed loading script whitespace	2017-07-18 17:59:42 +01:00
Brad Hefta-Gaub	2dfaf7b02a	Merge pull request #10862 from NeetBhagat/5783-Restarting-Interface-allows-you-to-have-Avatar-Scale-Too-Big ... Case 5783: Restarting Interface allows you to have Avatar Scale Too Big	2017-07-18 08:51:13 -07:00
Brad Hefta-Gaub	d94365cc44	Merge pull request #10979 from zfox23/hoverOverlay_lasers ... Create/Destroy Hover Overlays using hand controller lasers	2017-07-18 08:44:48 -07:00
Brad Hefta-Gaub	a7e328285e	Merge pull request #10969 from druiz17/bug/addmodel-textbox ... allow user move the cursor with the mouse for the add model URL textbox	2017-07-18 08:41:08 -07:00
NeetBhagat	ff51fa7199	Resolved review comments.	2017-07-18 10:42:01 +05:30
Brad Davis	d43432bd71	Cleanup dead code, fix startup behavior	2017-07-17 18:54:52 -07:00
Zach Fox	67c8ddfd57	Merge in changes from laser PR	2017-07-17 17:09:40 -07:00
Zach Fox	96f52a9812	First pass at getting overlays to show up on hover	2017-07-17 17:05:16 -07:00
Brad Davis	aab56cf2a9	Trying to resolve QML / Audio deadlocks	2017-07-17 16:21:28 -07:00
utkarshgautamnyu	758ae9825d	Merge pull request #10939 from highfidelity/bug/6118 ... Record total number of ATP/HTTP/File bytes downloaded during session	2017-07-17 13:53:21 -07:00
Zach Fox	974dff36b0	Make hover overlays work for hand controller lasers	2017-07-17 13:16:53 -07:00