Commit graph

17716 commits

Author SHA1 Message Date
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
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
SamGondelman
74e5814a48 try to fix rpath issue 2016-09-06 17:40:43 -07:00
SamGondelman
8a4d48ca8d set browserProfile now that Qt bug is fixed 2016-09-06 17:38:47 -07:00
SamGondelman
99176588cc remove old webwindowclass that relied on qwebkit 2016-09-06 17:36:59 -07:00
SamGondelman
7f2476f0f8 put pack macdeployqt call, but still removed qtwebprocess 2016-09-06 17:36:58 -07:00
SamGondelman
038aba20e4 disable dropshadows if unsupported (OSX and AMD cards) 2016-09-06 17:36:57 -07:00
SamGondelman
c993a6b818 try removing windows hack 2016-09-06 17:36:56 -07:00
SamGondelman
2db02fdde1 remove QtWebProcess hack on OSX 2016-09-06 17:36:56 -07:00
SamGondelman
716647037e removed unused code 2016-09-06 17:36:54 -07:00
SamGondelman
9903e464d8 fix error in FileDialog.qml 2016-09-06 17:36:53 -07:00
SamGondelman
98cb3cc366 updated build instructions 2016-09-06 17:36:52 -07:00
SamGondelman
9d447d4dcc enabled qnetworkrequest redirects everywhere I could find them 2016-09-06 17:35:06 -07:00
Brad Davis
20deae3242 Working on Qt 5.6 compatibility 2016-09-06 17:35:04 -07:00
Anthony J. Thibault
73315e3390 Punctuation mode now works 2016-09-06 17:07:41 -07:00
Anthony J. Thibault
28162915fd Re-styled keyboard, now with working shift key 2016-09-06 15:21:58 -07:00
Anthony J. Thibault
71520a661a WIP checkpoint of keyboard shift key support 2016-09-06 13:39:07 -07:00
Atlante45
eb007b24cd Use invalid port to signal no value passed 2016-09-06 11:59:07 -07:00
Atlante45
9f07511fd8 Move setter to LimitedNodeList 2016-09-06 10:18:42 -07:00
Atlante45
fcf44911a3 Fix Windows warning 2016-09-06 10:18:42 -07:00
Atlante45
a8de6f0a57 Add settings to change local port 2016-09-06 10:18:42 -07:00
Seth Alves
37db1cba26 Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions 2016-09-06 09:38:44 -07:00
Brad Hefta-Gaub
78cf81954c Merge pull request #8555 from jherico/thread_count
Stuttering: global thread pool management
2016-09-06 09:27:02 -07:00
Andrew Meadows
0a55afda69 Merge pull request #8554 from elisa-lj11/marketplaces_html
Include a marketplace status bar and access to "marketplace" of marketplaces
2016-09-02 17:12:05 -07:00
Anthony J. Thibault
9122a33fff only raise the webEntity virtual keyboard in HMD mode 2016-09-02 16:53:40 -07:00
elisa-lj11
2f07ba87af Renamed isZipped for more clarity on checking for non-fbx files 2016-09-02 16:48:55 -07:00