Andrzej Kapolka
|
0881cd4c92
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-10-10 10:32:19 -07:00 |
|
Andrzej Kapolka
|
ea639afe44
|
Use the head joint position so that lean affects camera position in first
person mode.
|
2013-10-10 10:31:34 -07:00 |
|
Philip Rosedale
|
72273d1469
|
indent
|
2013-10-10 10:14:35 -07:00 |
|
Philip Rosedale
|
dd09d686fc
|
indents
|
2013-10-10 09:53:43 -07:00 |
|
Philip Rosedale
|
d8dcb6aa44
|
bracket placement
|
2013-10-09 23:26:44 -07:00 |
|
Philip Rosedale
|
632dd2fa7d
|
code review, added Doxygen style comments
|
2013-10-09 23:23:20 -07: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 |
|
Philip Rosedale
|
1d1e1f6d41
|
spacing
|
2013-10-09 17:21:39 -07:00 |
|
Philip Rosedale
|
5509324ffd
|
Change particles to use vertex arrays, further speedups
|
2013-10-09 17:18:22 -07:00 |
|
Philip Rosedale
|
cabb5112dd
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-10-09 16:03:38 -07:00 |
|
Philip Rosedale
|
ab4b09ca39
|
More coding standard fixes to particle cloud
|
2013-10-09 16:03:06 -07:00 |
|
Andrzej Kapolka
|
083c5e34b2
|
Fix for non-Faceshift eye and mouth movement.
|
2013-10-09 15:11:14 -07:00 |
|
Philip Rosedale
|
4afa82d626
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-10-09 15:10:16 -07:00 |
|
Philip Rosedale
|
85a15a22fa
|
Further code cleanup on particle cloud
|
2013-10-09 15:10:03 -07:00 |
|
Andrzej Kapolka
|
dfa3ea78da
|
Reverse direction of eye offset.
|
2013-10-09 14:38:05 -07:00 |
|
Philip Rosedale
|
58d6c4c97a
|
Cleaning up particle code
|
2013-10-09 14:28:00 -07:00 |
|
Philip Rosedale
|
bcb3e082f6
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-10-09 12:17:43 -07:00 |
|
Andrzej Kapolka
|
604d6399eb
|
Fix for grow/shrink rates.
|
2013-10-09 11:58:27 -07:00 |
|
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 |
|
Philip Rosedale
|
8dc84fc841
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-10-09 11:44:56 -07:00 |
|
Stephen Birarda
|
478214f9da
|
fix Profile include from DataServerClient
|
2013-10-09 11:14:26 -07:00 |
|
Andrzej Kapolka
|
a679517596
|
Fix for jaundiced eyes.
|
2013-10-09 11:10:51 -07:00 |
|
Stephen Birarda
|
268a64d3d5
|
change data-server hostname to hifi global data-server
|
2013-10-09 10:27:02 -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 |
|
Philip Rosedale
|
906f3c8c60
|
got basic cloud working
|
2013-10-08 23:15:29 -07:00 |
|
Philip Rosedale
|
afd553330a
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-10-08 22:24:34 -07:00 |
|
Philip Rosedale
|
ce2e31ddd5
|
reconnecting particle cloud
|
2013-10-08 22:21:55 -07:00 |
|
Philip Rosedale
|
69277ec8ba
|
Added back field and cloud files
|
2013-10-08 21:49:13 -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
|
f5912f07a8
|
make sure username is not empty before requesting faceMesh
|
2013-10-08 12:45:18 -07:00 |
|
Stephen Birarda
|
d843285db7
|
save profile to settings, fix UUID storage
|
2013-10-08 12:40:09 -07:00 |
|
Stephen Birarda
|
ae59ce22b7
|
send an empty key when making a UUID request
|
2013-10-08 12:22:02 -07:00 |
|
Stephen Birarda
|
85edb93710
|
add a Profile class to hold user data from data-server
|
2013-10-08 12:13:45 -07:00 |
|
Stephen Birarda
|
56b71eb61a
|
re-send data-server GET requests if they are unmatched
|
2013-10-08 11:33:14 -07:00 |
|
Andrzej Kapolka
|
506f667083
|
More springy, more damp. Removed unused variable.
|
2013-10-08 11:26:15 -07:00 |
|
Andrzej Kapolka
|
acaf7d4f88
|
Merge branch 'master' of https://github.com/worklist/hifi into springy
|
2013-10-08 11:22:03 -07:00 |
|
Andrzej Kapolka
|
6a043145d3
|
Merge branch 'master' of https://github.com/worklist/hifi into springy
Conflicts:
interface/src/renderer/FBXReader.cpp
|
2013-10-08 11:21:47 -07:00 |
|