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
