3757 commits

Author	SHA1	Message	Date
vladest	80eb203008	More precise handle placing. some logging added	2017-11-28 20:20:58 +01:00
vladest	da5090fd49	Implemented more close to QQC2 ideology	2017-11-27 19:43:17 +01:00
vladest	3f0de940a4	Merge branch 'master' into move_to_qqc2	2017-11-26 10:18:44 +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
vladest	4e38b3bace	Started working on ComboBox. Add background for scroll bar	2017-11-20 20:35:41 +01:00
Dante Ruiz	76935c1457	fixing merge conflict	2017-11-20 09:51:10 -08:00
vladest	f20a723a7d	Merge branch 'master' into move_to_qqc2	2017-11-20 17:04:26 +01:00
vladest	f991379c9c	Fix scroll bar	2017-11-20 17:02:34 +01:00
vladest	50ed9e2b2a	Port CheckBox to QQC2	2017-11-19 22:03:38 +01:00
vladest	6b640bd028	Resolve merge conflicts	2017-11-19 20:52:39 +01: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
vladest	b21f66f666	Port PlaySampleSound to QQC2. Fix crash on press down key in scroll window	2017-11-19 20:09:07 +01: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
vladest	19f9af0576	Port avatar preferences	2017-11-18 23:03:52 +01:00
vladest	68b08f429c	Port Attachments to QQC2	2017-11-18 22:49:16 +01:00
vladest	d92f461f12	Port ControllerSettings	2017-11-18 20:44:52 +01:00
vladest	41f338e6ad	Port ScrollingWindow and TabletDebugWindow	2017-11-18 20:18:17 +01:00
vladest	c8d864465f	Merge branch 'master' into move_to_qqc2	2017-11-18 18:54:08 +01:00
vladest	34fe517c67	Merge conflicts	2017-11-18 18:48:33 +01: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
vladest	dbd6ec0dff	Port Edit.qml to QQC2 as well as some tablet preferences compinents	2017-11-17 20:46:21 +01: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
vladest	cfacf3b47d	Port web glyph button to QQC2	2017-11-16 21:58:09 +01:00
Zach Fox	7f64ede940	Fix skipping wallet setup step in certain cases	2017-11-16 11:44:52 -08:00
vladest	2aae8edde0	Merge branch 'master' into move_to_qqc2	2017-11-16 19:08:15 +01:00
vladest	b4f6c25f4d	Implement QQC1-compatible Action component	2017-11-16 19:04:35 +01: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
vladest	0e53afc346	Merge branch 'master' into move_to_qqc2	2017-11-15 20:53:14 +01:00
vladest	2852375285	Make QueryDioalogs buttons works	2017-11-15 20:32:28 +01: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
SamGondelman	2fb1981c4a	merge with master	2017-11-13 14:34:39 -08:00