Commit graph

31385 commits

Author SHA1 Message Date
amantley
27bfe2f0fe changed name of pre processor variable 2019-02-20 15:14:12 -08:00
amantley
95b3fbdc35 removed ulnar coeff, too jumpy 2019-02-20 15:02:12 -08:00
Angus Antley
7639eac3ad cleaning up theta functions 2019-02-20 07:18:14 -08:00
Angus Antley
1e73422b80 added the wrist and position coeffs back in, 1.0 works 2019-02-20 06:25:44 -08:00
amantley
951380db15 tweaked the constraints, to do: start conditions and possibly using base rotation on shoulder to determine hand offset 2019-02-19 17:53:59 -08:00
Angus Antley
f2301e7dac fixed relative wrist correction problem 2019-02-19 07:35:13 -08:00
Angus Antley
748368bfda mid tweak on the wrist and position coeffs 2019-02-17 23:32:52 -08:00
Angus Antley
e1dfd7d288 cleanup white space 2019-02-16 23:40:16 -08:00
Angus Antley
0982c37c5e took out the theta animvar and just use theta converted to pole vector 2019-02-16 14:50:47 -08:00
Angus Antley
70764bc3c4 Merge remote-tracking branch 'upstream/master' into animSplineIK 2019-02-15 19:24:30 -08:00
amantley
d78f253d24 code to generate pole vector from theta 2019-02-15 17:43:53 -08:00
amantley
95530e6ba5 removed the unnecessary animArmIK.h and .cpp 2019-02-15 15:41:23 -08:00
amantley
36093926d0 added fake android defines for running the new ik on pc 2019-02-15 15:00:39 -08:00
sabrina-shanman
bb123cfe3b Fix GLTF materials 2019-02-15 14:51:29 -08:00
amantley
3f9b761e42 updating the android only if defs 2019-02-15 14:05:42 -08:00
Andrew Meadows
7872da6b97
Merge pull request #14915 from samcake/brown
Case 21190: Introducing msaa to forward renderer
2019-02-15 13:48:33 -08:00
Sam Gateau
6edf7e7907
Merge pull request #14931 from jherico/fix/vive_crash
Case 21230: Fix crash in vive and interleaved stereo plugins
2019-02-15 11:41:03 -08:00
John Conklin II
5f0db88a20
Merge pull request #14914 from raveenajain/gltf_tangents
Case 21165: tangent attribute
2019-02-15 11:24:21 -08:00
Sam Gondelman
9aa99f24f0
Merge pull request #14905 from SamGondelman/materialMapping
Case 20242: FST materialMapping supports our material JSON format
2019-02-15 11:21:51 -08:00
amantley
7119bc5972 reverted the scale optimization in animspline.cpp 2019-02-15 10:54:02 -08:00
Brad Davis
5483971855 Fix crash in vive and interleaved stereo plugins 2019-02-15 10:46:08 -08:00
amantley
0fcaa695ba Merge remote-tracking branch 'upstream/master' into animArmIK 2019-02-15 10:35:33 -08:00
amantley
d6dfaacf6f adding ifdef for android os 2019-02-15 10:35:25 -08:00
Anthony Thibault
702f1c8e74
Merge pull request #14925 from hyperlogic/bug-fix/revert-anim-pose-optimization
Revert anim pose optimization
2019-02-15 09:42:27 -08:00
amantley
425413419a fixed merge conflict in avatar.h 2019-02-15 08:26:54 -08:00
Angus Antley
07af2c525e tweaked ulnar radial limit and extend limit 2019-02-15 07:31:28 -08:00
Angus Antley
382a03929e changed back to regular 2 bone Ik for arms in json and cleaned up rig.cpp and polevector constraint 2019-02-15 07:06:43 -08:00
Angus Antley
f8554d10a8 starting cleanup 2019-02-14 23:45:45 -08:00
Sam Gateau
13b5390243 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2019-02-14 21:01:44 -08:00
amantley
40196dcb40 wrist action works in rig now 2019-02-14 18:17:31 -08:00
amantley
5c26bbec5c moving the theta calculation to rig 2019-02-14 18:06:20 -08:00
Shannon Romano
f267043953
Merge pull request #14838 from SamGondelman/billboardMode
Case 20962: Billboard mode improvements
2019-02-14 17:44:48 -08:00
Shannon Romano
3b5b077a3e
Merge pull request #14887 from AndrewMeadows/shape-garbage-collector
Case 21066: restore shape caching in ShapeManager
2019-02-14 17:33:33 -08:00
Sam Gateau
34db48d3a3 Merging and resolving conflict 2019-02-14 17:03:44 -08:00
Anthony Thibault
a3407b96b0 Merge branch 'master' into bug-fix/revert-anim-pose-optimization 2019-02-14 16:56:17 -08:00
Sam Gateau
6168001ad4
Merge pull request #14909 from AndrewMeadows/update-collision-group-after-grab-80
Case 21159: fixes for more grab bugs
2019-02-14 16:52:03 -08:00
Anthony Thibault
39b4eaac34 Revert "AnimPose operator* optimizations"
This reverts commit 569bef50fd.
2019-02-14 16:13:00 -08:00
Anthony Thibault
f0e163b4df Revert "AnimPose::inverse() optimization"
This reverts commit 5c7e81584c.
2019-02-14 16:10:26 -08:00
Sam Gateau
fc1d3df613 Merge branch 'brown' of github.com:samcake/hifi into brown 2019-02-14 15:44:26 -08:00
Sam Gateau
522a9ed7c1 Keeping only the minimum for quest 2019-02-14 15:43:36 -08:00
Sam Gateau
98a5ec84a9 Adjusting the HUD operator render job to shave an extra framebuffer 2019-02-14 15:35:02 -08:00
raveenajain
01def37efd spacing 2019-02-14 14:22:43 -08:00
Bradley Austin Davis
d45d87031d
Merge pull request #14782 from SamGondelman/NOverlaysFinal
Case 20723, Case 20334: Internally, replace all overlays with local entities
2019-02-14 13:49:47 -08:00
raveenajain
e825be566d Merge branch 'master' of https://github.com/highfidelity/hifi into gltf_tangents 2019-02-14 11:45:53 -08:00
SamGondelman
dd0d7f0118 merge with master 2019-02-14 09:57:13 -08:00
Angus Antley
1924018d2c added code to convert theta to a projected pole vector 2019-02-14 07:15:58 -08:00
Sam Gateau
8fdf0fb80c Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2019-02-13 22:33:48 -08:00
Angus Antley
aa0c52abd7 fixed wrap around 180 degrees 2019-02-13 18:33:01 -08:00
Andrew Meadows
efe2767f3f
Merge pull request #14913 from SamGondelman/pal
Case 21147, Case 20944: Fix setTextures (pal, etc.)
2019-02-13 17:50:08 -08:00
Sam Gateau
bd3a732cdc Introducing msaa to forward renderer 2019-02-13 17:38:59 -08:00