Andrew Meadows
|
02c58447df
|
merge upstream/master into "shapes" project
Conflicts:
interface/src/avatar/MyAvatar.cpp
interface/src/avatar/SkeletonModel.cpp
interface/src/avatar/SkeletonModel.h
libraries/avatars/src/HandData.h
libraries/shared/src/SharedUtil.h
|
2014-03-18 12:41:20 -07:00 |
|
Andrew Meadows
|
d4c7e25f8e
|
Merge branch upstream/master into "hands" project
|
2014-03-14 14:28:50 -07:00 |
|
Andrew Meadows
|
a045a87cca
|
Remove arm stretching, add sixense calibration
|
2014-03-14 11:11:00 -07:00 |
|
Andrzej Kapolka
|
43feef3ebd
|
Only update the full set of joints when we've received new data from the
mixer. Closes #2274.
|
2014-03-13 12:03:02 -07:00 |
|
Andrew Meadows
|
37b088ebfa
|
Hands can collide with avatar head again
|
2014-03-06 12:38:07 -08:00 |
|
Andrew Meadows
|
7db5aaaf37
|
new collision pipeline for avatar shapes
|
2014-03-05 07:08:59 -08:00 |
|
Andrzej Kapolka
|
cd2bd32210
|
Delay loading models until we know that we need them (i.e., that we're not
beyond billboard distance). Closes #2121.
|
2014-02-27 12:30:46 -08:00 |
|
Andrew Meadows
|
32f3621855
|
merge upstream work into local repo
|
2014-01-15 14:13:48 -08:00 |
|
Andrew Meadows
|
22679687c5
|
Minor cleanup: moved #include out of header and into cpp file.
|
2014-01-14 16:17:37 -08:00 |
|
Andrzej Kapolka
|
5d88953f12
|
First cut at stretching the arms out and aligning forearms with wrists.
Closes #1423, #1504.
|
2014-01-14 15:27:28 -08:00 |
|
Andrzej Kapolka
|
0461335887
|
Align hand with forearm in mouse-pointing mode.
|
2014-01-02 14:56:29 -08:00 |
|
Andrzej Kapolka
|
a29dfe9c63
|
Yet another finger attempt.
|
2013-11-07 16:14:23 -08:00 |
|
Andrzej Kapolka
|
c3049d4378
|
Another shot at the fingers. Not attempting IK on the anymore.
|
2013-11-07 14:25:01 -08:00 |
|
Andrzej Kapolka
|
e6cd9a7368
|
Working on wiring up the fingers.
|
2013-11-07 12:12:48 -08:00 |
|
Andrzej Kapolka
|
2b4db0ea0e
|
Apply Leap data directly to skeleton.
|
2013-11-06 16:47:03 -08:00 |
|
Andrzej Kapolka
|
1f8bed9d9c
|
More transform rejiggery.
|
2013-10-22 15:31:27 -07:00 |
|
Andrzej Kapolka
|
349f7b363a
|
More work on custom skeletons.
|
2013-10-21 16:14:38 -07:00 |
|
Andrzej Kapolka
|
7e174093e4
|
Factoring the FBX model code out to a shared base class.
|
2013-10-18 17:26:03 -07:00 |
|