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

4471 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Stephen Birarda
0d5fc6a2a4 make operative variables non-globals for start/stop of assignment 2013-07-10 11:24:05 -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
Stephen Birarda
8ed518c4a2 add a clear method to the NodeList to delete all nodes 2013-07-10 10:51:21 -07:00
Stephen Birarda
dc59f6deb5 Merge branch 'master' of github.com:worklist/hifi into assignee 2013-07-10 10:01:01 -07:00
Stephen Birarda
9ba3bfc8b8 Merge pull request #632 from birarda/master 
remove warnings for wrong order member variable initialization
 2013-07-10 09:59:53 -07:00
Stephen Birarda
488a4affd3 fix member variable initialization order to remove warnings 2013-07-10 09:59:14 -07:00
Stephen Birarda
686362d79a Merge remote-tracking branch 'upstream/master' into assignee 2013-07-10 09:48:36 -07:00
Andrzej Kapolka
a116f5a636 Use InvenSense code to handle the rather complicated business of talking the 
sensor into giving us the compass reading.  We're getting it now, but I still
have to figure out how to incorporate it.
 2013-07-09 17:28:23 -07:00
Stephen Birarda
4773e70c15 rewrite Operative stubbed code to be able to be killed 2013-07-09 17:13:21 -07:00
Stephen Birarda
e910680fa4 Merge pull request #631 from Atlante45/19368 
Fixed broken shortcut (Turn on/off voxels is now Shift + V)
 2013-07-09 17:11:04 -07:00
Stephen Birarda
4e9bac4617 change usec timestamp returns to unsigned long long for 32 bit 2013-07-09 16:55:58 -07:00
Mark Peng
61ad33d9d0 Merge remote-tracking branch 'upstream/master' into eyecontact 2013-07-09 16:29:56 -07:00
Mark Peng
2a25c97446 Change LookAtPosition of Head to the eye level of another avatar, 
if looking at another avatar in Application.cpp.

Add eyePosition to Head class and bool isLookingAtOther.. in Application.cpp.
 2013-07-09 16:22:41 -07:00
Stephen Birarda
cf2d98e7b4 Merge remote-tracking branch 'upstream/master' into assignee 2013-07-09 15:52:53 -07:00
Stephen Birarda
4b0bff409c Merge pull request #606 from Atlante45/19368 
Code Review for Job #19368
 2013-07-09 15:50:34 -07:00
Philip Rosedale
c61c541004 Merge branch 'master' of https://github.com/worklist/hifi 2013-07-09 14:19:31 -07:00
Stephen Birarda
329e59f04e Merge pull request #629 from ZappoMan/bug_fixes 
make keyhole radius larger
 2013-07-09 13:53:48 -07:00
ZappoMan
f076eed9d2 more hacking on occlusion culling 2013-07-09 13:17:38 -07:00
ZappoMan
44357fcfb9 add 'level' param to tree recursion 2013-07-09 13:17:21 -07:00
ZappoMan
e85d5f3b14 make keyhole radius larger 2013-07-09 13:04:20 -07:00
Stephen Birarda
ccd65ecd67 tell shared where the macro dir is 2013-07-09 12:05:23 -07:00
Stephen Birarda
9304d9060f include glm in shared target for dummy Operative code 2013-07-09 12:03:16 -07:00
Stephen Birarda
68357ab6f7 include correct quaternion header for AudioInjector and Operative 2013-07-09 11:57:54 -07:00
Stephen Birarda
e7c6c19e60 uncomment the source line in podspec for testing against github 2013-07-09 10:36:50 -07:00