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

3822 commits

Author SHA1 Message Date
ksuprynowicz
c6f1e6410e Updated some URLs, rebranded documentation and changed default metaverse server address 2022-02-09 23:57:24 +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
f264cc0548 Merge branch 'master' into dev/webapp-master-update 2021-10-08 08:34:03 +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
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
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
Heather Anderson
0889782648 retire for_each loop for for(:) loop 2021-09-12 13:22:43 -07:00
Heather Anderson
6e4e0dfb6a remove unnecessary list copying when retrieving a list of plugins 2021-09-12 13:12:02 -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
74b185f6c6 Fix Qt warning: "QString::KeepEmptyParts" -> "Qt::KeepEmptyParts" 2021-09-09 18:57:43 -04:00
David Rowe
b1050dc83a Merge branch 'master' into dev/webapp-master-update 2021-09-01 21:52:04 +12:00
David Rowe
adc94a280e Log some warnings 2021-08-29 14:19:39 +12:00
David Rowe
ace612d038 Assignment client type is not known at construction 2021-08-18 21:27:35 +12:00
David Rowe
a3c1d50478 WebRTC signaling with assignment clients via domain server 2021-08-18 20:10:11 +12:00
Kalila L
76010bf650 Update help text for disable domain server port auto discovery option. 2021-08-13 10:29:16 -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
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
35948d7467
Merge branch 'master' into fix/cmdline-discovery 2021-07-15 22:21:47 -04:00
Kalila
241c54919d
Apply suggestions from code review 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2021-07-15 22:19:58 -04:00
David Rowe
6a17143df8 Rename "HifiSockAddr" to "SockAddr" 2021-07-06 13:23:57 +12:00
Kalila L
88b9b7468e CR. 2021-06-27 04:31:14 -04:00
David Rowe
5a5cb6488c Multiplex UDP and WebRTC sockets in a QUdpSocket-style NetworkSocket 2021-06-26 22:07:01 +12:00
Kalila L
2d4da7ba71 Add disable domain port auto discovery by assignment client option. 2021-06-21 13:22:48 -04:00
David Rowe
4d11d1d515 Convert all "/**jsdoc" occurrences to "/*@jsdoc" 2021-05-12 10:54:45 +12:00
Julian Groß
ecb7c47f1a Rename fbx folder to model-serializers 2021-04-15 19:26:10 +02:00
Dale Glass
43f6fd82f4 Implement thread debugging with tsan 
This is enabled with the VIRCADIA_THREAD_DEBUGGING environment variable.
It's incompatible with VIRCADIA_MEMORY_DEBUGGING, so only one of those
can be enabled for a build.
 2021-04-02 20:41:23 +02:00
David Rowe
c45007d038 Merge branch 'master' into fix/can-rez-attachment 
# Conflicts:
#	interface/src/Application.h
 2021-03-29 15:28:08 +13:00
David Rowe
71b025f7f0 Separate API vs. internal versions of clearAvatarEntity() 2021-03-22 15:36:57 +13:00
David Rowe
240c58c6ce Code review 2021-03-18 09:56:00 +13:00
David Rowe
2030d24523 Tidying 2021-03-16 14:37:16 +13:00
Kalila L
c278122f9a CR. 2021-03-15 01:26:07 -04:00
Kalila L
14d1af05a3 Missed comment. 2021-03-14 22:36:32 -04:00
Kalila L
008c0f0b1e Add iterator to improve max messages check performance. 2021-03-14 22:35:56 -04:00
Kalila L
9d15b00fbb Add check to stop processor before starting. 2021-03-14 21:50:08 -04:00
Kalila L
e12e746698 Optimize rate limiting on messaging mixer further. 2021-03-12 17:36:01 -05:00
Kalila L
4b61d3328d CR. 2021-03-12 10:50:50 -05:00
David Rowe
1b33339995 Make avatar mixer remove clients' unremoved avatar entities 2021-03-12 22:15:26 +13:00
David Rowe
283f7d61e2 Don't send avatar entities if don't have permission 2021-03-09 11:15:37 +13:00
David Rowe
3beceb4d7d Clear user's avatar entities if rez permissions change to "no" 2021-03-01 22:03:02 +13:00
David Rowe
e7a97c6117 Don't accept avatar entity data in message mixer if no rez permissions 2021-03-01 21:23:50 +13:00
David Rowe
3f01bd9250 Undo EntityData and EntityErase changes - these aren't avatar entities 2021-03-01 21:23:13 +13:00
Kalila L
3a945f87dd Add messaging mixer rate limiting per node functionality. 2021-02-26 21:01:22 -05:00
Kalila L
6b5cffa5e4 Initial pass at adding canRezAvatarEntities. 2021-02-26 06:14:06 -05:00
HifiExperiments
30c4779eeb name all the threads 2021-02-13 20:17:28 -08:00
HifiExperiments
81940214bb
Revert "Revert "Split Local and owned Avatar Entity scripts into their own ScriptEngine"" 2020-11-16 21:20:25 -08:00
kasenvr
21f8eac936
Revert "Split Local and owned Avatar Entity scripts into their own ScriptEngine" 2020-11-16 22:35:46 -05:00
HifiExperiments
b3e9c1e8f8 Merge remote-tracking branch 'upstream/master' into scriptEngine 2020-11-09 22:00:11 -08:00
kasenvr
2b511d8c45
Merge pull request #613 from odysseus654/pr/registerListener 
[enhancement] transition listener registration from member string name to member string pointer
 2020-10-29 17:13:05 -04:00
kasenvr
1c818bc8eb
Merge pull request #657 from daleglass/fix-build-on-qt-5.14 
Fix build on qt 5.14
 2020-09-24 17:11:42 -04:00
Heather Anderson
2067a438c2 fixed apparent typo preventing the CUSTOM_ASSIGNMENT_SERVER_HOSTNAME_OPTION or CUSTOM_ASSIGNMENT_SERVER_PORT_OPTION options from being reachable 2020-08-30 17:20:39 -07:00
HifiExperiments
2a1857e9ec split entity script engines into two 2020-08-27 16:50:32 -07:00
Dale Glass
5327ffeec4 Fix build under Qt 5.14 and later. 
Solves "redefinition of ‘struct std::hash<QString>’",
"redefinition of ‘struct std::hash<QByteArray>'", and
a build failure in TouchscreenVirtualPadDevice.h.
 2020-08-26 00:01:29 +02:00
Heather Anderson
2e5244663e transition listener registration from member string name to member string pointer 2020-08-09 14:57:00 -07:00
kasenvr
33067479a3
Merge pull request #539 from ctrlaltdavid/fix/recording-playback 
Fix avatar not displaying when recording is re-loaded
 2020-07-23 17:19:37 -04:00
David Rowe
91aa878dab Typo 2020-07-17 21:02:32 +12:00
David Rowe
62937c2bef Fix avatar not displaying when recording is re-loaded 2020-07-16 10:11:32 +12:00
Kasen IO
4b1e82fc0b Move user agent to networking constants. 2020-07-08 14:18:24 -04:00
kasenvr
2cc5679ca2
Merge pull request #435 from HifiExperiments/model 
Possible fix for entity server crash
 2020-07-04 17:38:21 -04:00
HifiExperiments
ef105e7de0 how about this 2020-06-10 15:56:02 -07:00
HifiExperiments
ae8879a558 possible fix for entity server crash 2020-06-08 16:58:21 -07:00
Dale Glass
b2a5e7fdd1 Additional review fixes 2020-06-08 17:53:27 +02:00
Dale Glass
303f10dada Review fixes 2020-06-07 02:47:39 +02:00
Dale Glass
8700214239 Add alternate audio stats without text formatting for the exporter 2020-06-07 02:47:39 +02:00
Dale Glass
a8bd627cda Add Prometheus exporter 
Exports domain statistics for the domain on port 9703 (officially reserved)
 2020-06-07 02:47:39 +02:00
Kasen IO
21fd10d154 Revert commit 359248829c using -m 1 to temporarily fix issue 383. 2020-06-03 16:08:18 -04:00
David Rowe
2d070e630b Merge branch 'master' into fix/jsdoc-fixes 
# Conflicts:
#	interface/resources/qml/hifi/avatarapp/MessageBoxes.qml
#	interface/resources/qml/hifi/commerce/checkout/Checkout.qml
#	interface/resources/qml/hifi/commerce/purchases/Purchases.qml
#	interface/src/Application.cpp
 2020-04-26 20:38:43 +12:00
David Rowe
ffeb37e7aa Merge remote-tracking branch 'hifi/master' into merge-hifi-master 
# Conflicts:
#	CMakeLists.txt
#	README.md
#	cmake/externals/glad32es/CMakeLists.txt
#	cmake/externals/glad41/CMakeLists.txt
#	cmake/externals/glad45/CMakeLists.txt
#	cmake/externals/polyvox/CMakeLists.txt
#	cmake/externals/quazip/CMakeLists.txt
#	cmake/externals/vhacd/CMakeLists.txt
#	cmake/init.cmake
#	cmake/ports/hifi-deps/CONTROL
#	cmake/ports/sdl2/CONTROL
#	cmake/ports/sdl2/disable-hidapi-for-uwp.patch
#	cmake/ports/sdl2/enable-winrt-cmake.patch
#	cmake/ports/sdl2/fix-arm64-headers.patch
#	cmake/ports/sdl2/fix-x86-windows.patch
#	cmake/ports/sdl2/portfile.cmake
#	cmake/ports/sdl2/vcpkg-cmake-wrapper.cmake
#	cmake/ports/tbb/portfile.cmake
#	hifi_vcpkg.py
#	interface/src/avatar/MyAvatar.h
#	libraries/avatars-renderer/src/avatars-renderer/Avatar.h
#	libraries/avatars/src/AvatarData.h
#	libraries/entities-renderer/src/RenderableEntityItem.h
#	libraries/entities/src/EntityItem.cpp
#	libraries/entities/src/EntityItem.h
#	libraries/fbx/src/GLTFSerializer.cpp
#	libraries/graphics-scripting/src/graphics-scripting/Forward.h
#	libraries/networking/src/AddressManager.cpp
#	libraries/networking/src/DomainHandler.h
#	libraries/procedural/src/procedural/ProceduralMaterialCache.cpp
#	libraries/render-utils/src/HighlightEffect.cpp
#	libraries/render-utils/src/MeshPartPayload.cpp
#	libraries/render-utils/src/Model.cpp
#	libraries/render-utils/src/RenderShadowTask.cpp
#	libraries/script-engine/src/WebSocketClass.cpp
 2020-04-09 16:46:27 +12:00
David Rowe
1a4266a64a Review JSDoc updates from recent commits 2020-01-20 14:33:06 +13:00
Kasen IO
c34cd996df change Metaverse API from setting 2019-12-20 11:39:05 +01:00
Brad Hefta-Gaub
2d56d7c026
Merge pull request #16551 from ctrlaltdavid/DEV-1943 
DEV-1943: Make MyAvatar.getAvatarEntityData() return all properties
 2019-12-13 10:53:24 -08:00
Simon Walton
82ed358323 Merge remote-tracking branch 'upstream/master' into linux-actions-builds 
Also merge in Linux PR build
 2019-12-05 16:19:12 -08:00
David Rowe
200ff2499e Include localVelocity etc. to match Entity.getEntityProperties() 2019-12-01 21:24:40 +13:00
David Rowe
9d3e9f6a78 Add new Avatar.getAvatarEntityData() method for API 2019-12-01 16:35:05 +13:00
David Rowe
c7f82a8264 Add new MyAvatar.getAvatarEntityData() implementation for API 2019-11-28 17:10:19 +13:00
David Rowe
9144e78cb9 Rename current getAvatarEntityData() method and use internally 2019-11-28 16:30:26 +13:00
Simon Walton
e3ae92ec84 Send notification whenever screen-share zone changes 2019-11-26 16:06:25 -08:00
Simon Walton
65fcf898be Use null zone id for leaving a screen zone 2019-11-26 13:40:37 -08:00
Simon Walton
8b2fc968f6 Fix logic in zone-checking code, other clean-up 2019-11-26 13:32:50 -08:00
Simon Walton
6b371ec388 Changes to avatar mixer to use screenshare zones 2019-11-25 18:30:53 -08:00
Simon Walton
27d3b493fa Initial Linux GHA build 2019-11-20 16:15:39 -08:00
jennaingersoll
451ffcd1e0
Merge pull request #16492 from jennaingersoll/jsdoc-revisions 
DOC-208: Revisions to JSDoc added by developers since July 2019
 2019-11-19 11:01:18 -08:00
ingerjm0
d2118f0aac DOC-208 revisions 2019-11-18 20:05:08 -08:00
Sabrina Shanman
518d6a530a
Merge pull request #16507 from highfidelity/master 
Merge master into instancing
 2019-11-18 13:54:33 -08:00
ingerjm0
ed9db81bed Fix for displaying moved properties' documentation in docs 2019-11-13 14:58:32 -08:00
Zach Fox
8aea0dd951 Merge in Howard's 'screenshare presence' open PR 2019-11-13 10:11:16 -08:00
Sabrina Shanman
769a332d22
Merge pull request #16485 from highfidelity/master 
Merge master into instancing
 2019-11-12 10:07:28 -08:00
Ken Cooke
63eb905712 Redefine audio zone attenuation coefficient of 1.0 to mean "silent at any distance" 
instead of extreme rate of falloff with distance.
 2019-11-09 09:32:00 -08:00
Sabrina Shanman
eebb9ad51f
Merge pull request #16475 from highfidelity/master 
Merge master into instancing
 2019-11-08 10:10:50 -08:00
Anthony J. Thibault
da7b835144 Fix for avatar recordings not playing back blendshapes 2019-11-05 11:10:52 -08:00
sabrina-shanman
7b14c00540 Merge branch 'master' into instancing 2019-11-05 10:22:24 -08:00
Zach Fox
c39dbc600d
Merge pull request #16441 from zfox23/enableHashMapSignalsForESS 
Implement DEV-2654: Allow ESS to make use of signals like `avatarRemovedEvent`
 2019-11-04 11:59:15 -08:00
HifiExperiments
bae2ba7bae merge with master 2019-11-02 01:08:56 -07:00
Zach Fox
3a606d1907 Implement DEV-2654: Allow ESS to make use of signals like 2019-11-01 14:41:11 -07:00
Sabrina Shanman
05ac16536e
Merge pull request #16436 from highfidelity/master 
Merge master into instancing
 2019-10-31 17:39:15 -07:00
Anthony Thibault
f99bb3ec77
Merge pull request #16400 from hyperlogic/feature/arkit-blendshapes 
Extended avatar blendshape support for ARKit compatiblity
 2019-10-31 12:33:50 -07:00
Sabrina Shanman
e8b963b59a
Merge pull request #16425 from highfidelity/master 
Merge master into instancing
 2019-10-30 09:16:04 -07:00
Howard Stearns
368b2bce90
Merge pull request #16375 from SimonWalton-HiFi/avatar-challenge-persist 
DEV-2390: Persist in checking owner and sending challenges for failures
 2019-10-29 08:48:59 -07:00