Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 14:54:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
83724 commits 71 branches 56 tags 1.2 GiB
Commit graph

83724 commits

This branch
This branch
All branches
Author SHA1 Message Date
Kasen IO
6b0fc8fd66 Titlebar now responds correctly to domain logged in state. 2020-08-05 02:18:01 -04:00
Kasen IO
448cdcb31f Update domain's describe-settings for clarity. 2020-08-05 00:23:55 -04:00
Kasen IO
c42adc9e00 Add menu items and triggers. 2020-08-05 00:14:27 -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
8f55e13aa2 Disable login screen for all first-time users. 2020-08-04 23:14:40 -04:00
Kasen IO
352a3f4ab1 Fix domain vs metaverse logins slightly. 2020-08-04 21:17:57 -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
kasenvr
4bfb414cbe
Merge pull request #585 from ctrlaltdavid/feature/oauth2-login 
OAuth2 WordPress log in
 2020-08-04 14:14:50 -04:00
HifiExperiments
87fd039f99 fix merge issue 2020-08-04 08:54:44 -07:00
HifiExperiments
0d62798860 Merge remote-tracking branch 'upstream/master' into parenting 2020-08-04 08:52:13 -07:00
David Rowe
dfef1fb5bb Remove unused domain server setting 2020-08-04 22:03:08 +12:00
David Rowe
6f9b47c07d Distinguish domain groups with a leading "@" 2020-08-04 21:31:13 +12:00
David Rowe
60048162c0 Use WordPress user roles as domain groups 2020-08-04 21:00:09 +12: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
bc56eb5ac7 Update to work with WordPress plugin 2020-08-04 17:12:31 +12:00
Heather Anderson
37c613c3d4 more changes from code review 2020-08-03 20:50:10 -07:00
Maki
3783c98976 Allow resolving relative urls when importing entities json 2020-08-04 01:33:19 +01:00
David Rowe
7da91d9557 Misc. tidying 2020-08-04 09:15:05 +12:00
David Rowe
257eadc99f "Unable connect to this domain" message box after login if can't connect 2020-08-03 16:12:13 +12:00
David Rowe
0b42ef5748 Regularize domain username case 2020-08-03 13:21:20 +12:00
David Rowe
26e6ce07d7 Further networking tidying 2020-08-03 11:26:11 +12:00
Heather Anderson
0c7aab1556 minor code review 2020-08-02 14:38:55 -07:00
David Rowe
43b6e77235 Tidy networking code 2020-08-03 09:17:12 +12:00
David Rowe
dfbad4efc0 Use "enable domain authentication" server setting 2020-08-02 21:22:59 +12:00
David Rowe
fdb4a5605a Tidy processing user connect request 2020-08-02 20:54:09 +12:00
David Rowe
c3769a5f74 Get WordPress API path from domain server settings 2020-08-02 17:33:13 +12:00
David Rowe
8cdd76a42e Verify user at domain server 2020-08-02 16:17:04 +12:00
kasenvr
8f3377b716
Merge pull request #579 from kasenvr/feature/chat-improvements-noti 
Feature/chat improvements noti
 2020-08-01 14:24:54 -04:00
kasenvr
cc43112bf3
Apply suggestions from code review 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-08-01 13:46:02 -04:00
David Rowe
15c6baceb8 Send OAuth2 username and tokens to domain server 2020-08-01 18:57:21 +12:00
David Rowe
aff3275207 Initial OAuth2 login working 2020-08-01 10:17:27 +12:00
Kasen IO
b64c44f5ee Make notices respect domain mute settings. 2020-07-31 17:30:50 -04:00
Kasen IO
bec293b8c7 Fix display name being incorrect. 2020-07-31 17:22:15 -04:00
David Rowe
56ba137ee3 Get OAuth2 URL from server settings 2020-07-31 20:48:27 +12:00
Heather Anderson
4f5f46a623 restructured the code to using a set of ContextAwareProfile objects rather than subscribing to an intermediate object 
changed _isRestricted from QAtomicInt to std::atomic<bool>
 2020-07-30 22:49:54 -07:00
David Rowe
c3d248a404 Merge branch 'oauth2-wordpress' into feature/oauth2-login 2020-07-31 15:20:32 +12:00
David Rowe
6b28f3ea0d Reinstate TODOs 2020-07-31 15:20:13 +12:00
kasenvr
c66452b416
Merge pull request #577 from ctrlaltdavid/feature/domain-groups 
Feature/domain groups
 2020-07-30 22:46:25 -04:00
kasenvr
856e1f1ca3
Update interface/src/ui/DialogsManager.cpp 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-07-30 22:25:24 -04:00
Kasen IO
431f188617 Merge branch 'master' into feature/chat-improvements-noti 2020-07-30 22:13:37 -04:00
kasenvr
7a25376131
Merge pull request #574 from ctrlaltdavid/fix/url-parameter 
Fix --url command line parameter to work with both "=" and " "
 2020-07-30 17:18:54 -04:00
kasenvr
75bd885efc
Merge pull request #564 from HifiExperiments/zoneImport 
renderWithZones works on import from JSON
 2020-07-30 17:16:41 -04:00
kasenvr
180b7f1bd3
Merge pull request #547 from HifiExperiments/scaled 
Fix lag on restart with scaled avatar
 2020-07-30 17:15:50 -04:00
Kasen IO
af34536a09 Further complete the loop. 2020-07-30 00:34:02 -04:00
Kasen IO
22085e2166 Add notification sound + delay to get name upon joining. 2020-07-29 22:16:07 -04:00