Commit graph

3816 commits

Author SHA1 Message Date
Andrew Meadows
09433a93ba Merge pull request #10477 from AndrewMeadows/correct-avatar-mass
More correct avatar mass
2017-05-17 16:22:06 -07:00
Brad Hefta-Gaub
764bfe94f5 Merge pull request #10336 from trentpolack/feature/snap-turn-smoothing-21270
Feature/snap turn smoothing 21270
2017-05-16 21:05:38 -07:00
Andrew Meadows
d065b569d3 support for variable avatar mass by size 2017-05-16 16:03:51 -07:00
Andrew Meadows
805d23567d fix simple typo 2017-05-16 16:03:50 -07:00
Seth Alves
66a1dbfcfe Merge pull request #10445 from AndrewMeadows/cleanup-head-simulation
cleanup Head::simulate() code
2017-05-15 11:21:43 -07:00
Vladyslav Stelmakhovskyi
cc10fc81b7 Fix crash in sit script 2017-05-13 20:57:04 +02:00
anshuman64
49d4cf4e68 Merge pull request #10419 from hyperlogic/feature/ik-solver-init-config
More stable IK when hips, feet and chest are controlled via external input
2017-05-12 17:22:29 -07:00
Seth Alves
c6131916e1 Merge branch 'master' of github.com:highfidelity/hifi into motor-action 2017-05-12 09:46:21 -07:00
Andrew Meadows
a43447310d remove physics dependency from avatars-render lib 2017-05-11 15:22:22 -07:00
Andrew Meadows
f4df223d23 cleanup Head::simulation() code 2017-05-11 14:46:00 -07:00
David Rowe
1b855f2c6b Voice modulation and facetrackers write to transient blendshapes 2017-05-11 18:15:38 +12:00
Anthony J. Thibault
93b8dc550c Merge branch 'master' into feature/ik-solver-init-config 2017-05-10 09:03:21 -07:00
trent
a3545661dc Merged hifi/master into this PR and resolved merge conflicts. 2017-05-09 15:09:53 -04:00
trent
9c8b844e26 Merge branch 'feature/snap-turn-smoothing-21270' of https://github.com/mittens/hifi into feature/snap-turn-smoothing-21270 2017-05-09 12:51:28 -04:00
trent
7faed38bb5 Just use the smooth time constant instead of a variable. 2017-05-09 12:51:25 -04:00
Seth Alves
1e1968357a Merge branch 'master' of github.com:highfidelity/hifi into motor-action 2017-05-09 09:24:50 -07:00
Andrew Meadows
e92e710cdc Merge pull request #10413 from humbletim/fix_lookat_regression
Fix lookAt eye snapping
2017-05-09 08:51:10 -07:00
humbletim
29b1ac3572 optimizations per feedback 2017-05-08 21:50:24 -04:00
humbletim
42d1498d20 call Model::updateRig (not Parent::updateRig) 2017-05-08 21:19:18 -04:00
Andrew Meadows
2835a73c6b Merge pull request #10071 from AndrewMeadows/walk-up-steps
avatar can walk up steps
2017-05-08 18:17:16 -07:00
Seth Alves
de589a32f3 clone spring action into one called tractor and use tractor is most places. this frees us to fix the math in spring so that it's actually a spring 2017-05-08 16:36:51 -07:00
humbletim
ef0e32643d update refactored logic to match previous application behavior 2017-05-08 18:53:47 -04:00
Anthony J. Thibault
712fcbe27a Removed cruft/debug code & comments 2017-05-08 15:06:30 -07:00
Anthony J. Thibault
7af93f9fea Hooked up IK constraint rendering 2017-05-08 15:06:29 -07:00
Anthony J. Thibault
e992d6703a WIP: debug render joint constraints. 2017-05-08 15:06:28 -07:00
Anthony J. Thibault
a260163aee WIP commit, first pass at generating limit center joints + debug draw 2017-05-08 15:06:27 -07:00
Andrew Meadows
afe0447322 remove unnecessary virtual keyword 2017-05-08 14:27:39 -07:00
Andrew Meadows
138a987a8f _rotationChanged is a timestamp 2017-05-08 14:27:18 -07:00
Brad Davis
b63015eaea Fix sped up animations 2017-05-06 14:34:28 -07:00
Andrew Meadows
fe401c7488 improved management of collisionless avatar state 2017-05-05 09:37:00 -07:00
Andrew Meadows
d34b667e82 remove kinematic character controller implemention 2017-05-05 09:35:49 -07:00
Andrew Meadows
0aa579225c even more correct API: MyAvatar.collisionsEnabled 2017-05-05 09:35:49 -07:00
Andrew Meadows
559f5836c5 restore MyAvatar.setCharacterControllerEnabled() 2017-05-05 09:35:49 -07:00
Andrew Meadows
94ee6d6838 fix driving motion of collisionless avatars 2017-05-05 09:35:49 -07:00
Andrew Meadows
c47e26174c support collisionless avatar when playing recording 2017-05-05 09:35:49 -07:00
Andrew Meadows
e21bd7a67a help avatar walk up steps 2017-05-05 09:35:49 -07:00
Brad Davis
9def788956 Merge pull request #10314 from jherico/avatars-renderer
Migrate Avatar rendering code to library
2017-05-04 14:23:49 -07:00
Brad Davis
2d0bbf70ae Migrate core avatar rendering functionality to library 2017-05-04 14:08:59 -07:00
Seth Alves
a259d00b63 Merge pull request #10332 from sethalves/bullet-constraints-5
Bullet constraints
2017-05-03 16:30:34 -07:00
trent
d7ed727faf Adjustments based on PR feedback, though it looks like this snap-turn-snafu-story is not yet complete. 2017-05-03 16:56:18 -04:00
trent
fc3cce6b73 Fixed the silly and stupid subtle issue that was causing the bug in inconsistencies. 2017-05-03 12:35:35 -04:00
trent
24f2678cdd Adjusted the smooth time for the snap-turn remote view. Fixed tab issue. 2017-05-03 12:05:21 -04:00
trent
786838d092 Merge branch 'master' of https://github.com/highfidelity/hifi into feature/snap-turn-smoothing-21270 2017-05-02 20:21:35 -04:00
trent
557a8fffd7 Addressing some PR feedback; moved easeInEaseOut to Interpolate class. My function is faster than andrew's. :D 2017-05-02 19:56:47 -04:00
Trent Polack
0a5dfbb9af Changed l to interp.
In my defense, if anyone ever looked at it and thought the 'l' was a '1', they should never be programming unless they used a special language where you could reassign numbers.
2017-05-02 19:10:33 -04:00
trent
f79e032841 Silly online git merge tool. You are silly. Errors fixed. 2017-05-02 14:48:27 -04:00
trent
6d1fb8a6f8 Merge branch 'feature/snap-turn-smoothing-21270' of https://github.com/mittens/hifi into feature/snap-turn-smoothing-21270 2017-05-02 13:55:39 -04:00
trent
49881b5ea2 Actually the full set of changes. Kids: don't forget to pop your stash. 2017-05-02 13:55:32 -04:00
samcake
df54ad2339 Merge branch 'master' of https://github.com/highfidelity/hifi into ambient 2017-05-02 10:50:39 -07:00
Trent Polack
8f93a9a074 Merge branch 'master' into feature/snap-turn-smoothing-21270 2017-05-02 13:43:32 -04:00