Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-09 13:44:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
85171 commits 67 branches 56 tags 1.2 GiB
Commit graph

1554 commits

Author SHA1 Message Date
David Rowe
ccd525a89b CR 2021-10-30 08:30:05 +13:00
David Rowe
bb3d0fa5fa Add secure WebSocket support 2021-10-27 21:42:58 +13:00
David Rowe
eb21eb3f38 Add WebRTC on/off switch to domain server settings 2021-10-26 21:06:23 +13:00
Kalila
f15aaa5b79
Merge pull request #1383 from ctrlaltdavid/dev/webapp-master-update 
Update webapp branch with the latest master.
 2021-10-14 06:15:34 -04:00
David Rowe
f264cc0548 Merge branch 'master' into dev/webapp-master-update 2021-10-08 08:34:03 +13:00
Kalila
1d8da471a2
Merge pull request #1344 from digisomni/feature/new-domain-wizard 
Overhaul the Domain server's onboarding wizard.
 2021-10-04 16:10:31 -04:00
Kalila L
9df620e4c3 CR. 2021-10-03 18:51:33 -04:00
David Rowe
c03312319d Merge branch 'master' into dev/webapp-master-update 
# Conflicts:
#	libraries/networking/src/NodeList.h
#	libraries/shared/src/shared/WebRTC.h
 2021-10-03 12:51:47 +13:00
Kalila
fe1d807097
Update DomainServer.cpp 2021-10-02 15:01:13 -04:00
Kalila L
b3a8c0bbec CR. 2021-09-30 23:56:35 -04:00
Kalila L
633a195da6 Add Doxygen for 'forwardMetaverseAPIRequest' function. 2021-09-19 18:15:57 -04:00
Heather Anderson
ab4d70760e review and cleanup of "#include <QtCore/QSharedPointer>" 2021-09-10 21:40:54 -07:00
Kalila L
c266b003fb Get Domain creation working; revise metaverse forwarding. (TLS init fail issue present) 2021-09-10 02:06:50 -04:00
David Rowe
87803e5124 Use client WebSocket address as WebRTC address 2021-09-05 22:55:24 +12:00
David Rowe
e9776541bd Use WebSocket address and port as WebRTC data channel ID 2021-09-05 22:54:58 +12:00
David Rowe
dddabecc84 Use domain server-assigned WebRTC data channel ID in assignment clients 2021-09-04 14:25:21 +12:00
David Rowe
911dc2aff3 Include socket type in domain packets 
Required for user client info sent to assignment clients from the domain server.
 2021-09-04 10:36:13 +12:00
Kalila L
8f51de62f2 Initial creation and wizard redirection added. 2021-09-03 00:06:23 -04:00
David Rowe
adc94a280e Log some warnings 2021-08-29 14:19:39 +12:00
David Rowe
ace612d038 Assignment client type is not known at construction 2021-08-18 21:27:35 +12:00
David Rowe
a3c1d50478 WebRTC signaling with assignment clients via domain server 2021-08-18 20:10:11 +12:00
David Rowe
9b2c773805 Move WebRTCSignalingServer into Domain Server 2021-08-17 22:37:43 +12:00
David Rowe
ed36321e25 Fill in connected client's ports with WebRTC data channel IDs 2021-07-30 14:12:38 +12:00
David Rowe
74c2788a14 Merge branch 'master' into dev/rename-hifisockaddr-webapp 
# Conflicts:
#	assignment-client/src/AssignmentClient.cpp
#	domain-server/src/DomainServer.cpp
#	libraries/networking/src/DomainHandler.cpp
#	libraries/networking/src/LimitedNodeList.cpp
#	libraries/networking/src/LimitedNodeList.h
#	libraries/networking/src/SockAddr.cpp
#	libraries/networking/src/SockAddr.h
#	libraries/networking/src/udt/Socket.cpp
#	libraries/networking/src/udt/Socket.h
#	tools/ice-client/src/ICEClientApp.cpp
 2021-07-21 15:03:29 +12:00
David Rowe
6a17143df8 Rename "HifiSockAddr" to "SockAddr" 2021-07-06 13:23:57 +12:00
David Rowe
5a5cb6488c Multiplex UDP and WebRTC sockets in a QUdpSocket-style NetworkSocket 2021-06-26 22:07:01 +12:00
David Rowe
d65ecead9f Abstract WebRTCDataChannel into a QUdpSocket-style WebRTCSocket 2021-06-26 21:20:26 +12:00
David Rowe
28c408de98 Typo 2021-06-05 18:23:37 +12:00
David Rowe
2402a5e333 Merge remote-tracking branch 'upstream/webapp' into dev/webrtc-datachannel 
# Conflicts:
#	domain-server/src/DomainServer.h
 2021-06-05 14:27:18 +12:00
David Rowe
1dcee6cc1d Conditionally include WebRTCSignalingServer.h 2021-06-02 23:00:19 +12:00
David Rowe
645dc265ab Fix non-WebRTC domain server builds 2021-06-01 15:41:25 +12:00
David Rowe
6c37628468 Add WebRTC data channel 2021-05-31 12:29:48 +12:00
David Rowe
6afb8044ea Add WebRTC signaling channel 2021-05-20 09:51:14 +12:00
Heather Anderson
9f5e06503a begin identifying Packet Type ID=1 as "domain connect" for a future version of the protocol, so we can detect protocol breaks when we shift to using this as our domain connect packet. 2021-04-24 23:28:53 -07:00
Dale Glass
fb19d1b29d Review fixes 2021-04-04 12:53:30 +02:00
Dale Glass
240e070a46 Log authentication events in the domain server 
This uses the vircadia.domain_server.auth logging category.
 2021-04-03 17:29:51 +02:00
Kalila
286976addb
Merge pull request #1147 from daleglass/fix-null-pointer-arithmetic-warning 
Fix warning: NULL used in arithmetic
 2021-04-02 16:24:26 -04:00
Dale Glass
3551b19942 Fix warning: NULL used in arithmetic 2021-04-02 00:50:14 +02:00
David Rowe
c45007d038 Merge branch 'master' into fix/can-rez-attachment 
# Conflicts:
#	interface/src/Application.h
 2021-03-29 15:28:08 +13:00
Kalila L
fd592dfb06 CR. 2021-03-19 04:11:26 -04:00
Kalila L
0216b34681 State of refactoring 2021-03-17 19:37:06 -04:00
Kalila
712b5e5088
Update DomainServerSettingsManager.cpp 2021-03-11 17:06:07 -05:00
Kalila L
78cc98bc7b Add improved functionality for Users.kick API. 
Add banByUsername, banByFingerprint, and banByIP parameters.
 2021-03-11 01:03:54 -05:00
David Rowe
dd674c395e Default canRezAvatarEntities on domains without new permission 2021-03-05 16:27:32 +13:00
David Rowe
2e75983800 Set default value of canRezAvatarEntities to that of canConnectToDomain 2021-03-03 16:31:12 +13:00
Kalila L
6b5cffa5e4 Initial pass at adding canRezAvatarEntities. 2021-02-26 06:14:06 -05:00
HifiExperiments
30c4779eeb name all the threads 2021-02-13 20:17:28 -08:00
Kalila L
5c9b1edb86 Convert QString to QJsonObject. 2020-12-14 01:03:36 -05:00
Kalila L
0468c98c30 CR, move duplicate consts to top of file. 2020-12-11 15:55:24 -05:00
Kalila L
cec112dd28 "port" -> "network_port" 2020-11-25 15:19:35 -05:00