Commit graph

31509 commits

Author SHA1 Message Date
Shannon Romano
badd0b8bd3
Merge pull request #14968 from davidkelly/dk/20726
Guard against accidentally calling wrong api/v1/places endpoint
2019-02-25 17:16:33 -08:00
Shannon Romano
bf3b4e6a57
Merge pull request #15015 from SamGondelman/flying
Case 21418: Allow flying in HMD if you would otherwise fall forever
2019-02-25 16:48:57 -08:00
amantley
12dbaa0ea0 changed the condition so that you can turn off ik in hmd mode if you want to for debug purposes 2019-02-25 14:56:17 -08:00
amantley
363c0cc26f moved the update of last ik to outside the if changed statement 2019-02-25 13:03:28 -08:00
amantley
cff0fd470a re-enabled ik off by default on Desktop 2019-02-25 12:23:03 -08:00
SamGondelman
e102ad073e allow flying in HMD if you would otherwise fall forever 2019-02-25 11:49:38 -08:00
Shannon Romano
dc6bdfae8a
Merge pull request #14995 from SamGondelman/parentCrash
Case 21391: Fix parent loop crash
2019-02-25 10:01:37 -08:00
John Conklin II
6af2b25767
Merge pull request #14980 from AndrewMeadows/dont-clear-space
Case 21309: don't corrupt workload system
2019-02-25 09:52:15 -08:00
Shannon Romano
5f99158c25
Merge pull request #14977 from SamGondelman/rot
Case 21354: Add "modelScale" property to fix pal
2019-02-22 16:36:17 -08:00
Sam Gondelman
30b6b7f21b
let's try that again 2019-02-22 16:30:36 -08:00
Anthony Thibault
1213084fc6
Merge pull request #14984 from kencooke/master
Case 21384: Avatar mouth blendshapes are not working correctly (master)
2019-02-22 16:29:07 -08:00
SamGondelman
081e62a647 fix parent loop crash 2019-02-22 14:26:15 -08:00
Shannon Romano
a63f3e76c8
Merge pull request #14972 from SamGondelman/billboard
Case 21341: Fix billboard mode in secondary camera
2019-02-22 13:01:09 -08:00
SamGondelman
6d6cd42adb fix bound scaling 2019-02-22 12:00:00 -08:00
Ken Cooke
c1786edc24 Emulate the old behavior of _lastInputLoudness 2019-02-21 18:45:17 -08:00
Andrew Meadows
be2d4272da remove the other unnecessary _space->clear() 2019-02-21 18:11:16 -08:00
Anthony Thibault
8785f733db
Merge pull request #14817 from amantley/animSplineIK
AnimSplineIK node added to inverse kinematics
2019-02-21 17:13:41 -08:00
Anthony Thibault
e54754c4ce
Merge pull request #14926 from luiscuenca/flowCpp
Cpp implementation of the Flow script
2019-02-21 17:10:05 -08:00
Andrew Meadows
982c4c2bc4 do not Space::clear() in clearNonLocalEntities() 2019-02-21 16:33:31 -08:00
luiscuenca
dcbf57ee0b Fix linux warning and HMD breaks flow 2019-02-21 16:41:24 -07:00
amantley
c9db426ce4 Merge remote-tracking branch 'upstream/master' into animSplineIK 2019-02-21 14:36:13 -08:00
amantley
6323f49f26 changed the define variable to HIFI_USE_OPTIMIZED_IK 2019-02-21 14:36:05 -08:00
SamGondelman
544f54e69a fix model scale 2019-02-21 14:10:36 -08:00
amantley
50bc8d3646 added protected function to cubic hermite spline 2019-02-21 13:32:28 -08:00
amantley
0bdc527ce7 turned off pole vector when hand behind back 2019-02-21 13:14:51 -08:00
amantley
de10aebbb5 removed white space 2019-02-21 11:44:18 -08:00
amantley
64ec28ef44 added back missing unity meta files 2019-02-21 11:37:14 -08:00
amantley
afed0b5442 review changes 2019-02-21 11:08:29 -08:00
luiscuenca
ec4d069011 Allow threads with only one joint, remove dummy joints and unused constants 2019-02-21 12:00:19 -07:00
SamGondelman
4fdf556d5d fix billboard mode in secondary camera 2019-02-21 10:29:21 -08:00
amantley
33fd64c68c direction on compare in positional theta function 2019-02-21 09:00:23 -08:00
amantley
f8a74efdc2 fixed build errors from jenkins 2019-02-20 17:59:45 -08:00
amantley
97da20781e removed whitespace 2019-02-20 15:19:36 -08:00
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
John Conklin II
87556059d3
Merge pull request #13901 from Cristo86/android_handshake
case 20058: Android - Handshake implementation
2019-02-20 13:33:52 -08:00
David Kelly
2202b69575 Guard against accidentally calling wrong api/v1/places endpoint
spaces
2019-02-20 13:09:29 -07:00
Brad Davis
79369a0c83 Merge remote-tracking branch 'upstream/master' into feature/quest 2019-02-20 10:40:49 -08:00
Shannon Romano
0b7bdb185e
Merge pull request #14949 from SamGondelman/wearables
Case 21300, Case 21301: Group cull all entity descendants of avatars
2019-02-20 10:29:40 -08:00
luiscuenca
bea7680864 Fix shared_ptr not part of std error 2019-02-20 10:57:11 -07:00
Brad Davis
817c24dd0b Merge remote-tracking branch 'upstream/master' into feature/quest 2019-02-20 09:51:03 -08:00
luiscuenca
fa44687de6 fix errors and remove debug draw 2019-02-20 09:22:39 -07: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
SamGondelman
c8ffb130a3 only update sub items on change 2019-02-19 17:38:47 -08:00
Shannon Romano
07d084d086
Merge pull request #14937 from SamGondelman/pal
Case 21259: Pal textures don't change
2019-02-19 17:14:15 -08:00
SamGondelman
6765268998 Merge remote-tracking branch 'upstream/master' into wearables 2019-02-19 16:52:00 -08:00
luiscuenca
04e57d0dd1 No Rig pointer on Flow class, solve network animations and fixed bug 2019-02-19 17:45:46 -07:00
amer cerkic
bf69e6d672 fixing compile errors 2019-02-19 16:03:02 -08:00