Commit graph

34919 commits

Author SHA1 Message Date
Dale Glass
5f7bd24c14 Fix MultiHash issues 2022-01-13 23:02:46 +01:00
Dale Glass
9df0f109fa
Merge pull request #1553 from ksuprynowicz/loadSpirvResource_fix
Fixed memcpy in loadSpirvResource
2021-12-26 20:37:09 +01:00
Dale Glass
d7073597e4
Merge pull request #1552 from ksuprynowicz/gltf_metallic_fix
Fixed metallic material import for glTF.
2021-12-26 20:34:01 +01:00
Dale Glass
d022b004f4
Merge pull request #1482 from daleglass/qt5-fix-vector
Replace the deprecated QVector::fromStdVector and QVector::toStdVector().
2021-12-26 20:23:43 +01:00
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
9a3686ccb6 Fixed metallic material import for GLTF 2021-12-23 19:40:50 +01:00
a7883fc588
Update libraries/model-serializers/src/GLTFSerializer.cpp
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2021-12-20 18:49:25 +01:00
7106482c58
Update libraries/model-serializers/src/GLTFSerializer.cpp
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2021-12-20 18:49:13 +01:00
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
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