ZappoMan
|
2c4ab63d2b
|
tweaks to placement and wording of voxel stats
|
2013-11-07 17:11:35 -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
|
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 |
|
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 |
|
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 |
|
Stephen Birarda
|
145efbda2d
|
some dialog touchups and visual changes
|
2013-11-05 11:21:32 -08:00 |
|
ZappoMan
|
843e9da873
|
merge conflict fix
|
2013-11-05 10:47:05 -08:00 |
|
ZappoMan
|
581e0adecf
|
Merge branch 'master' of https://github.com/worklist/hifi into new_voxel_scene_stats
Conflicts:
interface/src/Application.cpp
|
2013-11-05 10:45:30 -08:00 |
|
ZappoMan
|
09dab892d3
|
first cut at new voxel scene stats
|
2013-11-05 10:29:56 -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 |
|
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 |
|
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 |
|
ZappoMan
|
9bd27e2b2a
|
fix stutter on rotating
|
2013-11-03 21:11:08 -08:00 |
|
ZappoMan
|
c18de72dd4
|
work on debugging stutter behavior, mostly debugging and cleanup
|
2013-11-03 19:06:06 -08:00 |
|
ZappoMan
|
c4a2b3c49b
|
fix thinning in voxels as points by using correct points to calculate width of voxel based on camera position relative to voxel
|
2013-11-03 11:10:00 -08:00 |
|
Andrzej Kapolka
|
def3707041
|
I don't think Faceshift's gaze data is actually head-relative.
|
2013-11-01 18:28:35 -07:00 |
|
Andrzej Kapolka
|
a7683fa07f
|
More tweaks to eye offsets.
|
2013-11-01 18:15:43 -07:00 |
|
Andrzej Kapolka
|
e4bf5358eb
|
Attempt to use Faceshift eye data to deflect the default eye behavior.
|
2013-11-01 17:58:41 -07:00 |
|
Philip Rosedale
|
79fb92f195
|
Merge pull request #1170 from ZappoMan/point_shader
first cut a variable point size point rendering
|
2013-11-01 17:02:28 -07:00 |
|
ZappoMan
|
508b8f4678
|
change in comment to kick off build
|
2013-11-01 16:29:49 -07:00 |
|
ZappoMan
|
b103f9dacf
|
clean up
|
2013-11-01 15:32:17 -07:00 |
|
ZappoMan
|
e62322b805
|
clean up comment
|
2013-11-01 15:28:54 -07:00 |
|
ZappoMan
|
61b6d6a4a4
|
added comment about fixing point selection
|
2013-11-01 15:27:57 -07:00 |
|
ZappoMan
|
cab87c3a97
|
added comment about fixing point selection
|
2013-11-01 15:27:25 -07:00 |
|
Andrzej Kapolka
|
966f75db9b
|
Sanity check to prevent crash in Model::simulate.
|
2013-11-01 14:47:25 -07:00 |
|
ZappoMan
|
13b558c033
|
removed dead code
|
2013-11-01 14:40:58 -07:00 |
|
ZappoMan
|
56aafabacd
|
fixed up comments and style guide items
|
2013-11-01 14:39:55 -07:00 |
|
ZappoMan
|
6fd3c9714f
|
fixed header file merge conflict
|
2013-11-01 14:37:46 -07:00 |
|
ZappoMan
|
f5d09c0218
|
fix comments and style
|
2013-11-01 14:36:20 -07:00 |
|
ZappoMan
|
b3aac56d29
|
first cut a variable point size point rendering
|
2013-11-01 14:33:06 -07:00 |
|
Andrzej Kapolka
|
d04b36bf48
|
Fix for GuyFinal rotation.
|
2013-11-01 14:25:26 -07:00 |
|
Andrzej Kapolka
|
62381e19b5
|
Only use hacky model translation with the old skeleton.
|
2013-11-01 13:33:50 -07:00 |
|
Andrzej Kapolka
|
c3e0f8bc1f
|
Bump up the maximum eye angle slightly.
|
2013-11-01 10:48:09 -07:00 |
|
Andrzej Kapolka
|
4a011e0624
|
Pull out the weight access.
|
2013-10-31 17:10:35 -07:00 |
|