6782 commits

Author	SHA1	Message	Date
kasenvr	c7fbddf024	Merge pull request #631 from vegaslon/bug/TestFixAvatarApp ... Test moving to qt image error handling in avatar app	2020-09-02 18:50:31 -04:00
kasenvr	9004fb8060	Merge pull request #624 from ctrlaltdavid/feature/vircadia-about ... Add "About" JavaScript API and platform string	2020-09-02 18:50:09 -04:00
kasenvr	f2cc30d6d9	Merge pull request #276 from HifiExperiments/parenting ... Improving performance of entity updates	2020-09-01 04:34:51 -04:00
Vegaslon	c6fbe08a8f	Test moving to qt image error handling instead of creating own in attempt to fix avatar app slow down.	2020-08-20 08:59:57 -04:00
David Rowe	70fd954ef4	Replace the "HifiAbout" API with a new "About" API	2020-08-17 11:34:58 +12:00
Kasen IO	d89cf867d2	Center error text correctly.	2020-08-05 02:41:39 -04:00
kasenvr	b948f24a56	Apply suggestions from code review ... Co-authored-by: David Rowe <david@ctrlaltstudio.com>	2020-08-05 02:31:26 -04:00
kasenvr	4d3ca2fdc5	Apply suggestions from code review ... Co-authored-by: David Rowe <david@ctrlaltstudio.com>	2020-08-05 02:31:10 -04:00
Kasen IO	2881f1147f	Metaverse login display working correctly.	2020-08-05 00:09:09 -04:00
Kasen IO	d81ec3a4b8	Domain login display working correctly.	2020-08-04 23:46:39 -04:00
Kasen IO	0e8f019b8a	Further things kinda working.	2020-08-04 20:00:24 -04:00
Kasen IO	ffce0a9d27	Update QML.	2020-08-04 19:12:31 -04:00
Kasen IO	09f2153057	Update login QML to display domain URL.	2020-08-04 15:48:10 -04:00
Kasen IO	f066eccba0	Merge branch 'oauth2-wordpress' into feature/oauth2-kalila	2020-08-04 14:17:48 -04:00
HifiExperiments	0d62798860	Merge remote-tracking branch 'upstream/master' into parenting	2020-08-04 08:52:13 -07:00
David Rowe	3a43283e7b	Provide domain name to domain login dialog	2020-08-04 19:42:02 +12:00
Kasen IO	482922d986	First pass at making login dialog more clear.	2020-08-04 01:28:19 -04:00
David Rowe	56ba137ee3	Get OAuth2 URL from server settings	2020-07-31 20:48:27 +12:00
David Rowe	361ab97d83	Fix saving metaverse login	2020-07-25 20:53:23 +12:00
David Rowe	0618427d0f	Wire up domain login dialog	2020-07-25 20:40:52 +12:00
David Rowe	fec0e7a8bc	Merge branch 'feature/oauth2-kalila' into feature/oauth2-login-display	2020-07-25 16:53:43 +12:00
kasenvr	ec09f1a9d9	Merge pull request #550 from ctrlaltdavid/feature/resolution-scale-max ... Increase graphics settings' resolution scale item maximum to 2.0	2020-07-24 01:11:29 -04:00
Kasen IO	d7c0493b7a	Updated login QML to handle domain logins.	2020-07-23 22:14:21 -04:00
kasenvr	80d3e3c455	Merge pull request #520 from kasenvr/fix/move-user-agent ... Fix/move user agent	2020-07-23 17:13:18 -04:00
Kasen IO	647b45323e	Update user agents.	2020-07-21 02:36:38 -04:00
kasenvr	de082ce61d	Update TabletConnectionFailureDialog.qml	2020-07-18 14:26:26 -04:00
kasenvr	a973855085	Update ConnectionFailureDialog.qml	2020-07-18 14:25:50 -04:00
David Rowe	233deae44d	Increase graphics settings' resolution scale item maximum to 2.0	2020-07-18 20:50:52 +12:00
Kasen IO	ddbed5e702	Update the connection failure dialog 'go to' -> 'explore'	2020-07-17 04:24:47 -04:00
HifiExperiments	ed5c84548c	Merge remote-tracking branch 'upstream/master' into parenting	2020-07-16 13:33:46 -07:00
David Rowe	8dd8ebcbaf	Merge branch 'master' into feature/eye-tracking-option ... # Conflicts: # plugins/openvr/src/ViveControllerManager.cpp	2020-07-11 08:14:13 +12:00
HifiExperiments	c9684b8c6d	Merge remote-tracking branch 'upstream/master' into parenting	2020-07-10 11:43:03 -07:00
kasenvr	ab95e109ca	Merge pull request #468 from JulianGro/move-audio ... Little "Audio" settings UI improvements	2020-07-09 17:15:35 -04:00
David Rowe	6e1af6df73	Update copyright notices	2020-07-10 07:18:29 +12:00
Julian Groß	6737068b02	Test	2020-07-07 00:28:19 +02:00
David Rowe	52389e5804	Add correct privacy policy URL	2020-07-05 11:17:56 +12:00
motofckr9k	bb91c1c89b	Fix blocks	2020-07-03 10:22:06 +02:00
HifiExperiments	37ce2996c8	Merge remote-tracking branch 'upstream/master' into parenting	2020-07-01 14:56:36 -07:00
David Rowe	06010dbcae	Fix position of recommended puck placement dialog	2020-06-27 15:54:28 +12:00
David Rowe	258fc8a2f4	Improve some text and make checkboxes square	2020-06-27 15:54:15 +12:00
David Rowe	2e9a8e2b33	Add option to enable Vive PRO Eye eye tracking	2020-06-27 15:14:21 +12:00
David Rowe	147bea6ba9	Fix indentation	2020-06-22 21:12:46 +12:00
Julian Groß	5b0855fa6e	Fix indentation	2020-06-22 06:18:05 +02:00
Julian Groß	3fe1dddee2	Replace tabs with spaces	2020-06-22 04:19:10 +02:00
Julian Groß	ef5d6bfc2f	Remove unnessesary copyright	2020-06-22 04:11:34 +02:00
Julian Groß	34887ec604	Remove unnessesary whitespaces	2020-06-22 04:10:21 +02:00
motofckr9k	56362461fc	Fix "or" not dissappearing in popup window	2020-06-21 05:51:37 +02:00
motofckr9k	75f6246ac9	Move them even closer	2020-06-21 03:16:19 +02:00
motofckr9k	41563b14a8	Move signUpContainer closer to loginContainer	2020-06-21 03:05:54 +02:00
motofckr9k	3da755fb95	Change button text, and move it to answer "Don't have an account?"	2020-06-21 02:53:05 +02:00