Commit graph

3522 commits

Author SHA1 Message Date
Stephen Birarda
e5a1fa4dec Merge branch 'master' of github.com:worklist/hifi into synthesis 2013-06-05 17:03:53 -07:00
Stephen Birarda
fe7749c397 remove a blank line 2013-06-05 16:55:13 -07:00
Stephen Birarda
f5a73b00a4 combine change to attenuation coefficient in existing conditional 2013-06-05 16:54:36 -07:00
Stephen Birarda
7715e58b3d use the attenuation ratio passed by an injected source 2013-06-05 16:46:07 -07:00
Philip Rosedale
b0cdb11ac3 Merge pull request #489 from ey6es/master
Voxel URL sharing between avatars, tweak to rotation computations, fix for null replies.
2013-06-05 16:37:14 -07:00
Stephen Birarda
58752d7e2d rework the FreeVerb effect mix calculations 2013-06-05 16:04:58 -07:00
Stephen Birarda
60b018b8b2 refactoring in the audio-mixer for spherical injector and FreeVerb 2013-06-05 15:55:39 -07:00
Andrzej Kapolka
6c3425a642 Fix for URL decoding. 2013-06-05 15:39:37 -07:00
Andrzej Kapolka
b9e2e26ab1 Don't restart the download when we're given the same URL. 2013-06-05 14:59:08 -07:00
Andrzej Kapolka
a4aa8e7bde Basic sharing of the avatar voxel URLs. 2013-06-05 14:55:49 -07:00
Stephen Birarda
2db7b5de4e fix the number of bytes for microphone audio 2013-06-05 14:41:10 -07:00
Andrzej Kapolka
69dd4ff59b Improved rotation computation. 2013-06-05 13:08:17 -07:00
Stephen Birarda
5220129977 correct indentation in audio-mixer main 2013-06-05 12:55:22 -07:00
Stephen Birarda
b0a1a1a01b correct memcpy for orientation for PositionalAudioRingBuffer 2013-06-05 12:53:19 -07:00
Stephen Birarda
beb415a851 correct buffer byte constants in AudioRingBuffer 2013-06-05 12:45:07 -07:00
Stephen Birarda
16d1f8da5a pre-enumerate all sources to push buffers when there is only one source 2013-06-05 12:31:13 -07:00
Stephen Birarda
d64b46a6b2 add specialized parsing of audio data to ARB subclasses 2013-06-05 12:11:56 -07:00
Stephen Birarda
4cb00ad54b clean up AudioRingBuffer by subclassing 2013-06-05 11:51:21 -07:00
Andrzej Kapolka
391b62ed32 Make sure we don't hear back from replies after we've cleared them. 2013-06-05 10:34:41 -07:00
ZappoMan
8a08bfd01d Merge pull request #476 from PhilipRosedale/master
Cleanup of serial interface code, added translation estimate
2013-06-05 10:04:27 -07:00
Philip Rosedale
29c4374dc0 Merge fixes for brad, reversed pitch direction to correct mouse look 2013-06-05 09:59:39 -07:00
Stephen Birarda
6353940bf7 some extra cleanup after merge with upstream master 2013-06-05 09:59:33 -07:00
Stephen Birarda
eee7d6f92f resolve some conflicts on merge with upstream master 2013-06-05 09:56:26 -07:00
Stephen Birarda
6c2dcb86c8 Merge remote-tracking branch 'upstream/master' into synthesis 2013-06-05 09:55:16 -07:00
Philip Rosedale
626dcd0875 Merge branch 'master' of https://github.com/worklist/hifi 2013-06-05 09:40:42 -07:00
ZappoMan
9310876531 Merge pull request #485 from birarda/cube-injector
spherical audio injector and quaternion rotations for audio
2013-06-05 09:37:38 -07:00
birarda
69ed86de59 Merge pull request #488 from ZappoMan/master
support file:// urls for avitar voxles
2013-06-05 09:37:24 -07:00
Stephen Birarda
351828e8e5 some magic number removal in injector main 2013-06-05 09:35:43 -07:00
ZappoMan
3bce3f7a62 support file:// urls for avitar voxles 2013-06-05 00:53:27 -07:00
Philip Rosedale
8719b9f9d4 merge fix 2013-06-04 21:26:53 -07:00
Andrzej Kapolka
40b7672843 Merge pull request #487 from ey6es/master
Fix for loading avatar voxels from the web.
2013-06-04 18:03:12 -07:00
Andrzej Kapolka
c953fc743d Merge branch 'master' of https://github.com/worklist/hifi 2013-06-04 18:00:01 -07:00
Andrzej Kapolka
c0915a91cc Merge pull request #482 from ZappoMan/avatardata_optimization
Avatardata optimization
2013-06-04 17:59:25 -07:00
ZappoMan
b75bd80de7 fix build busters 2013-06-04 17:54:48 -07:00
Andrzej Kapolka
f708649546 Merge branch 'master' of https://github.com/worklist/hifi 2013-06-04 17:44:53 -07:00
Andrzej Kapolka
b30b64c5b5 Use downloadProgress rather than isFinished (which worked on files, but didn't
on HTTP URLs).
2013-06-04 17:44:19 -07:00
ZappoMan
f66641f1b4 Merge branch 'master' of https://github.com/worklist/hifi into avatardata_optimization 2013-06-04 17:41:41 -07:00
ZappoMan
26542d44c9 Merge pull request #478 from Atlante45/master
Settings handling with QSettings
2013-06-04 17:41:02 -07:00
ZappoMan
726a0cecf2 fixed build issue 2013-06-04 17:40:34 -07:00
Stephen Birarda
6bf6d5a28e cleanup NULL comparisons in AgentList 2013-06-04 17:29:37 -07:00
ZappoMan
4f2af717f2 Fixed merge issue with new orientation vectors, migrated to common identity names 2013-06-04 17:27:40 -07:00
Andrzej Kapolka
f403fc33f7 Merge pull request #486 from ey6es/voxeltars
Fix for glGenBuffers issue.
2013-06-04 17:27:16 -07:00
Andrzej Kapolka
ad377e6256 We can't initialize avatars from the network thread; they need access to the
OpenGL context.
2013-06-04 17:25:04 -07:00
Stephen Birarda
7f486c351f correct direction of angle of delivery 2013-06-04 17:15:58 -07:00
Philip Rosedale
4db6e9074e merge conflict fix 2013-06-04 17:11:33 -07:00
Stephen Birarda
fa9b897025 move mixer related constants above related part of mix 2013-06-04 17:00:55 -07:00
Stephen Birarda
c5d3365f3e correct spatialization and off-axis attenuation for a spherical source 2013-06-04 16:44:01 -07:00
atlante45
d539ea283e Merge 19358 with upstream Master 2013-06-05 01:43:47 +02:00
ZappoMan
6e70f3b187 Merge branch 'master' of https://github.com/worklist/hifi into avatardata_optimization 2013-06-04 16:21:20 -07:00
ZappoMan
82c1ee2062 Merge pull request #484 from ey6es/voxeltars
Voxeltars!  Much tweaking still to be done, and they currently only show on the local avatar.
2013-06-04 16:20:35 -07:00