3496 commits

Author	SHA1	Message	Date
vladest	be22f49c32	Merge branch 'master' into menu-updates	2018-04-28 20:22:28 +02:00
Zach Fox	c0fe504713	Merge pull request #13030 from zfox23/finalize_14295_14559 ... Finalize work on MS14295 and MS14559	2018-04-27 13:49:02 -07:00
Howard Stearns	f8ad36afd0	Merge pull request #13028 from zfox23/updateCommerceFor67 ... Allow gifting of Pending items; remove PoP verification rescheduling on Pending items	2018-04-27 11:55:40 -07:00
Zach Fox	bbc15cdc63	Finalize work on MS14295 and MS14559	2018-04-27 11:04:46 -07:00
Zach Fox	0f36fb113d	Allow gifting of Pending items; remove PoP verification rescheduling on Pending items	2018-04-27 10:20:55 -07:00
Brad Hefta-Gaub	e4f5eb9cca	Merge pull request #13020 from zfox23/MS14295_GiftsUIFixes ... MS14295: Fix lingering Gifts UI Bugs	2018-04-27 07:30:14 -07:00
Zach Fox	e3b14bf478	MS14295: Fix lingering Gifts UI Bugs	2018-04-26 15:57:37 -07:00
Zach Fox	fc324f67bd	MS14559: Fix sometimes being unable to click on 'Nearby' orb when sending Gift/HFC	2018-04-26 15:09:53 -07:00
vladest	3296ae0db8	Merge branch 'master' into menu-updates	2018-04-26 22:21:40 +02:00
John Conklin II	236e75b6c6	Merge pull request #12903 from druiz17/add-more-hmd-data ... Get the correct device name connect to OpenVr	2018-04-24 13:29:41 -07:00
vladest	60115752ad	Fixed saving after editing	2018-04-21 20:18:24 +02:00
vladest	2b716f051c	Merge branch 'master' into menu-updates	2018-04-20 19:34:15 +02:00
vladest	0e28e41107	Fix various issues with SpinBox-es and Sliders	2018-04-20 19:15:29 +02:00
vladest	b8577bd791	Merge branch 'master' into fix_spinbox	2018-04-20 18:09:16 +02:00
vladest	ab1a89a6f9	Merge branch 'master' into menu-updates	2018-04-19 21:02:30 +02:00
Howard Stearns	6d151f022d	Merge pull request #12910 from zfox23/MS12217_letterboxMessageFix ... Only dismiss letterbox when clicking on grey areas	2018-04-19 11:47:10 -07:00
vladest	663af09605	Fix SpinBox. attempt 1	2018-04-19 20:43:48 +02:00
vladest	60d53359bb	Fix Toolbar vertical position	2018-04-19 11:39:58 +02:00
Zach Fox	e01e7cc7bc	Be a bit more efficient	2018-04-18 16:34:02 -07:00
vladest	7b21b36d3c	Disable menu button in Toolbar mode	2018-04-18 22:19:54 +02:00
Dante Ruiz	9d6fc13a04	Merge branch 'master' of github.com:highfidelity/hifi into more-tablet-changes	2018-04-18 13:06:51 -07:00
Dante Ruiz	a65f5f7917	making tablet changes	2018-04-18 13:06:26 -07:00
vladest	b5071d28e8	Merge branch 'master' into menu-updates	2018-04-18 21:10:57 +02:00
vladest	cacb9359c2	Toolbar at bottom	2018-04-18 20:57:28 +02:00
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
vladest	bb7eb90f58	Merge branch 'master' into menu-updates	2018-04-17 19:55:11 +02:00
vladest	c402cb2c19	Fix Desktop double windows	2018-04-17 19:51:43 +02:00
Zach Fox	93cf399fd6	Only dismiss letterbox when clicking on grey areas	2018-04-16 15:09:19 -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
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
Dante Ruiz	5af1ea54d3	Merge branch 'master' of github.com:highfidelity/hifi into add-more-hmd-data	2018-04-16 10:10:55 -07:00
vladest	6d53512c6c	Merge	2018-04-15 15:24:16 +02: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
Seth Alves	46a741be7b	Merge pull request #12068 from vladest/move_to_qqc2 ... Move to qqc2	2018-04-12 11:26:55 -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
David Rowe	7a9e3388fa	Merge branch 'master' into 21801	2018-04-12 09:48:51 +12:00
Zach Fox	539fd42324	Reduce logging from some Commerce/Discovery features	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	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
Clément Brisset	c62a701a2d	Merge pull request #12838 from highfidelity/RC66 ... RC66 merge back to master	2018-04-09 13:17:12 -07:00