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 |
|
Philip Rosedale
|
aa03af8dbf
|
Merge pull request #1188 from ZappoMan/bugfixes
added more debugging
|
2013-11-05 14:46:41 -08:00 |
|
Philip Rosedale
|
0ca8440f46
|
Merge pull request #1183 from ey6es/master
Tweaks to voxel editing from Philip's Basecamp request.
|
2013-11-05 14:46:08 -08:00 |
|
Andrzej Kapolka
|
add8ccc877
|
Lower the deflection amount.
|
2013-11-05 14:31:41 -08:00 |
|
ZappoMan
|
406d42fe87
|
added more debugging
|
2013-11-05 14:27:20 -08:00 |
|
Andrzej Kapolka
|
092f1fa4c8
|
Shorten the long term average.
|
2013-11-05 14:10:53 -08:00 |
|
Andrzej Kapolka
|
2191896126
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-11-05 13:56:49 -08:00 |
|
Stephen Birarda
|
3454bf3fd1
|
Merge pull request #1187 from ZappoMan/bugfixes
added more debugging for server crashes
|
2013-11-05 13:56:23 -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
|
bd45f3aba0
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-11-05 13:49:33 -08:00 |
|
ZappoMan
|
1c580551bb
|
added more debugging
|
2013-11-05 13:47:58 -08:00 |
|
ZappoMan
|
3ba9c8c30e
|
added more debugging
|
2013-11-05 13:41:15 -08:00 |
|
Stephen Birarda
|
ead307216f
|
Merge pull request #1186 from ZappoMan/bugfixes
fixed warning and logic problem
|
2013-11-05 13:12:46 -08:00 |
|
ZappoMan
|
7cbebf3941
|
fixed warning and logic problem
|
2013-11-05 13:11:35 -08:00 |
|
ZappoMan
|
6dc7f68f0e
|
Merge pull request #1185 from birarda/assignment
add helper to ping if no active socket
|
2013-11-05 12:55:06 -08:00 |
|
Stephen Birarda
|
8789f06df3
|
Merge pull request #1184 from ZappoMan/bugfixes
make numberOfThreeBitSectionsInCode() robust against overflowing buffers if length is known
|
2013-11-05 12:49:53 -08:00 |
|
Stephen Birarda
|
eef6fd53eb
|
cleanup node type check in JL
|
2013-11-05 12:37:38 -08:00 |
|
Stephen Birarda
|
771021995b
|
add helper to ping with inactive socket
|
2013-11-05 12:34:56 -08:00 |
|
ZappoMan
|
e296be8c7a
|
make numberOfThreeBitSectionsInCode() robust against overflowing buffers if length is known
|
2013-11-05 12:31:20 -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
|
de5496aedc
|
Merge pull request #1180 from ZappoMan/bugfixes
add guards against buffer overflow in voxel server for edit/delete voxel packets
|
2013-11-05 11:49:06 -08:00 |
|
ZappoMan
|
3fc5e6cac7
|
Merge pull request #1181 from birarda/master
dialog touchups (stil no mouselook fix - Qt is patching)
|
2013-11-05 11:38:05 -08:00 |
|
ZappoMan
|
9060020279
|
style cleanup
|
2013-11-05 11:33:28 -08:00 |
|
Stephen Birarda
|
60e7c54303
|
fix some checks for empty inputs
|
2013-11-05 11:26:53 -08:00 |
|
ZappoMan
|
4cab991c02
|
style cleanup
|
2013-11-05 11:24:51 -08:00 |
|
Stephen Birarda
|
145efbda2d
|
some dialog touchups and visual changes
|
2013-11-05 11:21:32 -08:00 |
|
ZappoMan
|
adf0feed29
|
style clenaup
|
2013-11-05 11:14:29 -08:00 |
|
ZappoMan
|
1c4163b010
|
add guards against buffer overflow in voxel server for edit/delete voxel packets
|
2013-11-05 11:12:14 -08:00 |
|
Philip Rosedale
|
27ed53301b
|
Merge pull request #1178 from ZappoMan/bugfixes
Possible fix to crash in voxel server
|
2013-11-05 06:59:23 -08:00 |
|
Philip Rosedale
|
8bb3cb0c9f
|
Merge pull request #1179 from ey6es/master
Fix for Squigglevision effect on meshes at high(er) translation magnitudes.
|
2013-11-04 19:59:15 -08:00 |
|
Andrzej Kapolka
|
b2ed29dbff
|
Work around precision issues with multiplying matrices with high translation
magnitudes (by using relative translation).
|
2013-11-04 16:49:12 -08:00 |
|
ZappoMan
|
7daff4c279
|
coding standard cleanup
|
2013-11-04 15:36:46 -08:00 |
|
ZappoMan
|
9e88cfe953
|
initlaize sortedChildren[] array to help prevent possible crashes
|
2013-11-04 15:33:28 -08:00 |
|
ZappoMan
|
e89079e86c
|
add server config to the status page
|
2013-11-04 15:32:53 -08:00 |
|
Andrzej Kapolka
|
4cc650835d
|
Merge pull request #1177 from ey6es/master
Fix for jittery eyes.
|
2013-11-04 14:31:50 -08:00 |
|
Andrzej Kapolka
|
361f1f6adf
|
Don't override the lookat positions we receive for others.
|
2013-11-04 14:07:05 -08:00 |
|
Andrzej Kapolka
|
490194c747
|
Rescale eye positions to compensate for growing heads.
|
2013-11-04 13:53:39 -08:00 |
|
Philip Rosedale
|
11e6982a9d
|
Merge pull request #1176 from ZappoMan/bugfixes
fix oversending bug
|
2013-11-04 13:36:47 -08:00 |
|
ZappoMan
|
e0d5f2476c
|
tweak
|
2013-11-04 13:21:30 -08:00 |
|
ZappoMan
|
e8a1a383a3
|
fix oversending bug
|
2013-11-04 13:19:42 -08:00 |
|
ZappoMan
|
45ba3641a8
|
Merge pull request #1175 from birarda/master
guard for JurisdictionListener kill for missing UUID
|
2013-11-04 12:09:18 -08:00 |
|
Stephen Birarda
|
5c3075401a
|
add a guard for JurisdictionListener kill for missing UUID
|
2013-11-04 12:03:04 -08:00 |
|
Philip Rosedale
|
0f93c7417a
|
Merge pull request #1174 from ey6es/321contact
Use Faceshift gaze data to deflect the existing mouse lookat behavior.
|
2013-11-04 11:58:14 -08:00 |
|
Andrzej Kapolka
|
33c61937ab
|
Remove unused parameters.
|
2013-11-04 11:31:05 -08:00 |
|
Andrzej Kapolka
|
acaac714e6
|
More smoothing.
|
2013-11-04 11:20:56 -08:00 |
|
Andrzej Kapolka
|
ce1ebf8d11
|
The Faceshift eye rotations are indeed relative to the head.
|
2013-11-04 10:57:29 -08:00 |
|
Andrzej Kapolka
|
65907a75a3
|
Merge branch 'master' of https://github.com/worklist/hifi into 321contact
Conflicts:
interface/src/Application.cpp
|
2013-11-04 10:40:02 -08:00 |
|