Commit graph

7400 commits

Author SHA1 Message Date
Andrzej Kapolka
fb46a637fb Merge branch 'master' of https://github.com/worklist/hifi into sicksense 2013-11-21 10:49:58 -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
83d89cdc30 Path fix for readme. 2013-11-18 12:34:38 -08:00
Andrzej Kapolka
6d9bd6d2b0 Gitignore additions. 2013-11-18 12:16:25 -08:00
Andrzej Kapolka
0231ed133c Optional compilation for Sixense. 2013-11-18 12:09:52 -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
Stephen Birarda
893eadcb2f Merge pull request #1270 from ZappoMan/bugfixes
fix to crash on deleteNotify
2013-11-15 17:09:56 -08:00
ZappoMan
4da70cf3c8 fix to crash on deleteNotify 2013-11-15 16:45:03 -08:00
Philip Rosedale
ce4e99836b Merge pull request #1268 from ey6es/master
Fix for pupil dilation on Ryan's face.
2013-11-15 14:30:16 -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
01d29e3303 Merge pull request #1267 from ey6es/master
Couple of tiny fixes: head scales on remote avatars, disable mouse eye tracking in mirror mode.
2013-11-14 10:49:41 -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
Stephen Birarda
82649a9a49 Merge pull request #1261 from ZappoMan/paste_to_octalcode
add Paste To Voxel
2013-11-14 08:45:23 -08:00
ZappoMan
09c44d49ed Merge branch 'master' of https://github.com/worklist/hifi into paste_to_octalcode 2013-11-13 23:08:16 -08:00
ZappoMan
34668e8716 add Paste To Voxel 2013-11-13 23:04:51 -08:00
Philip Rosedale
266a0c8ed2 Merge pull request #1260 from ZappoMan/master
fix new VoxelPersistThread behavior so it's actually only checking dirty bits every each persist cycle
2013-11-13 21:46:47 -08:00
ZappoMan
1d272c333a fix new VoxelPersistThread behavior so it's actually only checking dirty bits every each persist cycle 2013-11-13 21:31:34 -08:00
Leonardo Murillo
8805531b00 Merge pull request #1259 from ZappoMan/bugfixes
added some debugging to see why the servers are spinning out constantly ...
2013-11-13 17:55:13 -08:00
ZappoMan
865d2d19f1 added some debugging to see why the servers are spinning out constantly checking for dirty tree 2013-11-13 17:29:01 -08:00
Stephen Birarda
950f486e2e Merge pull request #1258 from ZappoMan/remove_noise
removing more noise and dont sleep if we failed to lock the node
2013-11-13 17:00:06 -08:00
ZappoMan
2079ca4c8b Merge branch 'master' of https://github.com/worklist/hifi into remove_noise 2013-11-13 16:40:29 -08:00
ZappoMan
496f3a1380 removed some noise, and made persist thread less sleepy 2013-11-13 16:37:08 -08:00
ZappoMan
1a4ffcec93 removing more noise and dont sleep if we failed to lock the node 2013-11-13 16:24:01 -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
Stephen Birarda
951a805ee6 Merge pull request #1256 from ZappoMan/remove_noise
Remove noise
2013-11-13 16:11:43 -08:00
ZappoMan
02df4a82b5 removing more noise 2013-11-13 16:04:55 -08:00
ZappoMan
ba9cd6fdd4 removing more noise 2013-11-13 16:04:21 -08:00
ZappoMan
6396838afc Merge branch 'master' of https://github.com/worklist/hifi into remove_noise 2013-11-13 15:56:40 -08:00
ZappoMan
b6bc3cb166 handle changes in server list properly 2013-11-13 15:56:03 -08:00
Stephen Birarda
9db961b612 Merge pull request #1255 from ZappoMan/bugfixes
use node->trylock() in VoxelSendThread() to handle shutdown race condition
2013-11-13 15:18:24 -08:00
ZappoMan
5b09248ba9 remove noisy debugging 2013-11-13 15:15:54 -08:00
ZappoMan
3d20152c36 use node->trylock() in VoxelSendThread() to handle shutdown race condition 2013-11-13 15:11:43 -08:00
ZappoMan
8de113e65c adding jurisdiction details to voxel stats dialog 2013-11-13 14:22:57 -08:00
Stephen Birarda
52d86a8619 Merge pull request #1250 from ey6es/master
Back to CCR for IK (with rotational alignment to replace "gravity"), read/apply constraints correctly, Leap tweaks.
2013-11-13 14:08:20 -08:00
Andrzej Kapolka
c76af1ca12 Scratch that; didn't work. 2013-11-13 13:58:14 -08:00
Stephen Birarda
10b5f885f5 Merge pull request #1254 from ZappoMan/bugfixes
added more noisy debugging
2013-11-13 13:56:50 -08:00
Andrzej Kapolka
76d8bd0a9c Finger IK, take two. 2013-11-13 13:53:41 -08:00