stojce
|
355a1f3da3
|
Merge branch 'master' of https://github.com/worklist/hifi into 19435
Conflicts:
interface/src/avatar/Head.cpp
interface/src/avatar/Head.h
|
2013-10-11 22:54:59 +02:00 |
|
Philip Rosedale
|
27a892fa55
|
Removed old head rotation code, menu items, added ability to turn off faceshift head rotation
|
2013-10-09 22:46:34 -07:00 |
|
Andrzej Kapolka
|
083c5e34b2
|
Fix for non-Faceshift eye and mouth movement.
|
2013-10-09 15:11:14 -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 |
|
Andrzej Kapolka
|
3cca3dc894
|
Reset fix.
|
2013-10-08 14:06:04 -07:00 |
|
stojce
|
a795a5b88f
|
#19435 - Remove 'Perlin Face' option from menus and code
|
2013-10-08 18:23:51 +02:00 |
|
Andrzej Kapolka
|
3448ceccd2
|
Progress towards a spring-mass model.
|
2013-10-07 17:25:46 -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
|
c98dec8a65
|
Dilate our network-downloaded textures.
|
2013-10-02 11:59:14 -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
|
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
|
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
|
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
|
7cd2f2b06b
|
send faceshift data to avatar mixer
|
2013-09-12 17:41:26 -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
|
61f9088d3e
|
eyelib handling for faceshift
|
2013-09-10 16:35:14 -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
|
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
|
5da525fc3e
|
memory wastes and code cleaning PR comments
|
2013-09-04 15:12:24 -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 |
|
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
|
f39050ae28
|
Enable lookat vectors by default and make them glow.
|
2013-08-21 11:37:57 -07:00 |
|
Stephen Birarda
|
46b064b7d6
|
initial decoupling of menu from Application
|
2013-08-15 10:46:51 -07:00 |
|
Philip Rosedale
|
0d26bb4266
|
Camera always stops moving when using gyro's
|
2013-08-07 14:08:30 -07:00 |
|
atlante45
|
08309e3aac
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-08-07 11:11:29 -07:00 |
|
atlante45
|
414af9811a
|
- Add fading to lookAt vectors
|
2013-08-07 10:54:52 -07:00 |
|
Jeffrey Ventrella
|
6997d0174a
|
clean up in mohawk code
|
2013-08-07 10:24:21 -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 |
|
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 |
|
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 |
|
Philip Rosedale
|
58cb852597
|
Touch-driven pitch happens immediately even when wearing gyros
|
2013-08-06 10:06:40 -07:00 |
|
Jeffrey Ventrella
|
7693165578
|
merge
|
2013-08-05 11:28:59 -07:00 |
|