4746 commits

Author	SHA1	Message	Date
Zach Fox	a81a981676	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-08 09:44:52 -08:00
Anthony J. Thibault	42424d32f1	Added exponential smoothing filter ... Tuned coefficients to maximize glitch and vibration damping while minimizing latency.	2017-12-08 09:29:54 -08:00
Seth Alves	91b2d8df8a	Merge pull request #11874 from luiscuenca/audioscope ... Improve Audio Scope	2017-12-08 07:15:28 -08:00
Seth Alves	eda63e5758	Merge pull request #11919 from ElderOrb/FB9706 ... 9706 Editing Attachments Results In Attachments Window Scrolling To Top	2017-12-08 07:01:00 -08:00
H Q	4ce784291c	Provides a nice alert in case of insufficient funds to make a purchase	2017-12-07 15:13:01 -08:00
vladest	9b3db0725b	Retreive buttons list from tablet proxy	2017-12-07 22:36:34 +01:00
Zach Fox	b2bafed2bb	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-07 11:21:24 -08:00
Anthony J. Thibault	68ad27a38d	Merge branch 'master' into bug-fix/flying	2017-12-07 10:28:13 -08:00
vladest	c9f86e4b6b	Merge branch 'master' into tablet_home_paginate	2017-12-07 19:16:13 +01:00
vladest	3c11d29a7f	Something intermediate	2017-12-07 19:13:39 +01:00
Brad Hefta-Gaub	88ed15aaaa	Merge pull request #11942 from ctrlaltdavid/21633 ... Fix image overlay's subImage property's width and height support	2017-12-07 09:19:43 -08:00
David Rowe	efd72be96f	Fix image overlay's subImage property's width and height support	2017-12-07 12:05:46 +13:00
Zach Fox	3183a1a8b9	Add setupAttemptID to every step (thanks Dave)	2017-12-05 16:48:30 -08:00
Zach Fox	902064ed37	Cleanup debug stuff	2017-12-05 15:26:55 -08:00
Zach Fox	c807fc80e3	Add marketplace cta referrer	2017-12-05 15:25:05 -08:00
Zach Fox	7521e4870e	Bugfixes	2017-12-05 14:56:47 -08:00
Zach Fox	668f6d50b5	Add data tracking for wallet setup	2017-12-05 14:13:48 -08:00
Zach Fox	4334bf8222	Add data tracking for purchase and rez	2017-12-05 13:09:09 -08:00
Clément Brisset	a5e671e0fd	Merge pull request #11931 from highfidelity/stable ... stable -> master	2017-12-05 11:58:23 -08:00
Zach Fox	c80039ea87	Merge pull request #11929 from zfox23/commerce_fixGraySecurityImage1 ... Fix gray/incorrect security image after relog	2017-12-05 11:21:06 -08:00
Zach Fox	1507620fd5	Merge pull request #11921 from ElderOrb/FB10024 ... 10024 Wallet: TextField Focus Problems	2017-12-05 10:52:08 -08:00
Zach Fox	d59c9bd73a	Fix gray/incorrect security image after relog	2017-12-05 10:27:40 -08:00
luiscuenca	d70a3685b8	Clean up	2017-12-04 15:29:13 -08:00
luiscuenca	390c59b45c	Change menu and minor fixes	2017-12-04 15:29:01 -08:00
NissimHadar	ec1c4c37fa	Merge pull request #11912 from ElderOrb/FB9461 ... 9461 Keyboard for create appear then disappears immediately (HMD)	2017-12-04 16:49:25 -06:00
Alexander Ivash	f7328f05fb	remove keyboard-hiding logic as keyboard hides should be handled by focus change listener in 'onFocusObjectChanged' in the OffscreenQmlSurface	2017-12-05 00:51:42 +03:00
Zach Fox	4c96fc2d9d	Merge pull request #11905 from zfox23/commerce_resetWalletBeforeCreation ... Call reset() on Wallet before creating new wallet	2017-12-04 13:05:36 -08:00
Alexander Ivash	8a5904373b	remove 'collapse keyboard' hack as now there is dedicated 'collapse keyboard' button	2017-12-05 00:04:46 +03:00
Alexander Ivash	c67ff3b5d8	10024 Wallet: TextField Focus Problems ... note: removed excessive MouseArea-s	2017-12-05 00:03:48 +03:00
vladest	a0878298d5	Merge branch 'master' into tablet_home_paginate	2017-12-04 20:55:38 +01:00
vladest	b52163cb24	Intitial SpinBox port	2017-12-04 20:54:35 +01:00
vladest	3e118c58a1	Moved RadiButton and Slider	2017-12-04 12:51:57 +01: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
vladest	0f4329be69	Added keyboard support. Cleanup	2017-12-03 22:45:57 +01:00
Alexander Ivash	d60f082796	9706 Editing Attachments Results In Attachments Window Scrolling To Top	2017-12-03 23:24:34 +03:00
luiscuenca	4030688e7a	added record wav files	2017-12-03 11:54:37 -07:00
vladest	f2d7e2f607	Merge branch 'master' into move_to_qqc2	2017-12-02 22:41:19 +01:00
vladest	e1df38784b	Merge branch 'master' into tablet_home_paginate	2017-12-02 22:40:10 +01: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
Brad Hefta-Gaub	ec33aa9c4b	Merge pull request #11880 from ElderOrb/FB7991 ... 7991 Change Instances of Edit Mode to Create Mode	2017-12-02 12:50:48 -08:00
vladest	fd9539a9e4	Using Flickable signals to remove hover state instead of timer. No more delays	2017-12-02 13:57:12 +01:00
Anthony Thibault	fe16cc3fab	Merge pull request #11902 from luiscuenca/onloadFix ... Fixes create list and web and QML audio sync	2017-12-01 16:05:07 -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	b8f7ba9aa6	Fix month display in commerce...	2017-12-01 10:45:36 -08:00
Alexander Ivash	48b50e33dd	9461 Keyboard for create appear then disappears immediately (HMD)	2017-12-01 20:29:35 +03:00
Zach Fox	ebb2e50d01	Fix month display in commerce...	2017-12-01 09:29:19 -08:00
vladest	570be69fcf	Fix warnings after apps closed	2017-12-01 09:52:45 +01:00
David Rowe	fd76c7a88b	Fix erroneous 2D overlay unhandled property messages for bounds property	2017-12-01 17:40:34 +13:00
Zach Fox	24e5994f20	The nuclear option is a bad option.	2017-11-30 15:55:09 -08:00
Zach Fox	009d3a18a3	Call reset() on Ledger and Wallet before creating new wallet	2017-11-30 15:40:20 -08:00
vladest	f510b4bcd8	Swipe area expanded to whole tablet. Icons doesnt stick together anymore	2017-11-30 21:10:12 +01:00
vladest	69264a6ea8	Merge with master. Conflicts solved	2017-11-30 15:34:21 +01:00
vladest	74c002d1f5	Merge conflicts. Return back web console messages. For flickable in web engine core its enougth to add timestamp to touch events	2017-11-30 12:52:26 +01: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
vladest	ac7a5ebc94	ComboBox: fix closing popup. Started to implement keyboard support	2017-11-30 10:39:01 +01:00
luiscuenca	b890a29b3a	Clean console log	2017-11-29 19:05:01 -07:00
luiscuenca	b817143e2e	Fixes on web and QML audio sync	2017-11-29 18:16:21 -07:00
vladest	8c9e530adf	Merge branch 'master' into move_to_qqc2	2017-11-29 16:33:59 +01:00
Anthony J. Thibault	dff49cafaa	Embiggen the stick deadspots for oculus touch controllers ... This effectively splits the controller into directional zones. This should make driving/flying navigation more predictable and less prone to drifting in unintentional directions, which could induce nausea.	2017-11-28 17:11:44 -08: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
vladest	80eb203008	More precise handle placing. some logging added	2017-11-28 20:20:58 +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
Alexander Ivash	02684e3fed	remove not used files	2017-11-27 22:49:11 +03:00
Alexander Ivash	da06b2656f	7991 Change Instances of Edit Mode to Create Mode	2017-11-27 22:47:42 +03:00
vladest	da5090fd49	Implemented more close to QQC2 ideology	2017-11-27 19:43:17 +01: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
luiscuenca	027d2d323c	Measure tool and corrections	2017-11-26 22:28:34 -07:00
Menithal	ba1cd74ffe	21539: Moved Desktop HMD to None	2017-11-26 21:58:16 +02:00
vladest	3f0de940a4	Merge branch 'master' into move_to_qqc2	2017-11-26 10:18:44 +01: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
luiscuenca	5bf8367126	add resources	2017-11-22 18:17:50 -07: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	d31578abae	FIXME LATER! Remove mouseareas from passphrase screens	2017-11-17 15:47:02 -08:00
Zach Fox	7d34b3fe67	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-11-17 15:45:03 -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
Brad Davis	bb2e061d77	Fixing global declarations in JS	2017-11-15 12:00:52 -08:00
Brad Davis	26a745be6f	Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet	2017-11-15 11:59:06 -08:00
vladest	0e53afc346	Merge branch 'master' into move_to_qqc2	2017-11-15 20:53:14 +01:00
Brad Davis	1167be4102	Reverting tablet API rename, cleaning up duplicated code	2017-11-15 11:52:55 -08: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
Zach Fox	5290ee3b4e	Merge branch 'feature/qml_whitelist_tablet' of https://github.com/jherico/hifi into commerce_QmlWhitelist	2017-11-14 10:07:44 -08:00
Brad Davis	d71fd151c5	Fixing button model exposure	2017-11-13 16:45:27 -08:00
Zach Fox	a3332e15b7	Merge branch 'feature/qml_whitelist_tablet' of https://github.com/jherico/hifi into commerce_QmlWhitelist	2017-11-13 15:01:26 -08:00
SamGondelman	2fb1981c4a	merge with master	2017-11-13 14:34:39 -08:00
Brad Davis	69029b49f3	Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet	2017-11-13 14:29:49 -08:00
Brad Davis	8f85c7650b	Make sure loaded components get the right parent context	2017-11-13 14:16:04 -08:00
vladest	6b732804eb	Button as QQC2	2017-11-13 21:15:31 +01:00
Zach Fox	641c4656c4	Fix bug with disappearing certificate info	2017-11-13 10:53:16 -08:00
Brad Davis	5cf9c1bb33	Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet	2017-11-13 10:48:21 -08:00
vladest	4c1bbdacec	Fix merge conflicts	2017-11-13 16:45:10 +01:00
vladest	0c13c2b6e2	Remove unused QQC1 imports	2017-11-13 16:37:28 +01:00
Ryan Downe Karpf	f8b1c7978c	Merge pull request #11772 from 1P-Cusack/FogBugz/Case_6569 ... [Case 6569]: Silent failure is possible during Model Creation	2017-11-12 08:36:10 -08:00
vladest	50ea08f3d5	VR stylus and laser need longer timeout than mouse	2017-11-11 16:10:00 +01:00
vladest	9dbcff040d	Tune press delay to be able to swipe tablet pages easier	2017-11-11 09:43:34 +01:00
Brad Davis	7bf1b176d7	Renaming Tablet API to Tablets, supporting dev-mode QML loading from filesystem	2017-11-10 14:21:24 -08:00
vladest	637a4ff357	Merge branch 'master' into tablet_home_paginate	2017-11-10 21:12:34 +01:00
Brad Davis	92a3c209aa	Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet	2017-11-10 11:44:29 -08:00
beholder	d1969d649a	fix not collapsing keyboard	2017-11-10 21:20:00 +03:00
beholder	0bc95998c4	a few more adjustments based on discussion with Mukul	2017-11-10 21:20:00 +03:00
beholder	4d11f9a434	increase font pixel size for 'collapse keyboard' to 34px	2017-11-10 21:20:00 +03:00
beholder	db3ed81513	adjust to changed requirements: ... 1. The keyboard collapse button is moved to the lower right, replacing the keys there 2. The button next to m is a hyphen instead of a underscore, it turns to a underscore when the user clicks on shift 3. The input text at the top occupies the full width and is center aligned, when you start typing the text moves in both directions the left and the right	2017-11-10 21:20:00 +03:00
beholder	eb4214fb4c	add API for unfocusing input fields in HTML, unfocus WebEngine-based QML items on lowering keyboard	2017-11-10 21:20:00 +03:00
beholder	fb14e4dc4d	Fixed programmatical lowering of 'TabletAddressDialog'	2017-11-10 21:20:00 +03:00
beholder	a9fe3596cf	4684 Add collapse button on the virtual keyboard	2017-11-10 21:20:00 +03:00
beholder	87519cd26f	use conditional bindings to avoid intermediate binding states	2017-11-10 19:53:54 +03:00
beholder	908faa1334	refactoring: simplify code & fix the issue with menu-es sometimes losing checked state	2017-11-10 19:53:54 +03:00
LaShonda Hopper	0e90c92cf5	[Case 6569] Minor: Break up line to pass column count guidelines. ... Changes Committed: modified: interface/resources/qml/hifi/tablet/NewModelDialog.qml	2017-11-08 18:35:12 -05:00
LaShonda Hopper	a057cb914f	[Case 6569] Fixes clipping of cancel button by window edge. ... Changes Committed: modified: interface/resources/qml/hifi/tablet/NewModelDialog.qml	2017-11-08 18:27:25 -05:00
LaShonda Hopper	dac2ae19a4	[Case 6569] Add protection for dynamic vs static collision type (details below). ... When creating a model, it was possible to elect Exact collision with the dynamic property even though this combination is prohibited. This combination would silently fail rather than notifying the user of the error. This commit implements safeguards against the invalid combination: * If the user elects the Exact collision type and the dynamic field is unchecked, then dynamic field is disabled. * If the user elects a different collision type and the dynamic filed is unchecked, then the dynamic field is enabled. * If the user has checked the dynamic field and subsequently elects the Exact collision type, then the selection is void and the previous collision selection is retained; however, an error dialog is presented informing the user of the error. Changes Committed: modified: interface/resources/qml/hifi/tablet/NewModelDialog.qml	2017-11-08 18:27:24 -05:00
Brad Davis	25df649b44	Fix desktop mode script URL injection	2017-11-08 14:55:34 -08:00
David Rowe	c5c1ead400	Fix GOTO dialog's connection status and location not always updating	2017-11-09 10:51:21 +13:00
Zach Fox	a5dff0160b	Merge branch 'feature/qml_whitelist_tablet' of https://github.com/jherico/hifi into commerce_QmlWhitelist	2017-11-08 13:30:55 -08:00
Zach Fox	38fde43009	...simplify your life	2017-11-08 13:19:47 -08:00
Zach Fox	3190fe1f32	Use keyfilepath instead of cached public keys	2017-11-08 12:30:48 -08:00
Brad Davis	1a58aee385	Fix scripting URL injection, I hope	2017-11-08 12:00:29 -08:00
Zach Fox	72fa0823ba	Logic changes	2017-11-08 11:01:54 -08:00
Zach Fox	b7163bb8fc	Frontend changes	2017-11-08 10:25:11 -08:00
Zach Fox	845ff64c1e	Merge branch 'feature/qml_whitelist_tablet' of https://github.com/jherico/hifi into commerce_QmlWhitelist	2017-11-08 09:32:09 -08:00
Zach Fox	085355222f	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-11-08 09:31:09 -08:00
Ken Cooke	addcb51ed9	Change slider label from "master gain" to "master volume"	2017-11-08 07:50:35 -08:00
David Rowe	0d21e0be11	Delete old, no longer used file	2017-11-08 17:14:17 +13:00
David Rowe	055470296d	Move current location in GOTO dialog and add placeholder text to input	2017-11-08 17:13:40 +13:00
Brad Davis	b7f31eb5b9	Fixing desktop QML loading, tablet clickthrough bugs	2017-11-07 12:42:26 -08:00
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
Zach Fox	b54627594b	Merge branch 'feature/qml_whitelist_tablet' of https://github.com/jherico/hifi into commerce_QmlWhitelist	2017-11-06 09:29:26 -08:00
Zach Fox	149c8fbeb2	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-11-06 09:25:30 -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 Davis	d162e1cff6	Whitelist functionality for tablet apps	2017-11-04 15:14:06 -07: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
vladest	567a219e9c	Cleanup. Remove unused functionality	2017-10-28 12:01:37 +02:00
vladest	6fb1a9954e	Merge branch 'master' into fix_google_vr_height	2017-10-28 10:35: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	c62eb2bf3c	Merge branch 'feature/qml_whitelist_2' of https://github.com/jherico/hifi into commerce_QmlWhitelist	2017-10-26 14:58:43 -07:00
Brad Davis	ffc51d5387	Working on QML whitelist functionality	2017-10-26 14:20:13 -07: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
Ken Cooke	2156729a75	Tighter version of sample sound	2017-10-26 11:48:40 -07:00
Zach Fox	c1e990e7be	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-10-26 10:37:31 -07: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
Zach Fox	5898f0bd0c	Gotta do some fancy stuff with anchors for this to work	2017-10-25 15:04:47 -07:00
Zach Fox	dafa830c0d	First steps	2017-10-25 14:44:59 -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
Seth Alves	a467f30993	Merge pull request #11624 from highfidelity/AlanZimmerman-patch-1 ... Change tablet model's screen	2017-10-19 09:40:30 -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
Alan Z	6a2ee8c632	Change tablet model's screen ... Changed the texture for the model's screen to say: "Loading... If nothing happens shortly, re-open tablet"	2017-10-18 10:54:18 -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
Cain Kilgore	16467128a2	WL 21571	2017-10-18 02:42:08 +01:00
druiz17	9a881c5e57	fix keyboard	2017-10-17 15:43:23 -07:00
vladest	556fa7d0e5	Merge branch 'master' into fix_google_vr_height	2017-10-17 18:32:17 +02: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
vladest	654a861ddf	Merge branch 'master' into fix_google_vr_height	2017-10-14 22:01:53 +02:00
Ryan Huffman	4a9aa30630	Merge pull request #10956 from birarda/feat/update-default-avatar ... update default avatar to be better with oculus grab triggers	2017-10-13 15:57:37 -07: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
vladest	f524f8a50f	Remove commented code	2017-10-13 12:56:08 +02:00
vladest	77ce5234cf	Merge branch 'master' into fix_google_vr_height	2017-10-13 12:53:35 +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
vladest	337a74b281	Merge branch 'master' into fix_google_vr_height	2017-10-12 15:18:24 +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
Stephen Birarda	1fb7b0df7a	re-bake new default avatar to compress mesh	2017-10-09 10:57:34 -07:00
Stephen Birarda	78c5e84140	update to re-baked hipsFixed avatar	2017-10-09 10:33:35 -07:00
Stephen Birarda	198dbf83c3	fix name in mannequin FST	2017-10-09 10:33:34 -07:00
Stephen Birarda	429e037534	fix path to mannequin FBX from FST	2017-10-09 10:33:34 -07:00
Stephen Birarda	72b23a0fbb	update default avatar to be better with oculus grab triggers	2017-10-09 10:33:34 -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
vladest	abcaefae17	Merge branch 'master' into fix_google_vr_height	2017-10-06 14:54:55 +02: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
vladest	9a92b5635d	Fix too wide web view	2017-10-05 15:17:37 +02:00
vladest	91176f4659	Merge branch 'master' into fix_google_vr_height	2017-10-05 14:38:58 +02:00
vladest	193dc83b99	Fix alignment of audio devices input header	2017-10-05 13:59:42 +02:00
Zach Fox	9d51d40af4	Merge pull request #11489 from vladest/login_dialog_rework ... Login dialog rework	2017-10-04 15:47:44 -07:00
David Rowe	63e7521711	Merge branch 'master' into vr-edit-a	2017-10-05 11:29:49 +13:00
vladest	86e8076362	Fix puntuation mode	2017-10-04 20:30:25 +02:00
vladest	0a505617df	Implemented single keyboard instance for all Tablet login dialog items	2017-10-04 19:33:36 +02:00
Zach Fox	fcafbef109	Fix buying free items using Commerce system	2017-10-04 09:34:32 -07:00
SamGondelman	fa838e4715	merge from master	2017-10-03 15:53:33 -07:00
vladest	6fddf49988	Merge branch 'master' into login_dialog_rework	2017-10-03 21:39:38 +02:00
Zach Fox	ea3da6c9dd	Merge pull request #11495 from zfox23/pop_interfaceChanges2 ... Commerce: One step closer!	2017-10-03 11:56:00 -07:00
Sam Gateau	ab8757eeb2	Merge pull request #11504 from AndrewMeadows/main-loop-stats-audit ... Tweak debug stats for more clarity	2017-10-03 11:23:16 -07:00
Zach Fox	e64b0861a1	Change passphrase working	2017-10-03 10:53:10 -07:00
David Rowe	f52df6667a	Merge branch 'master' into vr-edit-a	2017-10-03 21:50:49 +13:00
druiz17	86f580919c	remove what space	2017-10-02 17:43:43 -07:00
Zach Fox	11d0062104	Progress on buy endpoint	2017-10-02 16:57:41 -07:00
druiz17	8a0ecf4e6f	propertly determine is laser intersects with HUD UI	2017-10-02 16:46:43 -07:00
druiz17	68780f56b7	Merge branch 'master' of github.com:highfidelity/hifi into fix-hud-module	2017-10-02 14:06:26 -07:00
Andrew Meadows	8d2153d2f3	cleanup debug stats, use more correct names	2017-10-02 13:08:17 -07:00
Zach Fox	1d1b846f39	Better 'view backup instructions' behavior	2017-10-02 12:44:51 -07:00
Zach Fox	15c0a21e0e	Varied commit - styling changes, beginnings of new Wallet endpoint, etc	2017-10-02 12:19:24 -07:00
Andrew Meadows	0fc6bf1e89	Merge pull request #11471 from Atlante45/feat/auto-bake ... Asset Browser tweaks	2017-10-02 11:29:36 -07:00
vladest	bf39eb9a77	Test Tablet keyboard specific	2017-10-02 20:02:55 +02:00
Zach Fox	1ec0f5d9a0	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_interfaceChanges2	2017-10-02 09:26:59 -07:00
vladest	07ba2cce5b	Merge branch 'master' into login_dialog_rework	2017-10-02 18:24:12 +02:00
vladest	e360c1363e	Merge branch 'master' into tablet_extended_sounds	2017-10-02 18:03:49 +02:00
David Rowe	829cc8e5e6	Merge branch 'master' into vr-edit-a	2017-10-02 17:08:27 +13:00
vladest	ad32e7bdf5	Merge branch 'master' into login_dialog_rework	2017-10-01 19:27:23 +02:00
vladest	9a00468ea9	semicolons, yes	2017-10-01 19:21:30 +02:00
vladest	feafd441b1	Make sure keyboard will be rised after lowering on another click	2017-10-01 18:54:07 +02:00
vladest	c3bc67b72d	Merge branch 'master' into fix_walletsetup_focus	2017-10-01 18:24:38 +02:00
David Rowe	0daa5012ca	Enable toolbar and tablet icons to load from local script directory	2017-09-30 15:00:15 +13:00
druiz17	20918641f4	saving work	2017-09-29 16:48:25 -07:00
Zach Fox	e6ea76eefe	Tiny language fix - Thanks Cain!	2017-09-29 15:44:44 -07:00
Zach Fox	4668294389	Fix login flow regression	2017-09-29 15:25:24 -07:00
Zach Fox	bbbce96407	Fix gray securityimage	2017-09-29 14:30:02 -07:00
Zach Fox	63396a2fc3	WalletScriptingInterface; wallet status refactor	2017-09-29 13:42:04 -07:00
vladest	7f6773b1f4	Added semicolons	2017-09-29 21:12:21 +02:00
SamGondelman	f7af581c71	track traversal time, rename entity server stat	2017-09-29 11:34:35 -07:00
SamGondelman	247764b679	add total entity packets in stat (kbps)	2017-09-29 11:34:34 -07:00
SamGondelman	b59ec07171	move hud rendering to render thread, still need to separate out hud overlays	2017-09-29 09:49:08 -07:00
vladest	01a0b26b90	Remove mouse area for text fields. use activeFocusOnPress property instead	2017-09-29 17:14:35 +02:00
vladest	d3cd034d61	Cleanup	2017-09-29 16:33:52 +02:00
vladest	174287c5f5	Merge branch 'master' into login_dialog_rework	2017-09-29 15:57:27 +02:00
Atlante45	af69222fdb	Fix icon name change	2017-09-28 18:34:42 -07:00
Zach Fox	a1ae13489e	Slight changes to tutorial	2017-09-28 16:41:29 -07:00
Zach Fox	4814f277c1	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_interfaceChanges2	2017-09-28 16:07:32 -07:00
Zach Fox	2cff5c1fa6	First time Purchases tutorial	2017-09-28 15:12:55 -07:00
Zach Fox	66be558a04	My Items Interface	2017-09-28 14:04:57 -07:00
vladest	4023c40149	Cleanup	2017-09-28 22:55:01 +02:00
Zach Fox	3a537cdcc3	Make usernameDropdown collapse when clicking anywhere outside it	2017-09-28 13:21:55 -07:00
Zach Fox	3742ccbdd3	Fix keyboard focus during setup while tip is up	2017-09-28 13:12:42 -07:00
Zach Fox	751dca0761	styling updates for purchases	2017-09-28 13:06:37 -07:00
Zach Fox	68c08969ae	Update Purchases	2017-09-28 12:49:38 -07:00
vladest	769c57208c	Signup ready	2017-09-28 21:35:41 +02:00
Zach Fox	8d74487393	Use edition number; fix CONFIRMED timer	2017-09-28 10:25:05 -07:00
Seth Alves	912305fd4b	Merge pull request #11476 from ElderOrb/case7925 ... 7925 Create Mode: keyboard focused entry field is not visible	2017-09-28 10:03:28 -07:00
vladest	8d23bf38ac	Merge branch 'master' into login_dialog_rework	2017-09-28 14:55:12 +02:00
vladest	4f907aba1e	sign in reworked	2017-09-28 14:49:48 +02:00
beholder	338a230de9	reduced delay to improve user experience	2017-09-28 13:01:14 +03:00
beholder	1021aa1a0e	re-center focused eleemnt even if keyboard was already visible	2017-09-28 12:59:36 +03:00
Zach Fox	60823903cf	You own X others	2017-09-27 17:05:07 -07:00
Zach Fox	7b7e0bc78b	Updated Recent Activity	2017-09-27 16:35:35 -07:00
Atlante45	eb06c33187	Naming coding standard fix	2017-09-27 15:32:53 -07:00
Zach Fox	7ad3a5a1e3	Commerce: Tons of Interface changes (#11463) ... * canRez(Tmp)Certified() * CertifiedItem beginnings * Skeleton of verifyOwnerChallenge() * Controlled failure; updateLocation() skeletion * Controlled failure on checkout page with ctrl+f * Skeleton Purchases first-use tutorial * Initial progress on new setup * Security pic tip * Skeleton Certificate page * Updates to Certificate * General progress; setup is nearly complete * Better buttons; last step almost done * Initial progress on wallet home * Completed recent transactions * Security page * Scrollbar * Fix auth error text * PassphraseSelection * Change security pic * Minor layout changes; beginnings of emulated header * Various layout changes; wallet nav bar * Help screen * Quick onaccepted change * First pass at new purchases * Small style updates * Some error progress * Lightbox in purchases * Collapse other help answers when clicking on another * REZZED notif * Commerce Lightbox * Lots of new interactions in Purchases * Hook up 'view certificate' * Fix errors, fix close button on cert * Purchases timer; much faster filter * Add debugCheckout * Purchase updates * GlyphButton; separator; Checkout Success; Ledger fix; debug modes * Lock glyph below security pic should be white * Various fixes, round 1 * Circular mask * Passphrase change button fix; TextField error edge highlighting * Recent Activity fixes * Various changes * Standard Security Pic location * Color changes * Filter bar changes * Styling for multiple owned items * Minor language change * Header dropdown (harder than expected) * Small fixes * View backup instructions * marketplaces.js onCommerceScreen * Beginnign of new injection * Marketplace injection changes * Purchase button style changes * More button styling * MY PURCHASES button * marketplace onUsernameChanged * New help QA * Help text changes etc * Downscale security image, reducing filesize * Lots of bugfixes * Cleanup before PR * Only open cert during inspection if commerce switch is on * Help text changes * Purchase status incl. change to confirmed; Help text; Open Explorer to hifikey * Quick glyph change * New 'wallet not set up' flow for when entering Purchases or Checkout without set-up wallet	2017-09-27 14:43:51 -07:00
beholder	00c3dcee2f	7925 Create Mode: keyboard focused entry field is not visible ... note: changed the way of calculation scroll value after showing virtual keyboard. Now it doesn't require KEYBOARD_HEGHT and will always try to position focused element at vertical center of the client area	2017-09-28 00:28:54 +03:00
beholder	3677718e48	7926 Create Mode: the keyboard tray is not styled correctly	2017-09-27 21:33:18 +03:00
Atlante45	73483eef94	Update information sentence	2017-09-26 19:19:34 -07:00
Atlante45	bf984e8d1a	Fix tablet asset browser	2017-09-26 19:05:36 -07:00
Atlante45	03bd887f9a	Re-sync files	2017-09-26 18:42:50 -07:00
Atlante45	dda715e171	Update TabletAssetServer	2017-09-26 18:25:20 -07:00
Atlante45	acb0bf8d20	Asset Browser tweaks	2017-09-26 17:26:46 -07:00
anshuman64	ca4d5ef807	Merge pull request #11454 from ElderOrb/case7877 ... 7877 Unexpected Behavior when pressing Enter on Input Field	2017-09-26 16:26:42 -07:00
Andrew Meadows	909e5e86b1	Merge pull request #11442 from vladest/fix_dde_visibility ... Fix dde visibility	2017-09-26 14:19:47 -07:00
beholder	5502a639e2	7877 Unexpected Behavior when pressing Enter on Input Field	2017-09-26 01:07:47 +03:00
vladest	083b52abaf	CHeck containsMouse property for mouse area instead on hovered	2017-09-25 21:15:05 +02:00
vladest	1a2d38e31f	Removed sounds for tablet in and out, added sounds for stylus instead. Added logging for testing semi-pressed laser and keyboard sounds	2017-09-25 17:11:44 +02:00
vladest	b5f0c4d940	Added settings controls sounds	2017-09-25 16:46:36 +02:00
vladest	5a452fa981	Merge branch 'master' into tablet_extended_sounds	2017-09-25 15:40:40 +02:00
Ryan Huffman	883bdc6003	Merge pull request #11425 from Atlante45/feat/auto-bake ... Asset Browser auto-refresh	2017-09-22 13:17:04 -07:00
vladest	5aab9bf5b0	Merge branch 'master' into fix_dde_visibility	2017-09-22 21:10:21 +02:00
vladest	4d530ef173	Make sure menu items vill be created even its not visible at the moment. Cleanup warnings on app close	2017-09-22 21:08:34 +02:00
Atlante45	6cdbf0c44a	Fix RunningScripts in tablet mode	2017-09-21 15:53:27 -07:00
Atlante45	1a571d0991	Add Asset Server auto refresh	2017-09-21 14:41:59 -07:00
Andrew Meadows	6b3b3a7448	Merge pull request #11382 from ElderOrb/case6618 ... 6618 [Worklist] Add Input Field On Top of Keyboard	2017-09-21 08:54:11 -07:00
Ryan Huffman	a56303a3fe	Merge pull request #11379 from highfidelity/feat/auto-bake ... Add auto baking to Asset Server and mesh compression for FBXs	2017-09-21 08:33:51 -07:00
Dante Ruiz	4f328524b1	Merge pull request #11182 from vladest/audio_devices_split ... Audio devices split	2017-09-20 16:43:30 -07:00
vladest	c48aba423a	Rename check box	2017-09-20 22:48:39 +02:00
vladest	3376786288	Added text selection on focus. Added basic check for text within url input field to decide is this something for search or for goto. Limited popup list height to do not cover virtual keyboard	2017-09-20 17:02:54 +02:00
vladest	56e6c8674a	Merge branch 'master' into webbrowser_updates	2017-09-20 14:38:09 +02:00
vladest	7a36894f76	Make sure audio device not gets unchecked	2017-09-19 23:25:41 +02:00
vladest	10f7f08171	Added peak model, missed during merging	2017-09-19 21:42:52 +02:00
vladest	6297448e90	Build fix	2017-09-19 19:49:19 +02:00
vladest	6c32783a09	Merge branch 'master' into audio_devices_split	2017-09-19 17:43:03 +02:00
Cain Kilgore	dbe7cc5d1a	21540 - Make Rotation using Vive Controller Work	2017-09-18 23:38:38 +01:00
vladest	e26118254f	Implemented Audio injector in Tablet scripting interface. Added missed sound events	2017-09-18 19:40:06 +02:00
vladest	bb214d7bf3	Merge branch 'master' into tablet_extended_sounds	2017-09-17 16:16:03 +02:00
Seth Alves	765031bf89	Merge pull request #11377 from vladest/create_resize ... Add resizable flag. Use the flag for Create only	2017-09-16 11:14:40 -07:00
Seth Alves	04b99ef8a5	Merge pull request #11352 from 1P-Cusack/FogBugz/Case_6107 ... [QML] Fixes FogBugz Case 6107: Can't sort on import menu (details below).	2017-09-16 11:08:59 -07:00
beholder	353bab5277	7384 On Domains without Edit Access, Create Button Text still Highlights ... (override color in states if captionColorOverride was specified)	2017-09-16 16:50:45 +03:00
beholder	871b169128	6618 [Worklist] Add Input Field On Top of Keyboard	2017-09-16 16:17:36 +03:00
Atlante45	a37642ba44	Pull Auto-Baking changes to TabletAssetServer.qml	2017-09-15 14:43:15 -07:00
Atlante45	c4d018504b	Pull Auto-Baking changes to TabletAssetServer.qml	2017-09-15 13:28:51 -07:00
vladest	de4f34aacb	Add resizable flag. Use the flag for Create only	2017-09-15 21:49:38 +02:00
Atlante45	8711823a9b	Sync up AssetServer.qml and TabletAssetServer.qml	2017-09-15 11:44:08 -07:00
Atlante45	ae14f1f88e	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake	2017-09-14 15:34:20 -07:00
LaShonda Hopper	24b6cd71fc	[Case 6107] Fixes Tablet import sorting (details below). ... This ports the fix from FileDialog to TabletFileDialog. * There appears to be 2 versions of this file: * qml/dialogs/TabletFileDialog.qml * qml/hifi/tablet/tabletWindows/TabletFileDialog.qml Testing the tablet within desktop mode works without this fix most likely because it uses qml/hifi/tablet/tabletWindows/TabletFileDialog.qml which didn't receive the same refactor pass via d3282a4e. Tested on Vive: Menu -> Edit -> Import Entities Changes Committed: modified: interface/resources/qml/dialogs/TabletFileDialog.qml	2017-09-14 14:49:49 -04:00
Seth Alves	10494cf3e0	Merge pull request #11359 from vladest/fix_runningscripts_selection ... use selection model of TreeView	2017-09-14 11:22:08 -07:00
Seth Alves	11df5a447e	Merge pull request #11310 from ElderOrb/case6718 ... 6718 PR11082: Help text cannot be dismissed by clicking on the text i…	2017-09-14 11:17:48 -07:00
vladest	61b283743e	Merge branch 'master' into tablet_extended_sounds	2017-09-14 19:52:35 +02:00
vladest	7233c47257	use selection model of TreeView	2017-09-14 15:36:12 +02:00
vladest	8013b34cf5	Merge branch 'master' into fix_google_vr_height	2017-09-14 14:44:28 +02:00
vladest	1860a2cb16	Experimentsl CSS injector	2017-09-14 14:40:22 +02:00
LaShonda Hopper	33c8e90e34	[QML] Fixes FogBugz Case 6107: Can't sort on import menu (details below). ... Looking through the log revealed the following warning: ".../qml/dialogs/FileDialog.qml:489: Error: Cannot assign to non-existent property 'sortOrder'" There was some refactoring to address some HMD functionality in 51b44d90 which resulted in an update to fileTableView's model. This appears to be the point at which sorting stopped working. This updates the fileTableView's sorting methods to use fileTableModel as opposed to fileTableView's model(filesModel). This appears safe given fileTableModel internally wraps around filesModel and is responsible for updating its value. I'm relatively new to QML/Qt; any comments or suggestions are welcome. Tagging @vladest since they may want to be aware given 51b44d90. Case Link: https://highfidelity.fogbugz.com/f/cases/6107 Reviewed-by: Leander Hasty <leander@1stplayable.com> Changes Committed: modified: interface/resources/qml/dialogs/FileDialog.qml	2017-09-13 16:25:36 -04:00
Melissa Brown	49ab8af428	Merge pull request #11344 from Menithal/21536 ... 21536: Clap App!	2017-09-13 12:54:31 -07:00
Atlante45	c04a6b5b88	Add error tooltip	2017-09-13 09:54:56 -07:00
Atlante45	2e84f48539	Fix QML errors	2017-09-13 09:54:55 -07:00
Atlante45	9f2b0258e9	Update baking status with the correct checkmark glyph	2017-09-13 09:54:55 -07:00
Atlante45	944a4fd49d	Update hifi glyphs + font reference	2017-09-13 09:54:55 -07:00
vladest	1ccf2ef690	Merge branch 'master' into fix_google_vr_height	2017-09-12 22:51:54 +02:00
Menithal	ca2d22a192	Updated Scripts	2017-09-12 21:22:40 +03:00
vladest	92a83328c0	Follow naming convention	2017-09-12 19:17:49 +02:00
vladest	58c0141f27	Remove unnecessary code	2017-09-12 19:00:00 +02:00
vladest	08deba35ae	Take in account current WebEngine profile to make sure all features are in place, like download	2017-09-12 16:22:53 +02:00
vladest	17a923b9de	Temporarily disable WebView flickable until new solution will be investigated	2017-09-12 15:48:47 +02:00
Menithal	30c979bd31	Added Clap App to Repository ... Addede Clap App Icons to tablet icons (there needs to be another way to do this than link directly to link or use this method!) Added module as valid global to eslintrc	2017-09-11 23:48:30 +03:00
vladest	00038664a6	Merge branch 'master' into fix_google_vr_height	2017-09-11 19:43:10 +02:00
Howard Stearns	54deef8f32	Merge pull request #11329 from davidkelly/dk/walletSSLFix ... fix wallet for new openssl	2017-09-11 10:07:12 -07:00
Andrew Meadows	a9feca18ca	Merge pull request #11317 from vladest/fix_flickable_on_wheel ... Add flickable on mouse wheel to web pages	2017-09-11 09:32:31 -07:00
vladest	ab59144018	Merge branch 'master' into fix_google_vr_height	2017-09-11 16:19:23 +02:00
vladest	c6d3bce704	Switch off Flickable	2017-09-10 18:33:04 +02:00
David Kelly	1903f65e45	oops	2017-09-08 16:58:12 -07:00
David Kelly	0a3958f743	cr feedback	2017-09-08 16:06:30 -07:00
David Kelly	99cdbbe306	and lets fix the purchases flow too	2017-09-08 14:00:09 -07:00
David Kelly	db0ecb61fd	Merge pull request #11325 from davidkelly/dk/UserHfcAccountRework ... Use new hfc account endpoint	2017-09-08 09:03:53 -07:00
David Kelly	45c8dd9dd4	cr feedback	2017-09-08 05:28:41 -07:00
vladest	832e4aa5eb	Introducong tablet audio events	2017-09-08 09:51:10 +02:00
David Kelly	efdc340c5c	Use new hfc account endpoint	2017-09-07 18:15:04 -07:00
Stephen Birarda	5e1decb02b	Merge branch 'master' of github.com:highfidelity/hifi into feat/auto-bake	2017-09-07 12:06:53 -07:00
Brad Hefta-Gaub	c5098abfb9	Merge pull request #10937 from kencooke/zzmp-audio/peak-values ... Add peak values for all input devices in selection dialog	2017-09-07 11:58:50 -07:00
Howard Stearns	a0ae9ee747	Merge pull request #11311 from davidkelly/dk/walletCleanup ... wallet cleanup	2017-09-06 14:29:24 -07:00
anshuman64	94e1545e58	Merge pull request #11298 from ElderOrb/case7382 ... 7382 Create Menu does not Work on Tablet	2017-09-06 14:09:41 -07:00
vladest	31a23acb1a	Add flickable on mouse wheel to web pages	2017-09-06 23:04:58 +02:00
vladest	e17f05a337	Correct UI	2017-09-06 14:52:08 +02:00
vladest	57643bd904	Merge branch 'master' into audio_devices_split	2017-09-06 14:20:41 +02:00
David Kelly	89cda8d306	oops -- === not ==	2017-09-05 17:15:25 -07:00
David Kelly	1fd30b1e0f	fix passphrase reset	2017-09-05 17:03:11 -07:00
David Kelly	350cee5f35	Wallet cleanup	2017-09-05 16:33:16 -07:00
beholder	41d014ca0c	6718 PR11082: Help text cannot be dismissed by clicking on the text inside the box.	2017-09-06 02:11:40 +03:00
vladest	85a3771a98	Remove commented out code	2017-09-05 22:19:38 +02:00
vladest	dd6d530853	Merge branch 'master' into flickable_web_pages	2017-09-05 22:14:52 +02:00
Dante Ruiz	ad5b8c438e	Merge pull request #11107 from mnafees/21412 ... CR for Job #21412 - Add "Report a Problem" feature	2017-09-05 13:05:05 -07:00
Dante Ruiz	e69227aef8	Merge pull request #11209 from vladest/tablet_login_button ... Added login button to Tablet	2017-09-05 12:59:02 -07:00
David Kelly	3bc45aefb1	Reset passphrase fix	2017-09-05 10:04:16 -07:00
vladest	87a5a6a5b9	Merge branch 'master' into webbrowser_updates	2017-09-05 13:12:27 +02:00
vladest	6de00c7969	Implemented suggestions popup. Cleanup	2017-09-05 13:11:52 +02:00
vladest	748ef8bb87	Enable edit in combobox	2017-09-03 18:10:53 +02:00
beholder	b5faa8ac56	7382 Create Menu does not Work on Tablet	2017-09-02 18:20:00 +03:00
Atlante45	28402be37c	Fix status glyphs	2017-09-01 14:17:28 -07:00
David Kelly	90316e275a	Merge branch 'commerce_walletPassphraseModal' of https://github.com/zfox23/hifi into commerce_walletPassphraseModal	2017-09-01 13:33:23 -07:00
David Kelly	9fe6ce0337	working change passphrase. some cleanup to come	2017-09-01 13:11:56 -07:00
Zach Fox	3cf0df518f	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletPassphraseModal	2017-09-01 11:53:47 -07:00
Zach Fox	51699c9a6a	Minor changes to fonts and colors	2017-09-01 11:44:46 -07:00
David Kelly	d8bb3c7915	Merge pull request #11289 from davidkelly/dk/penniesAndStuff ... Display hfc in "pennies"	2017-09-01 11:39:30 -07:00
Zach Fox	8fcdfa171d	Add debug button to clear passphrase	2017-08-31 16:51:39 -07:00
Zach Fox	1bfc767daf	Quick fixes	2017-08-31 16:42:14 -07:00
Atlante45	9b857eb53b	Ensure "enabled" binding stays in place	2017-08-31 16:16:43 -07:00
Atlante45	2fd2bb1e92	Auto reload after changing baking enabled	2017-08-31 16:00:55 -07:00
Zach Fox	fa25c434ca	Messages to marketplaces.js	2017-08-31 15:50:42 -07:00
Zach Fox	0a9e3e8967	Remove unnecessary code	2017-08-31 15:46:37 -07:00
Zach Fox	2c2500875f	Fixes and improvements	2017-08-31 15:39:58 -07:00
Hisham Qayum	6f1bb6abe2	wallet icon now has white background, diff design	2017-08-31 14:29:03 -08:00
Zach Fox	eab2947d40	Auth flow	2017-08-31 15:16:29 -07:00
Zach Fox	ce32d2d420	Checkout and Purchases	2017-08-31 14:12:05 -07:00
David Kelly	cdadaa8c9c	missed one	2017-08-31 13:41:53 -07:00
David Kelly	de2ce1cd5f	warning	2017-08-31 13:23:38 -07:00
Zach Fox	21a73b2f39	Changes in what I think are the right direction	2017-08-31 13:16:10 -07:00
Atlante45	a9cfc01df3	Set Baking Enabled API	2017-08-31 13:11:27 -07:00
druiz17	98b1fe6138	Merge pull request #11266 from ElderOrb/case6819 ... 6819 - Create button not disabled	2017-08-31 12:36:08 -07:00
Zach Fox	914a6bae00	Commerce: Wallet Passphrase Modal	2017-08-31 12:18:38 -07:00
David Kelly	8fbdd207c8	display hfc in "pennies"	2017-08-31 12:10:12 -07:00
vladest	6faab9fb1c	Switch flickable on by default for list and grid tabs	2017-08-31 19:21:38 +02:00
vladest	d6a7e69275	Merge branch 'master' into webbrowser_updates	2017-08-31 15:50:04 +02:00
vladest	a80d9a22df	Added option to disable flickable for web view	2017-08-31 12:20:20 +02:00
David Kelly	962d1fc81d	Merge branch 'master' of https://github.com/highfidelity/hifi into reset-wallet	2017-08-30 15:30:29 -07:00
David Kelly	988ee8c8d1	fix image provider, couple other things	2017-08-30 15:23:54 -07:00
vladest	46ce512e3d	Merge branch 'master' into flickable_web_pages	2017-08-30 23:17:05 +02:00
vladest	b547b2573e	Added logged in property	2017-08-30 23:15:39 +02:00
Zach Fox	17d999e721	Fixes	2017-08-30 13:25:34 -07:00
vladest	903036a709	Merge branch 'master' into tablet_login_button	2017-08-30 22:12:03 +02:00
Zach Fox	580865fa5a	Add skeleton for infinite scroll	2017-08-30 12:54:26 -07:00
Zach Fox	7a7d7f95d7	Polish transaction history and prepare for whatever new design	2017-08-30 12:45:13 -07:00
Zach Fox	fb4b0f60fa	Remove most dependencies on 'onVisibleChanged'	2017-08-30 11:55:29 -07:00
howard-stearns	b8da08ca42	reset wallet	2017-08-30 11:29:43 -07:00
vladest	88b045e3a9	Switched off overboundings. More accurate calculate height	2017-08-30 20:17:11 +02:00
Zach Fox	f366743be7	Login; punctuationMode; new images	2017-08-30 11:07:03 -07:00
Zach Fox	1b48319a3f	Merge pull request #11267 from zfox23/commerce_zachsPunchlist1 ... Commerce: Zachs Punchlist 01	2017-08-30 10:10:56 -07:00
Zach Fox	6ee634b90a	Lock overlay on top of security image	2017-08-29 17:19:34 -07:00
druiz17	2a97257698	Merge pull request #11140 from ElderOrb/case6788 ... 6788: You can deselect your current view mode	2017-08-29 17:15:51 -07:00
Zach Fox	5d1170c5d6	Only make message appear after inventory received	2017-08-29 16:17:59 -07:00
Zach Fox	a9c99854f9	Haven't purchased anything yet UI	2017-08-29 15:39:07 -07:00
Zach Fox	c7ad875485	Virtual keyboard and logic	2017-08-29 15:27:53 -07:00
Zach Fox	50241078ae	Buncha punchlist items checked off	2017-08-29 14:30:00 -07:00
beholder	180acbc188	6819 - Create button not disabled	2017-08-29 23:49:44 +03:00
beholder	a0a43ebf26	show checkbox or radiobutton dependently on exclusiveGroup presence	2017-08-29 23:23:16 +03:00
vladest	fe44abdb62	Merge branch 'master' into flickable_web_pages	2017-08-29 20:49:39 +02:00
vladest	55eed37698	Start working on autocompletion	2017-08-29 20:47:09 +02:00
David Kelly	84126d8f95	cr feedback	2017-08-29 08:46:13 -07:00
David Kelly	67f25adac0	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/transactionHistoryDisplay	2017-08-29 08:02:53 -07:00
David Kelly	a7af114144	fix wallet, use text from server in history (for now)	2017-08-28 17:04:19 -07:00
Zach Fox	22d3857501	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_checkoutAndInventory	2017-08-28 15:10:17 -07:00
Zach Fox	37b6099f36	Hook up root_file_url	2017-08-28 12:46:01 -07:00
Zach Fox	1c1b841a86	Fix security images; actually do the right thing when wallet not set up	2017-08-28 12:18:53 -07:00
Atlante45	ca62e7168c	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake	2017-08-28 11:41:23 -07:00
Zach Fox	ceb38e261d	HMD Keyboard for purchases filterBar	2017-08-28 10:45:08 -07:00
David Kelly	3955624e63	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/transactionHistoryDisplay	2017-08-28 10:13:21 -07:00
Zach Fox	ea00668725	Again to Another	2017-08-28 10:04:26 -07:00
Zach Fox	67f3b5c027	Remove quantity	2017-08-28 09:58:45 -07:00
Zach Fox	52cb1dd893	Correctly handle non-JSON items	2017-08-28 09:54:51 -07:00
Zach Fox	e293d122b1	Add security image to Checkout and Purchases	2017-08-28 09:33:30 -07:00
vladest	d8fb7300c3	Merge branch 'master' into tablet_login_button	2017-08-28 16:59:35 +02:00
vladest	e38075f7ba	Disable web engine scrollbars	2017-08-28 16:27:33 +02:00
vladest	9baf518c6a	Merge branch 'master' into flickable_web_pages	2017-08-27 12:00:05 +02:00
vladest	d4332e7776	Adopting according comments from designers	2017-08-26 20:55:16 +02:00
vladest	7796946343	Merge branch 'master' into audio_devices_split	2017-08-26 20:00:00 +02:00
Zach Fox	4c16366562	Ints aren't floats, silly!	2017-08-25 16:55:50 -07:00
Zach Fox	50f7f91d4e	Close the loop.	2017-08-25 16:49:02 -07:00
Zach Fox	a03f9592c1	Inventory to Purchases	2017-08-25 16:34:48 -07:00
druiz17	06ab8ddbb2	Merge pull request #11251 from elisa-lj11/blocks ... Blocks app accommodates updated Blocks website	2017-08-25 16:32:14 -07:00
Zach Fox	b1378816d5	Revert "MUCH faster filter!" ... This reverts commit 5173774db0.	2017-08-25 16:23:36 -07:00
Zach Fox	5173774db0	MUCH faster filter!	2017-08-25 16:15:07 -07:00
Zach Fox	ee8f5d6e7b	Filter	2017-08-25 16:08:32 -07:00
Zach Fox	d19377d2d4	Saving	2017-08-25 15:56:30 -07:00
Zach Fox	153c131482	Initial inventory progress	2017-08-25 15:28:35 -07:00
Atlante45	8a291f16ff	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake	2017-08-25 15:26:38 -07:00
Zach Fox	5487179a79	So much progress	2017-08-25 15:06:14 -07:00
David Kelly	b942faa60e	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/transactionHistoryDisplay	2017-08-25 14:16:31 -07:00
David Kelly	f015ac3c68	get transaction history into qml	2017-08-25 13:55:38 -07:00
Zach Fox	dd9bb17791	Progress!	2017-08-25 12:13:51 -07:00
Zach Fox	e606e3dfb3	Squashed commit of the following: ... commit 453897b9e2 Author: Zach Fox <fox@highfidelity.io> Date: Fri Aug 25 10:56:53 2017 -0700 Huge cleanup!	2017-08-25 11:45:37 -07:00
Zach Fox	453897b9e2	Huge cleanup!	2017-08-25 10:56:53 -07:00
Atlante45	348be788f7	Add BakingEnabled protocol	2017-08-25 10:56:27 -07:00
Atlante45	9e6502fe92	More UI work	2017-08-25 10:54:34 -07:00
vladest	26026cb2b5	Added logout. Truncate username to 8 characters	2017-08-25 17:37:10 +02:00
vladest	be56cab8e1	Merge branch 'master' into tablet_login_button	2017-08-25 15:50:10 +02:00
vladest	36879f83eb	Added scroll bar. Cleanup	2017-08-25 15:44:07 +02:00
vladest	df09c80cd9	Merge branch 'master' into flickable_web_pages	2017-08-25 13:15:30 +02:00
Elisa Lupin-Jimenez	3a512e3072	Merge branch 'master' of https://github.com/highfidelity/hifi into blocks	2017-08-24 16:50:58 -07:00
beholder	cbbe03cee7	6788: You can deselect your current view mode	2017-08-25 02:33:11 +03:00
Zach Fox	8d3c394d00	More progress	2017-08-24 16:21:41 -07:00
Elisa Lupin-Jimenez	e71823a8b5	forgot to track a file	2017-08-24 15:46:22 -07:00
Elisa Lupin-Jimenez	77f93ae84b	user agent switch allows downloads	2017-08-24 15:44:22 -07:00
Zach Fox	bdc1f7b236	Progress	2017-08-24 15:39:26 -07:00
Zach Fox	e2c74d8b88	Initial progress	2017-08-24 15:22:30 -07:00
vladest	d6079e70fb	Binding to width to make sure it will follow Tablet with when rotating	2017-08-24 23:44:53 +02:00
David Kelly	eb9436ba96	Merge pull request #11235 from davidkelly/dk/encryptFile ... Initial wallet app plus some encryption of security image	2017-08-24 13:17:14 -07:00
vladest	311dc9f0be	Merge branch 'master' into flickable_web_pages	2017-08-24 21:39:01 +02:00
vladest	c7fe845403	Move common webview flickable code to separate core file	2017-08-24 21:35:47 +02:00
David Kelly	698644c3b4	Merge branch 'commerce_walletApp' of https://github.com/zfox23/hifi into dk/encryptFile	2017-08-24 10:37:58 -07:00
Zach Fox	3d0fd76997	Temp fix for inventory and buy	2017-08-24 10:24:06 -07:00
David Kelly	138534c3ff	encrypt security image	2017-08-23 15:01:09 -07:00
David Kelly	f655bf2713	Merge branch 'commerce_walletApp' of https://github.com/zfox23/hifi into dk/encryptFile	2017-08-23 14:53:05 -07:00
beholder	9cd784990c	5830: Go-To menu shows up blank except for address bar	2017-08-23 23:27:02 +03:00
Zach Fox	a489267cec	Hide behind switch and remove dead code	2017-08-23 10:48:47 -07:00
David Kelly	591c031e7b	first pass still broken...	2017-08-22 16:24:25 -07:00
David Kelly	8bb7ea900a	Merge branch 'commerce_walletApp' of https://github.com/zfox23/hifi into dk/encryptFile	2017-08-22 16:23:23 -07:00
David Kelly	0bd3f1728d	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/encryptFile	2017-08-22 14:40:10 -07:00
vladest	f7a704d9f4	Added current tab selection according to context	2017-08-22 23:33:09 +02:00
vladest	6f0229f450	Reworked according to designers request. Do not fall back to default audion output	2017-08-22 23:26:27 +02:00
Zach Fox	763ce73306	Taking a break now	2017-08-22 12:26:46 -07:00
Zach Fox	a31088b60f	More progress	2017-08-22 12:16:17 -07:00
Zach Fox	f1da7a6381	Checkpoint	2017-08-22 11:53:37 -07:00
vladest	e403f7266a	Merge branch 'master' into audio_devices_split	2017-08-22 20:46:03 +02:00
Zach Fox	db16035f26	Parse balance correctly	2017-08-21 15:07:54 -07:00
vladest	43d3544a0d	Fix width of html pages in Create mode	2017-08-21 17:07:24 +02:00
vladest	9fd2a742a9	Fix QML warning. Fix AddressBar info scroll	2017-08-21 16:45:47 +02:00
vladest	3be684b973	Fixed spinner in center. Flicking only vertically	2017-08-21 16:31:25 +02:00
vladest	78e9bb6020	almost works for marketplace	2017-08-20 23:06:23 +02:00
vladest	56dedea66c	1st experimental approach	2017-08-20 17:57:14 +02:00
vladest	bad8c39444	Align user/login text right border with tablet buttons	2017-08-19 17:46:52 +02:00
vladest	3783b8a57c	Merge branch 'master' into tablet_login_button	2017-08-19 17:27:46 +02:00
Zach Fox	512a08f67f	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletApp	2017-08-18 17:05:56 -07:00
Zach Fox	6e171d38ce	Bugfixes	2017-08-18 17:04:46 -07:00
Zach Fox	a07598c738	Bugfixes	2017-08-18 16:36:11 -07:00
Zach Fox	94da149ac8	Almost there	2017-08-18 16:28:02 -07:00
druiz17	42f6333948	Merge pull request #11206 from vladest/goto_remove_snap ... Switch off snap behavior	2017-08-18 16:14:59 -07:00
David Kelly	1904bd3f2b	encrypting image, rough first pass, lots left	2017-08-18 16:14:10 -07:00
Zach Fox	c42a658bde	Almost-working change pages	2017-08-18 16:06:39 -07:00
Howard Stearns	188cbee781	Merge pull request #11212 from howard-stearns/asynchronous-commerce-2 ... Asynchronous Ledger Interactions with Server	2017-08-18 15:40:24 -07:00
Elisa Lupin-Jimenez	44f1f340e1	Merge pull request #11147 from elisa-lj11/blocks ... Adding Blocks Tablet App to Marketplace	2017-08-18 15:06:18 -07:00
Zach Fox	f28544e405	Show real balance	2017-08-18 14:53:55 -07:00
Zach Fox	a91c0cb169	Add 'exchange' tab	2017-08-18 14:22:25 -07:00
Zach Fox	4ff1fb8df0	Filling out home	2017-08-18 14:18:05 -07:00
howard-stearns	bd37679b65	working	2017-08-18 14:03:40 -07:00
Zach Fox	9636fad679	Updates from wireframes	2017-08-18 13:45:30 -07:00
Sam Gondelman	cbf2bb3a61	Merge pull request #10980 from SamGondelman/sharks ... Reduce laser pointer lag	2017-08-18 13:14:38 -07:00
Zach Fox	1a62f60348	Commit early and often.	2017-08-18 11:30:25 -07:00
Zach Fox	ace1e00158	MOREEEE PROGRESS	2017-08-18 10:52:42 -07:00
howard-stearns	6e34ab45d6	Merge branch 'master' of https://github.com/highfidelity/hifi into asynchronous-commerce-2	2017-08-18 10:03:33 -07:00
howard-stearns	3d401129fb	checkpoint	2017-08-18 10:03:00 -07:00
vladest	2e5e0c94f1	Added login button to Tablet	2017-08-18 15:34:15 +02:00
vladest	4eba09214c	Delegate highlighting to delegate item. Make sure ListView will not snap highlighted item	2017-08-18 08:11:29 +02:00
Zach Fox	ccf81f801d	All the pieces!	2017-08-17 17:06:48 -07:00
Zach Fox	05648bdbcb	Passphrases working	2017-08-17 16:53:38 -07:00
Zach Fox	d052b49a54	Login and picture selection done	2017-08-17 16:34:33 -07:00
Zach Fox	5f69f30551	MOAR PROGRESS	2017-08-17 16:20:50 -07:00
Zach Fox	9135e37078	Go go go go gog o	2017-08-17 15:20:17 -07:00
Zach Fox	eab16fc28c	Initial progress	2017-08-17 15:01:25 -07:00
vladest	f3969b0909	Switch off snap behavior	2017-08-17 22:28:42 +02:00
vladest	855f9d8a95	Missed qml file added	2017-08-17 21:47:48 +02:00
vladest	f77b913a14	Added input meter	2017-08-17 20:55:00 +02:00
Elisa Lupin-Jimenez	2b44608ece	Merge branch 'master' of https://github.com/highfidelity/hifi into blocks	2017-08-17 10:18:40 -07:00
vladest	1a32a6fac3	Merge branch 'master' into audio_devices_split	2017-08-17 17:20:11 +02:00
vladest	d6c426d064	Reworking according new design	2017-08-17 17:17:02 +02:00
Chris Collins	9c9bcd80b8	Merge pull request #11191 from SamGondelman/logging ... Miscellaneous logging fixes	2017-08-16 15:46:32 -07:00
vladest	2cca584e58	Merge branch 'master' into audio_devices_split	2017-08-16 22:47:06 +02:00
SamGondelman	86cc938a47	Merge remote-tracking branch 'upstream/master' into sharks	2017-08-16 09:54:12 -07:00
Zach Fox	2fa1bd25a8	Clipping and mipping!	2017-08-15 16:45:46 -07:00
Zach Fox	984a5aea2c	You can now spawn infinite copies of items you've previously purchased	2017-08-15 16:32:23 -07:00
Zach Fox	5c157a7397	Move security image to top left	2017-08-15 16:24:14 -07:00
Zach Fox	ccf2d71036	V1 done	2017-08-15 16:11:34 -07:00
Zach Fox	29a9ae28e9	Fixes	2017-08-15 15:36:28 -07:00
Zach Fox	768eb7f91c	Getting closer	2017-08-15 15:02:28 -07:00
Zach Fox	b7282cc776	Lots of fixes	2017-08-15 13:46:20 -07:00
Zach Fox	528d2072f9	Bugfixes and improvements	2017-08-15 12:14:32 -07:00
Zach Fox	bddce9328b	V1	2017-08-15 11:08:03 -07:00
Elisa Lupin-Jimenez	3d7995da34	Merge branch 'master' of https://github.com/highfidelity/hifi into blocks	2017-08-15 10:01:24 -07:00
SamGondelman	1c27335193	a couple logging fixes	2017-08-14 17:34:32 -07:00
Seth Alves	21cef482a5	Merge pull request #11190 from druiz17/fix-table-dialog ... Fixed unable to select items in a TreeView	2017-08-14 17:05:42 -07:00
Dante Ruiz	459f2c5cdc	fixed tab issue	2017-08-14 16:03:12 -07:00
Dante Ruiz	99617600c4	fix selection issue for TreeView.qml	2017-08-14 15:58:28 -07:00
Zach Fox	823f2fb252	Merge pull request #11181 from cain-kilgore/skybox-changer ... WL 21447 - Create a Skybox Changer	2017-08-14 15:08:03 -07:00
Cain Kilgore	e7a4bff705	Made Changes per Review, added js	2017-08-14 22:47:18 +01:00
druiz17	97aa92bc44	Merge pull request #11170 from cain-kilgore/web-browser-assets ... Added Assets for Web Browser MP Script	2017-08-14 13:50:11 -07:00
Zach Fox	199ba3bff0	Use new JSON inventory format	2017-08-14 11:55:21 -07:00
Cain Kilgore	28c81534c4	Updated Text at Top	2017-08-14 05:11:53 +01:00
vladest	b22745d57a	Fix binding loops	2017-08-12 12:52:35 +02:00
Cain Kilgore	8c9f3ae977	Skybox Changer PR	2017-08-12 01:35:48 +01:00
Zach Fox	0835b7b8e6	Bugfix	2017-08-11 16:36:26 -07:00
Zach Fox	d8e5f7a067	Small improvements	2017-08-11 16:32:35 -07:00
Zach Fox	c38837c200	Remove fixmes	2017-08-11 16:21:39 -07:00
Zach Fox	9120e678f1	Use asynchronous commerce API	2017-08-11 16:17:13 -07:00
howard-stearns	d7f83a2fdf	Merge branch 'master' of https://github.com/highfidelity/hifi into asynchronous-commerce	2017-08-11 15:53:53 -07:00
Zach Fox	a21ff75a49	Big progress!	2017-08-11 12:54:55 -07:00
howard-stearns	8ee54c7b36	Merge branch 'master' of https://github.com/highfidelity/hifi into asynchronous-commerce	2017-08-11 11:46:20 -07:00
howard-stearns	551ea921cd	Make API asynchronous, for communicating with server	2017-08-11 11:45:40 -07:00
vladest	af39b5660b	Merge branch 'master' into audio_devices_split	2017-08-11 20:42:49 +02:00
vladest	560696e41c	Split logic and interface for HMD and desktop devices. Added CheckBox control based on QQC2	2017-08-11 20:39:17 +02:00
Zach Fox	080c6da71a	Get HFC balance from QmlCommerce API	2017-08-11 10:49:11 -07:00
Zach Fox	e1064938cd	Add inventory; also fix some bugs	2017-08-11 10:31:32 -07:00
Elisa Lupin-Jimenez	6c2bf63392	Back button works	2017-08-10 17:51:19 -07:00
Elisa Lupin-Jimenez	da5bb03187	Trying to add in a back button	2017-08-10 16:34:37 -07:00
SamGondelman	4c55849290	merge from master	2017-08-10 15:43:23 -07:00
Cain Kilgore	4e81ebf85c	Added Assets for Web Browser MP Script	2017-08-10 22:53:35 +01:00
Sam Gateau	79f3be1efe	Merge pull request #11021 from Zvork/fade2 ... Fade dissolve effect JUST AVATARS	2017-08-10 13:48:30 -07:00
Seth Alves	d812c293e8	Merge pull request #11120 from mukulHF/bug-lock-default-scripts ... Disable the ability for a user to edit default scripts if developer settings is not enabled - adjusting values	2017-08-10 12:29:23 -07:00
druiz17	005c5a9278	Update TabletRunningScripts.qml	2017-08-10 12:26:57 -07:00
anshuman64	95b1d5fb91	Merge pull request #11146 from ElderOrb/help_buttons ... 5351: Help Button has Old UI	2017-08-10 11:56:11 -07:00
Seth Alves	f125ef04f1	Merge pull request #11150 from ElderOrb/Case6742 ... 6742: Multiple highlighted buttons	2017-08-09 17:53:55 -07:00
Zach Fox	65f9b0052f	Working buy button	2017-08-09 13:59:21 -07:00
Sam Gondelman	85c3f94976	Merge branch 'master' into sharks	2017-08-09 13:36:18 -07:00
Howard Stearns	cc634a2d1b	Merge pull request #11148 from zfox23/commerce_singleSetting ... New commerce mode now depends on 1 setting; bugfixes; Tablet -> TAB key	2017-08-09 13:25:10 -07:00
beholder	802b5733c5	6742: Multiple highlighted buttons	2017-08-09 22:26:13 +03:00
howard-stearns	a726b01263	remove duplicated line	2017-08-09 12:11:12 -07:00
howard-stearns	7414bf0d9a	oops. didn't test what I thought I did	2017-08-09 12:09:03 -07:00
howard-stearns	1cf81495ab	basic commerce infrastructure	2017-08-09 11:50:52 -07:00
Zach Fox	33fa8c4f86	Fix bugs and also change to single setting	2017-08-09 11:44:09 -07:00
beholder	836b09b83d	5351: Help Button has Old UI	2017-08-09 20:56:02 +03:00
Zach Fox	4f85923517	Tons of fixes and improvements!	2017-08-08 17:58:41 -07:00
Zach Fox	871a5ff1ab	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_CheckoutQMLInvestigation	2017-08-08 15:53:22 -07:00
Gerard Maguire	47b37ac04e	Bool	2017-08-08 15:35:14 +01:00
Gerard Maguire	356f055b53	fixed missing bool	2017-08-08 15:26:21 +01:00
Gerard Maguire	6facc02125	Merge branch 'master' of https://github.com/highfidelity/hifi into 21466	2017-08-08 13:58:32 +01:00
Gerard Maguire	6f81dd53f2	Fixed avatar rotation upon teleportation using Pal ... Added "VisitUserFromPAL" to LookupTrigger enum and bool "shouldMatchOrientation" to goToUser()	2017-08-08 05:08:20 +01:00
Zach Fox	1493a310af	Beginning of stack stuff	2017-08-07 17:02:24 -07:00
Zach Fox	45424f0cfe	Prototype V1	2017-08-07 16:25:42 -07:00
Zach Fox	7e922cb2c2	Layout	2017-08-07 16:16:17 -07:00
Zach Fox	517128a939	More steps	2017-08-07 16:03:42 -07:00
SamGondelman	489e08aef0	Merge branch 'master' of https://github.com/highfidelity/hifi into sharks	2017-08-07 13:29:00 -07:00
Seth Alves	60895872ca	Merge pull request #11123 from vladest/attachment_speedup ... Remove snap to item. Add caching for scrolling speedup	2017-08-07 13:18:50 -07:00
Seth Alves	af1e27dc36	Merge pull request #11053 from hyperlogic/feature/secondary-pose-support ... Improved support for Vive Trackers on biceps	2017-08-07 13:11:48 -07:00
mukulHF	780644fa38	Update TabletRunningScripts.qml	2017-08-07 11:37:27 -07:00
mukulHF	fadc19d8bb	Update RunningScripts.qml	2017-08-07 11:36:37 -07:00
mukulHF	cf7b2ba547	Update LetterboxMessage.qml	2017-08-07 11:35:42 -07:00
mukulHF	3ca2bc0571	Update DesktopLetterboxMessage.qml	2017-08-07 11:35:27 -07:00
mukulHF	e9f268ff26	Update LetterboxMessage.qml	2017-08-07 10:01:50 -07:00
mukulHF	4382f22622	Update DesktopLetterboxMessage.qml	2017-08-07 10:01:26 -07:00
Brad Davis	1ecca9fd29	Merge branch 'master' into zzmp-audio/peak-values	2017-08-06 17:21:00 -07:00
vladest	3a013bf86e	Remove snap to item. Add caching for scrolling speedup	2017-08-05 13:28:08 +02:00
mukulHF	1ce1e29368	Update DesktopLetterboxMessage.qml	2017-08-04 17:44:43 -07:00
mukulHF	7aad4af533	Update LetterboxMessage.qml	2017-08-04 17:44:16 -07:00
Anthony J. Thibault	98bbe887b9	Merge branch 'master' into feature/secondary-pose-support	2017-08-04 16:11:13 -07:00
SamGondelman	bd942ec406	merge from master	2017-08-04 12:17:54 -07:00
Dante Ruiz	9be60ee658	made more requested changes	2017-08-04 17:57:53 +01:00
Dante Ruiz	b72ac63662	Merge branch 'master' of github.com:highfidelity/hifi into bug-lock-default-scripts	2017-08-04 17:19:06 +01:00
vladest	9058a8e2ca	Cleanup top menu on menu reinstantiation	2017-08-04 16:36:00 +02:00
anshuman64	83e50f894a	Merge pull request #11106 from seefo/tracked-objects ... Added Vive pucks as an input channel and added new puck-attach script	2017-08-03 17:03:45 -07:00
Howard Stearns	71ce5a6494	Merge pull request #11016 from highfidelity/context-overlays ... Context Overlays	2017-08-03 16:28:14 -07:00
vladest	b049b0f415	Merge conflicts	2017-08-03 19:43:42 +02:00
Dante Ruiz	1e1ddf2941	making requested changes	2017-08-02 22:22:55 +01:00
Mohammed Nafees	93ad1b6cbf	Add link in help page to report a problem	2017-08-03 01:54:21 +05:30
seefo	106b0ad8bb	Added Vive pucks as an input channel	2017-08-02 13:08:43 -07:00
druiz17	6680be2a03	Merge pull request #11103 from vladest/fix_toolbar_apps_switch ... Fix toolbar apps switch	2017-08-02 12:59:31 -07:00
vladest	7d361c69c2	Audio mic bar show only rectangle on mouse over	2017-08-02 19:52:47 +02:00
vladest	4330e31212	Toolbar mode: 1. Fixed switching between different apps. 2. Fixed switching from Create	2017-08-02 16:32:09 +02:00
Dante Ruiz	51652482a4	Merge branch 'master' of github.com:highfidelity/hifi into bug-lock-default-scripts	2017-08-01 20:51:56 +01:00
David Kelly	b371c875c4	undo tab mapping to bring up tablet, for now	2017-07-31 14:46:26 -07:00
David Kelly	bd7c4b3b26	Merge remote-tracking branch 'upstream/master' into context-overlays	2017-07-31 13:14:53 -07:00
Anthony J. Thibault	2383933252	Merge branch 'master' into feature/secondary-pose-support	2017-07-31 10:55:40 -07:00
vladest	e30e0b1a5f	Make sure Tablet will be shown with opened running scripts dialog. Fixed potential stack corruption	2017-07-31 16:45:21 +02:00
Olivier Prat	490aad2a06	Merged from master	2017-07-31 12:00:35 +02:00
utkarshgautamnyu	f407bf6f5a	Merge pull request #11064 from highfidelity/bug/6513 ... Enabled multiple selection and deletion in Asset Browser	2017-07-28 09:46:34 -07:00
Anthony J. Thibault	6c2b6674bb	load and save shoulderConfig to settings.	2017-07-27 17:33:54 -07:00
utkarshgautamnyu	1beec26003	Update TabletAssetServer.qml	2017-07-27 15:55:55 -07:00
utkarshgautamnyu	a6a4bd5923	Update AssetServer.qml	2017-07-27 15:55:30 -07:00
utkarshgautamnyu	07fc9a6dc3	Indentation fixes	2017-07-27 14:53:49 -07:00
utkarshgautamnyu	4680911264	Enabled multiple selection and multiple deletion in asset browser	2017-07-27 14:47:30 -07:00
Brad Hefta-Gaub	9b3be6d164	Merge pull request #10808 from humbletim/21400 ... WL 21400 -- Setting that lets you switch from cursor to reticle	2017-07-27 13:16:58 -07:00
Anthony J. Thibault	78c6564174	Merge branch 'master' into feature/secondary-pose-support	2017-07-27 09:09:32 -07:00
Anthony J. Thibault	8dc9714282	Pass armCircumference and shoulderWidth to qml.	2017-07-27 09:08:34 -07:00
Chris Collins	853101fcbc	Merge pull request #10928 from 1P-Cusack/21362 ... Add point and thumb up gestures to the Vive.	2017-07-26 22:07:14 -07:00
Sam Gondelman	fcaa39b245	Merge branch 'master' into sharks	2017-07-26 18:18:09 -07:00
utkarshgautamnyu	71ddf1e7c1	Removed Compound Collision type	2017-07-26 10:20:17 -07:00
utkarshgautamnyu	24f4468fd5	added additional collision types to asset browser in tablet mode	2017-07-25 17:12:13 -07:00
utkarshgautamnyu	65192aa620	added additional collision types to asset browser and new model dialog	2017-07-25 17:12:13 -07:00
Anthony J. Thibault	572213daaf	Added shoulder config to Controller Settings UI ... All offset values in Controller Settings UI are now in cm.	2017-07-25 17:05:07 -07:00
SamGondelman	658acd91f2	experimenting with drawHUDLayer depth testing	2017-07-25 14:17:39 -07:00
1P-Cusack	9e25c3b7d8	Renaming 'not' route to 'logicalNot'. ... Build was failing on non-windows platforms because 'not' is a reserved word in C++ (which Visual Studio happily ignores).	2017-07-25 14:47:34 -04:00
Zach Fox	40038ce54b	Merge branch 'master' of https://github.com/highfidelity/hifi into context-overlays	2017-07-25 09:33:07 -07:00
Andrew Meadows	9d1fba3a3b	Merge pull request #10821 from ctrlaltdavid/21418 ... Don't execute body of controllers' plugin update methods if not enabled	2017-07-25 08:51:17 -07:00
Ryan Huffman	9421e6ebb6	Merge pull request #11029 from cain-kilgore/dominant-hands ... WL 21453 - Add a "Dominant Hand" setting	2017-07-25 08:01:31 -07:00
Cain Kilgore	f9204a7034	Now it should appear..	2017-07-25 09:03:47 +01:00
Cain Kilgore	2f857a6d1a	Forgot a file	2017-07-25 06:05:06 +01:00
SamGondelman	3c8b964cc9	replace setHandLasers with drawHUDLayer overlay property	2017-07-24 18:16:40 -07:00
Cain Kilgore	280a7a7e42	Fixing Styling, added Preference to Tablet, Moved Location to Avatar Tuning	2017-07-25 01:48:55 +01:00
Anthony J. Thibault	33a1d6e225	Merge branch 'master' into feature/secondary-pose-support	2017-07-24 17:27:33 -07:00
Anthony J. Thibault	9f6641ed10	Shoulder puck calibration work in progress ... * AnimInverseKinematics: debug draw for secondary targets * AnimInverseKienmatics: better clean up of ik target debug draw * GeometryUtil: added findPlaneFromPoints() * ViveControllerManager: external dependency on eigen * ViveControllerManager: record history of left/right hand controllers * ViveControllerManager: use history to determine user shoulder location for better calibration * ViveControllerManager: pass defaultToReferenceMat by const ref to calibrate functions. * CMake: added external depenency to eigen linear algebra library.	2017-07-24 17:22:48 -07:00
Cain Kilgore	84609f27e3	Final Change - They're now Radio Boxes.	2017-07-24 23:53:03 +01:00
Cain Kilgore	9c152ddc6f	Ticking left will keep it on left, not right	2017-07-24 22:30:43 +01:00
humbletim	de6975b227	add missing cursor-*.pngs	2017-07-24 17:16:13 -04:00
Cain Kilgore	e6fd85f45a	Some code cleanup	2017-07-24 19:02:40 +01:00
Cain Kilgore	42742ba1f9	Changed the Return to a String "left/right" instead.	2017-07-24 18:31:16 +01:00
Brad Hefta-Gaub	0ba8d43522	Merge pull request #10994 from vladest/avatar_default_speeds ... Change default mouse speeds for avatar	2017-07-24 10:13:27 -07:00
Stephen Birarda	26be7e1a01	Merge pull request #10999 from birarda/bug/html-path-on-mac-build ... fix create tab load on OS X	2017-07-24 10:12:40 -07:00
Cain Kilgore	a4cf27402d	Tabs and Cleanup of Code	2017-07-24 06:27:14 +01:00
Cain Kilgore	630922dd95	Dominant Hands Branch Initial Commit ... Adds a new option in the Avatar Basics section of the Avatar Settings. API Accessible Functions: MyAvatar.getUseAlternativeHand() MyAvatar.setUseAlternativeHand() Defaults to false (Right Hand). Will return True if set to Left Hand.	2017-07-24 06:18:24 +01:00
Dante Ruiz	95299244cf	fixed running scripts popup	2017-07-22 00:24:24 +01:00
Dante Ruiz	7bf3f45e39	finished the locked default scripts	2017-07-21 23:32:25 +01:00
vladest	615a3c52e4	Ooops..	2017-07-21 21:26:33 +02:00
Zach Fox	a346e5ccf6	New inspect icon	2017-07-21 11:56:06 -07:00
Zach Fox	a800f6c05a	No magic numbers; Move (i) based on laser hand; Tablet to Tab key	2017-07-21 11:48:19 -07:00
Dante Ruiz	625b7e535a	Merge branch 'master' of github.com:highfidelity/hifi into bug-lock-default-scripts	2017-07-21 17:20:03 +01:00
vladest	33a8ab2d58	Adjusted according discussion in PR	2017-07-21 18:18:23 +02:00
Olivier Prat	7bc7b1eabc	Merge branch 'master' of git://github.com/highfidelity/hifi into fade2	2017-07-21 09:27:30 +02:00
Dante Ruiz	3c862c34b2	disable reload default scripts by default	2017-07-20 21:15:00 +01:00
Stephen Birarda	3936ee93f0	use default scripts path in EditTabView to fix load on OS X	2017-07-19 16:34:04 -07:00
utkarshgautamnyu	ce5ff23e70	made changes to size of content to dosplay 'choose file' button	2017-07-19 16:15:34 -07:00
Chris Collins	e99683fdcf	Merge pull request #10985 from jherico/audio_deadlock ... Trying to resolve QML / Audio deadlocks	2017-07-18 12:40:03 -07:00
Brad Davis	aab56cf2a9	Trying to resolve QML / Audio deadlocks	2017-07-17 16:21:28 -07:00
1P-Cusack	7319998df9	Move ThumbUp gesture detection into json map file.	2017-07-17 10:58:30 -04:00
Olivier Prat	9e9c0aff65	Merge branch 'master' of git://github.com/highfidelity/hifi into fadeshape	2017-07-17 09:59:59 +02:00
Dante Ruiz	93d1725b3c	make cursor position change based on mouse click position	2017-07-14 19:30:35 +01:00
Zach Fox	a9197509d8	Merge pull request #10965 from CainFoool/avatar-scaler ... WL 21422 - Add a scale slider for avatar size	2017-07-14 10:30:33 -07:00
Andrew Meadows	9584035aa4	Merge pull request #10886 from 1P-Cusack/21420 ... [Worklist #21420] Implement Create button disabled state (details below).	2017-07-14 10:06:45 -07:00
Olivier Prat	82da9fb537	Merge branch 'master' of git://github.com/highfidelity/hifi into fade	2017-07-14 17:28:35 +02:00
Cain Kilgore	c60c8c7b13	Missed two tabs..	2017-07-14 00:59:25 +01:00
Cain Kilgore	4f8d958831	Some code cleaning, added comment for reasoning of specifying min and max in the qml	2017-07-14 00:56:42 +01:00
Cain Kilgore	d74c834f12	Fixed colour scheming and changed to a reload icon	2017-07-13 22:40:37 +01:00
Cain Kilgore	60300f5d7b	changed to icon (hopefully)	2017-07-13 22:06:44 +01:00
Cain Kilgore	f91a8c0f53	Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-scaler	2017-07-13 21:25:39 +01:00
Cain Kilgore	247e7b8bed	indentation!!!	2017-07-13 19:25:31 +01:00
Cain Kilgore	092725ad1a	a thing	2017-07-13 19:24:30 +01:00
Cain Kilgore	5329c1ce42	Fixed Indentation, removed old debug code	2017-07-13 19:23:28 +01:00
Cain Kilgore	521babb6bd	Avatar Scaler - should be PR Ready.	2017-07-13 19:18:51 +01:00
Anthony J. Thibault	22d8adcb99	Better shoulder/arm puck calibration.	2017-07-13 10:39:48 -07:00
Zach Fox	dc1b4b5324	New icons	2017-07-12 16:48:04 -07:00
Cain Kilgore	43782a29c7	Avatar Scaler - WIP	2017-07-12 22:04:58 +01:00
Olivier Prat	2f9885870b	First merge with Sam's fader branch with custom pipeline support in shape plumber	2017-07-12 17:29:21 +02:00
1P-Cusack	2cd10fd459	Move 'index point' logic into json config file.	2017-07-12 11:08:50 -04:00
Zach Fox	d786820670	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-07-11 16:16:37 -07:00
Ken Cooke	0da19af6f3	Stop all capture devices when Audio.qml is not visible. ... Otherwise, Windows will continue to capture audio from all attached devices (possibly causing mic audio glitches) until Interface shutdown.	2017-07-11 10:06:38 -07:00
Ken Cooke	d6eb731f3a	Merge branch 'master' into audio/peak-values	2017-07-10 21:55:11 -07:00
Zach Fox	ea62ef165c	Fix image container background	2017-07-10 16:13:45 -07:00
Zach Fox	4a74522884	Ensure tablet button shows up; protections for controller mapping	2017-07-10 15:16:16 -07:00
David Kelly	b87d69b15d	Insure spectator camera preview is up when reopening tablet	2017-07-10 13:16:08 -07:00
1P-Cusack	f5ccf508c9	Fixing braces dropped in merge conflict edit.	2017-07-10 14:11:04 -04:00
Dante Ruiz	89a072cfee	fixed hmd keyboard for goto	2017-07-10 19:05:07 +01:00
David Kelly	1c9c36a8c8	Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/hmdPreview	2017-07-10 10:22:31 -07:00
David Kelly	4843b91f47	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-07-10 09:50:17 -07:00
1st Playable	2cafefaff8	Merge branch 'master' into 21362	2017-07-10 12:05:36 -04:00
1P-Cusack	1d333a24c1	Add point and thumb up gestures to the vive. ... When the thumb is off the touchpad, trigger the 'thumb up' animation. When on the thumbpad an 75% forward, trigger the 'index point animation'. WL 21362	2017-07-10 11:51:42 -04:00
druiz17	6e44c95d53	Merge pull request #10906 from druiz17/audio-qml-fix ... Made the output audio listview dynamically change height base on content size	2017-07-07 16:48:15 -07:00
Zach Fox	dbb48cd1aa	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-07-07 16:03:04 -07:00
Zach Fox	e222753aac	Merge pull request #10911 from zfox23/PAL_adminFix2 ... Set admin status even if QML can't find user in PAL	2017-07-07 10:24:53 -07:00
Olivier Prat	06d69d04c3	TransitionStage + FadeJob compiling but not linked to entity events	2017-07-07 18:22:11 +02:00
Seth Alves	fc8b7c7cc5	Merge pull request #10904 from druiz17/window-root-spam ... fixed log spamming from windowRoot.qml in toolbar mode	2017-07-07 07:17:08 -07:00
Zach Fox	ee9cdaff90	Set admin status even if QML can't find user in PAL	2017-07-06 23:26:40 -07:00
Zach Fox	1afa2d3775	Spectator camera icon	2017-07-06 16:24:50 -07:00
David Kelly	b41c470064	first cut, still stereo	2017-07-06 15:59:24 -07:00
Dante Ruiz	1ac415aa14	dynamic listview height	2017-07-06 23:50:32 +01:00
druiz17	b4182fe7ac	Merge pull request #10899 from druiz17/calibration-update-2.0 ... Updates to the Calibration UI	2017-07-06 14:24:45 -07:00
Dante Ruiz	b0130896d1	fixed spamming from windowRoot.qml	2017-07-06 22:01:08 +01:00
Dante Ruiz	1fcb3b32d6	fixed letter cap	2017-07-06 20:55:19 +01:00
Seth Alves	0374d24b15	Merge pull request #10901 from druiz17/goto-keyboard-fix ... Fixed the keyboard not showing up for goto in HMD mode	2017-07-06 12:46:13 -07:00
Dante Ruiz	2d876377d5	keyboard know disappears when you click of the address line	2017-07-06 20:04:44 +01:00
Dante Ruiz	de5802418f	fixed some keybaord logic	2017-07-06 19:27:48 +01:00
Dante Ruiz	4e3dba1767	goto HMD keyboard fix	2017-07-06 19:12:52 +01:00
Dante Ruiz	9e4b5693c7	fixed merge conflicts	2017-07-06 18:49:46 +01:00
Dante Ruiz	6e1f9d275c	chnaged default head offset	2017-07-06 17:54:06 +01:00
Dante Ruiz	258c21838e	finished calibration-ui updates	2017-07-06 17:32:40 +01:00
LaShonda Hopper	9cae868492	[Worklist #21420] Implement Create button disabled state (details below). ... * The create button icon is set to its disabled resource when the user enters a domain where they have _neither_ Rez or TempRez permissions. ** If the user has either of the Rez permission levels then the normal edit-i.svg icon is used and the user is able to create items as before. * When the user clicks the button in this state, the INSUFFICIENT_PERMISSIONS_ERROR_MSG is shown and creation menu is not shown. * The disabled icon, edit-disabled.svg, is based on the edit-i.svg and is set to 33% opacity. Item Ticket Link: https://worklist.net/21420 Changes to be committed: new file: interface/resources/icons/tablet-icons/edit-disabled.svg modified: scripts/system/edit.js	2017-07-06 10:53:46 -04:00
David Rowe	cfd155c198	Merge branch 'master' into 21418	2017-07-06 16:56:10 +12:00
Dante Ruiz	6c15dffb9d	added new glyph	2017-07-06 00:45:59 +01:00
Zach Fox	39bdc20b4f	On checkbox language change	2017-07-05 16:13:36 -07:00
Zach Fox	f6583a1b87	Use correct text color for checkboxes	2017-07-05 14:46:59 -07:00
Zach Fox	0af53bb4a5	Instructions and cool static :)	2017-07-05 14:46:59 -07:00
Zach Fox	aea5779ed6	When a display texture isn't set, show preview instructions	2017-07-05 14:46:58 -07:00
Zach Fox	44cb48b17d	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-07-05 09:59:57 -07:00
Olivier Prat	5cee2cff9f	Merge branch 'master' of git://github.com/highfidelity/hifi into 21378	2017-07-04 17:48:07 +02:00
David Kelly	373bd0cc8a	aspect ratio preserved upon blitting, minor qml tweak, warnings fixed	2017-07-03 14:23:23 -07:00
David Kelly	5f015ec77f	Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview	2017-07-03 13:57:25 -07:00
Zach Fox	9411c2e732	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-07-03 10:24:02 -07:00
Dante Ruiz	063984f573	Merge branch 'master' of github.com:highfidelity/hifi into calibration-ui-update	2017-07-03 16:44:47 +01:00
Olivier Prat	d9a83539b2	Merged with master	2017-07-03 15:32:30 +02:00
David Kelly	073eae39b2	timer now resumes when visible again	2017-06-30 18:44:32 -07:00
Dante Ruiz	6f30cb1825	Merge branch 'master' of github.com:highfidelity/hifi into vive-in-desktop	2017-07-01 00:48:49 +01:00
Dante Ruiz	51792769b5	finished vive in desktop mode	2017-07-01 00:48:36 +01:00
David Rowe	07697c5083	Merge branch 'master' into 21418 ... # Conflicts: # interface/resources/qml/hifi/dialogs/GeneralPreferencesDialog.qml # interface/resources/qml/hifi/tablet/TabletGeneralPreferences.qml Removed stray "Vive Controller Picks" configuration item which no longer exists.	2017-07-01 11:19:00 +12:00
Dante Ruiz	309a03230c	Merge branch 'calibration-ui-update' into vive-in-desktop	2017-06-30 23:43:59 +01:00
Dante Ruiz	577969481d	head puck working	2017-06-30 23:43:12 +01:00
Brad Davis	31d2c9980e	Merge pull request #10797 from ctrlaltdavid/21396 ... Make Leap Motion a plugin	2017-06-30 14:37:23 -07:00
David Kelly	09d959bdeb	Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview	2017-06-30 14:16:01 -07:00
Zach Fox	e66b4f1761	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-30 10:12:24 -07:00
Seth Alves	c4667aa1a7	Merge pull request #10839 from vladest/file_dialog_crash_qt59 ... File dialog crash qt59	2017-06-29 10:34:26 -07:00
Dante Ruiz	a7e4dc1473	clean up code	2017-06-28 23:51:00 +01:00
David Rowe	be0e1a75a4	User-friendly SDL2 controller name	2017-06-29 10:03:58 +12:00
howard-stearns	3293b4c898	Merge branch 'master' of https://github.com/highfidelity/hifi into merge-from-master-6-28-2pm	2017-06-28 13:53:32 -07:00
Dante Ruiz	a2df2f8472	added user activity status	2017-06-28 19:52:19 +01:00
David Kelly	b73102d063	Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview	2017-06-28 08:57:04 -07:00
Andrew Meadows	1e23fa7baa	Merge pull request #10822 from hyperlogic/feature/no-toe-wiggle ... Eliminated toe wiggle while pucks are enabled.	2017-06-28 08:30:27 -07:00
Vladyslav Stelmakhovskyi	51b44d9021	Implement same for HMD mode	2017-06-28 16:36:25 +02:00
Vladyslav Stelmakhovskyi	d3282a4ed0	Cleanup	2017-06-28 15:56:35 +02:00
Vladyslav Stelmakhovskyi	0d4328fa51	Merge branch 'master' into file_dialog_crash_qt59	2017-06-28 15:54:53 +02:00
Olivier Prat	b76a8a6f9b	Merge branch 'master' of git://github.com/highfidelity/hifi into 21378	2017-06-28 14:37:03 +02:00
Zach Fox	5d8d2fd83e	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-27 16:47:44 -07:00
howard-stearns	07e43eab09	Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-27 16:44:39 -07:00
Zach Pomerantz	9b72ab96ff	add peak values to qml	2017-06-27 17:51:45 -04:00
Vladyslav Stelmakhovskyi	241231c00c	file lists works, but not initial yet	2017-06-27 22:14:58 +02:00