Commit graph

83474 commits

Author SHA1 Message Date
Kasen IO
294646a141 Add OAuth2 to domain settings. 2020-07-27 23:04:59 -04:00
kasenvr
ff648bf95b
Merge pull request from ctrlaltdavid/feature/oauth2-login-display
Display domain login dialog
2020-07-25 13:44:24 -04:00
David Rowe
ed44438387 Fix domain login dialog disappearing when teleport to domain 2020-07-25 21:46:18 +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
David Rowe
34eb74ac00 Update copyrights 2020-07-25 16:26:57 +12:00
David Rowe
82252cdc08 Get basics working 2020-07-25 16:22:52 +12:00
David Rowe
9bb913983d Stub out basics for displaying the domain login dialog 2020-07-25 15:31:17 +12:00
David Rowe
111afc8c69
Merge pull request from ctrlaltdavid/feature/oauth2-master-update
Update to latest master
2020-07-25 14:47:04 +12:00
David Rowe
d923936854 Merge branch 'master' into feature/oauth2-master-update 2020-07-25 10:06:18 +12:00
David Rowe
bcb469a29d
Merge pull request from ctrlaltdavid/feature/oauth2-login-required
Domain login groups and "not authorized on domain"
2020-07-25 09:16:03 +12:00
David Rowe
0b667e34a2 Regularize naming 2020-07-24 22:02:23 +12:00
David Rowe
6d310eb999 Generate "NotAuthorizedDomain" condition 2020-07-24 21:22:00 +12:00
kasenvr
ec09f1a9d9
Merge pull request 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
cd9f47004b Added loginDomain stub. 2020-07-23 22:14:35 -04:00
Kasen IO
d7c0493b7a Updated login QML to handle domain logins. 2020-07-23 22:14:21 -04:00
David Rowe
9b13f0bebb Merge branch 'feature/oauth2-groups' into feature/oauth2-login-required 2020-07-24 11:14:47 +12:00
David Rowe
2e9355da58 Distinguish not logged into metaverse vs domain 2020-07-24 11:13:41 +12:00
kasenvr
65d1a88a0c
Merge pull request from ctrlaltdavid/fix/fbx-single-color
Fix display of FBX models with only one color for vertices
2020-07-23 17:27:12 -04:00
kasenvr
ce6573333c
Merge pull request from HifiExperiments/alpha
Fix shape alpha 0 issue
2020-07-23 17:23:20 -04:00
kasenvr
33067479a3
Merge pull request from ctrlaltdavid/fix/recording-playback
Fix avatar not displaying when recording is re-loaded
2020-07-23 17:19:37 -04:00
kasenvr
d585b068b4
Merge pull request from kasenvr/feature/inventory-app
Feature/inventory app
2020-07-23 17:15:37 -04:00
kasenvr
80d3e3c455
Merge pull request from kasenvr/fix/move-user-agent
Fix/move user agent
2020-07-23 17:13:18 -04:00
kasenvr
d29f365830
Merge pull request from HifiExperiments/zones
Make sure renderWithZones works on models on restart/reload
2020-07-23 17:08:04 -04:00
kasenvr
ac3147fa66
Merge pull request from kasenvr/fix/goto-explore
Update the connection failure dialog 'go to' -> 'explore'
2020-07-23 17:05:28 -04:00
kasenvr
befdaec03b
Merge pull request from JulianGro/macos-rebrand
Change strings, comments and folders to Vircadia rebrand
2020-07-23 17:04:49 -04:00
David Rowe
07504232a9 Move new connection refused reason to end to maintain compatability 2020-07-24 08:43:40 +12:00
Kasen IO
a5d0c80c87 Revert "Remove supposedly unused logic?"
This reverts commit 9fd3f764ec.
2020-07-23 00:37:50 -04:00
Kasen IO
9fd3f764ec Remove supposedly unused logic? 2020-07-23 00:18:11 -04:00
Kasen IO
d3320ab17b Separate domain vs metaverse login denials for Interface. 2020-07-23 00:18:04 -04:00
David Rowe
e4c9657ab9 Initial auxiliary groups code 2020-07-23 16:08:09 +12:00
HifiExperiments
aa6eedf0fe make sure render with zones works on models on restart/reload 2020-07-21 12:06:38 -07:00
Kasen IO
f4016bb0d5 Add API call to retrieve user agent. 2020-07-21 02:36:55 -04:00
Kasen IO
647b45323e Update user agents. 2020-07-21 02:36:38 -04:00
Kasen IO
e573842786 Add compiled script files. 2020-07-21 00:43:44 -04:00
Kasen IO
78643d13e8 Update packages. 2020-07-21 00:40:21 -04:00
Kasen IO
d5bf5dfe7d Fix comma. 2020-07-21 00:38:29 -04:00
Kasen IO
087ede2f91 Address CR comments. 2020-07-20 13:57:28 -04:00
kasenvr
770dd83efc
Apply suggestions from code review
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2020-07-20 13:51:18 -04:00
kasenvr
022be754f1
Apply suggestions from code review
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2020-07-20 13:48:48 -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
David Rowe
91aa878dab Typo 2020-07-17 21:02:32 +12:00
Kasen IO
ddbed5e702 Update the connection failure dialog 'go to' -> 'explore' 2020-07-17 04:24:47 -04:00
David Rowe
335bc7b4db Fix display of FBX models with only one color for vertices 2020-07-17 20:17:08 +12:00
HifiExperiments
e635d0ff87 fix alpha 0 issue 2020-07-16 15:29:58 -07:00
kasenvr
84bee76968
Merge pull request from kasenvr/fix/install-docs-1
Update INSTALL.md
2020-07-16 17:16:50 -04:00
David Rowe
62937c2bef Fix avatar not displaying when recording is re-loaded 2020-07-16 10:11:32 +12:00