24704 commits

Author	SHA1	Message	Date
Zach Fox	3b8e52ea41	Merge pull request #12862 from zfox23/discovery_April2018 ... Discovery: April 2018 (Huge PR; see description)	2018-04-17 15:11:50 -07:00
Zach Fox	0504220171	Abide by new backend code	2018-04-16 13:01:31 -07:00
Zach Fox	02aa8ac566	Bugfixes per QA	2018-04-16 11:53:37 -07:00
John Conklin II	5705bac87f	Merge pull request #12723 from ctrlaltdavid/21801 ... HMD API JSDoc	2018-04-16 11:12:26 -07:00
Sam Gateau	3ac4a1db2d	Merge pull request #12850 from SimonWalton-HiFi/early-trace ... Enable Interface tracing from earliest execution point	2018-04-16 10:24:55 -07:00
Zach Fox	ee9519bf1b	Merge branch 'discovery_April2018' of github.com:zfox23/hifi into discovery_April2018	2018-04-16 10:12:34 -07:00
Zach Fox	071bf35683	Merge branch 'master' of github.com:highfidelity/hifi into discovery_April2018	2018-04-16 10:11:44 -07:00
Sam Gondelman	7c65c9c444	Merge pull request #12888 from SamGondelman/statsAssert ... Rollback some recent QML changes on Android	2018-04-13 16:35:28 -07:00
SamGondelman	8005547d03	rollback some qml changes on android	2018-04-13 14:28:00 -07:00
John Conklin II	008c7be369	Merge pull request #12787 from druiz17/fix-offscreen-windows ... hide desktop windows when switching into HMD mode	2018-04-13 12:17:15 -07:00
Melissa Brown	fd7b3b75f9	Merge pull request #12884 from Atlante45/fix/build-instructions ... Update docs with correct qt version	2018-04-13 11:12:06 -07:00
John Conklin II	fc487ea322	Merge pull request #12831 from ctrlaltdavid/21829 ... Model overlay fixes	2018-04-12 17:04:55 -07:00
Simon Walton	76468f7f26	Use existing DISABLE_WATCHDOG global to turn off thread entirely	2018-04-12 16:58:13 -07:00
Clement	157ca8cd68	Update docs with correct qt version	2018-04-12 16:21:26 -07:00
Sam Gateau	77a27b2be7	Merge pull request #12835 from NissimHadar/speedUp1 ... ktxInitialDataRequestFinished call to qcDebug(networking) - only in DEBUG	2018-04-12 11:48:09 -07:00
Seth Alves	46a741be7b	Merge pull request #12068 from vladest/move_to_qqc2 ... Move to qqc2	2018-04-12 11:26:55 -07:00
Simon Walton	a584d67acd	Tweaks for clang error and gcc warning	2018-04-12 10:44:41 -07:00
John Conklin II	67b1313fb6	Merge pull request #12669 from ElderOrb/FB13143 ... Fix several styling/alignment/overlapping issues in 'Add to world' and 'Rename' dialogs in Asset Browser	2018-04-12 10:34:58 -07:00
John Conklin II	213c35dab4	Merge pull request #12790 from WolfGangS/bugfix/12759-editoverlay-subimage ... Bugfix for #12759 Overlays.editOverlay not applying subImage property	2018-04-12 10:34:17 -07:00
John Conklin II	7bcaa12c50	Merge pull request #12679 from FlameSoulis/getAnimatationRoles-fix ... Typo corrected: getAnimatationRoles to getAnimationRoles	2018-04-12 10:32:09 -07:00
Simon Walton	5c141aa5e9	Add --disableWatchdog command-line option ... Watchdog still runs but doesn't abort on timeout. Also fixes for previous tracing improvements.	2018-04-12 09:28:28 -07:00
David Rowe	c2f0f7ef5f	Doc review	2018-04-12 10:54:35 +12:00
Sam Gateau	f355bd86c2	Merge pull request #12783 from samcake/blue ... Hack: Adding more budget options for memory texture	2018-04-11 15:46:08 -07:00
David Rowe	7a9e3388fa	Merge branch 'master' into 21801	2018-04-12 09:48:51 +12:00
John Conklin II	7a905ed420	Merge pull request #12777 from ctrlaltdavid/21813 ... Fix Window API position and size reporting	2018-04-11 13:48:21 -07:00
John Conklin II	854d3d7804	Merge pull request #12765 from ctrlaltdavid/21822 ... Fix text sizing per text3d overlay lineHeight property	2018-04-11 12:16:51 -07:00
MiladNazeri	9f7a765ec3	Merge pull request #12729 from ctrlaltdavid/21814 ... Settings API JSDoc	2018-04-11 11:48:15 -07:00
Zach Fox	539fd42324	Reduce logging from some Commerce/Discovery features	2018-04-11 09:41:47 -07:00
Zach Fox	a411760f0c	Finally fix the grey security pic bug!	2018-04-11 09:41:47 -07:00
Zach Fox	feec52b4bb	Cleanup 'Private' HMD Preview State Machine Logic	2018-04-11 09:41:47 -07:00
Zach Fox	dc3e1751cb	Commerce: Gifts	2018-04-11 09:41:47 -07:00
Zach Fox	0c9d65bc15	Merge pull request #12758 from zfox23/commerce_fixCertificateInfoError ... Commerce: Fix Certificate Info error	2018-04-11 09:38:43 -07:00
Zach Fox	095b4ba5f2	Reduce logging from some Commerce/Discovery features	2018-04-10 16:02:58 -07:00
Zach Fox	b9d0360ea2	Finally fix the grey security pic bug!	2018-04-10 16:00:53 -07:00
Zach Fox	a2f5891a0b	Cleanup 'Private' HMD Preview State Machine Logic	2018-04-10 16:00:18 -07:00
Zach Fox	ffab27d442	Commerce: Fix Certificate Info error	2018-04-10 15:54:55 -07:00
Zach Fox	a9b9a1cb10	Commerce: Gifts	2018-04-10 15:54:19 -07:00
Simon Walton	ca5720c015	Take out superfluous DependencyManager::set<tracing::Tracer>()	2018-04-10 13:52:46 -07:00
Simon Walton	cf3648409d	Allow duration for tracing, other fixes	2018-04-10 13:14:52 -07:00
Simon Walton	513a4875f0	Move --traceFile option to start of main()	2018-04-10 13:13:47 -07:00
Simon Walton	9b6306601a	Merge Clement's PR12700 diffs for early trace start	2018-04-10 13:13:46 -07:00
Sam Gondelman	d781cf43ee	Merge pull request #12775 from Cristo86/android_jump ... Android Control - jump and view sensitivity	2018-04-09 17:32:57 -07:00
Clément Brisset	c62a701a2d	Merge pull request #12838 from highfidelity/RC66 ... RC66 merge back to master	2018-04-09 13:17:12 -07:00
John Conklin II	890a63afb4	Merge pull request #12833 from ElderOrb/FB14015_RC66 ... Close 'goto' app on pressing 'forward' / 'backward' buttons	2018-04-09 11:42:17 -07:00
John Conklin II	be3d5d03cc	Merge pull request #12808 from ElderOrb/FB13962_RC66 ... Fix for auto-reopening of closed query dialogs (aka hack-on-top-of-hack)	2018-04-09 09:42:00 -07:00
NissimHadar	7f70511d1a	Added a script command to clear caches.	2018-04-08 10:32:35 -07:00
Alexander Ivash	faddc556d7	FB14015 - Go To app does not close when selecting forward and back arrows on desktop	2018-04-07 17:57:22 +03:00
David Rowe	f3a745b6cb	Fix initialization order	2018-04-07 18:53:27 +12:00
David Rowe	8093e3e5ae	Fix some miscellaneous JSDoc typos	2018-04-07 16:48:05 +12:00
David Rowe	96178404c7	Document that jointTranslations and jointRotations are not cloned	2018-04-07 16:47:38 +12:00