Commit graph

16511 commits

Author SHA1 Message Date
Craig Hansen-Sturm
0d5f28c7df audio buffer framing issue / comments 2014-09-11 11:05:27 -07:00
Craig Hansen-Sturm
63b8dd2d77 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-windows 2014-09-11 10:43:01 -07:00
AndrewMeadows
49af620665 Merge pull request #3393 from ey6es/master
shared TextRenderer instances; hostname for Faceshift connection
2014-09-11 09:20:47 -07:00
AndrewMeadows
d3d4717a92 Merge pull request #3385 from ctrlaltdavid/19933
Code Review for Job #19933
2014-09-11 08:39:51 -07:00
Andrzej Kapolka
b1cfafdbe7 Missed a spot in the TextRenderer conversion. 2014-09-10 23:09:03 -07:00
Andrzej Kapolka
7b3d06a783 Add option to change Faceshift hostname. 2014-09-10 19:34:21 -07:00
Andrzej Kapolka
de8dd4cecc Share instances of TextRenderer. 2014-09-10 18:55:36 -07:00
Philip Rosedale
2216f89b8d Merge pull request #3392 from ey6es/master
Fixes for 3DTV/Oculus (deferred lighting/ambient occlusion/glow/culling/pointers).
2014-09-10 17:43:53 -07:00
Andrzej Kapolka
8762073853 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-09-10 17:04:57 -07:00
Andrzej Kapolka
146a6526be Fix for Oculus mouse pointer. 2014-09-10 17:02:04 -07:00
Craig Hansen-Sturm
18975aef57 log audio device framing errors, copy as much data as we can, but don't assert 2014-09-10 16:48:35 -07:00
Philip Rosedale
07eba40e33 Merge pull request #3390 from chansensturm/audio-windows
Fix for stereo/mono and echo local server regression
2014-09-10 16:40:51 -07:00
Andrzej Kapolka
590c8042f8 Attempting to fix a bug in the Oculus overlay. 2014-09-10 16:36:32 -07:00
Craig Hansen-Sturm
ca4d1375f5 fix for recent stereo/mono and echo local server regression 2014-09-10 16:21:06 -07:00
Andrzej Kapolka
fe249ef348 Make sure the frustum that we use for culling contains the current camera
information.
2014-09-10 15:51:10 -07:00
Andrzej Kapolka
34ccc2ab7b Use the FBO dimensions, which may differ from the widget dimensions (as with
the Oculus).
2014-09-10 15:13:07 -07:00
Andrzej Kapolka
b328304da4 Up/down, not top/bottom. 2014-09-10 14:15:00 -07:00
Andrzej Kapolka
600f36aa64 Fix for Oculus API. 2014-09-10 14:14:02 -07:00
Andrzej Kapolka
423e6d0594 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-09-10 13:51:46 -07:00
Andrzej Kapolka
2cba7b37bf Attempting to fix 3DTV/Oculus deferred lighting/ambient occlusion. 2014-09-10 13:51:14 -07:00
Andrzej Kapolka
c9ed83ac14 Merge pull request #3389 from chansensturm/audio-windows
Windows/VS2013 Hot Fix
2014-09-10 13:45:05 -07:00
Craig Hansen-Sturm
cb8e832257 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-windows 2014-09-10 13:14:21 -07:00
Craig Hansen-Sturm
cf6fd4a66f Merge branch 'audio-windows' of https://github.com/chansensturm/hifi into audio-windows 2014-09-10 13:07:18 -07:00
Craig Hansen-Sturm
015fdec6bd Merge branch 'audio-windows' of https://github.com/chansensturm/hifi into audio-windows 2014-09-10 13:05:52 -07:00
Andrzej Kapolka
c5ad603321 Fix for glow disabled in 3D TV mode. 2014-09-10 12:47:46 -07:00
Andrzej Kapolka
2fde67be72 Fix for deferred lighting with 3DTV (/Oculus, although I haven't tested that
yet).
2014-09-10 12:40:03 -07:00
wangyix
7a2897fb6b fixes/patches for win32/vs2013 startup and shutdown 2014-09-10 12:24:59 -07:00
AndrewMeadows
f3b8d68c65 Merge pull request #3381 from chansensturm/audio-noise
Hot FIX:  pulse audio input device frame size
2014-09-10 08:25:42 -07:00
Philip Rosedale
ccd57163d0 Merge pull request #3388 from ZappoMan/quietDebug
silence some over active debug messages
2014-09-09 20:58:54 -07:00
Philip Rosedale
da057b468e Merge pull request #3387 from ZappoMan/nonBlockingForms
add support for non blocking forms
2014-09-09 20:56:58 -07:00
Philip Rosedale
4294da20bc Merge pull request #3386 from ZappoMan/getUnscaledMeshExtents
add getUnscaledMeshExtents to FBXGeometry
2014-09-09 20:51:23 -07:00
ZappoMan
e88726c7c5 silence some over active debug messages 2014-09-09 20:41:56 -07:00
Craig Hansen-Sturm
d2981b0808 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-windows 2014-09-09 19:15:38 -07:00
ZappoMan
a100630e47 add support for non blocking forms 2014-09-09 17:52:06 -07:00
ZappoMan
e6fc9d68ff add getUnscaledMeshExtents to FBXGeometry 2014-09-09 17:51:35 -07:00
AndrewMeadows
c815ee53c9 Merge pull request #3379 from ctrlaltdavid/20018
Code Review for Job #20018
2014-09-09 12:01:52 -07:00
AndrewMeadows
912260d95f Merge pull request #3376 from huffman/patch-1
Add include for QtGlobal to ensure OS global has been defined
2014-09-09 11:58:48 -07:00
Philip Rosedale
cbc5da3595 Merge pull request #3384 from ey6es/metavoxels
Support for loading (16-bit, unsigned, little-endian, square) raw depth ...
2014-09-08 22:18:12 -07:00
Andrzej Kapolka
a777566b01 Support for loading (16-bit, unsigned, little-endian, square) raw depth maps
with configurable offset/scale (defaults to normalized).
2014-09-08 18:50:30 -07:00
Craig Hansen-Sturm
87a6d5921f Merge branch 'master' of https://github.com/highfidelity/hifi into audio-noise 2014-09-08 17:55:01 -07:00
David Rowe
6d5f645299 Limit avatar head and body models in preferences to FST files (or blank) 2014-09-08 15:57:20 -07:00
Philip Rosedale
171d9ec49e Merge pull request #3380 from AndrewMeadows/inertia
fix residual velocity on teleport
2014-09-08 15:51:51 -07:00
Philip Rosedale
e6c1610a28 Merge pull request #3382 from ey6es/master
Scale up fonts and icons for "Retina" display.
2014-09-08 15:49:46 -07:00
Andrzej Kapolka
a9eb35448a Comment fix. 2014-09-08 15:39:20 -07:00
Craig Hansen-Sturm
424cffcd99 remove stray debugging info 2014-09-08 15:33:24 -07:00
Andrzej Kapolka
f69324f270 Fix for display name. 2014-09-08 15:29:36 -07:00
Craig Hansen-Sturm
cb4aab3902 allocate 8x buffer size (for pulse audio) / more audioGain loop unrolling w/frame alignment check 2014-09-08 15:28:55 -07:00
Andrew Meadows
6fc1c2540c fix residual velocity on teleport 2014-09-08 15:24:02 -07:00
Andrzej Kapolka
f2535d4df8 Adjust avatar names for device pixel ratio. 2014-09-08 15:23:08 -07:00
Andrzej Kapolka
5dfa22f3fd Adjusting font sizes. 2014-09-08 15:11:25 -07:00