Commit graph

17740 commits

Author SHA1 Message Date
howard-stearns
4357bb391d Merge branch 'master' of https://github.com/highfidelity/hifi into uniform-story-handling 2016-09-22 14:54:15 -07:00
Howard Stearns
8e9b743515 rollover images 2016-09-21 19:15:01 -07:00
Brad Hefta-Gaub
5d3d4bdbd9 add support for redirection on domain at max capacity 2016-09-21 18:12:38 -07:00
Ken Cooke
b14f43b11e Merge pull request #8610 from zzmp/test/audio-jitter
add audio jitter simulator testing tool
2016-09-21 16:43:36 -07:00
Howard Stearns
660343f8c6 Merge branch 'master' of https://github.com/highfidelity/hifi into uniform-story-handling 2016-09-21 16:31:50 -07:00
howard-stearns
41b20dc69d single feed with snapshot and concurrency, no radio buttons, mini-card
has two hotspots that bring up different kinds of cards, and anywhere
 else on the minicard takes you "there".
2016-09-21 16:00:29 -07:00
Clément Brisset
f26fbca699 Merge pull request #8623 from ZappoMan/improvedPreview
Improved preview
2016-09-20 19:05:26 -07:00
Brad Hefta-Gaub
8f5c5ebf0e improved disabled preview wording 2016-09-19 18:19:35 -07:00
Brad Hefta-Gaub
fd474f6319 add basic support for master vs stable builds 2016-09-19 14:14:32 -07:00
Chris Collins
3d9f231543 Merge pull request #8609 from zzmp/fix/audio-stats
fix audio network stats
2016-09-19 09:08:35 -07:00
Zach Pomerantz
bbbe070af1 bring audio network latencies to standard 2016-09-15 18:19:58 -07:00
Zach Pomerantz
5b03d3e13d render audio network stats immediately 2016-09-15 18:19:57 -07:00
Brad Hefta-Gaub
41bbfcd578 Merge pull request #8603 from sethalves/quiet-logging
categorize some qDebugs
2016-09-15 18:09:11 -07:00
Zach Pomerantz
177466e4c7 calculate unplayed ms on all streams/buffers as max 2016-09-15 17:54:41 -07:00
Zach Pomerantz
53f5899a69 add audio jitter simulator 2016-09-15 14:51:39 -07:00
Zach Pomerantz
9792d025fa clean up audio stats 2016-09-15 13:09:06 -07:00
Seth Alves
d67701f7bb new logging category for deadlock debug prints 2016-09-15 13:02:18 -07:00
Seth Alves
4470338663 catagorize some qDebugs 2016-09-14 21:39:45 -07:00
Seth Alves
d83600a22e Merge pull request #8599 from howard-stearns/close-address-bar-after-going-home
close address bar after going home
2016-09-14 19:43:57 -07:00
Seth Alves
59db640cb5 add explaining comment 2016-09-14 11:33:03 -07:00
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
David Rowe
fe8b3b4d0d Merge branch 'master' into 21040 2016-09-13 09:12:47 +12:00
Howard Stearns
b949c83a05 remove jpg error popup behavior 2016-09-10 11:18:14 -07:00
David Rowe
44282499c5 New glyph for "has transparent" 2016-09-10 14:37:09 +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
Brad Hefta-Gaub
dbf29ba79d Merge pull request #8569 from jherico/gli
Stuttering: Upgrade GLM & add GLI integration
2016-09-09 12:11:08 -07:00
Brad Davis
ecfe56085d GLM update and GLI integration 2016-09-09 10:18:15 -07:00
Brad Hefta-Gaub
fddbeb6d11 Merge pull request #8588 from zzmp/test/audio-jitter
add a test for audio jitter in DEV/PR builds
2016-09-09 10:17:34 -07:00
David Rowe
ce58edc4e0 Add frustum property to JavaScript Camera object 2016-09-09 18:56:05 +12:00
Brad Davis
bc6b43b7be Add debug option to lower texture resolution 2016-09-08 22:19:17 -07:00
Brad Hefta-Gaub
ad8a832c86 Merge pull request #8582 from howard-stearns/open-browser-and-close
Handle window.open/close in Web content.
2016-09-08 21:17:40 -07:00
Brad Hefta-Gaub
b56ad737d4 Merge pull request #8567 from hyperlogic/feature/tablet-ui-foundation
Web Entities Virtual Keyboard + Event Bridge support
2016-09-08 18:36:46 -07:00
Anthony J. Thibault
d38625ce2a Coding standard fix for JS portions of QML.
Semicolons at end of line.
2016-09-08 18:16:32 -07:00
Brad Hefta-Gaub
3d54600843 Merge pull request #8513 from Atlante45/feat/network-port
Add settings to change local port
2016-09-08 18:10:32 -07:00
Anthony J. Thibault
3574267382 Fix for keyboard on facebook share pop-up
It was a div tag with "contenteditable"="true" attribute.
2016-09-08 18:00:45 -07:00
Zach Pomerantz
e785c0cdf8 add test for audio jitter 2016-09-08 17:50:11 -07:00
Anthony J. Thibault
f7516c2b07 code convention and eslint on createGlobalEventBridge.js 2016-09-08 13:52:19 -07:00
howard-stearns
ebf280fd6f Handle window.open requests from web pages in WebView following QT upgrade.
Handle window.close requests in the browser.
2016-09-08 13:06:33 -07:00
howard-stearns
b918e1ec51 fix system toolbar following upgrade to QT 5.6 2016-09-08 11:32:12 -07:00
Anthony J. Thibault
ebb4c0990b Removed local copy of qtwebchannel.js, use qt resource version instead 2016-09-07 17:14:33 -07:00
Anthony J. Thibault
69bda0de83 Shift key resets after first alpha key. 2016-09-07 13:49:47 -07:00
Seth Alves
624cc655dd disable code that backs-up in time to pick release velocity 2016-09-07 13:24:53 -07:00
Anthony J. Thibault
7b4b98971e Merge branch 'master' into feature/tablet-ui-foundation 2016-09-07 12:49:13 -07:00
Anthony J. Thibault
41e0b8732f fix for occasional crash when deleting web entity 2016-09-07 10:59:16 -07:00
Anthony J. Thibault
dc0d0c2d5c Merge branch 'master' into feature/tablet-ui-foundation 2016-09-07 09:49:55 -07:00
Ken Cooke
9457d49103 Merge branch 'master' of https://github.com/highfidelity/hifi into low-latency-audio 2016-09-06 20:56:20 -07:00
Anthony J. Thibault
774509ba9e Changed punctuation button to &123 2016-09-06 17:41:56 -07:00
Brad Davis
9d057233c6 Fixing rebase 2016-09-06 17:40:48 -07:00