Commit graph

6844 commits

Author SHA1 Message Date
Philip Rosedale
d44a82fce1 Merge pull request #1097 from ZappoMan/keep_local_voxels
Fixed bug in Keep Local Voxels
2013-10-22 09:35:47 -07:00
ZappoMan
96cd8c5d97 fixed issue with delta frustums on hide out of view 2013-10-22 09:25:01 -07:00
ZappoMan
73d8cdacf8 fixed comment 2013-10-22 09:24:21 -07:00
ZappoMan
bfb9ed2229 fix issue with delta frustums in hideOutOfView 2013-10-22 09:22:55 -07:00
Philip Rosedale
cab9e7f658 Merge pull request #1094 from birarda/assignment
allow multiple buffers to be hooked to an individual node
2013-10-21 20:29:10 -07:00
Philip Rosedale
c354b4a063 Merge pull request #1095 from ZappoMan/keep_local_voxels
Keep local voxels
2013-10-21 17:22:24 -07:00
Stephen Birarda
197f9d6f49 Merge branch 'master' of github.com:worklist/hifi into assignment 2013-10-21 17:08:41 -07:00
Stephen Birarda
ee1a6bd99b Merge pull request #1096 from birarda/master
README touchups for QT_CMAKE_PREFIX_PATH
2013-10-21 16:55:27 -07:00
Stephen Birarda
076328d713 add some clarity for inclusion to profile 2013-10-21 16:54:57 -07:00
Stephen Birarda
08d1d418f8 touchups to README for QT_CMAKE_PREFIX_PATH 2013-10-21 16:43:26 -07:00
Stephen Birarda
cb2cb05688 remove the STK library as it is no longer needed 2013-10-21 16:32:32 -07:00
Stephen Birarda
73a42fbfde remove dependency on Stk library and TwoPole effect 2013-10-21 16:30:01 -07:00
ZappoMan
f618b3a88d removed some old comments 2013-10-21 16:19:03 -07:00
ZappoMan
f5efe2dd7f removed some old comments 2013-10-21 16:14:34 -07:00
ZappoMan
22a1d0a699 small tweak 2013-10-21 16:07:34 -07:00
Stephen Birarda
00446076b5 remove audio injectors that are starved and not added 2013-10-21 16:04:13 -07:00
ZappoMan
1b302f60f8 Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels 2013-10-21 16:03:53 -07:00
ZappoMan
b8dfc387b4 added reset settings for Old vs New voxel culling mode 2013-10-21 16:02:10 -07:00
ZappoMan
2979a8e738 better working version of hideOutOfView voxel support 2013-10-21 15:30:14 -07:00
Stephen Birarda
fbb097accb remove leftover listening mode, fix UUID push in InjectedAudioRingBuffer 2013-10-21 15:03:07 -07:00
ZappoMan
303f4a8ce4 improved VoxelNode delete of children 2013-10-21 14:44:46 -07:00
ZappoMan
2f423e66eb fixed long line 2013-10-21 14:43:55 -07:00
ZappoMan
f5a3fc07c4 added some debugging 2013-10-21 14:41:46 -07:00
ZappoMan
be67d6f8aa added some new debug menus 2013-10-21 14:41:07 -07:00
ZappoMan
023a521948 some debug timing and voxel stats display 2013-10-21 14:39:05 -07:00
Stephen Birarda
1b129a43b5 initial changes to allow for multiple buffers per client 2013-10-21 14:27:55 -07:00
Stephen Birarda
5fa5e7aa78 Merge branch 'master' of github.com:worklist/hifi into assignment 2013-10-21 09:33:14 -07:00
ZappoMan
b0bfba3043 Merge pull request #1090 from PhilipRosedale/master
Faceshift only notifies log on first fail to connect
2013-10-20 21:28:30 -07:00
Philip Rosedale
e1dc69ff5d Merge pull request #1093 from stojce/19437
Code Review for Job #19437
2013-10-19 19:19:27 -07:00
stojce
652892522e Merge branch 'master' of https://github.com/worklist/hifi into 19437 2013-10-19 09:06:41 +02:00
Stephen Birarda
b3909da5f0 audio injector requires two UUIDs 2013-10-18 17:37:25 -07:00
Stephen Birarda
4fe2e25bf0 add a stream identifier back to the audio injector 2013-10-18 17:36:59 -07:00
Philip Rosedale
f518fdc3aa Merge pull request #1091 from birarda/assignment
continued STUN requests for keepalive, propagate socket changes
2013-10-18 17:33:51 -07:00
Philip Rosedale
7ac9a87ad4 Merge pull request #1092 from birarda/master
fix for Qt 5.1.1 preferences bug
2013-10-18 17:33:40 -07:00
Stephen Birarda
7da1f5a235 add AudioMixerClientData to hold vector of PositionalAudioRingBuffer 2013-10-18 17:32:53 -07:00
Stephen Birarda
76197712d7 Merge branch 'master' of github.com:worklist/hifi into assignment 2013-10-18 16:34:50 -07:00
Stephen Birarda
b6c4599a55 cleaup some unecessary defaults in Menu 2013-10-18 16:10:03 -07:00
Stephen Birarda
bdfc7fdb64 fix for preferences bug on 5.1.1 2013-10-18 16:07:05 -07:00
Stephen Birarda
0dd16cfc1e debug a STUN reponse that only changes port 2013-10-18 15:27:35 -07:00
Stephen Birarda
32680bbaad continued STUN requests for keepalive, propagate socket changes 2013-10-18 15:05:16 -07:00
Philip Rosedale
bf842f01ba Merge branch 'master' of https://github.com/worklist/hifi 2013-10-18 14:37:49 -07:00
Philip Rosedale
e43758a115 Faceshift fail to connect only notifies log once 2013-10-18 14:36:57 -07:00
Andrzej Kapolka
8c85c5cb5e Merge pull request #1089 from ey6es/master
Added support for RotationOffset, which the Lulu model uses.
2013-10-18 14:27:38 -07:00
Andrzej Kapolka
58b4139dbc Added support for RotationOffset, which the Lulu model uses. 2013-10-18 14:26:42 -07:00
Leonardo Murillo
8d8278daef Merge pull request #1088 from birarda/assignment
add a DELETE method to civetweb to delete assignment by UUID
2013-10-18 10:52:33 -07:00
Stephen Birarda
7ca0a26c18 rename method to add assignments back to queue 2013-10-18 10:44:39 -07:00
Stephen Birarda
0d69349ba9 fix prefixed constants 2013-10-18 10:39:23 -07:00
Stephen Birarda
f6c9c57585 cleanup checking of request method, clarify that node is being deleted 2013-10-18 10:33:22 -07:00
Stephen Birarda
d85c0bb88a add a DELETE method to civetweb to delete assignment by UUID 2013-10-18 10:25:35 -07:00
ZappoMan
10b7110218 Merge pull request #1087 from birarda/assignment
fix a crash in AudioMixer with active socket but no linked data
2013-10-18 10:09:38 -07:00