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
7ed117dfcb
Replace links to docs.highfidelity.com
2020-01-24 10:18:55 +13:00
David Rowe
00bd81b8c3
using MyAvatar.getTargetAvatar or AvatarList.getAvatar.
2019-12-24 09:52:19 +13:00
David Rowe
ccc4be5312
Revise extended avatar blend shapes JSDoc
2019-12-18 12:54:56 +13:00
David Rowe
427aa851b3
Fix up links to avatar standards guide
2019-12-18 09:51:34 +13:00
David Rowe
34958ddb71
Address some JSDoc issues identified by makitsune
2019-12-18 08:01:20 +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
Anthony J. Thibault
404d1a3c93
Fix several bugs for eye tracking from input plugins to function
2019-11-21 17:57:44 -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
Anthony J. Thibault
217e17b4ac
Fix for inadvertant comment
...
This was likely breaking the avatar override feature.
2019-11-15 11:19:10 -08:00
Andrew Meadows
9d92546a8b
revert the revert of PR-16307
2019-11-14 09:59:43 -08:00
ingerjm0
417856fec4
JSDoc updates for PR16399
2019-11-12 20:45:20 -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
8d07d401c3
Add a line of JSDoc
2019-11-01 14:45:07 -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
Anthony Thibault
edb181bd16
Merge pull request #16317 from luiscuenca/setAvatarLookAtAPI
...
DEV-2285: Improve eyes look at
2019-10-23 20:42:27 -07:00
Anthony J. Thibault
f28d317914
Clean up reamining issues
2019-10-23 16:43:10 -07:00
luiscuenca
9432a37567
Undo changes in HeadData.cpp
2019-10-23 14:26:53 -07:00
luiscuenca
bb0849d3a0
Move changes to Head and remove leftover code
2019-10-23 14:23:29 -07:00
Anthony J. Thibault
03f88f696d
Renamed LipsTogether to MouthClose and bug fixes.
2019-10-21 19:37:57 -07:00
Anthony J. Thibault
92f1b59cc8
Full legacy API and FST support
2019-10-18 16:30:32 -07:00
luiscuenca
9f0e82e1e6
Improve eye's look at and blinking. Fix look at update
2019-10-16 15:29:28 -07:00
Anthony J. Thibault
389f5a1d33
ARKit Blendshape hookup work
2019-10-16 10:36:39 -07:00
Anthony J. Thibault
da0911e01b
Delete legacy blendshape code
...
Move FaceshiftConstants to BlendshapeConstants.
Delete FaceTracker and DdeFaceTracker classes.
Delete old facetracker menu and preferences
2019-10-16 10:36: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
luiscuenca
505813b3c3
Fix blink async and other is talking bug
2019-10-14 10:44:55 -07:00
Brad Hefta-Gaub
51669e1ac3
Revert "DEV-1811: apply deletion rules to linked entities"
2019-10-11 11:06:10 -07:00
Maia Hansen
07b916f0b7
Merge pull request #16307 from AndrewMeadows/colossal-cave
...
DEV-1811: apply deletion rules to linked entities
2019-10-10 13:24:43 -07:00
luiscuenca
fc018257e1
Select avatar to look using API. Blink when look at change
2019-10-09 12:20:35 -07:00
Andrew Meadows
8ab70225d9
apply delete rules down linked hierarchy
2019-10-07 14:38:36 -07:00
David Rowe
605d272392
Merge branch 'master' into DOC-111
2019-09-20 10:25:21 +12:00
David Rowe
d5e08d19e3
Fix JSDoc for miscellaneous white space issues
2019-09-20 08:17:24 +12:00
Seth Alves
5c570d28a0
remove old/unused eyetracker code
2019-09-17 09:43:20 -07:00
Anthony J. Thibault
c35640f739
Warning fixes and small bug fix to anim stats
2019-09-05 14:54:19 -07:00
HifiExperiments
97b9179144
merge with master
2019-09-05 00:46:56 -07:00
Simon Walton
abad9868ae
Log when avatar data becomes avatar-failed
2019-08-19 12:12:10 -07:00
Simon Walton
150b4e45d4
More robust handling of the avatar verify-failed property
2019-08-16 17:30:28 -07:00
Shannon Romano
9e0e6f9d5e
Merge pull request #16003 from ctrlaltdavid/DOC-84
...
DOC-84: Update JSDoc with glTF
2019-08-06 13:22:04 -07:00
David Rowe
e5c58d5ba5
Fix JSDoc typo noticed in passing
2019-07-30 11:37:20 +12:00
David Rowe
ade85ad8c0
Update API JSDoc with glTF
2019-07-30 10:41:07 +12:00
David Rowe
cf9e563458
Miscellaneous JSDoc fixes noticed in passing
2019-07-19 08:37:10 +12:00
SamGondelman
60600779c9
merge with master
2019-07-12 11:01:17 -07:00
Simon Walton
597477614c
Debugging for missing Avatar Data
2019-07-03 17:51:05 -07:00
Sam Gondelman
e4847cc4ae
Merge branch 'master' into proceduralMesh
2019-06-24 10:16:45 -07:00
jennaingersoll
1935b49538
Merge pull request #15676 from ctrlaltdavid/DOC-33
...
DOC-33: MyAvatar API JSDoc catch-up
2019-06-11 15:05:06 -07:00
Anthony J. Thibault
897e276188
Compile fix
2019-06-10 18:34:11 -07:00
