28503 commits

Author	SHA1	Message	Date
Sam Gateau	ddc42585d8	Cleanup syntax	2019-02-21 16:41:50 -08:00
Sam Gateau	94fc60f285	Bad idea to include global here	2019-02-21 16:34:50 -08:00
Sam Gateau	fe33aadd69	Assigning the default world detail and max render rate target in vr quest	2019-02-21 14:58:06 -08:00
Shannon Romano	f9e5ee0185	Merge pull request #14970 from danteruiz/quest-no-keyboard ... Case 21335: Use old tablet keyboard for quest	2019-02-21 10:34:53 -08:00
Dante Ruiz	bf8c671cd6	keyboard setting	2019-02-20 13:38:20 -08:00
John Conklin II	87556059d3	Merge pull request #13901 from Cristo86/android_handshake ... case 20058: Android - Handshake implementation	2019-02-20 13:33:52 -08:00
Brad Davis	79369a0c83	Merge remote-tracking branch 'upstream/master' into feature/quest	2019-02-20 10:40:49 -08:00
Shannon Romano	0b7bdb185e	Merge pull request #14949 from SamGondelman/wearables ... Case 21300, Case 21301: Group cull all entity descendants of avatars	2019-02-20 10:29:40 -08:00
John Conklin II	97c7b01005	Merge pull request #14965 from danteruiz/stylus-pick-perf ... Case 21255: PickManager performance is slow when keyboard mallets are enabled	2019-02-20 10:11:33 -08:00
Brad Davis	817c24dd0b	Merge remote-tracking branch 'upstream/master' into feature/quest	2019-02-20 09:51:03 -08:00
Brad Davis	122a246d2d	Fix typo	2019-02-19 17:30:47 -08:00
Shannon Romano	07d084d086	Merge pull request #14937 from SamGondelman/pal ... Case 21259: Pal textures don't change	2019-02-19 17:14:15 -08:00
Brad Davis	518e480a8b	Fix plugin activation	2019-02-19 17:00:50 -08:00
SamGondelman	6765268998	Merge remote-tracking branch 'upstream/master' into wearables	2019-02-19 16:52:00 -08:00
danteruiz	6bdf51a460	limit number of include items for mallets	2019-02-19 16:25:38 -08:00
danteruiz	d1c46e1cdc	fixing tablet pointer issues	2019-02-19 14:48:17 -08:00
Dante Ruiz	6189aff6b3	Merge pull request #14933 from danteruiz/pick-manager-perf ... Case 21271: Remove unnessary picks for quest	2019-02-19 14:20:56 -08:00
Brad Davis	d60dcb99d2	Merge remote-tracking branch 'upstream/master' into feature/quest	2019-02-19 12:37:30 -08:00
SamGondelman	2986ca20c5	Merge remote-tracking branch 'upstream/master' into pal	2019-02-19 11:31:40 -08:00
John Conklin II	d7a5c0bb4f	Merge pull request #14947 from SamGondelman/overlayClick ... Case 21291, Case 21292, Case 21293: Working on overlay bugs	2019-02-19 11:01:19 -08:00
John Conklin II	1348baecc7	Merge pull request #14935 from SamGondelman/matEntity ... Case 20920: Move Material Entity logic to render thread	2019-02-19 10:59:51 -08:00
John Conklin II	0f8c36156b	Merge pull request #14952 from SamGondelman/textColor ... Case 21305: Fix text overlay color property	2019-02-19 10:58:32 -08:00
Howard Stearns	d7d6ff53ca	Merge pull request #14765 from howard-stearns/artist-stocking-inventory ... Case 20657: artist stocking inventory	2019-02-19 10:46:01 -08:00
danteruiz	4bbae1230d	making requested chantges	2019-02-19 10:07:36 -08:00
SamGondelman	927e824610	fix missing color for text overlays	2019-02-18 16:14:07 -08:00
SamGondelman	06ac2b291b	attachments and wearables cull with avatar parent	2019-02-17 17:52:10 -08:00
SamGondelman	1163cbea70	improving web surface interaction and tablet hiding	2019-02-16 22:03:55 -08:00
SamGondelman	85421cd6ee	speed up stylus picks	2019-02-16 21:16:46 -08:00
SamGondelman	71653f95d7	working on overlay bugs	2019-02-16 20:08:36 -08:00
Howard Stearns	e9b323a807	fix HFC symbol location at checkout, and the display of unavailable items	2019-02-15 16:56:31 -08:00
danteruiz	b00746c096	Trim picks in use during quest:	2019-02-15 16:24:17 -08:00
SamGondelman	0f33d696d2	trying to fix pal colors	2019-02-15 16:12:36 -08:00
John Conklin II	4520236873	Merge pull request #14917 from thoys/feat/avatarTools/avatarDoctor ... Case 21012: Avatar Doctor	2019-02-15 15:43:18 -08:00
Howard Stearns	f16eb1c029	Merge branch 'master' of github.com:highfidelity/hifi into artist-stocking-inventory	2019-02-15 15:15:13 -08:00
Thijs Wenker	e900d3784b	fixes	2019-02-15 23:58:42 +01:00
SamGondelman	3df231f1e0	it's working!	2019-02-15 14:43:22 -08:00
John Conklin II	09d8221582	Merge pull request #14834 from gcalero/connection_failure_dialog ... Case 20936: Set message dialog text width so wrap mode takes effect	2019-02-15 14:16:02 -08:00
Brad Davis	578bc4fc89	Suppress logspam with missing Controller in QML	2019-02-15 14:15:24 -08:00
ingerjm0	c8791841de	Merge pull request #14918 from ctrlaltdavid/M21128 ... Case 21128: AccountServices, HifiAbout, and WalletScriptingInterface JSDoc	2019-02-15 14:15:13 -08:00
Brad Davis	78be935e1a	Consolidating differences from master	2019-02-15 14:12:37 -08:00
Brad Davis	4409e59682	Add per-android-app preprocessor macros	2019-02-15 14:11:26 -08:00
Roxanne Skelly	a82385200e	Merge pull request #14906 from roxanneskelly/QmlMarketplace ... Qml marketplace - multiple improvements/bugfixes	2019-02-15 14:04:47 -08:00
John Conklin II	b9356e22d8	Merge pull request #14927 from huffman/fix/hide-asset-browser ... Case 16349: Fix asset browser being hidden in incorrect way on server switch	2019-02-15 13:32:27 -08:00
SamGondelman	c92b82e744	merge with master	2019-02-15 12:43:30 -08:00
Roxanne Skelly	2c4f485079	QmlMarketplace invert arrow direction on sort.	2019-02-15 12:31:01 -08:00
Thijs Wenker	74ce98a075	Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarDoctor	2019-02-15 20:57:20 +01:00
Thijs Wenker	556a55ff16	Better scale and texture checks	2019-02-15 20:55:27 +01:00
SamGondelman	87ab255115	finish moving materials to rendering	2019-02-15 11:49:20 -08:00
Brad Davis	a5f84ab51a	Merge remote-tracking branch 'upstream/master' into feature/quest	2019-02-15 11:37:13 -08:00
Roxanne Skelly	fb524f8900	Merge branch 'QmlMarketplace' of https://github.com/roxanneskelly/hifi into QmlMarketplace	2019-02-15 11:35:06 -08:00