2701 commits

Author	SHA1	Message	Date
Alexander Ivash	c67ff3b5d8	10024 Wallet: TextField Focus Problems ... note: removed excessive MouseArea-s	2017-12-05 00:03:48 +03:00
Brad Hefta-Gaub	06cf194ec7	Merge pull request #11910 from ctrlaltdavid/21626 ... Fix erroneous 2D overlay unhandled property messages for bounds property	2017-12-03 18:09:17 -08:00
Brad Hefta-Gaub	3f705a7baf	Merge pull request #11858 from vladest/fix_tablet_scrollbars ... Use ScrollBars from QQC2, which supports mouse and touch events	2017-12-02 12:51:14 -08:00
Howard Stearns	e2efe062fe	Merge pull request #11893 from zfox23/commerce_sameInfoDontRefresh ... Don't refresh Inventory or Recent Activity if data hasn't changed	2017-12-01 13:57:34 -08:00
Zach Fox	ebb2e50d01	Fix month display in commerce...	2017-12-01 09:29:19 -08:00
David Rowe	fd76c7a88b	Fix erroneous 2D overlay unhandled property messages for bounds property	2017-12-01 17:40:34 +13:00
vladest	dfeefe53b8	Make scroll bar handle centered on shaft. Width chaned on par with entities list html view	2017-11-30 11:40:02 +01:00
Zach Fox	3c892920e3	Prevent seeding text from flashing	2017-11-28 17:00:15 -08:00
Zach Fox	5dc8715879	Bugfix	2017-11-28 16:14:17 -08:00
Zach Fox	489d11d5fd	Remove logging	2017-11-28 16:01:58 -08:00
Zach Fox	3e5a2addd2	Use same logic for Recent Activity	2017-11-28 16:00:46 -08:00
Zach Fox	e769d2fbc3	Don't refresh Inventory or Recent Activity if data hasn't changed	2017-11-28 15:44:42 -08:00
vladest	7283f0127b	return back square background for scroll bars	2017-11-28 22:21:52 +01:00
vladest	94937374c5	Make selection not visible under rounded scrollbar	2017-11-28 21:33:13 +01:00
vladest	b2ec2aab15	Merge branch 'master' into fix_tablet_scrollbars	2017-11-28 20:41:07 +01:00
MiladNazeri	83d13717fe	Merge pull request #11752 from Menithal/21539 ... 21539: Add "None" option in Head Tracking section when "Use Vive in Desktop Mode" is selected	2017-11-27 16:02:01 -08:00
Menithal	693da50a68	21539: Fixed None Checkmark being on Desktop mode	2017-11-27 07:59:04 +02:00
Menithal	5d52b9936b	21539: Updated Logic to match request	2017-11-27 07:42:18 +02:00
Menithal	ba1cd74ffe	21539: Moved Desktop HMD to None	2017-11-26 21:58:16 +02:00
vladest	6136a4cea6	Rounded background	2017-11-25 10:03:56 +01:00
vladest	73a557a8a4	Added Scroll Bar for Trees. Fixed some anchoring issues. Fixed headerless views	2017-11-24 15:58:27 +01:00
vladest	b69b580a68	Use ScrollBar from QQC2 which is supports both mouse and touch events	2017-11-23 23:08:43 +01:00
Zach Fox	fada02a76c	Merge pull request #11864 from zfox23/commerce_newHelpText ... New Help questions/answers/link	2017-11-22 12:53:16 -05:00
Zach Fox	d2ebfbf064	New Help questions/answers/link	2017-11-21 18:55:48 -05:00
samcake	84ff40c717	Merging with master	2017-11-21 14:12:47 -08:00
Brad Hefta-Gaub	5914f27027	Merge pull request #11706 from luiscuenca/webAudioDev_fresh ... QML & Web generated audio now follow the client audio device selection	2017-11-21 11:29:48 -08:00
Howard Stearns	4018b99118	Merge pull request #11848 from zfox23/commerce_flipTheSwitch ... Turn Commerce on by default!	2017-11-20 16:18:53 -08:00
Dante Ruiz	76935c1457	fixing merge conflict	2017-11-20 09:51:10 -08:00
Brad Hefta-Gaub	e070033ce4	Merge pull request #11793 from ElderOrb/FB9032 ... 9032 - Current display mode can be deselected in the toolbar/tablet menu	2017-11-19 11:25:35 -08:00
Brad Hefta-Gaub	ff8ca6da4c	Merge pull request #11303 from vladest/webbrowser_updates ... Webbrowser updates	2017-11-19 11:11:09 -08:00
Brad Hefta-Gaub	1de6ecec30	Merge pull request #11830 from ElderOrb/FB8244 ... 8244 Rename captionColorOverride to captionColor	2017-11-18 14:28:32 -08:00
Brad Hefta-Gaub	28b75abcee	Merge pull request #11816 from druiz17/fix-bringing-up-logs ... Fix issue of User is unable to bring up the High Fidelity Interface log.	2017-11-17 17:02:50 -08:00
Brad Hefta-Gaub	0678a7c9df	Merge pull request #11718 from kencooke/audio-louder-mastergain ... Adjustable master avatar volume	2017-11-17 16:58:27 -08:00
SamGondelman	033f658fff	Merge remote-tracking branch 'upstream/master' into pointers	2017-11-17 16:10:20 -08:00
Zach Fox	ec16f16757	Remove debug buttons from wallet	2017-11-17 15:21:18 -08:00
Zach Fox	4cc8db8aff	Merge pull request #11843 from zfox23/commerce_fixMyItems ... Fix 'My Items' display	2017-11-17 12:59:51 -08:00
Dante Ruiz	4de0fdf7d1	Merge pull request #11768 from ctrlaltdavid/21596 ... Add instructions and cursor to GOTO dialog input	2017-11-17 11:45:40 -08:00
Zach Fox	f570e3c874	Fix 'My Items' display	2017-11-17 11:27:00 -08:00
Zach Fox	7f64ede940	Fix skipping wallet setup step in certain cases	2017-11-16 11:44:52 -08:00
SamGondelman	e3aa79990b	merge with master	2017-11-16 09:45:32 -08:00
Alexander Ivash	c5d2f598d7	8244 Rename captionColorOverride to captionColor	2017-11-16 15:46:49 +03:00
SamGondelman	7eb22b372f	merge with master	2017-11-15 14:35:30 -08:00
Zach Fox	9f80a5f081	Merge pull request #11817 from zfox23/commerce_rezFix ... Fix rezzing non-JSON marketplace items	2017-11-15 14:17:05 -08:00
Zach Fox	e8c4878c8f	Fix rezzing non-JSON marketplace items	2017-11-15 11:25:18 -08:00
Dante Ruiz	d83f3152dd	Merge pull request #11809 from ElderOrb/FB8984 ... 8984 Opening tablet with "Enter" key displays the audio menu	2017-11-15 11:16:49 -08:00
Dante Ruiz	b633968865	fix-bringing-up-logs	2017-11-15 10:47:06 -08:00
Howard Stearns	1c293c4c48	Merge pull request #11813 from zfox23/commerce_removeEditJSDependency ... Remove Marketplace's dependency on Edit.js for REZ/WEAR	2017-11-14 16:33:35 -08:00
Zach Fox	f5994375cf	Remove Marketplace's dependency on Edit.js for rez	2017-11-14 14:29:49 -08:00
Zach Fox	c42003a374	Merge pull request #11794 from ElderOrb/FB4684_3 ... 4684 Add collapse button on the virtual keyboard	2017-11-14 12:22:42 -08:00
Alexander Ivash	e201e203b8	8984 Opening tablet with "Enter" key displays the audio menu	2017-11-14 22:18:48 +03:00