ZappoMan
73ad854235
latest version of quadtree coverage map
2013-06-28 22:05:32 -07:00
birarda
bd0d820fc7
Merge pull request #556 from PhilipRosedale/master
...
Dynamic jitter buffer for less stuttering, fixes to stereo
2013-06-21 14:29:45 -07:00
Andrzej Kapolka
483407a3f2
Merge branch 'master' of https://github.com/worklist/hifi into opencv
2013-06-21 14:09:38 -07:00
Eric Johnston
6825274b65
Re-issue of change which adds two-finger touch look to avatar.
...
The option is un-checked by default because of an unsolved problem: We're getting the events into Qt very slowly, so input from several seconds ago is still active when the user has stopped the touch action. This needs to be fixed before this can be turned on full-time.
Corrections were made per feedback, and the change has been merged with the latest.
2013-06-21 13:43:23 -07:00
Andrzej Kapolka
00eba63e4e
Added various options to test for voxel avatars, manual third person mode
...
(also, cleaned up the camera switching a little).
2013-06-21 11:33:38 -07:00
Andrzej Kapolka
b0dd5223e1
Avatar head roll/lean based on webcam data.
2013-06-20 14:20:03 -07:00
Philip Rosedale
c740400224
Merge fixes plus auto jitter buffer
2013-06-20 10:54:58 -07:00
Philip Rosedale
3304f0eb2e
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-19 16:03:20 -07:00
Philip Rosedale
bc374d0183
More audio tweaks
2013-06-19 16:02:56 -07:00
Andrzej Kapolka
68371f8c3f
Merge branch 'master' of https://github.com/worklist/hifi into opencv
2013-06-19 11:04:12 -07:00
ZappoMan
8331fc1acb
removed some old debug code
2013-06-18 10:19:49 -07:00
ZappoMan
7fe6c0e3b3
added occlusion culling menu option
2013-06-18 09:34:12 -07:00
Philip Rosedale
002f8c736f
Added adjustable audio jitter buffer (in preferences), and simple lowPassFilter (for pert testing compared to LPF)
2013-06-17 18:30:02 -07:00
Andrzej Kapolka
a771f53df3
Read the webcam frames in a separate thread, since the call blocks.
2013-06-17 18:07:53 -07:00
Andrzej Kapolka
ec495e14d3
Missed these guys.
2013-06-17 13:29:24 -07:00
ZappoMan
40c2cf2d44
removed some dead code
2013-06-13 13:31:26 -07:00
ZappoMan
8320925add
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
2013-06-13 13:30:18 -07:00
Philip Rosedale
b85f91a7d4
fixes per code review
2013-06-13 12:05:06 -07:00
ZappoMan
72b2845178
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
2013-06-13 09:40:45 -07:00
ZappoMan
0f234d739e
remove Camera menu from frustum debugging, because its obsolete and only causes problems
2013-06-12 21:44:49 -07:00
Philip Rosedale
a5a0df09cb
removed grab voxel rendering
2013-06-12 16:36:55 -07:00
Philip Rosedale
311b09eee0
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-12 14:30:48 -07:00
Andrzej Kapolka
178996bb8b
Make sure first person mode and mirror mode are mutually exclusive.
2013-06-12 13:30:41 -07:00
Philip Rosedale
ad58d0aa23
Adding voxel thrust on grabbing/dragging to move avatar
2013-06-11 21:19:58 -07:00
ZappoMan
ac7fbc6320
added occlusion tests to debug menu
2013-06-11 13:29:01 -07:00
ZappoMan
ab365202c8
added some debugging routines to visualize occlusion
2013-06-11 12:36:15 -07:00
Philip Rosedale
fb97d3e04b
Merge pull request #520 from tschw/19367
...
Code Review for Job #19367
2013-06-10 08:04:16 -07:00
atlante45
c96e01ef51
Fixed merge conflict
2013-06-09 23:15:49 +02:00
ZappoMan
b60df9ce89
Merge pull request #512 from ey6es/gyroquat
...
Fixes for preferences: store avatar voxel URL along with other avatar settings, use QAction rather than separate boolean for autosave.
2013-06-08 21:36:07 -07:00
tosh
d39b25a17b
adds menu option to set whether ground plane gets rendered
2013-06-08 02:31:23 +02:00
ZappoMan
46c66c39e5
implement keyhole frustum
2013-06-07 17:23:23 -07:00
atlante45
5c07638ce2
19369 - Added "Use Gravity" option
2013-06-08 02:05:54 +02:00
Andrzej Kapolka
ac2b7d7f48
Fix for initial camera transition.
2013-06-07 15:20:26 -07:00
Andrzej Kapolka
75c89f2c22
OK, I found the problem: duplication of state for the "autosave" option.
...
Let's just use the QAction, as does everything else.
2013-06-07 13:42:49 -07:00
ZappoMan
887e3428c2
cleaned up menus slightly
2013-06-07 09:39:24 -07:00
Philip Rosedale
dd0fa021a0
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-07 09:19:54 -07:00
Andrzej Kapolka
e0e94481c9
Add pitch/yaw scale preference to control degree of view rotation.
2013-06-06 17:53:00 -07:00
Philip Rosedale
b5e63fb446
Added debug->run timing tests option to speed test some common functions (please add some more, bottom of util.cpp
2013-06-06 17:52:19 -07:00
Philip Rosedale
97be04716e
Added render menu choice to switch between voxel and ball avatar rendering.
2013-06-05 17:24:53 -07:00
Philip Rosedale
29c4374dc0
Merge fixes for brad, reversed pitch direction to correct mouse look
2013-06-05 09:59:39 -07:00
Philip Rosedale
8719b9f9d4
merge fix
2013-06-04 21:26:53 -07:00
ZappoMan
b75bd80de7
fix build busters
2013-06-04 17:54:48 -07:00
Philip Rosedale
4db6e9074e
merge conflict fix
2013-06-04 17:11:33 -07:00
atlante45
d539ea283e
Merge 19358 with upstream Master
2013-06-05 01:43:47 +02:00
Andrzej Kapolka
d09700adde
Merge branch 'master' of https://github.com/worklist/hifi into voxeltars
...
Conflicts:
interface/src/Avatar.cpp
interface/src/Avatar.h
interface/src/Skeleton.h
interface/src/VoxelSystem.h
2013-06-04 11:00:59 -07:00
Andrzej Kapolka
bc8eadd526
More work on voxeltars; separated default pose from bind pose.
2013-06-04 10:22:58 -07:00
atlante45
c199190666
Fixes asked by ZappoMan on QSettings' commit.
2013-06-04 19:00:38 +02:00
Philip Rosedale
60100fd473
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-04 09:09:39 -07:00
ZappoMan
ce499f925a
add cut voxels
2013-06-04 09:02:34 -07:00
ZappoMan
435791f28c
CR feedback
2013-06-04 01:02:10 -07:00