Commit graph

7386 commits

Author SHA1 Message Date
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
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
ZappoMan
4640d337b7 added more noisy debugging 2013-11-13 13:47:39 -08:00
Andrzej Kapolka
3e4c5f84ed Only rotate if we have at least three active fingers. 2013-11-13 13:26:36 -08:00
Stephen Birarda
fea531ca3a Merge pull request #1253 from ZappoMan/bugfixes
added Noisy debugging to voxel server main loop
2013-11-13 12:55:53 -08:00
ZappoMan
4ac6338b8b added Noisy debugging to voxel server main loop 2013-11-13 12:54:34 -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
Philip Rosedale
3dc28682a8 Merge pull request #1244 from ZappoMan/bugfixes
fix bug where VoxelEditPacketSender oversends to unknown jurisdictions
2013-11-13 10:39:51 -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
Stephen Birarda
9c2f3be9d2 Merge pull request #1249 from birarda/no-corewlan
rename of custom formula to match Qt5 class
2013-11-13 10:31:14 -08:00
Stephen Birarda
3f50f6a5d4 rename formula to match class 2013-11-13 10:30:56 -08:00
Stephen Birarda
fbb30b592d Merge pull request #1248 from birarda/no-corewlan
add formula for patched qt5 install
2013-11-13 10:28:17 -08:00
Stephen Birarda
5c513670d3 add a formula for a qt5 install with no CoreWLAN 2013-11-13 10:27:44 -08:00
ZappoMan
e32bfc38f5 change voxelServersExist() to make sure that all existing voxel servers have a legitimate jurisdiction 2013-11-13 01:06:17 -08:00