Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-19 07:00:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
85427 commits 72 branches 59 tags 1.2 GiB
Commit graph

3772 commits

Author SHA1 Message Date
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
Simon Walton
285d73a802 Fix transition from verify-failed to noncertified 2019-10-28 17:47:46 -07:00
Simon Walton
6bceba7300 Use real avatar URL for verification rather than possible stolen-woody 2019-10-25 16:29:05 -07:00
Sabrina Shanman
e74de214e2
Merge pull request #16404 from highfidelity/master 
Merge master into instancing
 2019-10-25 09:55:44 -07:00
HifiExperiments
1e100a672e merge with master and try to fix opacity mode stuff 2019-10-23 22:21:45 -07:00
Anthony J. Thibault
d43d12dfa7 Merge branch 'master' into feature/arkit-blendshapes 2019-10-23 21:45:10 -07:00
Zach Fox
f325cef4d6 Implement DEV-257: Allow scripts running on the ESS to access avatar info via the AvatarHashMap 2019-10-22 15:45:49 -07:00
Anthony J. Thibault
92f1b59cc8 Full legacy API and FST support 2019-10-18 16:30:32 -07:00
Simon Walton
f573f8e03b Re-use challenge nonce until challenge succeeds 2019-10-18 14:37:04 -07:00
Sabrina Shanman
5d91d22314
Merge pull request #16379 from highfidelity/master 
Merge master into instancing
 2019-10-18 10:24:35 -07:00
Simon Walton
6bcb9f64f7 Persist in checking owner and sending challenges for failures 2019-10-17 17:29:14 -07:00
Simon Walton
84eab3cdd4 Remove excessive avatar-mixer logging 2019-10-16 16:58:37 -07:00
Anthony J. Thibault
8411e6b033 Blendshape script API work 
* Moved hasScriptedBlendshapes, hasProceduralBlinkFaceMovement, hasProceduralEyeFaceMovement, hasAudioEnabledFaceMovement to AvatarData
  so they are accessable via agent scripts.
* Marked setForceFaceTrackerConnected as depricated.
* Updated jsdoc comments
 2019-10-16 10:36:35 -07:00
Sabrina Shanman
63fa9afa13
Merge pull request #16323 from highfidelity/master 
Merge master into instancing
 2019-10-09 16:59:54 -07:00
Maia Hansen
6b5f90f641
Merge pull request #16315 from jherico/qt_5.13 
Qt 5.13 changes
 2019-10-09 15:04:07 -07:00
Brad Davis
960cab9994 Qt 5.13 warnings & fixes 2019-10-08 15:40:13 -07:00
Howard Stearns
9d17c32ff4
Merge pull request #16309 from SimonWalton-HiFi/assignment-client-logging-for-paging 
DEV-2329: Identify Alerting requirements for Assignment Client reliable operation
 2019-10-08 15:35:22 -07:00
Simon Walton
f63360a87a Change read back to peek - guess it was that way for a reason 2019-10-08 11:01:42 -07:00
Simon Walton
f73a7c0883 Modified AC logging for paging requirements 2019-10-07 17:35:14 -07:00
jennaingersoll
47aa43f56a
Merge pull request #16251 from ctrlaltdavid/DOC-155 
DOC-155: EntityViewer JSDoc
 2019-10-07 15:45:42 -07:00
Sabrina Shanman
2fcb526a5c
Merge pull request #16305 from highfidelity/master 
Merge master into instancing
 2019-10-07 15:44:42 -07:00
Simon Walton
67d80cdd15 Add per-Node & ESS-specific stats 2019-10-04 15:38:05 -07:00
Simon Walton
6a4406ad12 Put generic stats in sendStatsPacket() stub 2019-10-03 17:46:52 -07:00
Sam Gateau
1d19671e88 Merge branch 'master' of github.com:highfidelity/hifi into instancing 2019-10-01 11:27:16 -07:00
Atlante45
a4c857315a Add shutdown annotations for crash reporting 2019-09-30 14:54:17 -07:00
David Rowe
0cafae2422 EntityViewer JSDoc 2019-09-26 10:54:12 +12:00
Simon Walton
6ccfc37f27 Merge remote-tracking branch 'upstream/master' into connection-class-ignored-unused 2019-09-25 13:06:32 -07:00
Brad Hefta-Gaub
068fb0e177
Merge pull request #16240 from ctrlaltdavid/BUGZ-577 
BUGZ-577: Implement Recording.setPlayerVolume()
 2019-09-25 10:31:57 -07:00
Simon Walton
4f11e46b5e Don't move Connection class to changed address until it's used 2019-09-24 16:39:59 -07:00
David Rowe
2fe24b39db Code review 2019-09-25 07:50:56 +12:00
David Rowe
f60e863b66 Remove wayward comment 2019-09-24 16:36:11 +12:00
David Rowe
b174e002a9 Implement Recording.setPlayerVolume() 2019-09-24 12:52:51 +12:00
Clement
1ca30b688d Put flush timer on right thread without parenting 2019-09-20 15:39:35 -07:00
Clement
527b27b32d Make sure the flush timer is not spawned too early 2019-09-18 17:05:05 -07:00
sabrina-shanman
76b1f551b1 Merge branch 'master' into instancing 2019-09-16 10:17:59 -07:00
sabrina-shanman
5837053f50 Fix miscellaneous build errors/warnings 2019-09-13 16:56:30 -07:00
Shannon Romano
65d0bb1342
Merge pull request #15906 from kasenvr/kpi-v1-modkit-rc 
Kasen Plugin Infrastructure v½ Codename "Modkit Mini"
 2019-09-11 13:04:01 -07:00
Clement
3b734b2222 Always stop challenge timer from the right thread 2019-09-09 16:01:45 -07:00
Andrew Meadows
0a8c640ab5 give entity-script-server a simulation 2019-09-06 17:23:38 -07:00
Andrew Meadows
6e35c8b804 cleanup 2019-09-06 17:23:38 -07:00
humbletim
271fac4bca Merge remote-tracking branch 'upstream/master' into kasenvr-kpi-v1-modkit-rc-merge 2019-09-05 09:46:21 -04:00
HifiExperiments
97b9179144 merge with master 2019-09-05 00:46:56 -07:00
Clement
86b635d80a Add context object to timer connection 2019-09-03 13:40:02 -07:00
Howard Stearns
26256c383a
Merge pull request #16081 from SimonWalton-HiFi/avatar-thrashing 
DEV-336: Fixes for avatar-verify failures with rapid avatar selection
 2019-08-22 15:58:24 -07:00
Simon Walton
3d2e5dc816 Change method name for consistency 2019-08-21 14:19:57 -07:00
Simon Walton
cf21bc438e Remove unused function and debugging variable 2019-08-21 14:00:13 -07:00
Simon Walton
9d0cd83ca4 Better handling of challenge timer 2019-08-21 11:59:04 -07:00
Simon Walton
61668d3480 Handle concurrent verify operations better; other improvements 2019-08-20 18:03:46 -07:00
Simon Walton
2fafb6822d Remove identity-resend hack - shouldn't be required now 2019-08-16 18:03:20 -07:00
Simon Walton
4de720a456 Enable the event-queue hack on Linux in addition to Windows 2019-08-09 11:12:33 -07:00
Roxanne Skelly
2e5127fa98 Merge branch 'master' of https://github.com/highfidelity/hifi into bugz1046 2019-08-07 10:40:23 -07:00