2741 commits

Author	SHA1	Message	Date
Zach Fox	f248eb5518	Change wallet home when 0 transactions	2017-11-07 11:30:09 -08:00
SamGondelman	f970eb2302	merge with pointers branch	2017-11-06 14:49:50 -08:00
SamGondelman	7d420f5242	isLeftHand, isRightHand, isMouse	2017-11-06 12:29:21 -08:00
David Rowe	9db0dd6fea	Fix Asset Browser's "Copy URL" context menu	2017-11-05 20:38:37 +13:00
Menithal	ac1df7b815	21539: Allow HMD to turned off in Desktop Mode	2017-11-05 01:02:08 +02:00
Brad Hefta-Gaub	c1dfa24c12	Merge pull request #11743 from kencooke/audio-peakmeters-bugfix ... Fix the audio input device peak meters	2017-11-04 13:55:08 -07:00
Melissa Brown	a14e98053e	Merge pull request #11138 from Nex-Pro/21466 ... Fix Avatar Rotation upon Teleporting Using PAL	2017-11-03 11:58:15 -07:00
Nex-Pro	3171418173	Update NameCard.qml	2017-11-03 17:21:35 +00:00
vladest	6659565c39	Merge branch 'master' into tablet_home_paginate	2017-11-03 14:41:54 +01:00
vladest	659afcc43b	Make page indicators non clickable. Attempt to enable swipe even over buttons	2017-11-03 14:38:46 +01:00
Ken Cooke	babaef8399	Fix the audio input device peak meters	2017-11-03 05:59:59 -07:00
Zach Fox	6f3c61c4e0	Slightly modify invalid cert language	2017-11-02 17:59:36 -07:00
Zach Fox	19945c5991	Update cert UI	2017-11-02 10:22:00 -07:00
Zach Fox	56cb98d96f	Make inspection cert work	2017-11-01 12:02:57 -07:00
Zach Fox	b335ba9a75	Timeout timer	2017-11-01 11:34:29 -07:00
vladest	215e64d702	Merge branch 'master' into tablet_home_paginate	2017-11-01 18:51:01 +01:00
Ken Cooke	82d9827571	Merge branch 'master' into audio-louder-mastergain	2017-11-01 08:10:55 -07:00
Ken Cooke	3a2780bdf6	Enable gain slider in PAL menu to control Avatar MASTER Gain	2017-10-30 10:42:26 -07:00
vladest	d3c62db65d	Merge branch 'master' into webbrowser_updates	2017-10-30 18:17:19 +01:00
vladest	586dde7dd7	Removed GPL code. Added own implementation of suggestions engine. Fixed Google maps different issues	2017-10-30 18:15:42 +01:00
Ryan Downe Karpf	28a99fe685	Merge pull request #11655 from dback2/tabletcontextualmode ... add a tablet contextual mode flag to HMDScriptingInterface used to keep tablet in place	2017-10-30 08:56:26 -07:00
vladest	950ac3540a	Fix mute unmute. Scrolling thru suggestions popup now set popup's contains into url. Fixed reload timer	2017-10-29 14:05:47 +01:00
vladest	865c241a13	Merge branch 'master' into webbrowser_updates	2017-10-28 12:31:26 +02:00
vladest	b1601dcd4c	fix typo in tablet avatar browser	2017-10-28 12:07:29 +02:00
Brad Hefta-Gaub	8322631a6d	Merge pull request #11695 from luiscuenca/case6719 ... 6719 Avatar attachment window will update when attachments are modified	2017-10-27 17:01:05 -07:00
Brad Hefta-Gaub	d61ede2a4e	Merge pull request #11697 from ElderOrb/FB8211 ... 8211 Add very short haptic feedback when highlighting letters on keyboard	2017-10-27 13:26:41 -07:00
Zach Fox	5ab737f66d	Merge pull request #11658 from zfox23/pop_dynamicTestsMaster ... Commerce: Owner Verification for Certified Entities	2017-10-27 12:28:04 -07:00
luiscuenca	70b37f2e8a	Cleaning some old tabs	2017-10-27 11:32:44 -07:00
luiscuenca	f32282afdd	Clean update bug 8027	2017-10-27 11:03:02 -07:00
Zach Fox	9481824d0a	Fix enabled status of wear button	2017-10-26 17:02:09 -07:00
beholder	6093cef6f0	add comments to explain '-1'	2017-10-27 01:25:26 +03:00
beholder	f6fa85fed2	adjust to coding standards	2017-10-27 01:25:25 +03:00
Zach Fox	3e95484c4c	Merge branch 'master' of https://github.com/highfidelity/hifi into stagingSetting	2017-10-26 13:58:50 -07:00
beholder	5969e0b118	8211 Add very short haptic feedback when highlighting letters on keyboard	2017-10-26 23:03:06 +03:00
vladest	794355dc35	Merge branch 'master' into webbrowser_updates	2017-10-26 21:18:00 +02:00
vladest	320ab2e682	Rework using StackView. Now backward takes in account popups as well	2017-10-26 21:14:44 +02:00
luiscuenca	f0eab58ebd	Bug 6719 fixed	2017-10-26 09:41:24 -07:00
Ken Cooke	4eb8b826c2	Merge pull request #11681 from luiscuenca/case6443 ... 6443 Audio Menu Sample Sound won't play while domain is loading	2017-10-26 08:40:30 -07:00
luiscuenca	3d3077978e	Simplyfied and fixed null pointer	2017-10-25 18:47:10 -07:00
luiscuenca	a1c9285c90	Fixed bug on case 6443	2017-10-25 13:13:50 -07:00
Zach Fox	14150c09ac	Merge branch 'master' of https://github.com/highfidelity/hifi into stagingSetting	2017-10-25 12:59:36 -07:00
vladest	9f32b6c634	Merge branch 'master' into webbrowser_updates	2017-10-25 21:46:39 +02:00
vladest	505c281cd3	Merge branch 'master' into tablet_home_paginate	2017-10-25 21:19:16 +02:00
Brad Hefta-Gaub	18a74cea91	Merge pull request #11659 from zfox23/mergeRC57IntoMaster_20171023 ... 2017-10-23: Merge RC57 into Master	2017-10-24 21:19:01 -07:00
Zach Fox	7998984d8e	Missed tons of spots!	2017-10-24 14:30:47 -07:00
Dante Ruiz	f29937fb88	Merge branch 'master' of github.com:highfidelity/hifi into crash-keyboard	2017-10-24 13:54:21 -07:00
Dante Ruiz	92f765fe52	property set echomode for keyboard for wallet and webviews	2017-10-24 13:53:50 -07:00
Zach Fox	48c8d52c09	Cleanup	2017-10-24 13:30:27 -07:00
vladest	874b9149e7	Popupd support reworked	2017-10-24 22:04:25 +02:00
Zach Fox	c64c2e17c8	First pass at consolidation	2017-10-24 12:01:05 -07:00
Zach Fox	1f6d989044	Merge branch 'RC-57' of https://github.com/highfidelity/hifi into mergeRC57IntoMaster_20171023	2017-10-23 17:37:43 -07:00
Dante Ruiz	0242e8e4ba	fixed crash and login password	2017-10-23 16:33:49 -07:00
David Back	b5f1793863	add a tablet contextual mode flag to HMDScriptingInterface used to keep tablet in place	2017-10-23 14:21:18 -07:00
vladest	a33b2986cd	Merge branch 'master' into webbrowser_updates	2017-10-23 22:34:31 +02:00
vladest	fd41299efc	Disable profile and custom user agent which broke nav bars	2017-10-23 22:34:22 +02:00
Zach Fox	03b46c5e62	Merge pull request #11652 from cain-kilgore/21508 ... WL 21508 - Improve upon Skybox Changer (Updated)	2017-10-23 12:22:21 -07:00
Zach Fox	30bffdea32	Quick bugfix	2017-10-23 11:45:51 -07:00
Cain Kilgore	b60b58ff35	zFox Changes	2017-10-23 19:40:43 +01:00
Cain Kilgore	3b4185fdb3	WL 21508 - Improve upon Skybox Changer ... This involved a second PR, due to optimizing the way the Skyboxes are laid out. All of the Skyboxes will now appear at once, with the random button being removed. You are able to scroll up and down the list and choose which Skybox you'd like to pick.	2017-10-23 19:30:36 +01:00
Zach Fox	5c8451a626	Auto-refresh Wallet Home & Purchases on 4s timer	2017-10-23 10:36:23 -07:00
Melissa Brown	20787c9c7c	Merge pull request #11644 from cain-kilgore/21508 ... WL 21508 - Improve upon Skybox Changer	2017-10-23 10:30:55 -07:00
Cain Kilgore	b42afdaff0	WL 21508 - Cleanup from Code Review	2017-10-23 16:27:28 +01:00
vladest	b791dcba7f	Add sound cues to create app	2017-10-22 14:59:53 +02:00
vladest	cf7b050680	Sound cues for GoTo interface	2017-10-21 20:47:56 +02:00
Cain Kilgore	bc772a2f9a	WL 21508 - Improve upon Skybox Changer	2017-10-21 19:42:53 +01:00
vladest	d46578e572	Merge branch 'master' into webbrowser_updates	2017-10-21 19:12:23 +02:00
Brad Hefta-Gaub	f6af1d1ecf	Merge pull request #11387 from vladest/tablet_extended_sounds ... Tablet extended sounds	2017-10-20 13:49:06 -07:00
vladest	908d601a43	Code style fixes #1	2017-10-20 20:00:11 +02:00
Seth Alves	9d00606505	Merge pull request #11635 from druiz17/fix-hud-issues ... actually fix toolbar from completely dispersing	2017-10-20 10:22:34 -07:00
vladest	fa349a694c	Code style fixes	2017-10-20 15:12:09 +02:00
vladest	ea6c2e1bb5	Merge branch 'master' into tablet_extended_sounds	2017-10-20 14:46:02 +02:00
vladest	83c14bba5c	Fix popups misbehavior, wrong links with double http etc	2017-10-20 11:55:41 +02:00
druiz17	f2ad61934b	fix toolbar from completely dispearing	2017-10-19 14:02:21 -07:00
Zach Fox	aa48215933	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_OctoberFixes2	2017-10-19 10:54:31 -07:00
Brad Hefta-Gaub	f951a23356	Merge pull request #11627 from druiz17/reload-script ... fixed toolbar disapearing after reloading default scripts	2017-10-19 09:32:36 -07:00
vladest	92fc6daecc	Merge branch 'master' into webbrowser_updates	2017-10-19 14:56:31 +02:00
Zach Fox	dc1b3aef8f	Don't show purchases tutorial if user clicks what is rez	2017-10-18 16:25:06 -07:00
Zach Fox	322bac035c	Don't show 'no permission' text on wearables	2017-10-18 16:19:54 -07:00
druiz17	36912f1cd4	fixed toolbar disapearing after reloading default scripts	2017-10-18 16:03:32 -07:00
Zach Fox	1b7b35fe91	What does Rez mean?	2017-10-18 15:44:06 -07:00
Zach Fox	91ac2ab58c	LowerKeyboard button changes	2017-10-18 15:31:12 -07:00
Zach Fox	a993386613	Change color of 'Instructions Opened on Desktop' to disabled gray	2017-10-18 15:13:28 -07:00
Zach Fox	33508b6b2b	Update help text	2017-10-18 14:55:45 -07:00
Zach Fox	e829bd2919	Fix 'Recent Activity' indentation	2017-10-18 14:47:14 -07:00
Zach Fox	6f5fafb62f	Add 'showDebugButtons' switch on Help ta	2017-10-18 14:12:43 -07:00
Zach Fox	876001146a	Get categories from backend instead of site	2017-10-18 14:05:47 -07:00
Zach Fox	de50eef9c7	Fix rez certified...	2017-10-18 13:54:46 -07:00
Zach Fox	949da17046	Wear It button for items with category 'Wearables'	2017-10-18 13:51:58 -07:00
Zach Fox	a669aff453	Merge branch 'RC-57' of https://github.com/highfidelity/hifi into mergeRC57IntoMaster_20171018	2017-10-18 10:45:30 -07:00
vladest	48cd60887e	Merge branch 'master' into tablet_home_paginate	2017-10-17 17:30:13 +02:00
John Conklin II	42a018c2c5	Merge pull request #11606 from ElderOrb/case8213 ... 8213 Keyboard Input Field: Reveals Passwords (RC-57)	2017-10-16 16:14:43 -07:00
Brad Hefta-Gaub	c4e672d6b8	Merge pull request #11582 from ElderOrb/case8213 ... 8213 Keyboard Input Field: Reveals Passwords	2017-10-16 14:57:18 -07:00
vladest	c84d0e74b3	Merge branch 'master' into tablet_home_paginate	2017-10-14 22:36:33 +02:00
Zach Fox	6b7c997a4c	Minor text tweak	2017-10-13 13:37:11 -07:00
Zach Fox	051019a57a	Fix certificate username text eliding too early	2017-10-13 12:10:37 -07:00
Brad Hefta-Gaub	60030c08fa	Merge pull request #11573 from druiz17/bug-hud-module ... hud module intersects with dev stats window	2017-10-13 11:48:06 -07:00
Zach Fox	95a9675220	Final help QA - minus link to blockchain docs	2017-10-13 10:58:15 -07:00
druiz17	2422c9d9f3	made requested changes	2017-10-13 10:45:24 -07:00
vladest	f2847168a4	Use MouseArea for interacting instead of default one to be able interact in HMD mode	2017-10-13 19:12:42 +02:00
vladest	ed49489a4e	Merge branch 'master' into tablet_home_paginate	2017-10-13 12:57:26 +02:00
druiz17	83d2a54b0f	fixed some bugs	2017-10-12 13:48:21 -07:00
beholder	c31aa6bcdb	8213 Keyboard Input Field: Reveals Passwords	2017-10-12 22:08:46 +03:00
vladest	45f1f074df	Reduce combobox dropdown height taking keyboard in account	2017-10-12 20:52:40 +02:00
Zach Fox	30d6c78e4e	Merge pull request #11580 from ElderOrb/case8210 ... 8210 Keyboard Input Field: Pressing Space should Clear Field	2017-10-12 11:49:18 -07:00
vladest	67ee4a7679	Merge branch 'master' into webbrowser_updates	2017-10-12 20:15:53 +02:00
Zach Fox	1227168939	Merge pull request #11575 from ElderOrb/QTBUG-49297 ... workaround for https://bugreports.qt.io/browse/QTBUG-49297	2017-10-12 10:56:45 -07:00
druiz17	a6bc6a09a5	Merge branch 'master' of github.com:highfidelity/hifi into bug-hud-module	2017-10-12 10:34:17 -07:00
vladest	2d010980b0	Removed special sound for Mute and replace it with hover and click sounds	2017-10-12 19:15:09 +02:00
vladest	35b146b59a	Added sounds in Audio menu	2017-10-12 19:01:38 +02:00
vladest	b965049651	Do not produce sound and highlight on disabled items and menu separators	2017-10-12 18:39:26 +02:00
vladest	145149fedd	Merge branch 'master' into tablet_extended_sounds	2017-10-12 18:01:23 +02:00
beholder	f31316b0aa	8210 Keyboard Input Field: Pressing Space should Clear Field	2017-10-12 15:03:32 +03:00
beholder	dcdf85b08e	workaround for https://bugreports.qt.io/browse/QTBUG-49297	2017-10-12 02:10:09 +03:00
druiz17	42cab19ab2	generialze window search	2017-10-11 16:04:35 -07:00
vladest	85f2606582	Merge branch 'master' into tablet_home_paginate	2017-10-11 22:16:42 +02:00
vladest	726377db45	Refactor to SwipeView	2017-10-11 22:14:01 +02:00
druiz17	8f3fa08b1e	hud module intersects with stats window	2017-10-11 11:41:10 -07:00
Zach Fox	99109fe8e5	Merge pull request #11567 from zfox23/commerce_daveIntegration3 ... 2017-10-10 Commerce Frontend Updates	2017-10-11 11:07:03 -07:00
Zach Fox	3f0ec73be6	Fix date displays	2017-10-11 10:55:14 -07:00
Zach Fox	5e383e2b1c	My Item certificates	2017-10-10 14:56:17 -07:00
Dante Ruiz	742cf0debe	Merge pull request #11383 from ElderOrb/case7384 ... 7384 On Domains without Edit Access, Create Button Text still Highlights	2017-10-10 14:30:49 -07:00
Sam Gateau	f143c28625	Merge pull request #11542 from SamGondelman/bubbleBoy ... Move HUD and HUD overlay rendering out of display plugin	2017-10-10 14:26:20 -07:00
Zach Fox	702528a8cc	Fully integrate cert properties	2017-10-10 13:27:17 -07:00
vladest	33f74103b8	Merge branch 'master' into tablet_home_paginate	2017-10-10 21:55:04 +02:00
Zach Fox	1c0a564155	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_daveIntegration3	2017-10-10 12:36:06 -07:00
Zach Fox	b105248dd7	Merge pull request #11555 from zfox23/commerce_daveIntegration2 ... 2017-10-09 Commerce Frontend Updates	2017-10-10 12:34:30 -07:00
Zach Fox	be2b241629	Lots of progress; don't yet have some things	2017-10-10 12:20:48 -07:00
Zach Fox	8d0d9a159f	Bugfixes	2017-10-10 10:38:19 -07:00
Gerard Maguire	e5f65b5fb1	Merge branch 'master' of https://github.com/highfidelity/hifi into 21466	2017-10-10 17:44:27 +01:00
Gerard Maguire	afb03b3d2d	Avatar pitch and roll cleared	2017-10-10 16:19:31 +01:00
Cain Kilgore	583b0c521e	Open	2017-10-10 03:40:48 +01:00
Cain Kilgore	e9f4dee56d	WL 21562 - Fix the error in the Asset Browser	2017-10-10 03:39:13 +01:00
Zach Fox	b81a8a95ea	Final fixes	2017-10-09 15:23:22 -07:00
Zach Fox	38b95b5403	Instructions HTML file and flow	2017-10-09 15:07:14 -07:00
Zach Fox	733df8391f	Round 2	2017-10-09 12:27:56 -07:00
Zach Fox	acdd1e32e4	First round	2017-10-09 12:11:07 -07:00
druiz17	cd97ab0fdf	fixed looping sample sound bug	2017-10-09 11:39:57 -07:00
vladest	999e9aafa9	Merge branch 'master' into tablet_home_paginate	2017-10-08 16:12:07 +02:00
vladest	f2abb369c8	Tablet paginator initial	2017-10-08 16:09:01 +02:00
Thijs Wenker	77a36bf788	Merge pull request #10892 from ctrlaltdavid/vr-edit-a ... VR edit app	2017-10-07 02:19:00 +02:00
SamGondelman	7e6d5d9d98	merge with master	2017-10-06 14:57:08 -07:00
Gerard Maguire	93caa7e259	Merge branch 'master' of https://github.com/highfidelity/hifi into 21466	2017-10-06 17:52:42 +01:00
Zach Fox	051b63503c	Merge pull request #11534 from zfox23/commerce_daveIntegration1 ... Commerce backend changes sync, October 5 2017	2017-10-06 09:45:45 -07:00
David Rowe	28c7ef2e97	Merge branch 'master' into vr-edit-a	2017-10-06 11:54:08 +13:00
Zach Fox	0b600a74c3	Fix passphrase input focus problem; fix getting inventory and balance after logging in on Checkout	2017-10-05 14:34:53 -07:00
Zach Fox	9290a51685	Fix confirmed text	2017-10-05 14:03:56 -07:00
Andrew Meadows	05f2dfbbc3	Merge pull request #11529 from vladest/fix_audiotab_name_alignment ... Fix alignment of audio devices input header	2017-10-05 13:50:29 -07:00
Zach Fox	8e82095135	Number sold and limited run	2017-10-05 12:46:20 -07:00
Zach Fox	d605bd9ef4	Preprocess inventory endpoint result	2017-10-05 11:01:15 -07:00
Ryan Huffman	f0c9badbd6	Fix misspelling in lost-connection-to-atp error	2017-10-05 09:10:46 -07:00