57460 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Zach Fox	483d1e5b96	Merge pull request #11033 from zfox23/contextOverlays_tabletOrientation ... Hack to mod tablet orientation when clicking context overlay	2017-07-25 09:27:28 -07:00
Zach Fox	c22798a8e6	Offset tablet position to left of screen per feedback	2017-07-24 17:16:07 -07:00
Zach Fox	223ed5b59a	Hack to mod tablet orientation when clicking context overlay	2017-07-24 14:29:06 -07:00
David Kelly	e7c6ba9ae2	unused var	2017-07-21 14:44:45 -07:00
Zach Fox	811be15bbc	Another attmept to fix the tablet	2017-07-21 14:02:19 -07:00
David Kelly	8de09affad	Merge pull request #11025 from davidkelly/dk/contextOverlayPositioning ... reposition context overlay when far away	2017-07-21 13:35:57 -07:00
Zach Fox	796292dd4c	Fix the tablet	2017-07-21 13:21:13 -07:00
David Kelly	9e31024a0e	merged with new stuff too	2017-07-21 13:16:41 -07:00
Zach Fox	a346e5ccf6	New inspect icon	2017-07-21 11:56:06 -07:00
Zach Fox	a800f6c05a	No magic numbers; Move (i) based on laser hand; Tablet to Tab key	2017-07-21 11:48:19 -07:00
Zach Fox	7d125f44e4	Set parentID even when overlay already exists	2017-07-21 09:35:49 -07:00
David Kelly	9c0026bf69	make sure context overlays are on after pal is dismissed	2017-07-21 08:40:12 -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
Clément Brisset	1cb030992f	Merge pull request #10945 from rickdaniels/jh21402 ... Address #21402 Added a handler to Sit.js script for the onLoadComplet…	2017-07-20 18:02:47 -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	65a0f868ce	Merge pull request #11017 from zfox23/contextOverlays_hoverHandlers ... Add hover/unhover handlers to context overlays	2017-07-20 17:24:35 -07:00
Zach Fox	e68f9499fa	Add hover/unhover handlers to context overlays	2017-07-20 16:51:00 -07:00
David Kelly	5cd05da31e	strict comparisons	2017-07-20 15:16:40 -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	8f8f695e73	Merge pull request #11015 from davidkelly/dk/placeholderHighlighting ... registration point fix	2017-07-20 15:08:38 -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
rick@ghostpunch.com	52c8d77d8e	Merge branch 'master' of git://github.com/highfidelity/hifi into jh21402	2017-07-20 17:03:46 -04:00
rick@ghostpunch.com	451b7ec1de	Revert the role name filter change as it has already been added to the repo	2017-07-20 17:01:02 -04:00
Clément Brisset	c128a3ff86	Merge pull request #11001 from Atlante45/fix/debug-builds ... Fix debug builds startup crash	2017-07-20 13:31:55 -07:00
Clément Brisset	d2e64a52e1	Merge pull request #11013 from Atlante45/update-sit ... Update sit script in the repo	2017-07-20 13:28:29 -07:00
Zach Fox	bab58efc3c	Merge pull request #11014 from zfox23/contextOverlays_improvements2 ... Five major improvements to context-overlays	2017-07-20 13:27:48 -07:00
Zach Fox	46d09a12fe	Fix bug where overlay would get stuck	2017-07-20 13:26:43 -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
David Kelly	927699eb92	Merge pull request #11012 from davidkelly/dk/placeholderHighlighting ... Turn off ContextOverlay for edit, pal	2017-07-20 13:01:21 -07:00
Zach Fox	a1a7ab945a	Make dimensions better	2017-07-20 12:58:15 -07:00
David Kelly	f365ce8abd	typo	2017-07-20 12:58:06 -07:00
rick@ghostpunch.com	2b9da2bcba	Fix another typo. Sigh...	2017-07-20 15:44:59 -04:00
rick@ghostpunch.com	cc0ed9ead4	Corrected typo in role name search filter. Removed commented out debug print	2017-07-20 15:26:12 -04:00
Zach Fox	f515a24568	UX improvements	2017-07-20 12:00:13 -07:00
Atlante45	c0da0cb439	Update sit script in the repo	2017-07-20 11:56:41 -07:00
Brad Hefta-Gaub	cdb7652423	Merge pull request #11007 from MiladNazeri/patch-2 ... Update CONTRIBUTING.md	2017-07-20 11:55:26 -07:00
David Kelly	3bf81034a3	Merge branch 'context-overlays' of https://github.com/highfidelity/hifi into dk/placeholderHighlighting	2017-07-20 11:31:25 -07:00
David Kelly	b7be727b4c	turn off ContextOverlay for pal, edit. Improve clicks too	2017-07-20 11:30:55 -07:00
Seth Alves	38a955b886	Merge pull request #11011 from trentpolack/21434-obj-vertexcolors ... WL21434 - Add vertex color support for OBJ files.	2017-07-20 10:37:37 -07:00
David Kelly	c75a925bb6	Merge pull request #11003 from davidkelly/dk/placeholderHighlighting ... Highlight using simple yellow bounding box	2017-07-20 10:10:50 -07:00
trent	559e2e0ebb	Fixing formatting issues; renamed ::getVec3Vec3 to ::getVertex.	2017-07-20 13:09:17 -04:00
trent	ff3e9263ef	Stupid tabs.	2017-07-20 11:40:42 -04:00
trent	786535a001	Merge branch 'master' of https://github.com/highfidelity/hifi into 21434-obj-vertexcolors	2017-07-20 11:38:54 -04:00
trent	d71b0802a7	Added vertex color support to OBJReader.h|cpp.	2017-07-20 11:38:42 -04: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