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
|
427aa851b3
|
Fix up links to avatar standards guide
|
2019-12-18 09:51:34 +13:00 |
|
Brad Hefta-Gaub
|
fb70569fc2
|
Merge pull request #16548 from HifiExperiments/visible
Case 17368: Fix wearables not disappearing with avatar
|
2019-12-13 13:20:15 -08:00 |
|
SamGondelman
|
1736252f0d
|
trying and failing to fix models
|
2019-12-12 23:04:47 -05:00 |
|
SamGondelman
|
398562321d
|
fix wearables not disappearing with avatar
|
2019-12-12 23:02:57 -05:00 |
|
HifiExperiments
|
e0a29d9367
|
material entities support cullFaceMode and support gltf doubleSided
|
2019-12-12 23:01:57 -05:00 |
|
HifiExperiments
|
3dfd63d46b
|
merge with master
|
2019-11-26 20:42:44 -08:00 |
|
HifiExperiments
|
69714a89ca
|
material entities support cullFaceMode and support gltf doubleSided
|
2019-11-26 14:48:48 -08:00 |
|
Anthony J. Thibault
|
404d1a3c93
|
Fix several bugs for eye tracking from input plugins to function
|
2019-11-21 17:57:44 -08:00 |
|
Anthony J. Thibault
|
9d6ce44131
|
Head is now computed in proper sensor space
Eye tracking now works.
|
2019-11-20 15:30:16 -08:00 |
|
Brad Hefta-Gaub
|
0f428f0afb
|
Merge pull request #16498 from DouglasWilcox/improve_seated_rotation
Improve seated rotation
|
2019-11-19 10:22: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 |
|
DouglasWilcox
|
37010648be
|
Abandon exponential acceleration and use constant acceleration. Hook up turn->sit transitions.
|
2019-11-14 13:12:01 -08:00 |
|
Andrew Meadows
|
9dd0105ba5
|
only one copy of entityIDs instead of two
|
2019-11-14 09:59:43 -08:00 |
|
Andrew Meadows
|
0f2d9027e1
|
fix indentation
|
2019-11-14 09:59:43 -08:00 |
|
Andrew Meadows
|
3546bab19a
|
use std::vector<> instead of QVector<>
|
2019-11-14 09:59:43 -08:00 |
|
Andrew Meadows
|
9d92546a8b
|
revert the revert of PR-16307
|
2019-11-14 09:59:43 -08:00 |
|
DouglasWilcox
|
995f5f92cd
|
Do not use turningSpeed when setting seatedTurn vars, and iterate acceleration formula
|
2019-11-12 11:11:19 -08:00 |
|
DouglasWilcox
|
c36c4a17b1
|
first pass hookup of seated rotation with acceleration and animation response
|
2019-11-11 11:31:34 -08:00 |
|
sabrina-shanman
|
7b14c00540
|
Merge branch 'master' into instancing
|
2019-11-05 10:22:24 -08:00 |
|
HifiExperiments
|
bae2ba7bae
|
merge with master
|
2019-11-02 01:08:56 -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 |
|
luiscuenca
|
ab6631fae3
|
Fix look at update and allow to release control
|
2019-10-28 17:51:29 -07:00 |
|
Anthony J. Thibault
|
8cf58f2034
|
Fix for unused avatar transit warnings on mac and linux
This was introduced by PR #16403
https://github.com/highfidelity/hifi/pull/16403
|
2019-10-25 13:56:12 -07:00 |
|
Sabrina Shanman
|
c5884fd585
|
Merge pull request #16405 from highfidelity/master
Merge master into instancing
|
2019-10-25 10:28:57 -07:00 |
|
Sabrina Shanman
|
e74de214e2
|
Merge pull request #16404 from highfidelity/master
Merge master into instancing
|
2019-10-25 09:55:44 -07:00 |
|
Anthony J. Thibault
|
a67904212d
|
Remove AvatarTransit log spam
|
2019-10-24 15:52: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 |
|
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
|
bb0849d3a0
|
Move changes to Head and remove leftover code
|
2019-10-23 14:23:29 -07:00 |
|
Anthony J. Thibault
|
61b9f08fec
|
Blendshapes for OtherAvatars should update even if no joints have changes.
|
2019-10-22 22:19:03 -07:00 |
|
Sabrina Shanman
|
5d91d22314
|
Merge pull request #16379 from highfidelity/master
Merge master into instancing
|
2019-10-18 10:24:35 -07:00 |
|
luiscuenca
|
33ea63c708
|
Fix warnings and update controls
|
2019-10-17 15:06:12 -07:00 |
|
luiscuenca
|
63c2b41929
|
Restate legacy first person camera mode
|
2019-10-17 13:26:42 -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
|
6efd74a339
|
WIP adding blendshapes to input system
|
2019-10-16 10:36:38 -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 |
|
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 |
|
Sam Gateau
|
abaf0262a7
|
Merge branch 'master' of https://github.com/highfidelity/hifi into instancing
|
2019-10-08 18:55:51 -07:00 |
|
David Rowe
|
f224832d27
|
Merge branch 'master' into DOC-111
|
2019-10-08 20:44:13 +13:00 |
|