Commit graph

73 commits

Author SHA1 Message Date
David Rowe
3285816fca Fix up audio stats displayed in tablet 2017-03-03 16:45:35 +13:00
Dante Ruiz
f58a018c64 fixing merge conflicts 2017-02-21 15:46:41 +00:00
Seth Alves
4c1f5c1dc8 Merge branch 'overlays-uuid' of github.com:sethalves/hifi into tablet-ui-edit-js 2017-02-17 09:58:58 -08:00
Seth Alves
c1e41311fc working toward using uuids for overlay IDs 2017-02-16 17:18:09 -08:00
Dante Ruiz
afd56bbbbe fixed qml font path issue for desktop and tablet 2017-02-17 00:01:12 +00:00
Seth Alves
792c7ff51f PointerEvent will now relay keyboard modifiers 2017-02-15 10:41:56 -08:00
Dante Ruiz
888d4ff706 basic prefreneces done 2017-02-14 07:46:32 -08:00
Dante Ruiz
46cfa7cf13 saving work 2017-02-14 07:46:31 -08:00
Dante Ruiz
5c5ace7c7b goto in tablet 2017-02-09 07:13:29 -08:00
Anthony J. Thibault
a209d0372a First cut of pal on tablet. 2017-02-08 17:34:03 -08:00
Anthony J. Thibault
39d68828ab Disable FXAA on tablet overlay in desktop mode.
This introduces the "isAA" property to 3d overlays. When false, the overlay is rendered after
the "Antialiasing" render pass.  Ironically, disabling FXAA makes the text more readable, which is
essential in 2D desktop mode.

Two new shaders were introduced.

simple_opaque_web_browser_overlay.slf
simple_transparent_web_browser_overlay.slf

These are tailored to write into the main framebuffer instead of the g-buffer.
2017-01-30 11:24:59 -08:00
Anthony J. Thibault
bcd94203e6 Raised min fps of tablet overlay for smoother scrolling 2017-01-18 15:32:39 -08:00
dante ruiz
865a78a8c8 saving work 2017-01-18 07:40:14 -08:00
Seth Alves
cc4f4ac506 fix merge from upstream 2017-01-12 17:08:14 -08:00
Seth Alves
208c4686c4 merge from upstream 2017-01-12 15:44:27 -08:00
Brad Davis
f235a52a6d Eagerly cache QML surfaces for Web3D overlays to prevent stutter on loading the tablet 2017-01-11 14:21:29 -08:00
druiz17
28c8d527df Merge pull request #9340 from fayeli/tablet-hide-yellow
Ability to disable yellow highlight around Web Overlays
2017-01-10 09:11:51 -08:00
Faye Li Si Fi
2fa17ea6a7 fix missing parenthesis 2017-01-09 10:23:31 -08:00
Faye Li Si Fi
d0d89e216d Add showKeyboardFocusHighlight in constructor 2017-01-09 09:54:41 -08:00
Anthony J. Thibault
0860c50a49 Allow Hifi.SoundEffect to be used in all qml
Including webEntities, webOverlays and the system tablet.
We might want to add this to enable spatial sound effects for the web keyboard.
2017-01-06 14:01:13 -08:00
Faye Li Si Fi
e7d14b9381 Adding new property "showKeyboardFocusHighlight" to Web3DOverlay 2017-01-05 16:49:55 -08:00
Anthony J. Thibault
3c2f9acd39 Hooked up EventBridge to TabletScriptingInterface. 2017-01-03 15:43:21 -08:00
Anthony J. Thibault
01a96347a5 Updated Web3dOverlay.cpp to work with TabletRoot.qml 2016-12-20 14:40:29 -08:00
Anthony J. Thibault
84db58dbc6 Make tablet.qml work on Web3DOverlay 2016-12-20 12:16:11 -08:00
David Rowe
1b8108bfba Update from Seth 2016-12-20 07:45:35 -08:00
David Rowe
77676436a2 Missing comment close 2016-12-20 07:45:35 -08:00
David Rowe
5bb497d258 Initial fix for detaching tablet UI 2016-12-20 07:45:35 -08:00
David Rowe
6680395e97 Add scriptEvent message to web3d overlay event bridge 2016-12-20 07:43:48 -08:00
David Rowe
25651800dd Code review 2016-12-20 07:43:48 -08:00
David Rowe
0accdddc8f Fix Web overlay x, y coordinate calcs 2016-12-20 07:42:21 -08:00
David Rowe
5fbdd64fff Handle Clara marketplace downloads 2016-12-20 07:40:28 -08:00
David Rowe
bebedd8e51 Add JavaScript event bridge for Web 3D overlay 2016-12-20 07:40:28 -08:00
David Rowe
767b3ea8e9 Add script injection to Web 3D overlay 2016-12-20 07:40:28 -08:00
David Rowe
e85bc50333 Tidying 2016-12-20 07:38:25 -08:00
David Rowe
92b72af71c Direct keyboard input to Web overlay when has focus 2016-12-20 07:38:25 -08:00
David Rowe
e3444e1861 Add mouse press, move, and release handling to Web overlay 2016-12-20 07:38:25 -08:00
David Rowe
5db2fad6ec Fix Web 3D overlay ray intersection then comment out for performance
Per Image3DOverlay.
2016-12-20 07:38:25 -08:00
David Rowe
9bf8f25ed0 Update from Seth 2016-12-16 16:11:27 +13:00
David Rowe
fa6f121ff2 Missing comment close 2016-12-15 11:51:28 +13:00
David Rowe
b55c558f96 Initial fix for detaching tablet UI 2016-12-15 11:11:40 +13:00
David Rowe
d546b69daf Add scriptEvent message to web3d overlay event bridge 2016-12-14 14:30:02 +13:00
David Rowe
efb784f703 Code review 2016-12-13 13:11:21 +13:00
David Rowe
7d8926c802 Fix Web overlay x, y coordinate calcs 2016-12-09 17:00:00 +13:00
David Rowe
d857f943f8 Handle Clara marketplace downloads 2016-12-07 09:16:59 +13:00
David Rowe
a5bdd9066f Add JavaScript event bridge for Web 3D overlay 2016-12-05 17:20:30 +13:00
David Rowe
a8a04cfbba Add script injection to Web 3D overlay 2016-12-05 12:19:49 +13:00
David Rowe
71de106594 Tidying 2016-12-04 15:14:47 +13:00
David Rowe
38e6c8075c Direct keyboard input to Web overlay when has focus 2016-12-04 12:28:44 +13:00
David Rowe
6dbb7129e6 Add mouse press, move, and release handling to Web overlay 2016-12-03 17:09:09 +13:00
David Rowe
0134709e2c Fix Web 3D overlay ray intersection then comment out for performance
Per Image3DOverlay.
2016-12-02 18:50:01 +13:00