80307 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Simon Walton	0f6ad43531	Set desktop reserved threads to 1; HMD reserved threads to 2	2019-08-06 15:34:13 -07:00
Simon Walton	baa586939c	Merge branch 'master' into min_threadpool_2	2019-08-06 14:25:37 -07:00
milad	75708170dd	Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd	2019-08-06 13:23:32 -07:00
milad	82f6c29923	updated emoji size info	2019-08-06 13:23:10 -07:00
Shannon Romano	93d5d9bd3f	Merge pull request #15988 from ctrlaltdavid/DOC-98 ... DOC-98, DOC-114: PlatformInfo API changes JSDoc	2019-08-06 13:22:36 -07:00
Shannon Romano	9e0e6f9d5e	Merge pull request #16003 from ctrlaltdavid/DOC-84 ... DOC-84: Update JSDoc with glTF	2019-08-06 13:22:04 -07:00
milad	f1ff9207f9	removing empty js file	2019-08-06 13:20:15 -07:00
Shannon Romano	8c981140b0	Merge pull request #16005 from ctrlaltdavid/DOC-61 ... DOC-61: Render API JSDoc	2019-08-06 13:18:17 -07:00
milad	c20933b813	removed saved emoji called and also add more info to description	2019-08-06 13:16:58 -07:00
milad	1a95c126c3	working version but taking a snapshot of added emoji code before removing for handoff	2019-08-06 13:13:38 -07:00
Zach Fox	8b85bbfe67	Merge pull request #16034 from zfox23/masterGPU ... BUGZ-1103: Use 'Master GPU' information in About screen	2019-08-06 12:31:54 -07:00
jennaingersoll	f487d094fe	Merge pull request #15959 from ctrlaltdavid/DOC-124 ... DOC-124: Tidy JSDoc from some recent API changes	2019-08-06 11:57:28 -07:00
Zach Fox	2a4c0a3ecd	BUGZ-1103: Use 'Master GPU' information in About screen	2019-08-06 14:13:31 -04:00
Shannon Romano	f02b76fed0	Merge pull request #16011 from ctrlaltdavid/DOC-60 ... Case 22106: DebugDraw JSDoc	2019-08-06 10:47:43 -07:00
milad	77023b281b	Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd	2019-08-06 09:27:49 -07:00
Shannon Romano	9d3d5b7701	Merge pull request #15992 from hyperlogic/feature/reaction-fixes ... Refined reaction and sitting animations	2019-08-06 09:15:44 -07:00
Brad Davis	ee3b91f465	Fix vcpkg pre-requisites build for devs using VS2019	2019-08-05 20:02:58 -07:00
milad	5e12f4c42a	Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd	2019-08-05 19:01:20 -07:00
Sam Gateau	eb616452ec	An afternounwatchign code	2019-08-05 17:54:46 -07:00
David Rowe	2939610eae	Fix link to TextEffect type	2019-08-06 11:00:24 +12:00
David Rowe	1abf0eb207	Merge branch 'master' into DOC-124 ... # Conflicts: # libraries/entities/src/EntityItemProperties.cpp	2019-08-06 10:59:50 +12:00
David Rowe	8ea4ee6d48	Doc review	2019-08-06 10:42:17 +12:00
Andy Howell	7aaecd9cdc	Merge pull request #16030 from danteruiz/fix-updater ... fix updater typo	2019-08-05 15:42:00 -07:00
David Rowe	26a04e56eb	Merge branch 'master' into DOC-98	2019-08-06 10:33:12 +12:00
Sam Gateau	3a053c32f4	Merge branch 'master' of github.com:highfidelity/hifi into toulouse	2019-08-05 14:26:18 -07:00
Ken Cooke	6fd3214f48	Merge pull request #16029 from kencooke/audio-device-format-robustness ... BUGZ-1171: Fix audio output not working (alternate fix)	2019-08-05 14:19:46 -07:00
Zach Fox	26e0a5dfd8	Merge pull request #16028 from zfox23/shieldIcon_master ... RC84: Fix BUGZ-1131: Add Shield icon back to HUD for Metaverse users	2019-08-05 13:36:58 -07:00
sabrina-shanman	30482c2db4	Give the pointer its own copy of the script parameters in case its pick is deleted	2019-08-05 13:36:15 -07:00
dante ruiz	7ab8a6b8d1	fixing typo	2019-08-05 13:16:08 -07:00
David Rowe	f97417932c	Fix typo	2019-08-06 08:08:08 +12:00
David Rowe	419044021b	Merge branch 'master' into DOC-61	2019-08-06 08:03:12 +12:00
Anthony J. Thibault	640c058591	Code review feedback	2019-08-05 12:52:42 -07:00
Ken Cooke	86adc6099b	Attempt audio device format with native sample rate and channels forced to 2/1 before failing	2019-08-05 12:14:45 -07:00
Zach Fox	34bc71fba9	Fix BUGZ-1131: Add Shield icon back to HUD for Metaverse users	2019-08-05 15:12:29 -04:00
sabrina-shanman	715f6a4473	Mark BaseNestableTransformNode::toVariantMap with override	2019-08-05 12:02:24 -07:00
Brad Hefta-Gaub	e1ef003523	Merge pull request #16024 from amerhifi/master ... case BUGZ-1168: adding default script location setting for defaultscriptoverride run…	2019-08-05 11:34:41 -07:00
Ken Cooke	ccfe6bda63	Detect clipping prior to echo cancellation (overload of the uncancelled raw input will cause echo leakage!)	2019-08-05 10:34:03 -07:00
sabrina-shanman	0bd00c3554	Fix not being able to use both QVector<unsigned int> and QVector<glm::uint32> in scripting	2019-08-05 10:31:13 -07:00
sabrina-shanman	27cf080ad6	Simplify getting nestable pointer in BaseNestableTransformNode::toVariantMap	2019-08-05 09:52:01 -07:00
Sam Gateau	d55f143300	Merge branch 'master' of github.com:highfidelity/hifi into toulouse	2019-08-05 09:49:14 -07:00
Anthony J. Thibault	704a2d2ac9	Merge branch 'master' into feature/reaction-fixes	2019-08-05 09:43:32 -07:00
Anthony J. Thibault	649ef6c721	Added sitting idle variation and removed rejected emote variations.	2019-08-05 09:42:01 -07:00
Andy Howell	a0d52f6f24	Merge pull request #15985 from danteruiz/auto-updater ... DEV-264: Lilypad Launcher (Mac): Auto-update Launcher	2019-08-05 09:36:01 -07:00
HifiExperiments	1b84244210	merge with master	2019-08-05 09:35:56 -07:00
sabrina-shanman	f188a3589e	Fix function signature for BaseNestableTransformNode::toVariantMap	2019-08-05 09:35:47 -07:00
sabrina-shanman	64fb046a33	Simplify naming for script functions to get list of picks/pointers	2019-08-05 09:25:32 -07:00
milad	d1efbc051a	working UI	2019-08-04 15:11:55 -07:00
Anthony J. Thibault	a8d7f06862	warning fixes	2019-08-04 11:03:21 -07:00
David Rowe	5576bf7e09	Update PlatformInfo JSDoc with recent graphicsAPIs addition	2019-08-03 12:19:36 +12:00
David Rowe	e2748a861a	Merge branch 'master' into DOC-98 ... # Conflicts: # libraries/platform/src/platform/backend/Platform.cpp	2019-08-03 11:22:23 +12:00