Commit graph

21363 commits

Author SHA1 Message Date
Andrzej Kapolka
e65090bab9 Another slight stitching improvement. 2015-01-22 21:08:48 -08:00
David Rowe
22347dd794 Add AudioDevice.deviceChanged() signal and use to update audio menu 2015-01-22 19:11:55 -08:00
Sam Gateau
80784a7a33 fixing a bug in texture storage when accessing mip #0 2015-01-22 16:57:33 -08:00
Stephen Birarda
8544fccd84 use soxr resampling for loopback and output 2015-01-22 16:50:42 -08:00
Sam Gateau
258b5fd5a2 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-01-22 16:28:05 -08:00
Sam Gateau
49dde269a6 experimenting with linear space vs srgb space 2015-01-22 16:27:17 -08:00
Ryan Huffman
0e6f2d7252 Update runningScriptsWidgets px -> pt 2015-01-22 16:22:36 -08:00
Stephen Birarda
0440576dc2 use libsoxr for input to network resampling 2015-01-22 16:04:57 -08:00
Andrzej Kapolka
c1c9f698df Merge branch 'master' of https://github.com/highfidelity/hifi 2015-01-22 14:55:37 -08:00
Andrzej Kapolka
805d5ace13 Another slight stitching improvement. 2015-01-22 14:55:14 -08:00
Stephen Birarda
e488e841b7 Merge pull request #4151 from murillodigital/ice-monitoring
Adding http monitoring for ICE server
2015-01-22 14:26:49 -08:00
Stephen Birarda
102f076412 look for soxr and not redundant libsoxr 2015-01-22 14:09:29 -08:00
Stephen Birarda
c82ac27104 fix a typo in RtMidi find module 2015-01-22 14:06:53 -08:00
Stephen Birarda
aa6e1607e2 add libsoxr for audio resampling 2015-01-22 14:06:05 -08:00
Andrew Meadows
355759d3d4 Merge pull request #4152 from ZappoMan/fixGlitches
Fix glitches in bullets and multiple viewers
2015-01-22 13:49:00 -08:00
Philip Rosedale
59f79fd436 Add handedness choice, default to right handed 2015-01-22 13:42:19 -08:00
Leonardo Murillo
001d689646 Fixing includes 2015-01-22 15:37:58 -06:00
ZappoMan
d34764bd55 fix whitespace diff 2015-01-22 13:33:59 -08:00
Leonardo Murillo
162c2f031b Remove https unneeded crust 2015-01-22 15:33:37 -06:00
ZappoMan
6a9a6968f2 debugging stutter 2015-01-22 13:32:57 -08:00
ZappoMan
c6ad1462e6 debugging stutter 2015-01-22 13:31:59 -08:00
ZappoMan
838a549abe debugging stutter 2015-01-22 13:31:09 -08:00
ZappoMan
14c7dc8eb9 debugging stutter 2015-01-22 13:13:18 -08:00
Leonardo Murillo
5efc046316 Adding http monitoring for ICE server 2015-01-22 15:03:13 -06:00
Philip Rosedale
45a84895e1 Paddle ball game, first version 2015-01-22 12:44:07 -08:00
Sam Gateau
aecc8b85bd Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-01-22 12:40:30 -08:00
dev
03a5c398ec splitting the GLBackend.cpp in several files and fixing the build for mac 2015-01-22 12:38:24 -08:00
Atlante45
ef5e57a46e Merge branch 'android' of https://github.com/birarda/hifi into android 2015-01-22 11:38:56 -08:00
Stephen Birarda
21ecaafea9 don't force system include of GLM 2015-01-22 11:38:34 -08:00
Atlante45
ff5093622e Merge branch 'android' of https://github.com/birarda/hifi into android 2015-01-22 11:37:08 -08:00
Stephen Birarda
3d12ed95da fix for cmake variable interpolation warning 2015-01-22 11:22:37 -08:00
Atlante45
06895a2066 merge branch 'android' of https://github.com/birarda/hifi into android 2015-01-22 11:11:51 -08:00
Stephen Birarda
e5accde70d set the qmake excutable path to tell Qt modules where to look 2015-01-22 11:11:22 -08:00
Atlante45
5de2894f3f Merge branch 'android' of https://github.com/birarda/hifi into android 2015-01-22 11:06:15 -08:00
Stephen Birarda
64aa203825 add output of QT_CMAKE_PREFIX_PATH 2015-01-22 11:05:48 -08:00
Stephen Birarda
316bbce83c allow ANDROID_QT_CMAKE_PREFIX_PATH to designate Qt location 2015-01-22 11:04:04 -08:00
Brad Hefta-Gaub
ad209ee731 Merge pull request #4150 from AndrewMeadows/bispinor
remove ground collision hack for physics testing
2015-01-22 10:56:36 -08:00
Atlante45
cccf665ac3 Merge branch 'android' of https://github.com/birarda/hifi into android 2015-01-22 10:52:00 -08:00
Stephen Birarda
0af9a3ca36 remove an extra underscore 2015-01-22 10:36:40 -08:00
Stephen Birarda
b25a2a1918 temporary removal of VRLib requirement 2015-01-22 10:23:07 -08:00
Stephen Birarda
01ca47b68f more updates to android build instructions 2015-01-22 10:20:42 -08:00
Stephen Birarda
9ed98c1d97 update to build guide for OpenSSL changes 2015-01-22 10:16:07 -08:00
Andrew Meadows
b2f2a3ad27 Merge pull request #4149 from huffman/improve-loading
Update ImageOverlay to use TextureCache
2015-01-22 09:26:10 -08:00
Andrew Meadows
3997b916c1 remove ground collision hack for physics testing 2015-01-22 09:17:51 -08:00
Ryan Huffman
0e9e77f166 Fix broken support for color-only ImageOverlay 2015-01-22 08:58:55 -08:00
Ryan Huffman
52193fce38 Remove qDebug 2015-01-22 08:35:38 -08:00
Brad Hefta-Gaub
d8d0972cb6 Merge pull request #4148 from AndrewMeadows/isentropic
reduce flood of collision events
2015-01-21 19:37:04 -08:00
Brad Hefta-Gaub
7d7411ceee Merge pull request #4146 from PhilipRosedale/master
Improved Billiards, Gun
2015-01-21 19:36:20 -08:00
Andrew Meadows
77c4362991 fix typo 2015-01-21 18:14:24 -08:00
Andrew Meadows
b2e79a0157 don't process results when no simulation 2015-01-21 18:06:19 -08:00