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
Dale Glass
d0dc041275
Another default operator= and copy constructor
2020-01-19 11:24:51 +01:00
Dale Glass
68d10a2fe1
Make default copy constructors explicit
...
Recent versions of gcc generate a warning without this
2020-01-19 00:20:49 +01:00
David Rowe
ec1e6bc7d3
Merge branch 'DOC-55-C' into api-docs
2020-01-14 18:04:32 +13:00
David Rowe
b9a1b78531
Merge branch 'DOC-68' into api-docs
...
# Conflicts:
# libraries/shared/src/RegisteredMetaTypes.h
2020-01-14 18:02:23 +13:00
Seth Alves
82bddeb5a7
fix linux build
2020-01-03 10:27:43 -08:00
David Rowe
2dd981493e
Update classes' JSDoc per @hideconstructor
2019-12-23 14:13:48 +13:00
David Rowe
8255a50cde
Update MeshProxy and Entities.getMeshes() JSDoc
2019-12-20 13:34:21 +13:00
David Rowe
1ebc6a575e
Model API JSDoc
2019-12-20 13:33:48 +13:00
David Rowe
34958ddb71
Address some JSDoc issues identified by makitsune
2019-12-18 08:01:20 +13:00
David Rowe
845d388cbf
Fix AvatarEntityMap string values to be primitives, not objects
2019-11-28 13:56:33 +13:00
Seth Alves
ea2c6b4dfb
fix linux build
2019-11-22 11:35:23 -08:00
Sabrina Shanman
518d6a530a
Merge pull request #16507 from highfidelity/master
...
Merge master into instancing
2019-11-18 13:54:33 -08:00
Sam Gateau
6370059a96
Merge pull request #16483 from AndrewMeadows/debug-workload-selection
...
Add tools for debugging entity workload proxies
2019-11-18 11:02:00 -08:00
Andrew Meadows
9d92546a8b
revert the revert of PR-16307
2019-11-14 09:59:43 -08:00
Andrew Meadows
cf08a4162a
add workload job to help debug entity proxies
2019-11-12 10:35:16 -08:00
Sabrina Shanman
eebb9ad51f
Merge pull request #16475 from highfidelity/master
...
Merge master into instancing
2019-11-08 10:10:50 -08:00
Shannon Romano
d30f30191f
Merge pull request #16457 from jennaingersoll/doc-193
...
DOC-193 Clarified legacy vs current camera modes
2019-11-06 10:59:32 -08:00
ingerjm0
499a0a8067
Clean up code per review
2019-11-05 14:14:46 -08:00
ingerjm0
faa4c97f8a
Revisions per review
2019-11-05 14:04:01 -08:00
ingerjm0
27d4bfdd01
DOC-193 #comment Documented legacy vs current camera modes, along with code samples to re-enable legacy code
2019-11-05 12:20:51 -08:00
sabrina-shanman
88b6472ced
Fix build warning
2019-11-05 10:57:55 -08:00
sabrina-shanman
da5f80c139
Use std::vector types in ShapeInfo
2019-11-05 10:57:55 -08:00
Anthony J. Thibault
101ec9d753
Remove LipsUpperOpen and LipsLowerOpen, the last of the legacy faceshift blendshapes
...
These blendshapes are not present in ARKit and are not used by any of our procedural
face animations (talking, blinking etc). This change should have been part of #16400 but
was accidently left out.
2019-11-04 09:49:24 -08:00
Sabrina Shanman
05ac16536e
Merge pull request #16436 from highfidelity/master
...
Merge master into instancing
2019-10-31 17:39:15 -07:00
Sam Gateau
465e8c3e18
Prototyping the slim mesh generation
2019-10-31 12:58: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
Oren Hurvitz
35082a730e
Changed the desktop sprint speed to 2.0.
...
This change will not actually be felt by users, because the speed was already effectively 2.0
(because the sprint speeds for Desktop and HMD were reversed).
2019-10-27 09:35:16 +02:00
Anthony J. Thibault
d43d12dfa7
Merge branch 'master' into feature/arkit-blendshapes
2019-10-23 21:45:10 -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
63c2b41929
Restate legacy first person camera mode
2019-10-17 13:26:42 -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
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
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
Brad Davis
960cab9994
Qt 5.13 warnings & fixes
2019-10-08 15:40:13 -07:00
Andrew Meadows
5a81ed73fe
don't allow null Physics::sessionUUID
2019-10-07 14:38:36 -07:00
Andrew Meadows
aef8ac6bf0
make SpatialParentFinder base class pure virtual
2019-10-07 14:38:36 -07:00
Brad Davis
243120b95c
Even better frame capture
2019-10-04 14:57:39 -07:00
Atlante45
a4c857315a
Add shutdown annotations for crash reporting
2019-09-30 14:54:17 -07:00
Brad Davis
403499bf32
Cleaning up android build warnings
2019-09-27 09:19:52 -07:00
Shannon Romano
bd488f0196
Merge pull request #16144 from luiscuenca/addLookAtThirdCamera
...
DEV-391: Keyboard Input Controls Camera Not Avatar Orientation
2019-09-20 13:03:03 -07:00
luiscuenca
365aa1bf03
Add jdoc to camera modes and fix variable namings
2019-09-19 17:30:01 -07:00
luiscuenca
279e25ca70
Merge master
2019-09-19 13:21:49 -07:00
Clement
527b27b32d
Make sure the flush timer is not spawned too early
2019-09-18 17:05:05 -07:00
luiscuenca
1054e8fcde
Selfie camera and updated camera menus
2019-09-17 17:15:16 -07:00
Seth Alves
73e6be9c37
allow drawing DebugDraw spheres with a specific size
2019-09-17 09:43:19 -07:00
