Commit graph

34754 commits

Author SHA1 Message Date
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
David Rowe
dacda8405c Typo 2021-07-03 08:43:31 +12:00
David Rowe
a0a0e8db35 Merge branch 'webapp' into dev/webrtc-datachannel 2021-06-28 09:42:37 +12: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
e48e02d8c6 Fix JSDoc typo 2021-06-22 20:59:06 +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
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
David Rowe
aa1c32ec53 Rename new domain server environment variable 2021-05-29 09:25:15 +12:00
David Rowe
ce31b70a1d Update Windows WebRTC from version M81 to M84 2021-05-21 07:58:10 +12:00
David Rowe
6afb8044ea Add WebRTC signaling channel 2021-05-20 09:51:14 +12:00
David Rowe
adfb428796 Distinguish use of WebRTC features - audio versus data channel 2021-05-20 09:43:18 +12:00
David Rowe
8545b8c6c1 Fix missed JSDoc tag change 2021-05-16 21:44:16 +12:00
David Rowe
4d11d1d515 Convert all "/**jsdoc" occurrences to "/*@jsdoc" 2021-05-12 10:54:45 +12:00
Heather Anderson
04f8ccd2b0 drop remaining references to QScriptEngineDebugger 2021-05-08 20:31:03 -07:00
Kalila
cb3a0b51fe
Merge pull request #1183 from ctrlaltdavid/feature/rpm-blendshapes
ReadyPlayerMe blendshapes support
2021-05-01 14:24:30 -04:00
Kalila
a3626c83f4
Merge pull request #692 from odysseus654/pr/move-connect-packet-type
The domain server should see Packet ID=1 as a (broken) attempt to connect to the domain server
2021-04-29 18:39:25 -04:00
David Rowe
58a6ac384e Replace some QMap occurrences with QHash 2021-04-29 08:15:37 +12:00
David Rowe
d1136c2d3e Merge branch 'master' into feature/rpm-blendshapes 2021-04-27 21:32:35 +12:00
Kalila
3629427cff
Merge pull request #1161 from ctrlaltdavid/fix/spinbox
Fix settings (QML) spin box stepping
2021-04-26 03:39:56 -04: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
daleglass
c7e79a5e3e
Merge pull request #1181 from ctrlaltdavid/fix/gltf-colors
Fix glTF mesh colors
2021-04-24 20:24:26 +02:00
David Rowe
24ddbc0d56 Update ReadyPlayerMe default mapping 2021-04-24 09:10:32 +12:00
David Rowe
e9fa76ae6e Fix conditional application 2021-04-24 08:49:57 +12:00
Kalila
5ec026255c
Merge pull request #938 from vircadia/feature/qt-update
Update to Qt 5.15.2
2021-04-22 17:36:53 -04:00
David Rowe
f4af0be95b Conditionally apply ReadyPlayerMe synonyms 2021-04-21 10:14:46 +12:00
David Rowe
a6d8e150f0 Move and rename ReadyPlayerMe synonyms 2021-04-21 09:47:24 +12:00
David Rowe
bfb42c8233 Merge branch 'master' into feature/rpm-blendshapes 2021-04-21 08:57:52 +12:00
David Rowe
f67410a5e9 Merge branch 'master' into fix/gltf-colors 2021-04-21 08:31:17 +12:00
Kalila
dec3369583
Merge pull request #1178 from JulianGro/rename_fbx_to_model-serializers
Rename fbx to model serializers
2021-04-19 16:00:21 -04:00
David Rowe
0b536f0cae Support ReadyPlayerMe blendshapes in glTF files 2021-04-19 11:10:25 +12:00
David Rowe
71bcabfc0a Remove unused enum 2021-04-17 21:30:46 +12:00
David Rowe
a26f11a84f Adjust glTF mesh colors 2021-04-17 14:22:20 +12:00
Julian Groß
1cadfcc284
Merge branch 'master' into feature/qt-update 2021-04-16 01:55:51 +02:00
Julian Groß
12c3bd80e5 Fix GLTFSerializer not being up to date 2021-04-15 23:49:02 +02:00
Kalila
a35b9c4563
Merge pull request #1126 from daleglass/hash_all_fingerprints
Hash Windows and Mac machine fingerprints.
2021-04-15 17:46:17 -04:00
Julian Groß
8573425f68 Update library headers 2021-04-15 20:15:36 +02:00
Julian Groß
ecb7c47f1a Rename fbx folder to model-serializers 2021-04-15 19:26:10 +02:00
David Rowe
312dc9ccb7 Update Chrome browser version 2021-04-12 15:30:23 +12:00
Dale Glass
b3db458091 Fix mismatched if in CMake warning
This should have no actual effect, just a warning fix
2021-04-11 23:00:46 +02:00
Kalila
1dba5bedfa
Merge pull request #1149 from daleglass/add_thread_debugging
Implement thread debugging with tsan
2021-04-08 17:17:07 -04:00
David Rowe
7088fc9d6c Merge branch 'master' into fix/spinbox 2021-04-05 10:41:31 +12: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