Andrzej Kapolka
5511c02449
Merge branch 'master' of https://github.com/worklist/hifi
2013-10-09 11:53:08 -07:00
Andrzej Kapolka
0a54c2f1e9
Tweaking the growing heads.
2013-10-09 11:52:56 -07:00
Andrzej Kapolka
a679517596
Fix for jaundiced eyes.
2013-10-09 11:10:51 -07:00
Stephen Birarda
f09888dd1b
Merge branch 'master' of github.com:worklist/hifi into nameserver
2013-10-09 10:21:25 -07:00
Andrzej Kapolka
1b4daa8eb9
No glow on own avatar, only on others when farther than five units away.
2013-10-09 10:17:41 -07:00
Stephen Birarda
9c6cdcc70b
complete setting of user model from data-server
2013-10-08 15:39:04 -07:00
Andrzej Kapolka
87bdd2fb1a
When in mirror mode and using a blend face, try to position the camera so as
...
to look directly into the face's eyes.
2013-10-08 15:09:56 -07:00
Stephen Birarda
233c1599bd
leverage existing URL update rate for interim face model update solution
2013-10-08 14:25:53 -07:00
Andrzej Kapolka
3cca3dc894
Reset fix.
2013-10-08 14:06:04 -07:00
Stephen Birarda
10f29dfe90
ask the data-server for a face mesh on UUID change
2013-10-08 14:02:57 -07:00
Stephen Birarda
15ddd9989b
ovverride UUID setter in Avatar for DataServerClient get request
2013-10-08 13:59:28 -07:00
Andrzej Kapolka
15f7b70269
Let's actually use the transform we constructed.
2013-10-08 13:54:54 -07:00
Stephen Birarda
b17e12460c
shift get/set of face model URL to Profile class
2013-10-08 13:52:04 -07:00
Stephen Birarda
8bac70e4a5
pass UUID from data-server to avatar-mixer
2013-10-08 13:43:31 -07:00
Andrzej Kapolka
60306af3e9
Default springiness, allow springiness on non-blended meshes.
2013-10-08 13:35:02 -07:00
Stephen Birarda
6bd71da84e
pack the UUID with the avatar data
2013-10-08 13:31:39 -07:00
Stephen Birarda
97966592e1
Merge branch 'master' of github.com:worklist/hifi into nameserver
2013-10-08 13:19:55 -07:00
Stephen Birarda
d843285db7
save profile to settings, fix UUID storage
2013-10-08 12:40:09 -07:00
Stephen Birarda
85edb93710
add a Profile class to hold user data from data-server
2013-10-08 12:13:45 -07:00
Andrzej Kapolka
506f667083
More springy, more damp. Removed unused variable.
2013-10-08 11:26:15 -07:00
Andrzej Kapolka
e3436eed91
Fixes for eyes rolling back in head, macaw head without mapping file.
2013-10-08 11:18:12 -07:00
Andrzej Kapolka
b22334730d
Fix for eyes rolling back in head.
2013-10-08 11:01:31 -07:00
stojce
a795a5b88f
#19435 - Remove 'Perlin Face' option from menus and code
2013-10-08 18:23:51 +02:00
Andrzej Kapolka
b0bc122a48
Got some actual damped oscillation going.
2013-10-07 18:02:03 -07:00
Andrzej Kapolka
3448ceccd2
Progress towards a spring-mass model.
2013-10-07 17:25:46 -07:00
Stephen Birarda
e9e77d8276
set username instead of UUID in Interface preferences
2013-10-07 13:35:16 -07:00
Stephen Birarda
f36fd47ef7
store username and not UUID for MyAvatar
2013-10-07 12:17:47 -07:00
Stephen Birarda
98f435ccc2
link mesh URL and UUID in prefs to data server client
2013-10-07 12:03:04 -07:00
Andrzej Kapolka
325ac73d0a
Apply color to ambient material property, too.
2013-10-04 17:04:50 -07:00
Andrzej Kapolka
5f26177560
Fix for URLs' not being sent: setting the scale calls createMohawk, which
...
reseeds the random number generator, breaking "shouldDo."
2013-10-04 13:42:03 -07:00
Andrzej Kapolka
b281facf45
Remove references to ambient, use the requested alpha.
2013-10-04 10:53:19 -07:00
Andrzej Kapolka
51c868fd28
Apply (some) FBX material properties to rendered meshes.
2013-10-03 18:12:58 -07:00
Andrzej Kapolka
1994f9cc91
Missed a spot.
2013-10-02 15:10:35 -07:00
Andrzej Kapolka
97762b21c4
Change order of transformations so that head offset is consistent with scale.
2013-10-02 15:03:33 -07:00
Andrzej Kapolka
c98dec8a65
Dilate our network-downloaded textures.
2013-10-02 11:59:14 -07:00
Andrzej Kapolka
d87fe204e0
Merge branch 'master' of https://github.com/worklist/hifi
2013-10-02 10:23:43 -07:00
Andrzej Kapolka
3c6fb2914f
Use inheritance type flags. Getting closer to the correct transforms.
2013-10-01 15:03:29 -07:00
Philip Rosedale
64151975f2
Merge pull request #1002 from ZappoMan/voxel_render_pipeline_improvement
...
Voxel render pipeline improvement
2013-10-01 13:13:11 -07:00
Andrzej Kapolka
3c3cf0b002
Basic geometry sharing/texture loading.
2013-10-01 10:50:09 -07:00
ZappoMan
793a14e25a
first cut at new faster voxel pipeline
2013-10-01 10:37:14 -07:00
Stephen Birarda
ca68846c1b
some deletions and cleanup based on Xcode analysis
2013-09-30 15:36:23 -07:00
Stephen Birarda
617b905385
Merge pull request #996 from ey6es/master
...
Transformation rejiggery to support Ryan's alien model.
2013-09-30 14:34:26 -07:00
Andrzej Kapolka
71d68796f3
Remove whitespace.
2013-09-30 13:27:10 -07:00
Andrzej Kapolka
5dc7b64c03
Merge branch 'master' of https://github.com/worklist/hifi
2013-09-30 13:22:59 -07:00
Andrzej Kapolka
40d195595f
Include the neck pivot when we get the eye locations.
2013-09-30 13:20:28 -07:00
Andrzej Kapolka
d4c4cbc981
Get the neck joint and position blend face relative to that.
2013-09-30 13:15:59 -07:00
Philip Rosedale
f30ff1704a
Fix to make touch-look MUCH smoother for flying around
2013-09-30 12:43:25 -07:00
Andrzej Kapolka
d4203ff3d3
Pivot fix.
2013-09-30 12:01:27 -07:00
Andrzej Kapolka
1592aac177
Getting closer to the correct set of transforms.
2013-09-30 11:24:41 -07:00
Philip Rosedale
9645cd9831
Click on voxels as way of moving around
2013-09-28 15:18:59 -07:00
Andrzej Kapolka
f8d26f207d
Include the local transforms from the FBX file when rendering meshes.
2013-09-27 17:57:18 -07:00
Freddy
c78aa591c5
Fix spinning while flying, top speed now about Mach 1
2013-09-27 15:08:10 -07:00
Freddy
f88a3633a5
Slow down when near other avatars for easier positioning
2013-09-27 00:40:41 -07:00
Freddy
6b0f9314ba
Faceshift drives body rotation, remove gyro-driven rotation
2013-09-26 23:52:44 -07:00
Andrzej Kapolka
91999dfe1f
Pupil dilation.
2013-09-26 15:48:11 -07:00
Andrzej Kapolka
4dec183262
Enlarge heads when they're moused over.
2013-09-26 12:07:13 -07:00
Andrzej Kapolka
736dae0c81
Use shaders for eyes (like the ones for the iris).
2013-09-25 15:26:29 -07:00
Andrzej Kapolka
402f65fc00
Use the blend face eye locations for the eye vectors, when possible.
2013-09-25 14:12:50 -07:00
Andrzej Kapolka
9a16d44a47
Render the eye textures.
2013-09-25 13:47:03 -07:00
Andrzej Kapolka
85ab9b7576
Use the texture coordinates when rendering the eyes.
2013-09-25 11:35:02 -07:00
Andrzej Kapolka
71ec6f75e5
Move the eyeball meshes according to the lookat direction (not really visible
...
yet since the eyeballs have no textures).
2013-09-24 18:57:37 -07:00
Andrzej Kapolka
b44e962ac7
Merge branch 'master' of https://github.com/worklist/hifi into blendface
2013-09-24 14:30:57 -07:00
Andrzej Kapolka
1b9444cb39
As a temporary hack, render the mesh with the most blendshapes with the head
...
color (other meshes white).
2013-09-24 14:22:01 -07:00
Andrzej Kapolka
fd41a075ed
Added support for multiple blended meshes.
2013-09-24 13:53:19 -07:00
Freddy
6bbe34a8c4
missing space
2013-09-23 23:06:32 -07:00
Freddy
027811e37c
Increase thrust while holding keys down to allow very fast speeds
2013-09-23 22:53:35 -07:00
Andrzej Kapolka
aa6eb7b3d8
Render the "other" meshes as separate, static, white.
2013-09-23 16:34:28 -07:00
Andrzej Kapolka
255e5179ae
Let's actually use the variable we initialized.
2013-09-23 13:02:00 -07:00
Andrzej Kapolka
1a55c64299
Scale the normal contributions down. For some reason, their magnitudes are
...
higher than one would expect.
2013-09-23 12:42:58 -07:00
Andrzej Kapolka
807f6aaf14
Temporarily render the normals for debugging.
2013-09-23 12:20:19 -07:00
Andrzej Kapolka
c7bb523fc5
Apply the skin color to the blend face.
2013-09-23 12:15:02 -07:00
Andrzej Kapolka
1893fdba29
Revert "Trying a different method of updating the normals."
...
This reverts commit 8e2be380f6
.
2013-09-23 11:47:59 -07:00
Andrzej Kapolka
8e2be380f6
Trying a different method of updating the normals.
2013-09-23 11:17:12 -07:00
Andrzej Kapolka
0fa2eca02d
Remove option to use Faceshift rig (using the "macaw" model has much the same
...
result, and it lets other people see it).
2013-09-23 10:43:20 -07:00
Andrzej Kapolka
8c963ed6a7
Blend the normals, too.
2013-09-23 10:30:03 -07:00
Andrzej Kapolka
24bf1e2036
Don't render neck/neck base when blend face is active.
2013-09-20 17:55:31 -07:00
Andrzej Kapolka
133ba3a00a
Set normals based on indices, cache face models.
2013-09-20 17:40:15 -07:00
Stephen Birarda
f8f0e3db1b
remove the sphere from the ground plane
2013-09-20 14:04:18 -07:00
Andrzej Kapolka
fe0d93102e
Another slight face fix: clear the face when set, before loading the new one.
2013-09-20 13:46:29 -07:00
Andrzej Kapolka
df0b2f4eec
Fix for face model sending.
2013-09-20 13:28:50 -07:00
Andrzej Kapolka
2f5a5a4b27
Remove unnecessary, unlucky "13," add note explaining arbitrary translation.
2013-09-20 09:52:15 -07:00
Andrzej Kapolka
a04ced633e
Include the face model URL in the same packet as the avatar voxel URL.
2013-09-19 16:35:25 -07:00
Andrzej Kapolka
fff10375a9
Map the blendshapes by name.
2013-09-19 15:48:33 -07:00
Andrzej Kapolka
116a4e0bad
Subtract the deltas.
2013-09-19 15:18:45 -07:00
Andrzej Kapolka
09fa782c61
More work on FBX reading.
2013-09-19 15:05:17 -07:00
Andrzej Kapolka
dfea69ab8f
Basic FBX parser.
2013-09-18 16:26:35 -07:00
Andrzej Kapolka
6be03ac3df
Working on downloading the faces.
2013-09-18 10:10:24 -07:00
Andrzej Kapolka
596d0ac471
Subtract the neutral position from the blendshapes.
2013-09-17 17:01:17 -07:00
Andrzej Kapolka
617b3d67cf
I think we need to treat the blend shapes as offsets from neutral.
2013-09-17 16:11:07 -07:00
Andrzej Kapolka
558d3d41a6
First attempt at blending.
2013-09-17 15:22:06 -07:00
Andrzej Kapolka
1afece81c5
Use quads as well as triangles, apply scale.
2013-09-17 11:49:50 -07:00
Andrzej Kapolka
b4ca66eb68
Merge branch 'master' of https://github.com/worklist/hifi into blendface
...
Conflicts:
interface/src/devices/Faceshift.cpp
2013-09-17 11:05:11 -07:00
Andrzej Kapolka
262365f15f
Only render the Perlin face for the local user.
2013-09-17 10:51:33 -07:00
Andrzej Kapolka
1fce6c717b
Working on shipping around the complete set of blendshape coefficients.
2013-09-16 17:28:04 -07:00
Andrzej Kapolka
f9426cbecc
Working on reading and rendering the rig from Faceshift.
2013-09-16 15:49:40 -07:00
atlante45
ac0ee6c7d6
another merge commit
2013-09-14 14:41:03 -07:00
atlante45
d6981bfa20
Andrejz Faceshift modif merge
2013-09-13 18:18:41 -07:00
atlante45
7a2a79f6f5
Temp code for Brad to look at
2013-09-13 15:17:17 -07:00
atlante45
683cfd6c8b
Fixed Eye Open
2013-09-13 11:21:13 -07:00
atlante45
87b4528e2c
removed unmeant committed files
2013-09-12 17:54:57 -07:00
atlante45
7cd2f2b06b
send faceshift data to avatar mixer
2013-09-12 17:41:26 -07:00
atlante45
64b462a4f0
Improved smile
2013-09-11 15:19:01 -07:00
atlante45
88e8ef7c7c
eye opening and some better memory handling
2013-09-11 12:57:58 -07:00
atlante45
5618a784c7
Fixed perlin's face eyes
2013-09-11 10:51:31 -07:00
Andrzej Kapolka
feecb4fa25
Fix for eyelids, change Faceshift menu option to indicate that it applies
...
specifically to TCP connection.
2013-09-11 10:44:38 -07:00
atlante45
ae5173a730
Added Jaw
2013-09-10 18:32:39 -07:00
atlante45
117565934c
added smooth normals for lighting
2013-09-10 17:54:59 -07:00
RyanDowne
13c228e796
Added Smile
2013-09-10 17:33:22 -07:00
atlante45
61f9088d3e
eyelib handling for faceshift
2013-09-10 16:35:14 -07:00
atlante45
85c3d54718
mouth handling on perlin faces
2013-09-10 15:33:09 -07:00
atlante45
4e3484021e
PerlinFace implementation
2013-09-10 15:31:58 -07:00
Andrzej Kapolka
cea645dfc7
Tweak to blink angles.
2013-09-10 12:34:41 -07:00
Andrzej Kapolka
6614a13c64
Align the eyelids to the top of the iris.
2013-09-10 11:58:45 -07:00
Andrzej Kapolka
db8575b59a
Reduced the restore rate.
2013-09-10 11:25:30 -07:00
Andrzej Kapolka
c56778c3bf
When devices become inactive (including when Faceshift reports loss of
...
tracking), smoothly restore neutral head rotation/lean.
2013-09-10 11:14:36 -07:00
Andrzej Kapolka
8fec78d82a
Disable random saccades for own eyes.
2013-09-09 13:48:46 -07:00
Andrzej Kapolka
03ead34642
Code review cleanup.
2013-09-05 10:34:43 -07:00
Andrzej Kapolka
834b671f5a
Merge branch 'master' of https://github.com/worklist/hifi into shifty
2013-09-04 15:32:15 -07:00
atlante45
b8c18bee2d
merge
2013-09-04 15:31:12 -07:00
atlante45
5da525fc3e
memory wastes and code cleaning PR comments
2013-09-04 15:12:24 -07:00
Andrzej Kapolka
0a9db6a5ee
Moved device-related files to "devices" folder.
2013-09-04 12:15:36 -07:00
Andrzej Kapolka
5e23c79192
Tweaked feature scales, send recalibrate request on reset.
2013-09-04 11:55:55 -07:00
Andrzej Kapolka
679926ce42
Working on brow/mouth mapping.
2013-09-04 11:40:53 -07:00
Andrzej Kapolka
f84d6f4f37
Fix for eye pitch, track blinking locally.
2013-09-04 10:59:53 -07:00
Andrzej Kapolka
734cb83e81
Read Faceshift head translation/rotation.
2013-09-03 13:56:04 -07:00
atlante45
7688dc4779
Fixed renderer related files memory wastes
2013-09-03 13:50:01 -07:00
atlante45
688bc17954
Fixed avatar related files memory wastes
2013-09-03 13:37:25 -07:00
Andrzej Kapolka
86561b98cc
Merge branch 'master' of https://github.com/worklist/hifi into led
2013-08-30 15:16:22 -07:00
Stephen Birarda
b46bd1fd41
display the Avatar's hand in first person
2013-08-30 10:28:30 -07:00
Andrzej Kapolka
799d2b487f
Initialization order fix.
2013-08-26 16:53:12 -07:00
Andrzej Kapolka
8d8ba532e1
These initializers are in the wrong order.
2013-08-26 14:52:21 -07:00
Andrzej Kapolka
28ffd8eca7
Render the ball heads with the voxeltar bodies.
2013-08-23 14:22:00 -07:00
Andrzej Kapolka
2cff4b6b3a
"Laser pointer" for transmitter.
2013-08-22 17:09:23 -07:00
Andrzej Kapolka
3dfefefeae
Make the surrounding spheres glow when moving, too.
2013-08-22 14:00:50 -07:00
Andrzej Kapolka
2eaaee673f
Argh, forgot to return the result of the superclass implementation.
2013-08-22 13:52:10 -07:00
Andrzej Kapolka
7da9556815
Glow when moving.
2013-08-22 11:23:28 -07:00
Andrzej Kapolka
ff245427fd
Merge branch 'master' of https://github.com/worklist/hifi
...
Conflicts:
interface/src/avatar/Avatar.cpp
2013-08-22 10:40:15 -07:00
Andrzej Kapolka
165342bcc3
Have the local avatar glow when moving.
2013-08-22 10:35:21 -07:00
Stephen Birarda
6206d9e8db
fix for collisions when wearing Oculus
2013-08-21 17:42:13 -07:00
ZappoMan
69842ef82f
Merge pull request #878 from LionTurtle/master
...
Add MyAvatar class, subclass of Avatar class.
2013-08-21 16:55:24 -07:00
LionTurtle
3eb0a1a190
Magic number removal...
2013-08-21 16:35:16 -07:00
LionTurtle
e252d3b2ac
Style and spacing changes in MyAvatar/Avatar classes.
2013-08-21 16:32:06 -07:00
LionTurtle
a6109d411b
Remove unnecessary comments and spaces.
2013-08-21 13:47:19 -07:00
LionTurtle
bb9af3103c
Remove unused setNoise() function in MyAvatar.h that was causing
...
build error.
2013-08-21 13:44:01 -07:00
LionTurtle
de9bd9e1b8
Add MyAvatar and resolve merge conflicts.
2013-08-21 13:38:23 -07:00
LionTurtle
1300bf7de2
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
interface/src/avatar/Avatar.cpp
interface/src/avatar/Avatar.h
2013-08-21 13:36:28 -07:00
LionTurtle
f4109b3fb4
Add MyAvatar subclass. For functions such as render() and simulate(),
...
they have been edited so that there are MyAvatar and Avatar specific
versions in their respective classes. isMyAvatar() has been removed.
2013-08-21 13:24:54 -07:00
Andrzej Kapolka
f39050ae28
Enable lookat vectors by default and make them glow.
2013-08-21 11:37:57 -07:00
Andrzej Kapolka
222e026662
Use a small default lean scale.
2013-08-19 13:18:20 -07:00
Andrzej Kapolka
8d65323345
Restore the gyro-only lean behavior based on linear accelerometer data.
2013-08-19 13:14:35 -07:00
Stephen Birarda
d4951b0223
fix getter for Hand and Head
2013-08-15 16:09:44 -07:00
Stephen Birarda
9816e1d9a8
some spacing cleanup in Head
2013-08-15 16:09:00 -07:00
Stephen Birarda
6cbe0ca3d0
some spacing cleanup in Avatar header
2013-08-15 16:04:42 -07:00
Stephen Birarda
811fc87294
move avatar size changes to Avatar slots
2013-08-15 12:18:19 -07:00
Stephen Birarda
bbe239694e
move Avatar goHome to Avatar slot
2013-08-15 11:36:12 -07:00
Stephen Birarda
f5079374f3
fix hooks for skeleton tracking and collisions
2013-08-15 11:29:10 -07:00
Stephen Birarda
10109fff10
inlined spacing cleanup in Head, remove noise
2013-08-15 11:04:18 -07:00
Stephen Birarda
46b064b7d6
initial decoupling of menu from Application
2013-08-15 10:46:51 -07:00
atlante45
521eb19625
PR comments + Changed MIN and MAX scale
2013-08-08 16:22:26 -07:00
atlante45
f5fe965093
Position based follow mode whith head movement
2013-08-08 15:49:35 -07:00
Eric Johnston
a20668951a
Merge branch 'master' of git://github.com/worklist/hifi into dev4
2013-08-07 17:06:43 -07:00
Stephen Birarda
655a27b257
Merge pull request #825 from Atlante45/master
...
Fix other avatar not rendered in first person
2013-08-07 16:44:23 -07:00
atlante45
4449b46466
Fix other avatar not rendered in first person
2013-08-07 16:38:02 -07:00
Eric Johnston
524e5dd130
Fixed fencepost error to make trails slightly cleaner
2013-08-07 16:33:38 -07:00
Eric Johnston
a01b36c7a5
Merge branch 'master' of git://github.com/worklist/hifi into dev4
2013-08-07 16:22:21 -07:00
Eric Johnston
52b33cb466
Rave tweaks: Improvements to finger trails and hand rendering
2013-08-07 16:19:54 -07:00
ZappoMan
9f5f7d96da
Merge pull request #820 from Atlante45/master
...
Display leap hand and rave glove in first person mode
2013-08-07 16:17:37 -07:00
ZappoMan
85d5f86046
Merge pull request #821 from PhilipRosedale/master
...
Rotation stops faster
2013-08-07 16:16:54 -07:00
Hifi Test Account
38651a6a40
Translate half cylinder backing rather than rotate a 2nd one.
2013-08-07 16:04:45 -07:00
Hifi Test Account
8cadca4ce7
Resize half cylinder backing to texture in full frame mode.
2013-08-07 15:35:12 -07:00
atlante45
b6adb14a16
Merge branch 'master' of https://github.com/worklist/hifi
2013-08-07 14:51:09 -07:00
atlante45
20fea6b0ad
Height relative collision rdius when not in first person
2013-08-07 14:50:35 -07:00
Philip Rosedale
a4d1bc5b6e
Merge branch 'master' of https://github.com/worklist/hifi
2013-08-07 14:43:49 -07:00
Andrzej Kapolka
a8099c93c0
Merge pull request #806 from LionTurtle/master
...
Add renderHalfCylinder function and render a static half cylinder behind the face in full frame mode.
2013-08-07 14:43:04 -07:00
Philip Rosedale
0445da3221
Stop rotating more quickly, display avatar position and yaw stats
2013-08-07 14:42:57 -07:00
atlante45
c48652c2c3
Display leap hand and rave glove in first person mode
2013-08-07 14:28:21 -07:00
atlante45
81446f13d5
Fix head not colliding with voxels and environement
2013-08-07 14:18:02 -07:00
Philip Rosedale
0d26bb4266
Camera always stops moving when using gyro's
2013-08-07 14:08:30 -07:00
Hifi Test Account
cd8047b01a
Remove unused vars in Face class.
2013-08-07 13:54:38 -07:00
atlante45
3bc9dd116e
- Compute collisions radius only when collisions are on
2013-08-07 12:31:31 -07:00
Hifi Test Account
5f90e1a4e9
Fix the last commit. Remove compile error and increased buffer size to
...
to account for the increased size of vertexData.
2013-08-07 12:30:45 -07:00
atlante45
35557e1973
- Change collision radius according to near clip so nothing comes inside
2013-08-07 12:25:31 -07:00
Hifi Test Account
edf4579d0e
Merge remote-tracking branch 'upstream/master'
2013-08-07 12:08:43 -07:00
Hifi Test Account
1e7dbbbccd
Fix renderHalfCylinder so that normals are correct now. Add facePosition and faceRotation storage to Face class.
2013-08-07 12:07:41 -07:00
ZappoMan
11b7e84a80
Merge pull request #811 from ey6es/master
...
Several minor fixes for depth camera code.
2013-08-07 12:01:01 -07:00
Andrzej Kapolka
e17149a49d
Merge pull request #812 from Atlante45/master
...
Rendering changes
2013-08-07 11:46:43 -07:00
Andrzej Kapolka
377adb30ae
Merge branch 'master' of https://github.com/worklist/hifi
2013-08-07 11:14:48 -07:00
Eric Johnston
5373f85d30
Merge branch 'master' of https://github.com/worklist/hifi into dev4
2013-08-07 11:13:42 -07:00
atlante45
08309e3aac
Merge branch 'master' of https://github.com/worklist/hifi
2013-08-07 11:11:29 -07:00
Eric Johnston
10e4174ce3
Rave tweak: keep the right arm on the right-most Leap hand.
2013-08-07 11:08:14 -07:00
atlante45
dcdae6c6a0
- Add a translucide sphere around avatars far away with radius relative to average loudness
2013-08-07 11:00:20 -07:00
atlante45
414af9811a
- Add fading to lookAt vectors
2013-08-07 10:54:52 -07:00
ZappoMan
d893d4cf16
Merge pull request #807 from machinelevel/dev4
...
Rave tweaks: change the look of the hands, fix screen-darken
2013-08-07 10:49:59 -07:00
Eric Johnston
1fc4f17f7a
Rave tweaks: change the look of the hands, fix screen-darken
...
Screen-darken is now a simple fullscreen draw
Leap hands are now visible and match body lighting
Fingertips are hidden and hand coloring matches body and arm
"fake hands" aren't active unless they're chosen from the Debug menu.
2013-08-07 10:29:31 -07:00
Jeffrey Ventrella
6997d0174a
clean up in mohawk code
2013-08-07 10:24:21 -07:00
Andrzej Kapolka
ca939fb6b8
Merge branch 'master' of https://github.com/worklist/hifi
2013-08-07 10:18:45 -07:00
Jeffrey Ventrella
b007ab11d4
Merge remote-tracking branch 'upstream/master' into particles
2013-08-07 10:18:32 -07:00
Jeffrey Ventrella
253154ce6d
fixed mohawk physics bug
2013-08-07 10:17:53 -07:00
Andrzej Kapolka
f20ac7f4bc
Include received video data in bandwidth usage, clear webcam bits when it's
...
been turned off.
2013-08-07 10:17:04 -07:00
Hifi Test Account
988faeff54
Render static halfCylinder backing to face in full frame mode.
2013-08-07 10:14:35 -07:00
Hifi Test Account
05d933bf33
Successful static half cylinder backing.
2013-08-06 18:38:41 -07:00
Eric Johnston
35465686db
Rave tweaks: Use separate light settings for avatars and particles
2013-08-06 17:39:56 -07:00
Philip Rosedale
7583e1cd14
Merge pull request #802 from ey6es/master
...
Added a textured rendering mode for depth data that doesn't use video input; rather, it computes normals from the depth and uses local lighting.
2013-08-06 17:13:50 -07:00
Eric Johnston
378cb343ae
Rave tweaks per Ryan's request: Mood lighting for the avatars. This also sets us up to have light coming from the effects, if we want.
2013-08-06 16:45:15 -07:00
Andrzej Kapolka
2f2eaf8ae5
Merge branch 'master' of https://github.com/worklist/hifi
2013-08-06 16:28:22 -07:00
Andrzej Kapolka
63aeb4df75
Merge branch 'master' of https://github.com/worklist/hifi
...
Conflicts:
interface/src/Application.cpp
2013-08-06 16:28:14 -07:00
Andrzej Kapolka
bd3c235fe4
Switching between textured and untextured modes.
2013-08-06 16:23:58 -07:00
atlante45
558255ca3d
- Made collision On by default
2013-08-06 16:13:31 -07:00
ZappoMan
634b69b545
Merge pull request #797 from machinelevel/dev4
...
Rave demo changes per Ryan's request: Darken the world when you're in ra...
2013-08-06 15:00:26 -07:00
ZappoMan
05452dc2aa
Merge pull request #796 from PhilipRosedale/touchLook
...
Tune gyros, always fly in direction of sight, head always moves with gyros, adjustable view sensitivity
2013-08-06 14:59:28 -07:00
Eric Johnston
2e5dade413
Rave demo changes per Ryan's request: Darken the world when you're in rave mode, but leave the avatars and effects un-darkened.
...
Also fixed a warning in AvatarData.cpp initialization
2013-08-06 14:29:30 -07:00
ZappoMan
fb2a1cce50
Merge pull request #795 from machinelevel/dev4
...
Rave glove adjustments per Ryan's requests: hide fingers and arms when r...
2013-08-06 13:45:42 -07:00
Andrzej Kapolka
720ae561df
Working on support for a textured face mode that doesn't rely on the video
...
stream.
2013-08-06 13:27:54 -07:00
Eric Johnston
9a4a0e2819
Rave glove adjustments per Ryan's requests: hide fingers and arms when raving, center hands in front of face.
2013-08-06 12:44:29 -07:00
Philip Rosedale
ebd5c4832a
Merge branch 'master' of https://github.com/worklist/hifi into touchLook
2013-08-06 12:34:55 -07:00
Philip Rosedale
120bbbd506
Tuned gyro look, added better preferences
2013-08-06 12:34:45 -07:00
ZappoMan
c93ed450a2
Merge pull request #791 from Atlante45/stalking_indicator
...
Stalking indicator
2013-08-06 12:33:26 -07:00
Philip Rosedale
abf64f3e7f
Merge pull request #792 from Atlante45/turn_off_collisions
...
Add option to turn collisions on and off
2013-08-06 12:27:27 -07:00
Philip Rosedale
bb15eb664c
Merge pull request #793 from machinelevel/dev4
...
Rave glove: Fix initialization issues and activate mode switch.
2013-08-06 12:15:01 -07:00
Eric Johnston
ab31c3f82d
Rave glove: Fix initialization issues and activate mode switch.
...
Note that this change will have no effect until the Avatar Mixer gets it, because the mixer will continue to send "glove mode 0" until it receives this update.
2013-08-06 11:59:58 -07:00
atlante45
ddf1b06bf9
Add option to turn collisions on and off
2013-08-06 11:33:59 -07:00
atlante45
eb9f32b7cb
Merge branch 'master' of https://github.com/worklist/hifi into stalking_indicator
2013-08-06 11:07:58 -07:00
atlante45
32c155ef71
Render a string to show who is following who
2013-08-06 10:53:10 -07:00
ZappoMan
13408b607e
Merge pull request #790 from PhilipRosedale/touchLook
...
Touch-driven pitch happens immediately even when wearing gyros
2013-08-06 10:39:57 -07:00
Philip Rosedale
58cb852597
Touch-driven pitch happens immediately even when wearing gyros
2013-08-06 10:06:40 -07:00
Eric Johnston
16aae5993a
Rave glove fixes: removed double-stored glove mode members
...
Uncommented glove mode switch, which now calls a non-crashing method.
Fixed overlapping method names for very different methods (setRaveGloveMode becomes activateNewRaveGloveMode).
2013-08-06 07:33:18 -07:00
Philip Rosedale
e5de67152e
Merge pull request #786 from Ventrella/particles
...
Added member variables to Hand.cpp to manage rave glove mode switching
2013-08-05 19:26:55 -07:00
Philip Rosedale
d7dc07502c
Merge pull request #787 from machinelevel/dev4
...
Rave glove demo: network-glove fixes
2013-08-05 18:58:04 -07:00
Jeffrey Ventrella
f9f925b70b
removed printf
2013-08-05 17:30:04 -07:00
Eric Johnston
d85ce81313
Rave glove demo: network-glove fixes
...
After this change, people can see each other's rave glove performances.
1. Moved hand->simulate call into avatar->simulate so that it gets called on all avatars, not just mine.
2. Hide the rave stage, so it's out of the way while we figure out the best way to darken the world, if that's still desired.
2013-08-05 17:27:42 -07:00
Jeffrey Ventrella
cba42808c1
fixed initial rave glove mode
2013-08-05 17:24:31 -07:00
Jeffrey Ventrella
4ceba28632
working with Eric to fix transmission of hand data
2013-08-05 17:00:50 -07:00
atlante45
55e34558cb
Merge branch 'master' of https://github.com/worklist/hifi
2013-08-05 15:26:43 -07:00
atlante45
29062c51b2
- changed according to review comments
...
- added reset scale option
2013-08-05 15:23:40 -07:00
ZappoMan
7021d3c6a5
Merge pull request #777 from Ventrella/particles
...
Added BendyLine
2013-08-05 14:55:26 -07:00
atlante45
6c0ea0cf9c
Merge branch 'master' of https://github.com/worklist/hifi
2013-08-05 14:11:14 -07:00
Jeffrey Ventrella
96b443ec5d
Merge pull request #781 from machinelevel/dev4
...
Rave glove demo: Network rave data
2013-08-05 14:07:57 -07:00
atlante45
3d853f5b90
- Smooth rescaling
...
- stop following when leading avatar disconnect
- set max far clip for no more crash with really big avatars
2013-08-05 14:05:58 -07:00
Eric Johnston
a3a5c3d6d4
Rave glove demo: Network rave data
...
Sending glove modes over the network, and fixed ghost-fingers-left-behind issue.
Issues addressed:
https://basecamp.com/2151194/projects/2058851-avatar/todos/54607028-bug-phantom-leap
https://basecamp.com/2151194/projects/2058851-avatar/todos/54633674-demo-make
2013-08-05 13:25:05 -07:00
Jeffrey Ventrella
7693165578
merge
2013-08-05 11:28:59 -07:00
Jeffrey Ventrella
6e69c4fbbb
improved particle rainbow color cycle mode
2013-08-05 11:28:10 -07:00
Stephen Birarda
a4ea0f035a
resolve conflicts on merge with upstream master
2013-08-05 09:56:07 -07:00
ZappoMan
ce937247d1
added back getUprightEyeLevelPosition()
2013-08-02 18:47:21 -07:00
ZappoMan
fd81053e33
fixed compiler warnings
2013-08-02 18:33:41 -07:00
Mark Peng
71a919f226
Switch back to avatar.getEyePosition() rather than
...
avatar.getHead().getEyePosition() because of mysterious lag.
2013-08-02 18:02:37 -07:00
Mark Peng
e0b7773521
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
interface/src/Application.cpp
interface/src/avatar/Head.cpp
2013-08-02 17:35:29 -07:00
Mark Peng
d7cd88a9a7
Fix camera positioning so that it is in between avatar's eyes. Plus
...
some code clean up.
2013-08-02 17:30:26 -07:00
Philip Rosedale
1309e72553
Merge pull request #758 from Ventrella/particles
...
Added avatar nose
2013-08-02 17:26:10 -07:00
Andrzej Kapolka
4a122c6dca
Merge pull request #761 from ey6es/pointy
...
Adjusted bitrate for full frame video, fix for underflow errors.
2013-08-02 17:05:00 -07:00
Jeffrey Ventrella
d87b4a8e1e
Merge remote-tracking branch 'upstream/master' into particles
2013-08-02 16:08:01 -07:00