Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-22 23:14:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
6921 commits 25 branches 0 tags 1.1 GiB
Commit graph

3554 commits

Author SHA1 Message Date
Philip Rosedale
bf3f507301 Merge pull request #1043 from birarda/master 
fix domain jumping with goToUser, remove planet environments
 2013-10-10 17:25:43 -07:00
Philip Rosedale
77cf08b8f8 Merge pull request #1044 from birarda/data-server 
don't goToUser without domain and position
 2013-10-10 17:21:58 -07:00
Stephen Birarda
2c181011b3 don't attempt to go to user without domain AND position 2013-10-10 16:48:26 -07:00
ZappoMan
fbcf66b232 Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels 
Conflicts:
	interface/src/Menu.h
 2013-10-10 16:37:07 -07:00
Stephen Birarda
6f868a00eb reset environment on domain-server change 2013-10-10 16:34:35 -07:00
Stephen Birarda
aa0a97b959 use deleteLater to ensure that AvatarVoxelSystem delete is on correct thread 2013-10-10 16:23:22 -07:00
Andrzej Kapolka
6e012ea6d2 When computing average model color, skip eyes and weight rest by number of 
vertices.
 2013-10-10 16:04:42 -07:00
Philip Rosedale
43e01ee105 Merge pull request #1039 from birarda/data-server 
add ability to jump to a user's domain and location
 2013-10-10 15:37:21 -07:00
ZappoMan
c5d3f53bd6 Merge pull request #1037 from birarda/infoview 
fix InfoView full screen bug
 2013-10-10 15:29:55 -07:00
ZappoMan
3ad2a6edaa remove dead code 2013-10-10 15:28:55 -07:00
ZappoMan
f3aa82624f progress on keep local voxels 2013-10-10 15:28:06 -07:00
ZappoMan
0a6ddf108f progress on keep local voxels 2013-10-10 15:25:33 -07:00
ZappoMan
c86bad77c9 progress on keep local voxels 2013-10-10 15:23:22 -07:00
Andrzej Kapolka
42d3ee450b Fix for seg fault on exit. 2013-10-10 15:15:28 -07:00
Stephen Birarda
33e6e1925e handle get of multiple values in single packet 2013-10-10 13:50:03 -07:00
Andrzej Kapolka
4c073426c8 Ball and cone color from average geometry colors. 2013-10-10 13:41:50 -07:00
Stephen Birarda
7851251e5d indicate number of values being put to data-server 2013-10-10 11:51:18 -07:00
Stephen Birarda
d37ae7da1b include the number of keys with data-server get 2013-10-10 11:49:14 -07:00
Andrzej Kapolka
14dfa72284 Rotation fix. 2013-10-10 11:25:11 -07:00
Stephen Birarda
11437054a6 add line to fix InfoView full screen bug 2013-10-10 11:01:07 -07:00
Andrzej Kapolka
052c8246fa Let's use the "eye level" position. 2013-10-10 10:49:19 -07:00
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
Stephen Birarda
fb39ad0a55 comment out data-server packet queueing until sequencing is implemented 2013-10-09 17:03:02 -07:00
Stephen Birarda
4c148c6f3a ask data-server for domain + position of user from goToUser 2013-10-09 16:58:27 -07:00
Stephen Birarda
cd504e2293 use QString for DataServerClient keys 2013-10-09 16:50:54 -07:00
Stephen Birarda
3231776e76 add API for Profile userString and multiple value requests 2013-10-09 16:45:02 -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
Stephen Birarda
d66137e314 add a Go To User option to the menu 2013-10-09 15:36:33 -07:00
Stephen Birarda
f7a0dd514e load NodeList and Profile settings with menu settings load 2013-10-09 15:23:07 -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
Stephen Birarda
d3b95d19a1 send the user's last domain and position to data-server 2013-10-09 15:09:57 -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
ZappoMan
d939d3aaae Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels 2013-10-09 14:02:40 -07:00
ZappoMan
c25b03dd58 first cut at keeping local voxels 2013-10-09 14:02:31 -07:00
Stephen Birarda
9112efaa36 move username change to Login, add lastPosition and lastDomain 2013-10-09 13:00:05 -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
ZappoMan
5e6e15db41 Merge pull request #1025 from ZappoMan/voxel_render_modes 
two possible crash fixes
 2013-10-08 11:21:10 -07:00
Stephen Birarda
892614470e Merge branch 'master' of github.com:worklist/hifi into nameserver 2013-10-08 11:19:32 -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
ce23b415e0 Fix for macaw head without mapping file. 2013-10-08 11:11:01 -07:00
Andrzej Kapolka
b22334730d Fix for eyes rolling back in head. 2013-10-08 11:01:31 -07:00
Andrzej Kapolka
184e0f4439 Merge branch 'master' of https://github.com/worklist/hifi into springy 2013-10-08 10:34:53 -07:00
ZappoMan
89a4ea6470 two possible crash fixes 2013-10-08 09:56:47 -07:00
stojce
a795a5b88f #19435 - Remove 'Perlin Face' option from menus and code 2013-10-08 18:23:51 +02:00
ZappoMan
aa80ec3497 cleanup code for PR 2013-10-07 19:46:52 -07:00
ZappoMan
54364a235d tighten up mutex locks to keep at 60 fps 2013-10-07 19:43:45 -07:00
Andrzej Kapolka
b0bc122a48 Got some actual damped oscillation going. 2013-10-07 18:02:03 -07:00
Stephen Birarda
7964f360ab add method to DataServerClient to resend unmatched packets 2013-10-07 17:52:21 -07:00
ZappoMan
f6981feacf added various render mode options, including voxels as points 2013-10-07 17:46:22 -07:00
Andrzej Kapolka
3448ceccd2 Progress towards a spring-mass model. 2013-10-07 17:25:46 -07:00
Stephen Birarda
26d5e2cfec clear the face model URL if the username is changed in preferences 2013-10-07 17:24:07 -07:00
Stephen Birarda
4b62026c25 shore up receipt of face mesh URL from data-server 2013-10-07 17:06:38 -07:00
Stephen Birarda
b33843fddc ask for a mesh if username is present on login or is changed 2013-10-07 13:52: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
stojce
16d10775dc #19434 restore window position on start 
- store position and size on app end
- restore position and size on app start
 2013-10-07 21:04:36 +02:00
Stephen Birarda
98f435ccc2 link mesh URL and UUID in prefs to data server client 2013-10-07 12:03:04 -07:00
Stephen Birarda
fea3ca8229 pack string representation of UUID for data server communication 2013-10-07 10:58:26 -07:00
Stephen Birarda
5a7d21f529 add UUID helper class to get UUID string without braces 2013-10-07 10:56:23 -07:00
Stephen Birarda
13232a4c0b stubbing of mechanism to confirm packets sent to data server 2013-10-07 10:45:54 -07:00
Stephen Birarda
4cc9f29c83 initial stub of data server client code in Interface 2013-10-07 09:55:08 -07:00
stojce
61b213804a #19426 - Add a mute control to the interface 
- OpenGL overlay icon
- mute control
- icons
 2013-10-05 13:18:35 +02:00
ZappoMan
5f6fb3a3ae added some timing debugging 2013-10-05 00:55:34 -07:00
ZappoMan
3001917e10 added debugging 2013-10-04 22:49:05 -07:00
ZappoMan
6fce838e2e remove comment 2013-10-04 21:38:47 -07:00
ZappoMan
0c70a05732 make view frustum oversend and don't remove oversend in client 2013-10-04 21:36:21 -07:00
Andrzej Kapolka
a704a29864 Include a mapping for the names generated by the FBX export. 2013-10-04 17:56:36 -07:00
Andrzej Kapolka
08426fbd9c Handle index-to-direct normals (exported by the Faceshift rig FBX). 2013-10-04 17:49:18 -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
Philip Rosedale
c99f1646db Merge pull request #1015 from ZappoMan/voxel_render_pipeline_improvement 
Fixes to delete/add voxel sometimes not rendering
 2013-10-03 16:08:12 -07:00
ZappoMan
608c24e258 fix build buster 2013-10-03 15:58:15 -07:00
Andrzej Kapolka
2fc1af8c1a Fix for relative texture paths. 2013-10-03 15:47:43 -07:00
ZappoMan
2450d64016 Merge branch 'master' of https://github.com/worklist/hifi into voxel_render_pipeline_improvement 2013-10-03 15:09:28 -07:00
Andrzej Kapolka
813fa1030b Merge branch 'master' of https://github.com/worklist/hifi 2013-10-03 14:39:13 -07:00
Andrzej Kapolka
b2b9e1e0bf Need to allow multiple blendshape mappings per shape index. 2013-10-03 14:35:58 -07:00
Andrzej Kapolka
cc5cc1a409 Fixed incorrect capitalization. 2013-10-03 14:16:28 -07:00
ZappoMan
1c664b311d fixed behavior of voxel delete and some cases of voxel add in fast pipeline mode 2013-10-03 14:15:13 -07:00
Andrzej Kapolka
5756733aef Load mapping and use it for offset, joint mappings, blendshape mappings. 2013-10-03 14:03:01 -07:00
Philip Rosedale
e9a21e284a Merge pull request #1011 from ZappoMan/voxeleditsender_improvements 
VoxelEditPacketSender class improvements
 2013-10-02 21:25:10 -07:00
ZappoMan
8a439fabed Merge pull request #1008 from PhilipRosedale/master 
Head-driven mouse works with Faceshift
 2013-10-02 21:17:43 -07:00
ZappoMan
aac6d409d2 delete voxels locally on edit to match add behavior 2013-10-02 17:00:19 -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
ZappoMan
51fa5f4f47 Merge branch 'master' of https://github.com/worklist/hifi into voxeleditsender_improvements 2013-10-02 15:02:33 -07:00
ZappoMan
cc0009976b first cut and handling buffering of edit packets when voxel servers are unknown 2013-10-02 15:02:23 -07:00
Andrzej Kapolka
c98dec8a65 Dilate our network-downloaded textures. 2013-10-02 11:59:14 -07:00
PhilipRosedale
26618f45f8 use clamp instead of min, max 2013-10-02 10:50:41 -07:00
PhilipRosedale
6d2585a732 faceshift drives head mouse, improved reticle 2013-10-02 10:46:31 -07:00
Andrzej Kapolka
d87fe204e0 Merge branch 'master' of https://github.com/worklist/hifi 2013-10-02 10:23:43 -07:00
Andrzej Kapolka
97cbef1d59 Avoid warnings on invalid URLs, delete reply when reference is deleted. 2013-10-02 10:23:04 -07:00
Andrzej Kapolka
40a3268d7c Fixed an OS X warning and a misplaced parenthesis. 2013-10-01 16:31:57 -07:00
PhilipRosedale
99c866dba4 Merge branch 'master' of https://github.com/worklist/hifi 2013-10-01 16:10:30 -07:00
PhilipRosedale
7dd1a7525e starting to add faceshift head mouse 2013-10-01 16:10:22 -07:00
Andrzej Kapolka
6ccd406a35 Experimenting with the pivot points. 2013-10-01 15:20:18 -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
cebd8e5f4b Merge pull request #997 from birarda/assignment 
file of static assignments for DS
 2013-10-01 13:47:10 -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
ZappoMan
1aa7855166 cleanup 2013-10-01 12:43:30 -07:00
ZappoMan
8ceee2ec1e more cleanup of faster voxel pipeline 2013-10-01 11:51:25 -07:00
Philip Rosedale
4cd3abfb86 Merge pull request #1000 from birarda/master 
some deletions and cleanup
 2013-10-01 11:44:28 -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
ZappoMan
0f74d4bda9 change nodeDeleted() to voxelDeleted() to improve readability 2013-09-30 15:50:31 -07:00
Stephen Birarda
43eed32e1d end is important, put it back 2013-09-30 15:42:07 -07:00
Stephen Birarda
ca68846c1b some deletions and cleanup based on Xcode analysis 2013-09-30 15:36:23 -07:00
ZappoMan
865bb7555f fix hang on preference dialog box 2013-09-30 15:27:02 -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
a22b3d28bf Merge branch 'master' of https://github.com/worklist/hifi 2013-09-30 12:44:07 -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
Philip Rosedale
7a74432bef Merge pull request #994 from ZappoMan/voxel_geo_shader 
removed old normal support from voxel system only using global normals
 2013-09-30 11:37:09 -07:00
Andrzej Kapolka
1592aac177 Getting closer to the correct set of transforms. 2013-09-30 11:24:41 -07:00
Stephen Birarda
bb32da12f1 complete removal of fervor and C++11 array 2013-09-30 10:30:18 -07:00
ZappoMan
b6fe8befdc removed old normal support from voxel system only using global normals 2013-09-30 09:29:04 -07:00
Philip Rosedale
9645cd9831 Click on voxels as way of moving around 2013-09-28 15:18:59 -07:00
stojce
a0f23d409e Merging changes 2013-09-28 13:16:50 +02:00
stojce
bac228bdb8 Merge branch 'master' of https://github.com/worklist/hifi 2013-09-28 12:47:47 +02:00
Andrzej Kapolka
f8d26f207d Include the local transforms from the FBX file when rendering meshes. 2013-09-27 17:57:18 -07:00
ZappoMan
5dd4d8a8e1 Merge pull request #990 from PhilipRosedale/master 
Smooth flying, fixed spinning problem, top speed about Mach 1
 2013-09-27 16:22:49 -07:00
Philip Rosedale
1189ac2216 Merge pull request #989 from ZappoMan/voxel_geo_shader 
add support for global normals for voxels
 2013-09-27 15:10:53 -07:00
Freddy
c78aa591c5 Fix spinning while flying, top speed now about Mach 1 2013-09-27 15:08:10 -07:00
ZappoMan
8cffa8d872 add support for global normals for voxels 2013-09-27 15:04:44 -07:00
Philip Rosedale
549b863665 Merge pull request #988 from ZappoMan/voxel_geo_shader 
voxel rendering performance and debugging improvements
 2013-09-27 13:27:29 -07:00
ZappoMan
605c2f30cf add memory usage debugging 2013-09-27 10:17:10 -07:00
ZappoMan
eb6af1afbf fix byte normals, fix crashes in switching between voxel shader and normal mode 2013-09-27 09:02:51 -07:00
ZappoMan
fb85add6b4 Merge pull request #986 from PhilipRosedale/master 
Faceshift rotates body, slow near others for easier positioning
 2013-09-27 07:01:00 -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
ZappoMan
2487a55be9 add support for use of Byte normals 2013-09-26 19:04:19 -07:00
Freddy
462d0b90c1 Merge branch 'master' of https://github.com/worklist/hifi 2013-09-26 17:26:59 -07:00
Philip Rosedale
0fbabe9891 Merge pull request #984 from ZappoMan/voxel_geo_shader 
Voxel Geometry Shader Experiment
 2013-09-26 17:22:55 -07:00
Freddy
e74950db24 Merge branch 'master' of https://github.com/worklist/hifi 2013-09-26 17:07:41 -07:00
ZappoMan
3f8e55da28 style cleanup 2013-09-26 16:46:34 -07:00
ZappoMan
5695429a78 style fixes 2013-09-26 16:36:59 -07:00
ZappoMan
fd0cc3b417 style fixes 2013-09-26 16:33:37 -07:00
ZappoMan
7845340279 menu cleanup, support for on the fly switching of maxVoxels and useVoxelShader 2013-09-26 16:26:49 -07:00
Freddy
ddcec39f04 Merge branch 'master' of https://github.com/worklist/hifi 2013-09-26 15:58:06 -07:00
Andrzej Kapolka
91999dfe1f Pupil dilation. 2013-09-26 15:48:11 -07:00
ZappoMan
552d9fadd8 rearranged menus, some hacking on voxel shader 2013-09-26 14:51:57 -07:00
Andrzej Kapolka
4dec183262 Enlarge heads when they're moused over. 2013-09-26 12:07:13 -07:00
Andrzej Kapolka
3ccf276137 Merge branch 'master' of https://github.com/worklist/hifi into grower 2013-09-25 18:06:27 -07:00
Andrzej Kapolka
0ae614fa7b Fix to load Ryan's alien model (handle per-vertex normals). 2013-09-25 17:55:22 -07:00
Andrzej Kapolka
63efeccb13 Renaming for clarity. 2013-09-25 17:38:37 -07:00
Freddy
b4fa1dc7c2 Merge remote-tracking branch 'upstream/master' 2013-09-25 16:49:04 -07:00
Freddy
1dbc8459f8 adding measured angular velocity to faceshift 2013-09-25 16:46:26 -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
7d14aaeea4 Merge branch 'master' of https://github.com/worklist/hifi into blendface 2013-09-25 14:39:43 -07:00
Andrzej Kapolka
6e8df9584e Faceshift starts reporting failure to track under load, so determine active 
state based on the amount of time elapsed since last successful tracking data
received.
 2013-09-25 14:37:53 -07:00