Andrzej Kapolka
|
dff2266aee
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-11-08 15:38:52 -08:00 |
|
Andrzej Kapolka
|
0eaaa89c9a
|
Read the palm direction from the FST, use that to determine Leap rotations.
|
2013-11-08 15:38:20 -08:00 |
|
Andrzej Kapolka
|
3446337cc5
|
Trying incremental rotations for Leap palms.
|
2013-11-08 15:11:56 -08:00 |
|
Andrzej Kapolka
|
49c9d41dd5
|
Read and enforce angle constraints (untested).
|
2013-11-08 14:49:38 -08:00 |
|
philiprosedale
|
facf7094f0
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-11-08 14:34:52 -08:00 |
|
Philip Rosedale
|
2991c8af61
|
screen does not flash when voxels are clicked
|
2013-11-08 14:34:22 -08:00 |
|
Philip Rosedale
|
f3b6e21a6d
|
Voxel click to fly is now an option in the Tools Menu
|
2013-11-08 14:34:15 -08:00 |
|
Andrzej Kapolka
|
db9fa63112
|
Partial orchidectomy: removed (some of) Jeffrey's balls.
|
2013-11-08 11:19:35 -08:00 |
|
Philip Rosedale
|
d4fc85b197
|
Merge pull request #1226 from ey6es/master
New IK method with "gravity" for more relaxed positions, Leap integration with new skeleton.
|
2013-11-07 18:11:20 -08:00 |
|
Andrzej Kapolka
|
62134ebc4c
|
Sign fix.
|
2013-11-07 18:00:21 -08:00 |
|
Andrzej Kapolka
|
11fedb23cd
|
Try finding the fingers using the rotation about the palm.
|
2013-11-07 17:51:54 -08:00 |
|
Andrzej Kapolka
|
ebe3ef4b22
|
Toggle for the leap hands.
|
2013-11-07 17:20:52 -08:00 |
|
ZappoMan
|
1587cf0bbe
|
some comment cleanup
|
2013-11-07 17:17:34 -08:00 |
|
ZappoMan
|
2c4ab63d2b
|
tweaks to placement and wording of voxel stats
|
2013-11-07 17:11:35 -08:00 |
|
Andrzej Kapolka
|
f5889934a2
|
Derp, have to set the rotation after adjusting it.
|
2013-11-07 17:01:29 -08:00 |
|
Andrzej Kapolka
|
4bf4accba7
|
Rotate the palm according to the average finger direction.
|
2013-11-07 16:57:07 -08:00 |
|
ZappoMan
|
19515c80fd
|
Merge branch 'master' of https://github.com/worklist/hifi into new_voxel_scene_stats
Conflicts:
interface/src/Application.cpp
|
2013-11-07 16:44:34 -08:00 |
|
Andrzej Kapolka
|
55d31ee7f3
|
Render the body in first-person mode so that we can see our hands.
|
2013-11-07 16:37:51 -08:00 |
|
Andrzej Kapolka
|
d35356348b
|
Demagicked a couple of numbers.
|
2013-11-07 16:24:46 -08:00 |
|
Andrzej Kapolka
|
dabb670f1a
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-11-07 16:21:06 -08:00 |
|
Andrzej Kapolka
|
a29dfe9c63
|
Yet another finger attempt.
|
2013-11-07 16:14:23 -08:00 |
|
Andrzej Kapolka
|
6ac3fe4c9c
|
Merge pull request #1224 from birarda/master
use virtual deleteOrDeleteLater in NodeData to handle AvatarVoxelSystem
|
2013-11-07 15:44:41 -08:00 |
|
Stephen Birarda
|
5889d4122f
|
use virtual deleteOrDeleteLater in NodeData to handle AvatarVoxelSystem
|
2013-11-07 15:41:10 -08:00 |
|
Andrzej Kapolka
|
c3049d4378
|
Another shot at the fingers. Not attempting IK on the anymore.
|
2013-11-07 14:25:01 -08:00 |
|
ZappoMan
|
64d5ccf91e
|
add menu option for voxel server fade in/out and dont remove local voxels when server shuts down
|
2013-11-07 14:10:09 -08:00 |
|
Andrzej Kapolka
|
aec7dbca08
|
Attempting the fingers again.
|
2013-11-07 13:57:54 -08:00 |
|
Andrzej Kapolka
|
797645a209
|
More palm fixes.
|
2013-11-07 13:29:17 -08:00 |
|
Andrzej Kapolka
|
4360621daf
|
Adjustments to wrist rotations.
|
2013-11-07 13:17:08 -08:00 |
|
Andrzej Kapolka
|
f0e72d8d0c
|
Removed unused variable, debugging code.
|
2013-11-07 12:16:17 -08:00 |
|
Andrzej Kapolka
|
e6cd9a7368
|
Working on wiring up the fingers.
|
2013-11-07 12:12:48 -08:00 |
|
Andrzej Kapolka
|
be09d319b7
|
Gravity adjustments.
|
2013-11-06 17:58:05 -08:00 |
|
Andrzej Kapolka
|
1ae8a211bb
|
Swap the palms if they're in the wrong order.
|
2013-11-06 17:34:40 -08:00 |
|
Andrzej Kapolka
|
afd3f6937c
|
Derp; I don't want the length of the scale, I want the average of the
components.
|
2013-11-06 17:05:10 -08:00 |
|
Andrzej Kapolka
|
2e9625ebd5
|
Check palms' active state, apply rotations.
|
2013-11-06 16:57:30 -08:00 |
|
Andrzej Kapolka
|
2b4db0ea0e
|
Apply Leap data directly to skeleton.
|
2013-11-06 16:47:03 -08:00 |
|
Andrzej Kapolka
|
d0cd9e9790
|
Active the hand when we have leap hand data.
|
2013-11-06 16:24:25 -08:00 |
|
Andrzej Kapolka
|
97cf9f2285
|
Cleanup on aisle 3.
|
2013-11-06 15:58:35 -08:00 |
|
Andrzej Kapolka
|
1706c7c97a
|
New IK method: will be easier to add constraints, adds "gravity" influence to
sap potential energy.
|
2013-11-06 15:51:26 -08:00 |
|
Stephen Birarda
|
a4fcff6b19
|
only send fake event to the OGLWidget
|
2013-11-06 12:36:52 -08:00 |
|
Stephen Birarda
|
503de083f8
|
an actual patch for two finger mouselook fail after dialog
|
2013-11-06 12:27:45 -08:00 |
|
Andrzej Kapolka
|
c55f8c5900
|
Forgot to return a value.
|
2013-11-05 16:14:21 -08:00 |
|
Andrzej Kapolka
|
ae4db63368
|
Remove growing head behavior.
|
2013-11-05 16:11:12 -08:00 |
|
Andrzej Kapolka
|
9460fb87c2
|
Return arm to neutral position when mouse pointer is invisible.
|
2013-11-05 16:06:11 -08:00 |
|
Andrzej Kapolka
|
add8ccc877
|
Lower the deflection amount.
|
2013-11-05 14:31:41 -08:00 |
|
Andrzej Kapolka
|
092f1fa4c8
|
Shorten the long term average.
|
2013-11-05 14:10:53 -08:00 |
|
Andrzej Kapolka
|
6633b6a633
|
For now, don't perform avatar collisions unless we have a skeleton model.
|
2013-11-05 13:56:14 -08:00 |
|
Andrzej Kapolka
|
359083ee9d
|
Sneak in a toggle for chat circling.
|
2013-11-05 12:30:38 -08:00 |
|
Andrzej Kapolka
|
afc5e0795c
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-11-05 12:13:40 -08:00 |
|
Andrzej Kapolka
|
0c8799bb3d
|
Tweaks to voxel editing: edit from farther away, expand cubes to make sure
they show up over voxels, initialize voxel scale with moused-over scale.
|
2013-11-05 12:12:54 -08:00 |
|
Stephen Birarda
|
60e7c54303
|
fix some checks for empty inputs
|
2013-11-05 11:26:53 -08:00 |
|