Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-13 06:47:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
4533 commits 76 branches 59 tags 1.2 GiB
Commit graph

4533 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
d72f257d5d Merge pull request #648 from birarda/master 
some refactoring for sample addition in audio mixer
 2013-07-11 10:56:13 -07:00
Andrzej Kapolka
cf7408505f Shut down the webcam when it's turned off, but don't delete the grabber (since 
it has expensive-to-init state like the face cascade).
 2013-07-11 10:53:51 -07:00
Mark Peng
9749e5edd6 Add const var to represent magic num in eyecontact code when gyros 
are on.
 2013-07-11 10:53:38 -07:00
Atlante45
b3f8711f95 Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming 2013-07-11 10:53:27 -07:00
Stephen Birarda
5527d4b50f use glm clamp instead of pleateauAdditionOfSamples in audio mixer 2013-07-11 10:51:56 -07:00
ZappoMan
a1eed4e597 Merge pull request #642 from LionTurtle/master 
Make lookAtVectors lock on other avatar's eyes if the mouse is over the other avatar's head.
 2013-07-11 10:51:26 -07:00
ZappoMan
04cd340f0b add back in correct isViewChanging() 2013-07-11 10:50:17 -07:00
Mark Peng
24d32bcdc8 Fix style mistakes according to code review for eyecontact code. 2013-07-11 10:40:57 -07:00
ZappoMan
9aed3d3cc6 enable delta sending by default 2013-07-11 10:37:28 -07:00
Atlante45
5608a0a3b2 Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming 2013-07-11 10:33:55 -07:00
Mark Peng
29d1e08f48 Merge remote-tracking branch 'upstream/master' 2013-07-11 10:33:21 -07:00
Philip Rosedale
e21c711de9 Merge branch 'master' of https://github.com/worklist/hifi 2013-07-11 10:29:34 -07:00
Andrzej Kapolka
d4abceba2b Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-07-11 10:28:26 -07:00
Andrzej Kapolka
b62d2d85c3 Let's try actually releasing the camera when we turn it off. 2013-07-11 10:28:09 -07:00
ZappoMan
d4ce00de77 Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-07-11 10:24:53 -07:00
Mark Peng
083e0e9d06 Merge remote-tracking branch 'upstream/master' 2013-07-11 10:20:41 -07:00
Stephen Birarda
580f05c10f Merge pull request #647 from birarda/master 
put back missing voxels thanks to timing changes
 2013-07-11 10:20:01 -07:00
Mark Peng
f145a1eac4 Add condition to updateAvatar() where if another avatar's head is at 
the center of the screen, the lookAtPosition is set to the eye level
of that avatar.
 2013-07-11 10:17:45 -07:00
Atlante45
6e2422a547 Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming 2013-07-11 10:13:29 -07:00
Stephen Birarda
beb89e3d2b change some timing types from int to uint64_t to avoid costly assumptions 2013-07-11 10:09:00 -07:00
Stephen Birarda
4ed231670f put back the missing voxels 2013-07-11 10:04:27 -07:00
ZappoMan
5427b263f6 Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-07-11 09:46:10 -07:00
ZappoMan
a16c5a9a4a Merge pull request #635 from birarda/timestamps 
switch to uint64_t for timestamps
 2013-07-11 09:43:03 -07:00
Stephen Birarda
dc264c98ec delete a function accidentally added on merge 2013-07-11 09:38:55 -07:00
Stephen Birarda
ca0f6a4d10 header re-arranging and changing 2013-07-11 09:30:45 -07:00
Stephen Birarda
211204e878 Merge remote-tracking branch 'upstream/master' into timestamps 2013-07-11 09:23:16 -07:00
Stephen Birarda
cbf18160cb include stdint for uint64_t in SimpleMovingAverage 2013-07-11 09:22:08 -07:00
ZappoMan
34cebc36c7 short circuit node recursion for delta sending 2013-07-11 09:11:09 -07:00
Philip Rosedale
0e31e17540 Merge branch 'master' of https://github.com/worklist/hifi 2013-07-11 09:09:32 -07:00
Philip Rosedale
cf665e10b3 Merge pull request #644 from ZappoMan/occlusion_culling 
Latest Revision of Occlusion Culling & Delta Sending Work - now it's always better and never worse
 2013-07-11 09:05:03 -07:00
Philip Rosedale
8ea2b46264 Merge pull request #641 from ZappoMan/bug_fixes 
Two small bug fixes
 2013-07-11 07:46:57 -07:00
ZappoMan
ab8e2916d3 improvements to delta sending 2013-07-10 19:49:50 -07:00
ZappoMan
dc70675c22 removed obsolete ResIn mode 2013-07-10 19:04:28 -07:00
Jeffrey Ventrella
6c3644a2fc merge 2013-07-10 18:32:59 -07:00
Jeffrey Ventrella
420ecddafb Merge remote-tracking branch 'upstream/master' into particles 2013-07-10 18:32:42 -07:00
Jeffrey Ventrella
980a5b7980 cleanup 2013-07-10 18:32:17 -07:00
ZappoMan
8adf713caa Merge pull request #643 from ey6es/kinected 
Flip x when in mirror mode, rather than special-casing all the head rotations; also, fix for sideways leaning.
 2013-07-10 18:12:13 -07:00
Atlante45
4108bb135b Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming 2013-07-10 18:11:04 -07:00
ZappoMan
9e83de7fbf Merge pull request #634 from machinelevel/dev4 
Added a readme with instructions on installing the Leap libraries.
 2013-07-10 18:05:03 -07:00
Jeffrey Ventrella
171c10dabe raised home position 2013-07-10 18:04:19 -07:00
Jeffrey Ventrella
8ae10a6614 added emitter 2013-07-10 17:55:42 -07:00
ZappoMan
3d3eca9afa Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-07-10 17:45:04 -07:00
ZappoMan
50a5b60c55 spacing cleanup 2013-07-10 17:41:30 -07:00
Atlante45
5ae24fc660 Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming 
Conflicts:
	interface/src/Head.cpp
 2013-07-10 17:39:31 -07:00
ZappoMan
66f0813981 removed level form recursion calls 2013-07-10 17:39:27 -07:00
Atlante45
906fc04e35 first step toward resizing avatars 2013-07-10 17:35:39 -07:00
Andrzej Kapolka
d59b9ce955 Flip x when in mirror mode, rather than special-casing all the head rotations. 
Also fixed sideways leaning (was correct in mirror mode, incorrect in world).
 2013-07-10 17:31:21 -07:00
ZappoMan
f720513aff removed scanTreeWithOcclusion() experimental code 2013-07-10 17:30:40 -07:00
Mark Peng
3909217815 Remove unused #include for glm intersect in Application.cpp 2013-07-10 17:24:47 -07:00
ZappoMan
371bf7d181 removed dead code, fixed compiler warning 2013-07-10 17:22:30 -07:00