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 |
|
Sam Gateau
|
108d331d86
|
more
|
2019-10-14 17:45:07 -07:00 |
|
Sam Gateau
|
95cabb7597
|
Merge branch 'master' of github.com:highfidelity/hifi into instancing
|
2019-10-14 10:04:25 -07:00 |
|
Sam Gateau
|
8989acd576
|
Merge branch 'instancing' of github.com:highfidelity/hifi into instancing
|
2019-10-14 10:04:20 -07:00 |
|
Zach Fox
|
b45156b44c
|
Merge pull request #16337 from RebeccaStankus/locationText
Added blank placeholder text on focus to text field
|
2019-10-14 12:35:29 -04:00 |
|
Shannon Romano
|
8f7f23480f
|
Merge pull request #16340 from RebeccaStankus/settingsApp
Moved position of settings app.
Something is up with the CLA but this is a valid PR
|
2019-10-14 08:52:35 -07:00 |
|
Shannon Romano
|
ab3787e477
|
Merge pull request #16341 from sethalves/boostrapping
fix typo
|
2019-10-14 08:50:44 -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 |
|
Seth Alves
|
0a01c3ceab
|
boostrapping, not even once.
|
2019-10-13 17:36:32 -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 |
|
Rebecca Stankus
|
4ac87ef503
|
Moved position of settings app
|
2019-10-11 16:20:37 -07:00 |
|
Maia Hansen
|
db75d03f76
|
Merge pull request #16332 from highfidelity/Fix-stand-talk-pops
Fix stand talk pops
|
2019-10-11 15:51:00 -07:00 |
|
Rebecca Stankus
|
21503137d4
|
Added blank placeholder text on focus to text field
|
2019-10-11 14:42:39 -07:00 |
|
Sam Gateau
|
93e266cde5
|
Merge pull request #16333 from highfidelity/revert-16307-colossal-cave
Revert "DEV-1811: apply deletion rules to linked entities"
|
2019-10-11 13:13:55 -07:00 |
|
dooglifeSF
|
0b3823645b
|
Merge branch 'master' into Fix-stand-talk-pops
|
2019-10-11 13:08:26 -07:00 |
|
Maia Hansen
|
330b09d012
|
Merge pull request #16330 from highfidelity/Fix-erratic-seated-idles-and-fidgets
Fix erratic seated idles and fidgets.
|
2019-10-11 11:23:20 -07:00 |
|
Brad Hefta-Gaub
|
51669e1ac3
|
Revert "DEV-1811: apply deletion rules to linked entities"
|
2019-10-11 11:06:10 -07:00 |
|
dooglifeSF
|
96510429ba
|
Fix stand talking pops
|
2019-10-11 10:44:50 -07:00 |
|
dooglifeSF
|
df11977b39
|
remove all transitions from seated except idle via isNotSeated
|
2019-10-11 09:54: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 |
|
Sam Gateau
|
a68e34b3e7
|
Merge pull request #16321 from samcake/instancing
Instancing: applying the new hfm shape to create the render items of the model
|
2019-10-10 16:08:42 -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 |
|
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 |
|
Zach Fox
|
eb697f1dc2
|
Merge pull request #16325 from zfox23/removeRunClientTest
DEV-2386: Remove 'Run Client Script Test'
|
2019-10-10 15:06:12 -04:00 |
|
Zach Fox
|
7256abc6b0
|
Merge pull request #16326 from zfox23/shadowsTooltip
DEV-2379: Modify Shadow-related tooltips in Create
|
2019-10-10 14:55:15 -04:00 |
|
Zach Fox
|
3f00c524fb
|
DEV-2379: Modify Shadow-related tooltips in Create
|
2019-10-10 11:47:40 -07:00 |
|
Zach Fox
|
240f904b85
|
DEV-2386: Remove 'Run Client Script Test'
|
2019-10-10 11:11:27 -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
|
63fa9afa13
|
Merge pull request #16323 from highfidelity/master
Merge master into instancing
|
2019-10-09 16:59:54 -07:00 |
|
Sam Gateau
|
9905fc076c
|
Materials of baked models fbx are loading correctly, still using the name/id of the mateiral in the part struct
|
2019-10-09 16:44:06 -07:00 |
|
Zach Fox
|
a5caa36f07
|
Merge pull request #16318 from MiladNazeri/dev-2082/cannont-click-yourself-in-third-person-for-nametag
dev-2082/cannot-click-yourself-in-third-person-for-nametag
|
2019-10-09 19:34:00 -04:00 |
|
Shannon Romano
|
a52b8acf4d
|
Merge pull request #16306 from huffman/feat/hq-launcher-serverless
DEV-2374: Add serverless content back to launcher builds
|
2019-10-09 16:15:58 -07:00 |
|
Brad Hefta-Gaub
|
3efc24d49c
|
Merge pull request #16319 from sethalves/LOD-20-20-for-android
force LOD to be 20-20 on android, and force lodAngleDeg to 0.248
|
2019-10-09 16:02:01 -07:00 |
|
Maia Hansen
|
6b5f90f641
|
Merge pull request #16315 from jherico/qt_5.13
Qt 5.13 changes
|
2019-10-09 15:04:07 -07:00 |
|
Seth Alves
|
1ce3cebe1f
|
force LOD to be 20-20 on android, and force lodAngleDeg to 0.248
|
2019-10-09 14:04:44 -07:00 |
|
milad
|
77d17e0ff7
|
removed extra disconnect function
|
2019-10-09 13:26:53 -07:00 |
|
milad
|
e2fee5361d
|
updated startup/shutdown
|
2019-10-09 13:09:38 -07:00 |
|
milad
|
06244338d6
|
updated nametags to work in selfie mode
|
2019-10-09 12:36:44 -07:00 |
|
dooglifeSF
|
85b681e70e
|
switch abs() to fabsf()
|
2019-10-09 11:07:14 -07:00 |
|
Shannon Romano
|
f71dfa065c
|
Merge pull request #16314 from huffman/fix/oculus-touch-calibration-crash
DEV-841: Fix oculus calibration screen crash if touch is not turned on
|
2019-10-09 10:44:03 -07:00 |
|
dooglifeSF
|
2a1258968a
|
Change macro to const float, use floats in control flow.
|
2019-10-09 10:10:45 -07:00 |
|