Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-10 13:19:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
84999 commits 21 branches 28 tags 1.2 GiB
Commit graph

34796 commits

Author SHA1 Message Date
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
Kalila
42ffb5709c
Merge pull request #1270 from daleglass/use_qt_endl 
Replace uses of endl on Qt classes with Qt::endl
 2021-07-15 22:18:36 -04:00
Kalila
d75df82687
Merge pull request #1102 from HifiExperiments/materials2 
Material improvements 2: reference textures/materials by entity ID
 2021-07-15 17:42:40 -04:00
Kalila
0193e0f4d6
Merge pull request #1244 from digisomni/fix/lookup-string-spaces 
Add ability for 'handleLookupString' to have spaces.
 2021-07-12 17:07:29 -04:00
David Rowe
4dac611036 Fix build error 2021-07-08 15:30:51 +12:00
David Rowe
ed13cbd01b Merge branch 'webapp' into dev/webrtc-packet 
# Conflicts:
#	libraries/networking/src/webrtc/WebRTCDataChannels.h
 2021-07-08 14:54:21 +12:00
HifiExperiments
12833b9c93 CR and percent decoding 2021-07-06 19:13:33 -07:00
HifiExperiments
bdbb88084b CR 2021-07-05 21:02:40 -07:00
David Rowe
6a17143df8 Rename "HifiSockAddr" to "SockAddr" 2021-07-06 13:23:57 +12:00
HifiExperiments
7f99ddca2e merge with master 2021-07-05 16:48:45 -07:00
David Rowe
cb89eabf74 Typo 2021-07-06 08:48:43 +12:00
David Rowe
28b46ed861 Log warning if try to set local port on WebRTC LimitedNodeList 2021-07-05 10:59:19 +12:00
David Rowe
319f3e7122 Misc fixes to AddressManager JSDoc 2021-07-05 10:43:50 +12:00
David Rowe
3ebb75acf5 Undo documentation improvements 2021-07-05 10:24:59 +12:00
David Rowe
7ecd9b6b8e Miscellaneous tidying 2021-07-04 16:38:47 +12:00
David Rowe
e682336cc2 Add missing Doxygen 2021-07-04 15:57:53 +12:00
David Rowe
f6a8ae285d Fix WebRTC peer connection not being closed properly 2021-07-04 15:50:52 +12:00
Dale Glass
be6a67b5eb Replace uses of endl on Qt classes with Qt::endl 
This fixes a whole bunch of warnings
 2021-07-03 19:08:03 +02:00
David Rowe
dacda8405c Typo 2021-07-03 08:43:31 +12:00
David Rowe
f02ffe1ed9 Use alternative signal/slot mechanism for Android compatibility 2021-07-02 12:05:29 +12:00
David Rowe
89c527f0d8 Update Doxygen group tags to use /// format 2021-07-01 15:59:58 +12:00
David Rowe
4d375c029f Merge remote-tracking branch 'upstream/webapp' into dev/webrtc-packet 2021-07-01 12:14:52 +12:00
David Rowe
d0c89c7d91 Tidying 2021-06-30 22:21:38 +12:00
Kalila
40f81e4866
Merge pull request #1223 from odysseus654/pr/scripting-docs 
Ensuring minimal documentation for classes declared in script-engine
 2021-06-29 19:09:26 -04:00
David Rowe
a0a0e8db35 Merge branch 'webapp' into dev/webrtc-datachannel 2021-06-28 09:42:37 +12:00
Kalila
b86e4b98a9
Merge pull request #1249 from digisomni/fix/docs-links-dev 
Update user docs links "docs.vircadia.dev" -> "docs.vircadia.com".
 2021-06-27 05:55:13 -04:00
David Rowe
d6061289ec Merge branch 'master' into dev/webapp-master-update 2021-06-27 09:51:41 +12:00
Kalila
7442b14dce
Merge pull request #1258 from ctrlaltdavid/dev/webrtc-update 
Update WebRTC Windows package
 2021-06-26 14:29:24 -04:00
David Rowe
2a9ab98e41 Miscellaneous tidying and fixes 2021-06-26 22:07:48 +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
5b937a1580 WebRTCSignalingServer and WebRTCDataChannels improvements 2021-06-26 20:07:26 +12:00
David Rowe
c9d4fe8558 Remove unused code 2021-06-26 17:23:58 +12:00
David Rowe
e48e02d8c6 Fix JSDoc typo 2021-06-22 20:59:06 +12:00
Kalila L
d26e035764 Update copyright headers. 2021-06-21 12:06:52 -04:00
Kalila L
90aaa85089 Update user docs links "docs.vircadia.dev" -> "docs.vircadia.com". 2021-06-21 12:01:37 -04:00
Kalila L
0625dbe53c Some URL updates. 2021-06-17 19:45:56 -04:00
Kalila L
1215ced6fa CR. 2021-06-15 15:02:03 -04:00
Kalila L
1411d55364 Add ability for 'handleLookupString' to have spaces. 2021-06-15 00:31:28 -04:00
Kalila L
51e6468abd Rename 'URL_SCHEME_HIFI' -> 'URL_SCHEME_VIRCADIA'. 2021-06-11 17:04:16 -04: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
4681475269 Merge branch 'master' into dev/webrtc-datachannel 2021-06-05 14:21:29 +12:00
Kalila
d8a0d13812
Merge pull request #1206 from odysseus654/pr/drop-script-debugging 
drop remaining references to QScriptEngineDebugger
 2021-06-03 18:01:40 -04:00
Kalila
229164c5b9
Merge pull request #1219 from ctrlaltdavid/dev/webrtc-signaling 
WebRTC Signaling Channel
 2021-06-02 05:44:03 -04:00
David Rowe
c28f4749ed Doxygen tidying 2021-06-01 09:34:38 +12:00
David Rowe
63ec933290 Code tidying 2021-06-01 09:34:17 +12:00
David Rowe
e6c49cf407 Fix data channel ID 2021-06-01 09:32:28 +12:00
David Rowe
6c37628468 Add WebRTC data channel 2021-05-31 12:29:48 +12:00
Heather Anderson
259cd20b87 Ensuring minimal documentation for classes declared in script-engine 2021-05-29 22:50:39 -07:00
David Rowe
aa1c32ec53 Rename new domain server environment variable 2021-05-29 09:25:15 +12:00