Commit graph

52066 commits

Author SHA1 Message Date
Brad Davis
14c8c3f4db Return existing textures when matching hash for a previously found live texture 2017-03-20 09:39:29 -07:00
samcake
cf033b5ece Merge pull request #9930 from jherico/smarter_textures
Fix issue with scaling prior to KTX serialization
2017-03-17 10:43:23 -07:00
Brad Davis
813e3a1bca Fix issue with scaling prior to KTX serialization 2017-03-17 08:05:52 -07:00
Brad Davis
fc21c6bbd8 Merge remote-tracking branch 'upstream/master' into smarter_textures 2017-03-14 15:57:25 -07:00
Brad Davis
ff89a5c8c4 Merge pull request #9889 from samcake/brown
Fix the unsupported KTX file format
2017-03-14 15:56:15 -07:00
samcake
900615fcd5 Fix the unsupported ktx format, it was coming from the BUmp map case 2017-03-14 15:53:29 -07:00
samcake
e0f0cc2102 Fix the unsupported ktx format, it was coming from the BUmp map case 2017-03-14 15:49:44 -07:00
samcake
0fa5d1808a Merge pull request #9888 from jherico/smarter_textures
Protect against missing texture cache on shutdown
2017-03-14 14:46:55 -07:00
Brad Davis
5e716f15b5 Protect against missing texture cache on shutdown 2017-03-14 13:48:24 -07:00
Brad Hefta-Gaub
a8d18adf83 Merge pull request #9872 from ZappoMan/fadeInWhenOpeningNoiseGate
code review changes
2017-03-14 09:26:14 -07:00
Zach Pomerantz
a41146451b Merge pull request #9883 from jherico/smarter_textures
Don't crash when failing to convert a texture to KTX format
2017-03-14 12:14:56 -04:00
Brad Davis
1ccf715e3b Don't crash when failing to convert a texture to KTX format 2017-03-14 09:09:14 -07:00
Brad Davis
eab91d061d Merge pull request #9868 from zzmp/ktx/local-not-roaming
Use Local for WIN32 FileCache
2017-03-13 15:52:11 -07:00
Brad Davis
3bef5ad528 Merge remote-tracking branch 'upstream/master' into smarter_textures 2017-03-13 14:30:25 -07:00
Zach Pomerantz
808973d7d2 use QStandardPaths instead of hardcoded paths 2017-03-13 17:26:42 -04:00
Zach Pomerantz
463f6454f8 use Local instead of Roaming for FileCache 2017-03-13 17:26:38 -04:00
Zach Pomerantz
172a638ef0 move resource paths to PathUtils 2017-03-13 17:26:34 -04:00
Brad Davis
02189812da Merge pull request #9867 from zzmp/ktx/manifest
Remove manifest from FileCache
2017-03-13 13:21:03 -07:00
ZappoMan
956fdd0933 CR feedback 2017-03-13 12:06:38 -07:00
ZappoMan
099ee1db7f CR feedback 2017-03-13 12:05:42 -07:00
ZappoMan
f5e434bc40 Merge branch 'master' of https://github.com/highfidelity/hifi into fadeInWhenOpeningNoiseGate 2017-03-13 11:59:38 -07:00
ZappoMan
3e020ede78 CR feedback 2017-03-13 11:58:43 -07:00
Andrew Meadows
546f32431d Merge pull request #9862 from ZappoMan/fadeInWhenOpeningNoiseGate
Various noise gate, scope, and audio stats improvements
2017-03-13 11:52:16 -07:00
ZappoMan
81d01da21d Merge branch 'master' of https://github.com/highfidelity/hifi into fadeInWhenOpeningNoiseGate 2017-03-13 10:55:09 -07:00
Andrew Meadows
6e7f4b0418 Merge pull request #9829 from ZappoMan/addDoubleClick
Add double click message support to entities and overlays
2017-03-13 10:44:54 -07:00
Zach Pomerantz
a27d88da1a update TextureCache to use FileCache 2017-03-13 13:41:44 -04:00
Zach Pomerantz
a0c56618b3 update FileCache to rm manifest 2017-03-13 13:41:44 -04:00
Zach Pomerantz
3624d7a6ee Merge pull request #9848 from jherico/smarter_textures
Smarter Textures - Fix OSX link failure
2017-03-13 13:06:26 -04:00
Brad Hefta-Gaub
a38965d628 add more audio stats 2017-03-11 09:50:30 -08:00
Brad Hefta-Gaub
6ce50269ac add audio mixer in/out stats to the client stats 2017-03-10 18:42:18 -08:00
Brad Hefta-Gaub
aa65f03509 fix mac warning and remove accidentally added whitespace 2017-03-10 18:14:00 -08:00
Brad Hefta-Gaub
23e47f2fdc added icons to the audioScope app 2017-03-10 18:13:35 -08:00
Brad Hefta-Gaub
7eb4b8f5f7 expose AudioScope to QML 2017-03-10 17:38:13 -08:00
Brad Hefta-Gaub
b8a2525f9e add auto pause/resume to the Audio Scope App 2017-03-10 17:38:00 -08:00
Brad Hefta-Gaub
5f3ee2e98f add a basic tablet app for the audio scope 2017-03-10 17:08:54 -08:00
Brad Hefta-Gaub
eaea718de1 add various scriping interfaces for managing the audio scope and detecting noise gate transitions 2017-03-10 17:08:19 -08:00
Chris Collins
49efd8ad42 Merge pull request #9841 from AndrewMeadows/fix-crash-copying-joint-data
fix crash when unpacking too many joints
2017-03-10 14:39:27 -08:00
Brad Hefta-Gaub
69fdea3621 fix typo in comment 2017-03-10 11:44:53 -08:00
Brad Hefta-Gaub
a4eac3cbc0 Merge branch 'master' of https://github.com/highfidelity/hifi into fadeInWhenOpeningNoiseGate
Conflicts:
	libraries/audio-client/src/AudioNoiseGate.cpp
2017-03-10 11:43:30 -08:00
Seth Alves
494b602d4c Merge pull request #9850 from druiz17/toolbar-MIA-afetr-snapshot
toolbar becomes visible after taking a snapshot
2017-03-10 10:20:01 -08:00
Seth Alves
cef4c988c4 Merge pull request #9835 from druiz17/toolbar-window-dont-close
Close toolbar windows when reloading scripts
2017-03-10 10:19:07 -08:00
Brad Davis
43d8433d9a Removing unused include 2017-03-10 09:19:00 -08:00
Dante Ruiz
d54005b62e no more duplicate snapshot buttons after taking reloading scripts 2017-03-10 00:17:44 +00:00
Dante Ruiz
c6c0c6d382 toolbar becomes visible after taking a snapshot 2017-03-09 22:54:22 +00:00
Brad Hefta-Gaub
95776c2e51 Merge pull request #9830 from zzmp/fix/audio-silent-check
better detection of silent samples in audio-mixer
2017-03-09 14:11:46 -08:00
Zach Pomerantz
7e2f1a6455 check for silent samples befor limiting 2017-03-09 14:31:54 -05:00
Zach Pomerantz
e69d6d8b5f track silent listeners in audio-mixer 2017-03-09 14:31:41 -05:00
Brad Hefta-Gaub
45efb235e3 Merge pull request #9842 from ZappoMan/tellCodecAboutSilence
improved noise gate
2017-03-09 11:04:22 -08:00
Bradley Austin Davis
8a438948b9 Fix OSX link failure 2017-03-09 10:42:56 -08:00
druiz17
007ed9fe81 Merge pull request #9836 from druiz17/2-tablets-fix
Fixed having more than one tablet when reloading scripts
2017-03-09 09:13:14 -08:00