Faye Li Si Fi
0556661d13
getting rid of uneccessary flag, fix formatting, and getting it to work yay
2016-12-07 15:40:21 -08:00
samcake
3ae06847c4
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-12-07 14:55:26 -08:00
David Rowe
c4c2a95e83
Add "back" button to marketplaces footer
2016-12-08 10:58:37 +13:00
Chris Collins
2601dd3da7
Merge pull request #9160 from highfidelity/RC-29
...
Beta Release 29 - Includes up to Developer Release 5770
2016-12-07 12:51:19 -08:00
Faye Li Si Fi
0fcb8803b6
attempt to expose last edited property to script
2016-12-07 12:27:31 -08:00
Faye Li Si Fi
fc393262c9
Merge remote-tracking branch 'refs/remotes/highfidelity/master'
2016-12-07 12:24:37 -08:00
Chris Collins
f7e8d47426
Revert "Updated the Qt audio plugins"
...
This reverts commit b888ce890c
2016-12-07 12:21:13 -08:00
Zach Pomerantz
d2ed3caf02
respect audio thread pool size setting
2016-12-07 13:40:22 -05:00
Ken Cooke
e4b5c14ea3
PR feedback
2016-12-07 10:15:55 -08:00
Bradley Austin Davis
87dd8a46f8
Preserve and restore the GL context when resizing QML surfaces
2016-12-07 09:19:50 -08:00
Chris Collins
bc9f2b4007
Merge pull request #9163 from jherico/gl_context_preservation
...
Preserve and restore the GL context when resizing QML surfaces
2016-12-07 09:08:36 -08:00
Ken Cooke
0f10975a59
Robust WAV parser.
...
Skips extraneous chunks, handles WAVE_FORMAT_EXTENSIBLE, supports arbitrary sample rates.
2016-12-07 08:44:10 -08:00
Bradley Austin Davis
5c3480e2a2
Preserve and restore the GL context when resizing QML surfaces
2016-12-07 05:02:45 -08:00
Zach Pomerantz
c4e435a166
simplify locks in AudioMixerSlavePool
2016-12-07 01:17:34 +00:00
Howard Stearns
2eb8d9d0c4
Merge pull request #9153 from davidkelly/dk/machineFingerprint
...
Machine fingerprint
2016-12-06 16:34:45 -08:00
Zach Pomerantz
b2f995d3df
algorithm->nestedEach in LimitedNodeList
2016-12-07 00:03:30 +00:00
Zach Pomerantz
28960681d9
limit audio pool to sane thread count
2016-12-06 23:57:38 +00:00
Zach Pomerantz
259775e163
clarify lock requirement in audio slave pool
2016-12-06 23:56:11 +00:00
Zach Pomerantz
2fc904b990
fix typos
2016-12-06 23:54:13 +00:00
Zach Pomerantz
557ab43f0f
add a timeout for errant audio slave threads
2016-12-06 23:53:16 +00:00
David Rowe
1de2c14fee
Remove e-mail message hyperlink if displaying on tablet
2016-12-07 12:52:53 +13:00
Zach Pomerantz
132e9bd644
add timings to AudioMixer
2016-12-06 23:51:06 +00:00
David Rowe
e821ec5593
Inject navigation footer into Clara account createion page
2016-12-07 12:38:16 +13:00
David Rowe
01226b03ef
Improve text and robustness of marketplaces footer
2016-12-07 12:20:43 +13:00
David Kelly
562cd12bca
More CR feedback
...
Breaking into 2 functions - one public, one private, so I can avoid
nested control structures and so on in dealing with errors on the
windows side of things. So, no more namespace, back to a class with
2 static functions, one public one private
2016-12-06 15:17:47 -08:00
David Rowe
186d3f18ef
Improve temporary download directory robustness
2016-12-07 11:55:17 +13:00
David Rowe
eafd51ba9e
Merge branch 'master' into 21089
2016-12-07 11:27:15 +13:00
David Rowe
641e47e0c5
Fix build warnings
2016-12-07 10:39:37 +13:00
David Rowe
460d332c6f
Delete redundant code
2016-12-07 10:06:32 +13:00
David Rowe
8e30674069
Tidying
2016-12-07 09:28:35 +13:00
David Rowe
d857f943f8
Handle Clara marketplace downloads
2016-12-07 09:16:59 +13:00
Zach Pomerantz
2a6e46aa0c
rm static buffer from AudioMixerSlave
2016-12-06 20:15:39 +00:00
Chris Collins
e7ca61480e
Merge pull request #9159 from howard-stearns/mic-icon-swap-2
...
new mic toolbar button art
2016-12-06 11:23:07 -08:00
David Kelly
dc47c5fc0c
CR feedback
...
lame mistake - it is always the error branches that get you.
2016-12-06 11:12:50 -08:00
howard-stearns
3ba5e1ed4a
new mic toolbar button art
2016-12-06 10:52:40 -08:00
Seth Alves
a04b486dfc
Merge pull request #9123 from druiz17/touchBug
...
fixed context menu showing up in the correct location with oculus touch
2016-12-06 10:34:00 -08:00
Brad Hefta-Gaub
b97012fc97
Merge pull request #9137 from jherico/msvc2015
...
Fixes for building on MSVC 2015 / Qt 5.8
2016-12-06 10:25:16 -08:00
Brad Hefta-Gaub
9e0ee9c894
Merge pull request #9158 from jherico/xbox_deadzone
...
Add dead zone to yaw controls
2016-12-06 10:24:13 -08:00
Ken Cooke
9831d874b5
Remove debugging code
2016-12-06 10:22:58 -08:00
Ken Cooke
975cbd8e44
Replace test renderer with spatialized binaural renderer
2016-12-06 10:12:36 -08:00
Bradley Austin Davis
f112d345e8
Add dead zone to yaw controls
2016-12-06 09:38:30 -08:00
Chris Collins
6d4b1c4b97
Merge pull request #9155 from jherico/text_degrade_fix
...
Fix drop in text rendering quality when texture memory is low
2016-12-06 09:23:32 -08:00
Andrew Meadows
7db8e8f31b
Merge pull request #9156 from hyperlogic/out-of-body-revert
...
Revert Out of Body experience
2016-12-06 08:37:20 -08:00
David Kelly
c40aadfea4
whitespace
2016-12-05 17:13:12 -08:00
David Kelly
296d9b1ddf
Merge branch 'dk/machineFingerprint' of https://github.com/davidkelly/hifi into dk/machineFingerprint
2016-12-05 17:10:19 -08:00
David Kelly
7880b5bfe0
Simple fallback now
...
If the bios uuid isn't a valid UUID (on mac or windows it 'should be`)
then we read the fallback from the settings and use that, or create and
write one to the settings if it is missing.
2016-12-05 17:05:39 -08:00
Ryan Downe Karpf
fa50e8eddd
Merge pull request #9157 from howard-stearns/mic-icon-swap
...
new mic unumute art
2016-12-05 17:01:59 -08:00
Ryan Huffman
a81e7c2d2c
Merge pull request #9148 from Polyrhythm/ryan/client-side-tests
...
Client script test runner
2016-12-05 16:23:17 -08:00
howard-stearns
7621672964
new mic unumute art
2016-12-05 16:00:03 -08:00
Anthony J. Thibault
89ae3b3d6e
Revert "Merge pull request #8691 from highfidelity/out-of-body-experience"
...
This reverts commit efe9571ab8333e9ec7f4
2016-12-05 15:18:03 -08:00
