Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
83628 commits 2 branches 0 tags 1.1 GiB
Commit graph

83628 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Kasen IO
a64b391a7b Add user enter and leave domain notification to chat. 2020-07-29 22:07:02 -04:00
Kasen IO
c933f21a77 Add ability to click on message to display chat window. 2020-07-29 22:06:43 -04:00
Kasen IO
382e47471e Fix date display for logs. 2020-07-29 22:06:24 -04:00
Kasen IO
5706a42b56 Implement further handling of Interface OAuth2 
This is preliminary, needs to be revisited in a more dynamic and clean fashion with time.
 2020-07-29 01:53:21 -04:00
David Rowe
7c8993b34f Add TODO 2020-07-29 10:03:44 +12:00
David Rowe
d5e189422f Support blacklisting per domain groups 2020-07-29 08:08:08 +12:00
David Rowe
94908fd1a7 Add support for group lists in domain server 2020-07-28 22:05:40 +12:00
David Rowe
429b4ceefa Flesh out domain groups code 2020-07-28 21:23:55 +12:00
Kasen IO
294646a141 Add OAuth2 to domain settings. 2020-07-27 23:04:59 -04:00
David Rowe
c6af3d23c9 Fix --url command line parameter to work with both "=" and " " 2020-07-26 19:41:30 +12:00
kasenvr
bfb4eaeb21
Merge pull request #538 from ctrlaltdavid/fix/camera-in-screenshot 
Delay taking snapshot further at low render rates
 2020-07-25 15:40:39 -04:00
kasenvr
ff648bf95b
Merge pull request #573 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 #572 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 #571 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 #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
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 #545 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 #543 from HifiExperiments/alpha 
Fix shape alpha 0 issue
 2020-07-23 17:23:20 -04:00
kasenvr
33067479a3
Merge pull request #539 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 #521 from kasenvr/feature/inventory-app 
Feature/inventory app
 2020-07-23 17:15:37 -04:00