sabrina-shanman
|
be9931bcab
|
Move skinning reweighting code out of model prep to hfm library; use in FBXSerializer.
|
2019-10-18 10:08:45 -07:00 |
|
sabrina-shanman
|
acbdd2b3b5
|
Fix not building due to removed shape.transform
|
2019-10-16 17:04:19 -07:00 |
|
sabrina-shanman
|
0c3e81f52f
|
Merge branch 'instancing' of github.com:highfidelity/hifi into instancing_gltf
|
2019-10-16 14:03:01 -07:00 |
|
sabrina-shanman
|
5df4092f67
|
Merge branch 'instancing_gtlf_wip' into instancing_gltf
|
2019-10-16 13:40:23 -07:00 |
|
Sam Gateau
|
e9e9d1cdfe
|
Merge branch 'instancing' of github.com:highfidelity/hifi into instancing
|
2019-10-16 13:15:40 -07:00 |
|
Sam Gateau
|
af269a4720
|
Merge branch 'master' of github.com:highfidelity/hifi into upstream-instancing
|
2019-10-16 11:57:15 -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
|
0a9c389641
|
last issue
|
2019-10-16 08:06:35 -07:00 |
|
Sam Gateau
|
fc4a314fd3
|
Merge branch 'instancing' of https://github.com/highfidelity/hifi into instancing
|
2019-10-16 04:08:58 -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 |
|
Sam Gateau
|
f049ab7887
|
Understanding that CLuster can be just one for a mesh and we need the bindingMatrix to be applied correctly, differenciating intentionnally the transform for bound evaluation and the one used for render in the case of SKinned mesh because the clusterMatrices contain the extra offset from rig to model
|
2019-10-15 18:12:09 -07:00 |
|
dooglifeSF
|
0510215240
|
Move magic number to constant for SLOW_SPEED_THRESHOLD.
|
2019-10-15 17:48:06 -07:00 |
|
Shannon Romano
|
bebb21fa9e
|
Merge pull request #16352 from hyperlogic/bug-fix/legacy-sit-script
Bugfix for legacy sit scripts
|
2019-10-15 16:19:49 -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 |
|
Zach Fox
|
1527bf2e11
|
Merge pull request #16294 from RebeccaStankus/friction
First Time User Experience Project
|
2019-10-15 14:56:25 -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 |
|
Seth Alves
|
1f8a7cfea7
|
fix step translate actions
|
2019-10-15 09:23:35 -07:00 |
|
Sam Gateau
|
108d331d86
|
more
|
2019-10-14 17:45:07 -07:00 |
|
sabrina-shanman
|
acca22e2d6
|
Remove unused primitive reference in GLTFSerializer
|
2019-10-14 15:30:03 -07:00 |
|
sabrina-shanman
|
2c99ab5e54
|
Merge branch 'instancing' of github.com:highfidelity/hifi into instancing_gltf
|
2019-10-14 15:05:13 -07:00 |
|
Sabrina Shanman
|
c38462bf6d
|
Merge pull request #16345 from highfidelity/master
Merge master into instancing
|
2019-10-14 14:54:22 -07:00 |
|
sabrina-shanman
|
82247072de
|
Create new mesh if GLTF primitive has different vertex attributes
|
2019-10-14 14:51:57 -07:00 |
|
Zach Fox
|
341abb8185
|
Merge branch 'master' of github.com:highfidelity/hifi into friction
|
2019-10-14 12:36:35 -07:00 |
|
Zach Fox
|
a1b6b0af35
|
Merge pull request #16336 from ctrlaltdavid/DEV-1867
DEV-1867: Fix toolbarTest.js
|
2019-10-14 11:50:59 -07:00 |
|
Sam Gateau
|
95cabb7597
|
Merge branch 'master' of github.com:highfidelity/hifi into instancing
|
2019-10-14 10:04:25 -07:00 |
|
Shannon Romano
|
83875089e4
|
Merge pull request #16328 from Atlante45/fix/account-settings
DEV-2376: Don't post account settings after pull
|
2019-10-14 08:49:22 -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 |
|
Sam Gateau
|
8af507571c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into instancing
|
2019-10-12 20:04:20 -07:00 |
|
Sam Gateau
|
8a1f3648f9
|
fooling around to get the cluster working
|
2019-10-11 18:06:44 -07:00 |
|
sabrina-shanman
|
6b46f8e6c4
|
Remove empty for loop
|
2019-10-11 14:51:48 -07:00 |
|
sabrina-shanman
|
99a2fedd5f
|
Quick fix for non-matching vertex attributes in GLTF mesh primitives
|
2019-10-11 14:16:30 -07:00 |
|
David Rowe
|
f944604120
|
Deprecate Toolbar API's addButton() and removeButton() methods
|
2019-10-12 10:10:27 +13:00 |
|
Brad Hefta-Gaub
|
51669e1ac3
|
Revert "DEV-1811: apply deletion rules to linked entities"
|
2019-10-11 11:06:10 -07:00 |
|
Sam Gateau
|
336f16e634
|
Merge branch 'master' of https://github.com/highfidelity/hifi into instancing
|
2019-10-10 19:27:17 -07:00 |
|
Clement
|
3b21dfcd0a
|
CR
|
2019-10-10 17:49:51 -07:00 |
|
Sam Gateau
|
a995f2c09f
|
in the middle of something
|
2019-10-10 17:09:54 -07:00 |
|
sabrina-shanman
|
8e69905e0e
|
Merge branch 'instancing' of github.com:highfidelity/hifi into instancing_gltf
|
2019-10-10 16:16:37 -07:00 |
|
Clement
|
390c7b14c9
|
Don't post account settings after pull
Account settings would always get pushed after a pull even if they
hadn't changed
|
2019-10-10 15:55:19 -07:00 |
|
Zach Fox
|
19acd76854
|
Modify InteractiveWindow positions in C++ instead of JS, resulting in huge speedup
|
2019-10-10 15:48:40 -07:00 |
|
Ken Cooke
|
8325ee2c8e
|
Merge pull request #16327 from kencooke/audio-device-sleep-wake
DEV-1901: No audio in Interface when restoring from sleep
|
2019-10-10 15:12:07 -07:00 |
|
Ken Cooke
|
ec67b67966
|
On waking from sleep/hibernate, restart the audio devices
|
2019-10-10 14:10:47 -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 |
|
sabrina-shanman
|
bf65711e04
|
Fix build warning with cluster.jointIndex in FBXSerializer
|
2019-10-10 11:14:58 -07:00 |
|
sabrina-shanman
|
f9dd3a9aec
|
Merge branch 'instancing' of github.com:highfidelity/hifi into instancing_gltf
|
2019-10-10 10:16:01 -07:00 |
|
Sam Gateau
|
c0e4509095
|
Merge branch 'master' of github.com:highfidelity/hifi into instancing
|
2019-10-10 09:04:38 -07:00 |
|
Sam Gateau
|
3e8d6671f7
|
Merge branch 'instancing' of github.com:highfidelity/hifi into instancing
|
2019-10-10 09:04:22 -07:00 |
|
Brad Hefta-Gaub
|
1316f9b046
|
Merge pull request #16301 from dooglifeSF/drivekey_anim_triggers
Drivekey anim triggers
|
2019-10-09 18:25:10 -07:00 |
|
sabrina-shanman
|
9fd3d44a0d
|
Make GLTF joint.globalTransform more correct
|
2019-10-09 17:32:28 -07:00 |
|
sabrina-shanman
|
d3ed0bc71b
|
Remove unused joint/transform calculation in GLTFSerializer
|
2019-10-09 17:32:27 -07:00 |
|
sabrina-shanman
|
726a91cdb9
|
Fix un-transformed vertex being added to extents instead of transformed one
|
2019-10-09 17:32:27 -07:00 |
|