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
