Kasen IO
21fd10d154
Revert commit 359248829c using -m 1 to temporarily fix issue 383.
2020-06-03 16:08:18 -04: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
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
2dd981493e
Update classes' JSDoc per @hideconstructor
2019-12-23 14:13:48 +13:00
David Rowe
5eb6e9dadd
Add recently added properties to caches' JSDoc
2019-11-26 17:00:13 +13: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
DouglasWilcox
b8e85aedc7
Merge branch 'master' into improve_seated_rotation
2019-11-13 13:11:30 -08:00
sabrina-shanman
516debdcb2
Fix code style / remove cruft
2019-11-13 12:50:13 -08:00
DouglasWilcox
a3de25618a
Handle HMD in input vars and remove/fix json transitions in/out of HMD strafe states.
...
(cherry picked from commit f9f28fc286
2019-11-13 09:52:56 -08:00
DouglasWilcox
f9f28fc286
Handle HMD in input vars and remove/fix json transitions in/out of HMD strafe states.
2019-11-12 14:15:19 -08:00
DouglasWilcox
995f5f92cd
Do not use turningSpeed when setting seatedTurn vars, and iterate acceleration formula
2019-11-12 11:11:19 -08:00
Sabrina Shanman
769a332d22
Merge pull request #16485 from highfidelity/master
...
Merge master into instancing
2019-11-12 10:07:28 -08:00
DouglasWilcox
64634f51b1
Merge branch 'master' into improve_seated_rotation
2019-11-11 11:31:56 -08:00
DouglasWilcox
c36c4a17b1
first pass hookup of seated rotation with acceleration and animation response
2019-11-11 11:31:34 -08:00
dooglifeSF
055d5cdf9b
Simplify boolean statements, revise several settle anims
2019-11-08 13:46:38 -08:00
Sabrina Shanman
eebb9ad51f
Merge pull request #16475 from highfidelity/master
...
Merge master into instancing
2019-11-08 10:10:50 -08:00
dooglifeSF
8e11d91c03
Merge branch 'master' into rand_settles_and_by_momentum
2019-11-07 15:09:10 -08:00
dooglifeSF
73202b9caf
Different settle transition depending on momentum
2019-11-07 09:52:26 -08:00
Anthony J. Thibault
6e7f222608
Fix for assert in AnimBlendDirectional on startup
...
Specifically, std::vector subscript out of range.
2019-11-05 14:16:10 -08:00
Sabrina Shanman
05ac16536e
Merge pull request #16436 from highfidelity/master
...
Merge master into instancing
2019-10-31 17:39:15 -07:00
Oren Hurvitz
70c3bb2748
Emit an event when failing to load an avatar.
...
Previously, MyAvatar only emitted an event (onLoadComplete) if the load succeeded.
Now it also emits an event (onLoadFailed) if the load failed.
2019-10-27 10:55:31 +02:00
sabrina-shanman
4e0db5d641
Fix build warnings
2019-10-24 15:49:03 -07:00
Sabrina Shanman
6db993fe05
Merge pull request #16397 from sabrina-shanman/instancing_skinning
...
(DEV-561) First pass at skinning for GLTF
2019-10-23 15:41:12 -07:00
sabrina-shanman
ca164375f1
New skinning for GLTF
2019-10-23 10:41:36 -07:00
Sam Gateau
a95a4b5aa2
Address warnings and comments from review
2019-10-18 11:43:25 -07:00
Sam Gateau
695b9cdba6
Clening up left over comments and typos, simplify the code to update Matrices in the model classes and removed renderITemsIdMap because not needed, chasing the problem of the physics objects transform
2019-10-18 03:31:06 -07:00
Sam Gateau
e9e9d1cdfe
Merge branch 'instancing' of github.com:highfidelity/hifi into instancing
2019-10-16 13:15:40 -07:00
Shannon Romano
71ef645781
Merge pull request #16351 from dooglifeSF/transition-locomotion-to-idle-based-on-input-and-speed
...
Fix sliding when stopping from run.
2019-10-16 09:03:00 -07:00
Sam Gateau
eecaeb1155
FOund the issue why the skinning was incorrect, removed unecessary data structures in the newly added objects and renamed Deformer to SkinCluster and DYnamicTransform to SkinDeformer
2019-10-16 04:02:05 -07:00
dooglifeSF
0510215240
Move magic number to constant for SLOW_SPEED_THRESHOLD.
2019-10-15 17:48:06 -07:00
Anthony J. Thibault
14e5962675
Bugfix for legacy sit scripts
...
Don't return additive clip nodes as valid "roles" for users to override.
2019-10-15 15:29:24 -07:00
dooglifeSF
a043f0a17e
Create isNotInputSlow var for stategraph switch when no input and speed less than 1.5 m/s
2019-10-15 14:51:42 -07:00
Sam Gateau
05ac9aefa8
the clusterMatrices should be working, but n skin index and weights are assigned yet
2019-10-14 02:21:01 -07:00
dooglifeSF
85b681e70e
switch abs() to fabsf()
2019-10-09 11:07:14 -07:00
dooglifeSF
2a1258968a
Change macro to const float, use floats in control flow.
2019-10-09 10:10:45 -07:00
dooglifeSF
8a262a3d1a
Merge branch 'master' into drivekey_anim_triggers
2019-10-09 07:37:38 -07:00
dooglifeSF
cfa7df7d1a
Refactor the if-logic to remove complexity
2019-10-08 16:14:21 -07:00
dooglifeSF
2626f85f49
Handle multiple inputs, bias towards inputZ instead of inputX, and add a deadzone that matches xbox controller analog deadzone
2019-10-08 15:44:06 -07:00
David Rowe
1106d8fdfa
Doc review
2019-10-08 21:15:16 +13:00
David Rowe
f224832d27
Merge branch 'master' into DOC-111
2019-10-08 20:44:13 +13:00
dooglifeSF
387f0a3f10
add isInput* and isNotInput vars for use in json, and edit json to use them
2019-10-04 15:28:35 -07:00
Anthony J. Thibault
1068637d39
Fix for avatars that are stuck in idle pose for observers
...
The problem can occur because the default constructor for the NetworkAnimState does not initialize the blendTime member.
This can cause the avatar to remain stuck in an idle pose for observers when blendTime happens to be randomly initialzied to a large negative floating point value.
To fix this we explicitly initialize it to FLT_MAX.
Additionally, a debug print has been added to help diagnose this issue if it occurs again.
2019-10-01 14:28:10 -07:00
David Rowe
605d272392
Merge branch 'master' into DOC-111
2019-09-20 10:25:21 +12:00
luiscuenca
279e25ca70
Merge master
2019-09-19 13:21:49 -07:00
David Rowe
d5e08d19e3
Fix JSDoc for miscellaneous white space issues
2019-09-20 08:17:24 +12:00
luiscuenca
6d98537a20
Clean up code and refactor avatar-animation.json
2019-09-19 10:45:20 -07:00
Shannon Romano
a5fdf5bb40
Merge pull request #16214 from hyperlogic/bug-fix/additive-blend-scale-fix
...
Fix additive blending on avatars with non identity scale.
2019-09-19 09:04:28 -07:00
Anthony J. Thibault
41978aa4a4
Fix additive blending on avatars with non identity scale.
...
Some avatars that have non 1.0 scale values were incorrectly being scaled during additive blends, this fixes that.
2019-09-18 14:42:57 -07:00
