Philip Rosedale
|
d7b1eae446
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-11-25 09:45:27 -08:00 |
|
ZappoMan
|
25511f99ec
|
cleanup for coding standard
|
2013-11-24 15:22:44 -08:00 |
|
ZappoMan
|
e2f5069e6a
|
more VoxelPacket compression tuning
|
2013-11-24 14:41:50 -08:00 |
|
ZappoMan
|
e65f74e06b
|
moved compression into VoxelPacket class. works, but too slow for larger sizes
|
2013-11-23 21:40:50 -08:00 |
|
ZappoMan
|
57831b377f
|
tweaks and cleanup
|
2013-11-23 14:07:09 -08:00 |
|
ZappoMan
|
4c0569fc60
|
removing compression from VoxelNodeData to eventually move it into VoxelPacket where it belongs
|
2013-11-23 13:55:21 -08:00 |
|
Philip Rosedale
|
a1ba36d543
|
Lean drive works with keys and no up/down
|
2013-11-22 20:08:44 -08:00 |
|
ZappoMan
|
7151d1679f
|
Merge pull request #1288 from ey6es/master
Have avatars glow/shrink out of existence when they log off or move to another domain/location.
|
2013-11-22 16:48:12 -08:00 |
|
Andrzej Kapolka
|
083800dc59
|
Glow/shrink avatars when killed, send kill message when we move between
domains, locations, etc.
|
2013-11-22 16:23:40 -08:00 |
|
Andrzej Kapolka
|
092515e199
|
Send an explicit kill request to the avatar mixer (which will pass it along to
the other clients) when we exit.
|
2013-11-22 15:19:59 -08:00 |
|
Philip Rosedale
|
582a71990e
|
Improved using faceshift to turn body
|
2013-11-22 15:08:16 -08:00 |
|
Andrzej Kapolka
|
eeeed84664
|
When Faceshift isn't connected, apply the audio-based blinking and brow/mouth
movement to the new face models.
|
2013-11-22 13:36:14 -08:00 |
|
Andrzej Kapolka
|
91b38313be
|
Treat pitchFromTouch more like yawFromTouch, persist mouse pitch.
|
2013-11-22 11:28:33 -08:00 |
|
Andrzej Kapolka
|
b04a249079
|
Make this a constant.
|
2013-11-21 14:24:30 -08:00 |
|
Andrzej Kapolka
|
88a84c733e
|
Stretch out shadow volume to encompass all avatars.
|
2013-11-21 14:14:09 -08:00 |
|
Andrzej Kapolka
|
053d6b1e71
|
Fix for Leap drive enabled without Leap.
|
2013-11-21 14:01:12 -08:00 |
|
Andrzej Kapolka
|
3137e9a3e6
|
Don't leave out the head when we draw our shadow.
|
2013-11-21 13:57:55 -08:00 |
|
Andrzej Kapolka
|
898135fbf2
|
Linear filtering for more smoothness.
|
2013-11-21 13:36:16 -08:00 |
|
Andrzej Kapolka
|
f0e5872b89
|
Lighten the shadows, remove some debug code.
|
2013-11-21 12:29:22 -08:00 |
|
ZappoMan
|
6c640752cd
|
make compression optional
|
2013-11-21 12:04:13 -08:00 |
|
ZappoMan
|
a590f384a6
|
Merge branch 'master' of https://github.com/worklist/hifi into compressed_packets
|
2013-11-21 11:33:08 -08:00 |
|
Andrzej Kapolka
|
f38e74c51c
|
Merge branch 'master' of https://github.com/worklist/hifi into shadowplay
|
2013-11-21 11:18:56 -08:00 |
|
Andrzej Kapolka
|
3cf47f8d5c
|
Merge branch 'master' of https://github.com/worklist/hifi into shadowplay
|
2013-11-21 11:08:45 -08:00 |
|
Andrzej Kapolka
|
7bc65136c7
|
Merge branch 'master' of https://github.com/worklist/hifi into sicksense
|
2013-11-21 11:00:09 -08:00 |
|
Andrzej Kapolka
|
cd4ef08dae
|
Merge pull request #1272 from ZappoMan/stats_crash_bug_fix
fix to crash in client side VoxelSceneStats crash
|
2013-11-21 10:59:57 -08:00 |
|
Andrzej Kapolka
|
dcc926a0db
|
Working on the "real" shadow volume.
|
2013-11-20 20:36:54 -08:00 |
|
Andrzej Kapolka
|
758246309a
|
Use compare mode.
|
2013-11-20 20:06:22 -08:00 |
|
Andrzej Kapolka
|
4bcc6fdc0d
|
More progress on shadows.
|
2013-11-20 18:27:59 -08:00 |
|
Andrzej Kapolka
|
5cc5d9bba8
|
Progress towards shadow maps.
|
2013-11-20 16:23:54 -08:00 |
|
ZappoMan
|
6881d9fb36
|
fix to crash in client side VoxelSceneStats crash
|
2013-11-19 22:57:42 -08:00 |
|
Andrzej Kapolka
|
4e952b0f99
|
Clamp pitch from touch when adjusting it.
|
2013-11-19 16:40:29 -08:00 |
|
Andrzej Kapolka
|
69b5b81f34
|
Limit combined pitch.
|
2013-11-19 16:31:24 -08:00 |
|
Andrzej Kapolka
|
80e6606dd2
|
Adjusted constants, added reasonable starting base position.
|
2013-11-19 15:31:04 -08:00 |
|
Andrzej Kapolka
|
38c2abd6d8
|
First stab at Leap driving.
|
2013-11-19 15:10:02 -08:00 |
|
Andrzej Kapolka
|
bc523092ba
|
Sniffing glue, wrong week, etc.
|
2013-11-19 11:59:25 -08:00 |
|
Andrzej Kapolka
|
ced1fca2e4
|
Missed another spot.
|
2013-11-19 11:57:01 -08:00 |
|
Andrzej Kapolka
|
3d82fe65b4
|
Forgot this part.
|
2013-11-19 11:53:57 -08:00 |
|
Andrzej Kapolka
|
1e7866ad02
|
Clamped values, adjusted them.
|
2013-11-19 11:51:32 -08:00 |
|
Andrzej Kapolka
|
df8fbf8f72
|
More general, angle-driven form of driving based on lean.
|
2013-11-19 11:09:02 -08:00 |
|
Andrzej Kapolka
|
5e933b0815
|
Working on basic Faceshift drive.
|
2013-11-18 18:06:01 -08:00 |
|
Andrzej Kapolka
|
f59b403103
|
Drive avatar with Sixense joysticks and triggers.
|
2013-11-18 16:20:00 -08:00 |
|
Andrzej Kapolka
|
0231ed133c
|
Optional compilation for Sixense.
|
2013-11-18 12:09:52 -08:00 |
|
ZappoMan
|
c2cb6df61c
|
first cut at compresses voxel packets
|
2013-11-18 09:46:32 -08:00 |
|
ZappoMan
|
73c1ef9997
|
fix macos menu placement for About, Preferences, and Quit
|
2013-11-17 00:01:32 -08:00 |
|
Andrzej Kapolka
|
9c401607b1
|
Missed the actual files.
|
2013-11-15 18:47:25 -08:00 |
|
Andrzej Kapolka
|
1f2fe5ddee
|
Rudimentary Sixense (Razer Hydra) support.
|
2013-11-15 18:06:32 -08:00 |
|
Andrzej Kapolka
|
7249e5293c
|
Added a slider in the preferences to control the amount of Faceshift eye
deflection.
|
2013-11-15 10:17:52 -08:00 |
|
Andrzej Kapolka
|
f7458cf934
|
Fix for pupil dilation on Ryan's face.
|
2013-11-14 15:21:54 -08:00 |
|
Andrzej Kapolka
|
d3d2c344e6
|
Set the head scale for other avatars.
|
2013-11-14 10:46:56 -08:00 |
|
Andrzej Kapolka
|
c358b9f0fd
|
Don't track the mouse in mirror mode.
|
2013-11-14 10:19:35 -08:00 |
|
ZappoMan
|
34668e8716
|
add Paste To Voxel
|
2013-11-13 23:04:51 -08:00 |
|
Stephen Birarda
|
91c3327736
|
Merge pull request #1257 from ZappoMan/new_voxel_scene_stats
Adds details about the connected voxel servers to allow debugging of client side jurisdictions
|
2013-11-13 16:18:02 -08:00 |
|
ZappoMan
|
b6bc3cb166
|
handle changes in server list properly
|
2013-11-13 15:56:03 -08:00 |
|
ZappoMan
|
8de113e65c
|
adding jurisdiction details to voxel stats dialog
|
2013-11-13 14:22:57 -08:00 |
|
Andrzej Kapolka
|
c76af1ca12
|
Scratch that; didn't work.
|
2013-11-13 13:58:14 -08:00 |
|
Andrzej Kapolka
|
76d8bd0a9c
|
Finger IK, take two.
|
2013-11-13 13:53:41 -08:00 |
|
Andrzej Kapolka
|
3e4c5f84ed
|
Only rotate if we have at least three active fingers.
|
2013-11-13 13:26:36 -08:00 |
|
Andrzej Kapolka
|
52a3071cb3
|
Order of update fix.
|
2013-11-13 12:29:43 -08:00 |
|
Andrzej Kapolka
|
332de0646d
|
Orient the Leap hands relative to the body, not the head.
|
2013-11-13 12:22:54 -08:00 |
|
Andrzej Kapolka
|
d87dccd614
|
Alignment to pull elbows towards ground.
|
2013-11-13 12:06:08 -08:00 |
|
Andrzej Kapolka
|
c2e4a70685
|
Back to the cyclic coordinate descent algorithm (easier to apply joint
constraints); Leap hands relative to eyes.
|
2013-11-13 10:35:20 -08:00 |
|
Andrzej Kapolka
|
a36f9d52af
|
Constraint fix, apply constraints to wrists.
|
2013-11-12 15:43:11 -08:00 |
|
Andrzej Kapolka
|
df30e3c851
|
As a hack, when we have an FBX face/body, position the camera to point at the
origin and reposition the models based on the relative eye positions. Fixes
the jitteriness in rear mirror mode.
|
2013-11-12 12:28:07 -08:00 |
|
Andrzej Kapolka
|
feb2a150b7
|
Don't decay head roll/pitch when moving if Faceshift is active.
|
2013-11-08 18:05:24 -08:00 |
|
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 |
|