Commit graph

46694 commits

Author SHA1 Message Date
Seth Alves
8734661a0e add explaining comment 2016-09-14 11:28:22 -07:00
Seth Alves
e5e9bb0052 Merge branch 'master' of github.com:highfidelity/hifi into grab-point-adjustments 2016-09-14 11:28:10 -07:00
howard-stearns
db20a8ceef fix 1319 2016-09-14 11:20:09 -07:00
Seth Alves
1dace86df8 Merge branch 'qml-keyboard' of github.com:sethalves/hifi into qml-keyboard 2016-09-14 10:38:36 -07:00
Seth Alves
409ebe526b qml keyboard for Browser window 2016-09-14 10:38:08 -07:00
Seth Alves
b48270c9a7 don't accidently select entities through edit.js window 2016-09-14 10:25:30 -07:00
Ken Cooke
ad97a15e8b Handle another case when resampling is not needed 2016-09-14 09:54:15 -07:00
Seth Alves
e6a1c14de6 Merge branch 'master' of github.com:highfidelity/hifi into qml-keyboard 2016-09-14 09:43:19 -07:00
Ken Cooke
e82d751dac Fix typo 2016-09-14 08:25:41 -07:00
Ken Cooke
25920732ec Remove unused buffer 2016-09-14 08:23:53 -07:00
Ken Cooke
96313a421c Cleanup the confusion of using null-resampler for channel conversion 2016-09-14 08:22:18 -07:00
Ken Cooke
c555e369c8 Handle the case when resampling is not needed 2016-09-14 06:37:09 -07:00
Ken Cooke
27d24eb79b Fix compiler warning 2016-09-13 20:56:36 -07:00
Ken Cooke
ed9061040a Better Android settings 2016-09-13 20:16:23 -07:00
Ken Cooke
f1455ab157 Remove unneeded buffers 2016-09-13 20:06:44 -07:00
Ken Cooke
3a41b285a0 Fix local audio injectors, that got disabled somehow 2016-09-13 17:21:48 -07:00
Seth Alves
79dfacde64 Merge branch 'qml-keyboard' of github.com:sethalves/hifi into qml-keyboard 2016-09-13 16:43:07 -07:00
Seth Alves
447de7cd5a qml keyboard for edit.js window 2016-09-13 16:31:59 -07:00
Ken Cooke
724df38df0 Optimize the audio pipeline. Use float mixBuffer and apply reverb at 24khz 2016-09-13 16:11:06 -07:00
Seth Alves
23c3f794d9 Merge branch 'qml-keyboard' of github.com:sethalves/hifi into qml-keyboard 2016-09-13 11:36:44 -07:00
Seth Alves
92bda6827b remove vive keyboard 2016-09-13 11:27:10 -07:00
Seth Alves
dff567054d qml keyboard for avatar preferences dialog 2016-09-13 11:17:00 -07:00
Marko Kudjerski
6ccf86e3e9 remove qtaudio_windows.dll on Windows before installing the new version 2016-09-13 11:10:36 -07:00
Brad Hefta-Gaub
7c3c05a450 Merge pull request #8584 from zzmp/fix/audio-starve-detection
fix audio client starve detection
2016-09-13 09:08:20 -07:00
Brad Hefta-Gaub
e828a18a2e Merge pull request #8532 from ctrlaltdavid/21040
Add performance information to entities list
2016-09-13 08:32:34 -07:00
Seth Alves
161424afaf qml keyboard for browsable preferences 2016-09-12 21:39:52 -07:00
David Rowe
fa0aeb4563 Display render info values only when valid provided 2016-09-13 13:03:47 +12:00
David Rowe
0cf3f6e953 Fix texture count and size getting stuck on 0 2016-09-13 13:03:06 +12:00
Seth Alves
d0e693247a Merge branch 'qml-keyboard' of github.com:sethalves/hifi into qml-keyboard 2016-09-12 16:52:43 -07:00
Seth Alves
753e4c4c7b keyboard for avatar attachment model url dialog 2016-09-12 16:49:10 -07:00
Seth Alves
2c0676d9b1 make qml keyboard work better in running-scripts dialog 2016-09-12 16:28:24 -07:00
Seth Alves
b841e3094d qml keyboard for file dialog 2016-09-12 16:23:05 -07:00
David Rowe
d61e4c5c11 Display textures size in MB 2016-09-13 10:52:19 +12:00
Seth Alves
e1d00908ac Merge branch 'qml-keyboard' of github.com:sethalves/hifi into qml-keyboard 2016-09-12 15:37:22 -07:00
Seth Alves
3e86b2f0f2 remove some unneeded objectNames 2016-09-12 15:34:29 -07:00
Seth Alves
4c370d0d32 qml keyboard for query-dialog 2016-09-12 15:31:07 -07:00
David Rowe
fe8b3b4d0d Merge branch 'master' into 21040 2016-09-13 09:12:47 +12:00
Seth Alves
38a1556716 qml keyboard for running-scripts window 2016-09-12 13:28:46 -07:00
Seth Alves
e020351c93 Merge branch 'master' of github.com:highfidelity/hifi into qml-keyboard 2016-09-12 11:22:12 -07:00
Seth Alves
51fe9b2a80 Merge branch 'master' of github.com:highfidelity/hifi into qml-keyboard 2016-09-12 09:59:19 -07:00
Chris Collins
7eba6cdbed Merge pull request #8591 from howard-stearns/remove-jpg-error-popup-behavior
remove jpg error popup behavior
2016-09-12 09:55:46 -07:00
Howard Stearns
b949c83a05 remove jpg error popup behavior 2016-09-10 11:18:14 -07:00
Seth Alves
8899c0b790 Merge branch 'master' of github.com:highfidelity/hifi into qml-keyboard 2016-09-10 10:43:07 -07:00
David Rowe
44282499c5 New glyph for "has transparent" 2016-09-10 14:37:09 +12:00
Seth Alves
44af3b43cc fix property access 2016-09-09 17:02:11 -07:00
Seth Alves
c396196e0f show and hide keyboard for qml windows 2016-09-09 16:48:46 -07:00
David Rowe
a06f49f791 Fix footer entities count not being updated when change filter value 2016-09-10 11:14:23 +12:00
David Rowe
68499f49ad Fix count of textures 2016-09-10 10:15:13 +12:00
Brad Hefta-Gaub
258c83f864 Merge pull request #8551 from jherico/texture_load_test_pbo
Stuttering: Sparse Textures
2016-09-09 13:47:27 -07:00
Seth Alves
dd39d46883 fold WebEntityAPIHelper members into OffscreenQmlSurface 2016-09-09 13:41:09 -07:00