Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-07 16:40:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
85599 commits 25 branches 28 tags 1.2 GiB
Commit graph

34965 commits

Author SHA1 Message Date
ksuprynowicz
2ef47b0bed Fixed memcpy in loadSpirvResource 2021-12-25 18:25:13 +01:00
Dale Glass
8d8d43e342 Review fix 2021-12-23 23:10:44 +01:00
Dale Glass
aeb52b38c7 Replace the deprecated toStdVector() and fromStdVector() 2021-12-23 23:10:44 +01:00
ksuprynowicz
9a3686ccb6 Fixed metallic material import for GLTF 2021-12-23 19:40:50 +01:00
ksuprynowicz
a7883fc588
Update libraries/model-serializers/src/GLTFSerializer.cpp 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2021-12-20 18:49:25 +01:00
ksuprynowicz
7106482c58
Update libraries/model-serializers/src/GLTFSerializer.cpp 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2021-12-20 18:49:13 +01:00
ksuprynowicz
9a3a22d310 Changes to for loops needed to prevent crash on some GLTF models 2021-12-20 00:57:37 +01:00
Kalila
03b5b83b67
Merge pull request #1339 from odysseus654/pr/make_shared 
Housekeeping: use of std::make_shared / QSharedPointer::create.
 2021-12-09 17:14:04 -05:00
Kalila
a1d0f95535
Merge pull request #1340 from odysseus654/pr/auto-const-ref 
Housekeeping: Update use of "auto" with plugin lists.
 2021-12-09 17:13:55 -05:00
David Rowe
022dea7a58 Update API examples to use "vircadia" in mapping names 2021-12-04 21:37:33 +13:00
Kalila
b7734e32d0
Merge pull request #1468 from daleglass/qt5-fix-multimap 
Fix deprecated usage of multiple keys in QHash and QMap.
 2021-12-02 20:28:22 -05:00
Dale Glass
14374d4d70 Replace usage of deprecated uniqueKeys 
uniqueKeys() is deprecated, and _resources shouldn't contain duplicated keys.
 2021-11-26 18:39:21 +01:00
Kalila
aabcdeadbf
Merge pull request #1469 from vircadia/webapp 
Enable WebRTC connections to be made to the Domain, i.e., add Web client support.
 2021-11-26 12:19:45 -05:00
Dale Glass
d77c8bbe41 Fix warnings related to deprecated usage of multiple keys in QHash and QMap 
This replaces those uses with QMultiHash and QMultiMap
 2021-11-26 17:53:23 +01:00
Dale Glass
57167cdfef
Merge pull request #1465 from daleglass/fix-meshstates-assertion 
Fix for _meshStates.empty() assertion.
 2021-11-25 23:17:05 +01:00
ksuprynowicz
65576ba99e Fix automatic texture memory bug 
Fixes int32 overflow in automatic texture memory procedure
 2021-11-24 22:20:52 +01:00
David Rowe
48c32b96f4 Merge branch 'master' into fix/ssl-websocket-crash 2021-11-23 09:58:04 +13:00
David Rowe
075c0d8b89 Fix domain server crash with SSL WebSocket 2021-11-23 09:57:42 +13:00
Dale Glass
65a87b9603 Fix for _meshStates.empty() assertion 
See the comment in the code for a detailed discussion of the issue. This is
a workaround, but it should be a safe one.
 2021-11-22 01:13:39 +01:00
David Rowe
56d33b555e Fix assignment client crash 2021-11-20 17:26:06 +13:00
David Rowe
cf57b506b5 Fix domain server crash 2021-11-20 12:13:30 +13:00
David Rowe
fb79d57fef Improve WebRTC debug 2021-11-20 11:06:05 +13:00
David Rowe
861b8398f4 Merge branch 'webapp' into dev/webrtc-revisions 2021-11-14 14:13:19 +13:00
Dale Glass
b3722b050c
Merge pull request #1438 from namark/settings-null-deref-fix 
Fixed empty POST request to settings.json crashing the Domain server.
 2021-11-06 19:31:34 +01:00
Dale Glass
35a420d312
Merge pull request #1422 from Penguin-Guru/master 
Changed preset framerates; Add "low power" preset.
 2021-11-06 19:30:01 +01:00
David Rowe
afd7993152 Disable WebRTC debug 2021-11-06 22:31:52 +13:00
Dale Glass
b4727adecc Update comment as per review 2021-11-04 23:53:56 +01:00
namark
7fac5dd8b8 Preserving _requestContent invariant in HTTPConnection class, 
in the case when Content-Length header is empty, to avoid null
dereference in the requestContent() getter.
 2021-11-05 00:16:59 +04:00
Dale Glass
5759c76154 Fix mime type for .htm and .html files 
The code forces text/html for .shtml files, but if .html ones were used,
it would look up in the mime database and come up with application/x-extension-html

Web browsers try downloading that instead of rendering it.
 2021-11-03 01:12:48 +01:00
Kalila
61367ffd47
Merge pull request #1427 from Penguin-Guru/AntialiasingSetting 
Add antialiasing setting.
 2021-11-02 16:09:15 -04:00
David Rowe
c76dc5358b Rename domain server cert files 2021-10-31 10:01:04 +13:00
Penguin-Guru
56bc962d36 Changed preset framerates. Added preset. 2021-10-30 12:57:00 -07:00
Penguin-Guru
44fb53d4f2 Removed comment. 2021-10-30 10:43:10 -07:00
David Rowe
ccd525a89b CR 2021-10-30 08:30:05 +13:00
David Rowe
8e3cfe9805 Fix non-const lvalue reference 2021-10-29 23:04:41 +13:00
Kalila
55d27f5813
Merge pull request #1406 from daleglass/update-webrtc-linux 
Update WebRTC for Linux.
 2021-10-28 17:55:59 -04:00
David Rowe
bb3d0fa5fa Add secure WebSocket support 2021-10-27 21:42:58 +13:00
David Rowe
92e3d1465e Reduce the number of ICE servers used 2021-10-27 21:41:12 +13:00
David Rowe
2971dd6185 Fix handling of ICE candidate received from client 2021-10-26 12:13:25 +13:00
David Rowe
0fcb9423bf Fix ICE servers used for STUN 2021-10-26 11:21:23 +13:00
Penguin-Guru
e6a41e85b2 Added comments. Referenced all enums explicitly. 2021-10-25 13:40:36 -07:00
Penguin-Guru
8386f2eb61 Clumsy fix for enum storage. 2021-10-24 19:19:20 -07:00
Penguin-Guru
66fdfa40ad Hopefully implemented antialiasing setting. 2021-10-24 15:32:51 -07:00
Kalila
f5f51dfca7
Merge pull request #1415 from ctrlaltdavid/dev/message-mixer 
Networking code tidying and dead code removal.
 2021-10-22 01:45:54 -04:00
Dale Glass
4abe8da23e New build, against openssl 2021-10-20 01:16:45 +02:00
David Rowe
7bb74d0103 Comment code intent 2021-10-19 11:40:20 +13:00
David Rowe
afe459b5b3 Remove unused code 2021-10-19 11:40:00 +13:00
Dale Glass
e44628f6d6 Target webrtc on Linux 2021-10-18 20:55:50 +02:00
Dale Glass
b9568e36ec Enable data channel 2021-10-18 20:55:47 +02:00
Dale Glass
cd56af6e7e Partial changes 2021-10-18 20:54:12 +02:00
David Rowe
4b871d1073 Tidying 2021-10-15 09:37:37 +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
8e653c3a65 Fix assertion message 2021-10-14 21:59:46 +13:00
David Rowe
f15d87fff1 Remove unused code 2021-10-14 13:38:30 +13:00
Julian Groß
b42170c7b6 Disable automatic texture memory on unsupported platforms. Fix automatic texture memory fallback. 2021-10-10 15:01:35 +02:00
David Rowe
f264cc0548 Merge branch 'master' into dev/webapp-master-update 2021-10-08 08:34:03 +13:00
David Rowe
f5452a4324 Guard against invalid data channel address 2021-10-07 21:03:23 +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
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
939d0958c1
Merge pull request #1367 from daleglass/fix-recursive-mutex-warnings 
Replace the deprecated QMutex{ QMutex::Recursive} with QRecursiveMutex (solves approximately 1700 warnings).
 2021-10-01 00:15:02 -04:00
Kalila
eab8dcd257
Merge pull request #1376 from JulianGro/gles_glvnd 
Use GLVND on GLES.
 2021-09-30 17:26:14 -04:00
Kalila
c87006c91b
Merge pull request #1346 from JulianGro/aarch64_gha 
Add aarch64 Linux GHA builds.
 2021-09-30 17:14:09 -04:00
David Rowe
de37734e18 Tidying to match the Web SDK 2021-10-01 09:09:07 +13:00
Julian Groß
da71fbf294 Use GLVND on GLES 2021-09-27 14:43:58 +02:00
Dale Glass
b8d1057e1f Replace the deprecated QMutex{ QMutex::Recursive} with QRecursiveMutex 
This fixes around 1700 warnings.
 2021-09-26 01:27:19 +02:00
Dale Glass
891d555679
Merge pull request #1352 from odysseus654/pr/q_disable_copy 
Code Review: use of Q_DISABLE_COPY.
 2021-09-25 20:33:20 +02:00
Dale Glass
3349d02cef
Merge pull request #1349 from JulianGro/use_GLVND 
Set GL preference to GLVND
 2021-09-25 20:31:11 +02:00
Alezia Kurdis
ec74154042
Adjustment to Doc for "created" properties 
Adjustment to Doc for "created" properties.
The doc was pretending that it is a string value but it's in fact a number (Unix Timestamp).

Addressing ISSUE #839
 2021-09-23 22:07:56 -04:00
Heather Anderson
57a3cd3d63 replace the various disable-copy constructions with Q_DISABLE_COPY (or Q_DISABLE_COPY_MOVE) 2021-09-18 21:36:35 -07:00
David Rowe
6c4e105c06 Remove some unused audio stream method parameters 2021-09-18 10:01:21 +12:00
Julian Groß
babee7c527 Set GL preference to GLVND 2021-09-17 21:04:12 +02:00
Julian Groß
f03606ee60 Disable WebRTC on aarch64 Linux 2021-09-16 06:09:11 +02:00
Heather Anderson
6e4e0dfb6a remove unnecessary list copying when retrieving a list of plugins 2021-09-12 13:12:02 -07:00
Heather Anderson
05182af561 more (relatively useless) code review 2021-09-11 20:16:51 -07:00
Heather Anderson
bcce9a2091 convert explicit shared pointer creation (using "new") to make_shared where possible/appropriate 2021-09-11 15:15:04 -07: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
Kalila L
74b185f6c6 Fix Qt warning: "QString::KeepEmptyParts" -> "Qt::KeepEmptyParts" 2021-09-09 18:57:43 -04:00
David Rowe
96708f5fe3 Move crash fix 2021-09-07 18:58:37 +12:00
David Rowe
e3c28a5dc8 Alternative crash fix 2021-09-06 16:28:38 +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
b5867fef48 Tidying 2021-09-04 14:31:20 +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
David Rowe
ff72b422b3 Fix WebRTCDataChannels crash 2021-09-03 19:04:24 +12:00
David Rowe
65dec6dfd8 Socket type isn't used in all code 2021-09-02 15:00:26 +12:00
David Rowe
b1050dc83a Merge branch 'master' into dev/webapp-master-update 2021-09-01 21:52:04 +12:00
David Rowe
ac9229ace0 Fix avatar crash 2021-08-29 21:34:31 +12:00
Kalila
2a4ad7b163
Merge pull request #1251 from digisomni/fix/cmdline-discovery 
Add disable domain port auto discovery by assignment client option.
 2021-08-22 03:05:21 -04:00
David Rowe
1605039929 Tidying 2021-08-21 21:11:42 +12:00
Kalila
45e10f0670
Merge pull request #1303 from daleglass/qt5-fix-qtcpsocket-error 
Replace deprecated QAbstractsocket::error with QAbstractSocket::error…
 2021-08-19 20:51:27 -04:00
David Rowe
ace612d038 Assignment client type is not known at construction 2021-08-18 21:27:35 +12:00
David Rowe
5d15ebb723 WebRTC data channel with assignment clients 2021-08-18 20:21:56 +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
Kalila
29b4fea1d2
Merge pull request #1299 from ctrlaltdavid/dev/webrtc-doxygen 
Fix a couple of WebRTC Doxygen typos
 2021-08-16 00:05:44 -04:00
Kalila
019e012f2e
Apply suggestions from code review 
Co-authored-by: Heather Anderson <heath@odysseus.anderson.name>
 2021-08-12 23:01:13 -04:00
Dale Glass
ae9f2aa1ee Update slots to the new syntax, use QAbstractSocket::errorOccurred 2021-08-12 22:53:24 +02:00
Dale Glass
24ab523acc Replace deprecated QAbstractsocket::error with QAbstractSocket::errorOccurred 2021-08-06 23:26:02 +02:00
Dale Glass
24b2cdfcd2 Fix QString::SplitBehavior deprecation, replace with Qt:: 2021-08-06 20:16:10 +02:00