Commit graph

4577 commits

Author SHA1 Message Date
ZappoMan
1831cc0de3 removed level param from recursion 2013-07-10 17:06:22 -07:00
ZappoMan
62c933140d implement max number of polygons in the coverage regions to keep them from getting slow 2013-07-10 16:57:42 -07:00
Mark Peng
baf9edecc9 Merge remote-tracking branch 'upstream/master' 2013-07-10 16:51:53 -07:00
Philip Rosedale
04b88e5d31 Merge pull request #639 from ey6es/kinected
Linux support and compass fusion for gyros.  With special bonus upper eyelid lowering a la Ryan.
2013-07-10 16:39:21 -07:00
Andrzej Kapolka
a03a46ad16 Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-07-10 16:36:21 -07:00
Andrzej Kapolka
100f7c19c3 Merge pull request #636 from PhilipRosedale/master
Touchlook tuned and always on!
2013-07-10 16:36:10 -07:00
ZappoMan
6694ef3869 fixed some compiler warnings 2013-07-10 16:33:27 -07:00
ZappoMan
4afda27ee0 Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-07-10 16:28:51 -07:00
ZappoMan
78c62f29c3 lazy load stars file only if stars render enabled 2013-07-10 16:12:34 -07:00
ZappoMan
3c150c3ec6 only get boundary distance once, since its the same for all grandchildren 2013-07-10 16:12:13 -07:00
ZappoMan
1439b47e84 only get boundary distance once, since its the same for all grandchildren 2013-07-10 16:09:45 -07:00
ZappoMan
d8f368a50c lazy load stars file only if stars render enabled 2013-07-10 16:06:23 -07:00
Mark Peng
62570f0804 Merge remote-tracking branch 'upstream/master' 2013-07-10 16:01:28 -07:00
Mark Peng
0b334f9e5d Make lookAtVectors lock on other avatar's eyes if the mouse is over
the other avatar's head.

Add rayIntersectsSphere function to Util. glm::intersectRaySphere was buggy.
2013-07-10 15:56:23 -07:00
Eric Johnston
38fe6201a8 Added content to read me 2013-07-10 15:33:28 -07:00
Andrzej Kapolka
67afc61fd8 Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-07-10 15:16:38 -07:00
Andrzej Kapolka
559dc4bb5d Flush the queue so that we don't get any funny data on the initial read. 2013-07-10 15:07:39 -07:00
Andrzej Kapolka
2ffd151a1f Ryan likes the eyelids starting at forty degrees. 2013-07-10 14:40:45 -07:00
Andrzej Kapolka
6a5fb4f535 Removed unused variables, added motion driver library for OS X. 2013-07-10 14:28:06 -07:00
Stephen Birarda
790a48b9f8 Merge pull request #630 from Atlante45/19373
Code Review for Job #19373
2013-07-10 14:25:18 -07:00
Atlante45
425ea0aa29 merge conflict 2013-07-10 14:22:03 -07:00
Andrzej Kapolka
53eb5ed0bb No clock_gettime on OS X; must use gettimeofday. 2013-07-10 14:21:23 -07:00
Andrzej Kapolka
0aa1b396db Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-07-10 14:08:03 -07:00
Philip Rosedale
df7bcedd44 Merge branch 'master' of https://github.com/worklist/hifi 2013-07-10 14:07:41 -07:00
Philip Rosedale
5a550d7974 Merge pull request #638 from ZappoMan/bug_fixes
fix random big average voxels slightly in view bug
2013-07-10 14:07:20 -07:00
Andrzej Kapolka
6fe9a71868 Basic compass fusion. 2013-07-10 14:06:12 -07:00
ZappoMan
09f77279e2 add shortcut key to enable wants occlusion culling 2013-07-10 13:42:43 -07:00
ZappoMan
02437c6f39 fix random big average voxels slightly in view bug 2013-07-10 13:29:12 -07:00
ZappoMan
8bccfff5b5 fix random big average voxels slightly in view bug 2013-07-10 13:14:23 -07:00
Atlante45
7d94f65448 Linked ZLIB to voxels library 2013-07-10 13:00:16 -07:00
Atlante45
d79acea6a7 Merge branch 'master' of git://github.com/worklist/hifi into 19373 2013-07-10 12:46:50 -07:00
Stephen Birarda
26b6712e4d Merge pull request #637 from birarda/master
remove read and write avatar data methods that aren't implemented
2013-07-10 12:37:52 -07:00
Stephen Birarda
70ccef0733 remove avatar data read and write to file 2013-07-10 12:37:23 -07:00
Philip Rosedale
dae79d8a55 Merge branch 'master' of https://github.com/worklist/hifi 2013-07-10 12:20:45 -07:00
Philip Rosedale
2e854b5ed7 Tune and smooth 'Touch Look' and always turned on, old mouseLook code removed. Add vec3 speed test. Smooth simulation by passing exact deltaTime to update() 2013-07-10 12:20:26 -07:00
Mark Peng
4b6e7f1079 Merge remote-tracking branch 'upstream/master' into eyecontact 2013-07-10 11:57:08 -07:00
Mark Peng
e4e7966075 Add print statements to debug eyecontact code in Application.cpp. 2013-07-10 11:56:16 -07:00
Atlante45
3062011442 Merge branch 'master' of git://github.com/worklist/hifi 2013-07-10 11:53:37 -07:00
Philip Rosedale
0f011e07e5 Merge pull request #633 from birarda/inf-stats
fix for inf stat values
2013-07-10 11:51:27 -07:00
Stephen Birarda
ca8f25955a switch usec timestamps to uint64_t 2013-07-10 11:46:48 -07:00
Eric Johnston
c1080bca1a Added a read me with instructions on installing the Leap libraries. 2013-07-10 11:32:18 -07:00
ZappoMan
de7cb9227a removed some dead code 2013-07-10 11:31:45 -07:00
Stephen Birarda
c5df53ed52 fix cast to 0 for long long in SimpleMovingAverage 2013-07-10 11:26:39 -07:00
ZappoMan
845b8924a5 removed some dead code 2013-07-10 11:21:38 -07:00
ZappoMan
ed8c33ef4b removed some comments 2013-07-10 11:19:49 -07:00
ZappoMan
d8b72cb126 removed some comments 2013-07-10 11:17:23 -07:00
ZappoMan
a9b1aa727f added back stars file loading 2013-07-10 11:11:21 -07:00
ZappoMan
abd7dfde8b added vector math timing test 2013-07-10 11:10:03 -07:00
ZappoMan
d89c3c8042 add version of recurse tree that uses pointer stack and allows timing breaks 2013-07-10 11:09:48 -07:00
Atlante45
56cde48e05 Merge branch 'master' of git://github.com/worklist/hifi 2013-07-10 10:30:04 -07:00