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

34965 commits

Author SHA1 Message Date
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
David Rowe
500da963ad Make parameter names consistent across usages 2021-08-04 16:11:04 +12:00
David Rowe
9be1c08c8c Fix domain server crash 2021-07-31 23:03:48 +12:00
David Rowe
8528422834 Fix WebRTC Doxygen typos 2021-07-30 14:18:34 +12:00
David Rowe
0ea6d88bf5 Fix function parameter ID 2021-07-30 14:14:36 +12:00
David Rowe
3603520c94 fillPacketHeader() can be private 2021-07-30 14:13:44 +12:00
David Rowe
fa01ead130 Add extra WebRTC debug 2021-07-30 14:13:15 +12:00
Dale Glass
b293dd2816
Merge pull request #1288 from digisomni/feature/add-talk-to-help 
Add "Talk" link to "Help" menu.
 2021-07-29 23:40:24 +02:00
Kalila
10e8d9f6d8
Update NetworkingConstants.h 2021-07-23 20:44:24 -04:00
Dale Glass
567ff291fe
Merge pull request #943 from daleglass/cmake-build-in-build-dir 
Cmake: build in build dir
 2021-07-22 23:26:21 +02:00
David Rowe
38f7506c5e Fix erroneous domain server log message 2021-07-21 20:06:18 +12:00
David Rowe
320b5a2d22 Fix HifiSockAddr references 2021-07-21 19:54:40 +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
Dale Glass
32c3725b5d Define _USE_MATH_DEFINES everywhere that uses math constants 
On Win32, things are failing to build with messages like:

RenderableEntityItem.cpp(674,51): error C2065: 'M_PI': undeclared identifier

This is because as per Microsoft documentation, _USE_MATH_DEFINES is needed to
obtain constants like M_PI:

https://docs.microsoft.com/en-us/cpp/c-runtime-library/math-constants?view=msvc-160

It seems this worked previously due to some quirk of CMake, but stopped working
after some reordering. This change makes this definition explicit where it is needed.
 2021-07-17 19:34:26 +02:00
Kalila
35948d7467
Merge branch 'master' into fix/cmdline-discovery 2021-07-15 22:21:47 -04: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
f62c964fdc
Typo, remove double definitions of constants. 2021-07-15 22:16:32 -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
8e4a0f8880
Merge branch 'master' into feature/add-talk-to-help 2021-07-15 17:34:29 -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
Kalila L
8df362ef1f Add "Talk" link to "Help" menu. 2021-07-10 18:05:28 -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
Kalila L
88b9b7468e CR. 2021-06-27 04:31:14 -04:00
Kalila
a217f80ee3
Update NodeList.cpp 2021-06-27 04:14:21 -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
2d4da7ba71 Add disable domain port auto discovery by assignment client option. 2021-06-21 13:22:48 -04: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
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