57563 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Seth Alves	8a0b43981c	Merge branch 'master' of github.com:highfidelity/hifi into script-getmeshes-for-models	2017-07-20 12:28:58 -07: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
Brad Davis	3a31805dff	Fix warnings in Qt 59 / VS 2017 build	2017-07-20 11:57:12 -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
Seth Alves	bd37f8edf5	Merge branch 'master' of github.com:highfidelity/hifi into script-getmeshes-for-models	2017-07-20 09:03:59 -07:00
Chris Collins	13262afec7	Merge pull request #10972 from highfidelity/RC-48 ... Beta Release 48 - Includes up to Developer Release 6863	2017-07-20 08:57:47 -07: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
Dante Ruiz	3805228b70	fixed grab the tablet in third person	2017-07-20 16:26:51 +01: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
MiladNazeri	13274fb9a3	Update CONTRIBUTING.md ... Same issue as the readme.md change.	2017-07-20 10:20:56 -04:00
Ken Cooke	87d9dfd243	Merge pull request #11002 from ctrlaltdavid/21461 ... Fix noise reduction checkbox not always working	2017-07-19 19:22:28 -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
Zach Fox	5c74a3bbeb	Improve hand controller + overlay interaction	2017-07-19 17:09:57 -07:00
Zach Fox	2dc3844116	Improve reliability of hand lasers; increase size of target	2017-07-19 17:07:57 -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
Stephen Birarda	3936ee93f0	use default scripts path in EditTabView to fix load on OS X	2017-07-19 16:34:04 -07:00
Atlante45	70a5916ef3	Fix debug builds startup crash	2017-07-19 16:18:01 -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	2bd46d35df	Merge pull request #10998 from davidkelly/dk/marketplaceItemsOnly ... Overlay appears only on marketplace items	2017-07-19 16:04:47 -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