Brad Davis
d162e1cff6
Whitelist functionality for tablet apps
2017-11-04 15:14:06 -07:00
Sam Gondelman
863a2041a6
Merge branch 'master' into pointerEvents
2017-10-25 17:22:19 -07:00
Bradley Austin Davis
4f5851f420
Reducing needless render updates
2017-10-23 15:31:25 -07:00
SamGondelman
9bbb2eb692
austin's comments, send events directly to selected web entity
2017-10-23 10:17:45 -07:00
SamGondelman
53fde83922
cleaning up pointerevents, wip
2017-10-12 11:21:50 -07:00
SamGondelman
a6b7578c3c
start fixing asynch issue, fixes model loading!
2017-10-05 12:30:00 -07:00
Seth Alves
7397a123c5
Merge pull request #11345 from SamGondelman/textAA
...
Text3D Overlays and Entities fixes and no-AA
2017-09-26 12:26:08 -07:00
Brad Davis
549cb77902
Fix dimensions of rendered web entities
2017-09-21 20:59:01 -07:00
SamGondelman
1b85a453ab
working on text3d overlays and entities
2017-09-12 16:49:51 -07:00
Sam Gondelman
4e7818180b
Merge branch 'master' into tabletLayer2
2017-08-24 17:56:44 -07:00
SamGondelman
4a49801217
web overlays and entities are always nonAA
2017-08-24 14:23:21 -07:00
Brad Davis
e817d3ced4
Threaded rendering & entity rendering refactor
2017-08-24 13:34:34 -07:00
Brad Davis
86e3489167
Updates from Threaded Rendering project
2017-08-04 15:22:14 -07:00
Brad Davis
4439de240a
Trying to fix QtQml/QtScript crashes
2017-06-22 16:39:57 -07:00
Brad Davis
fece438602
Cleanup and refactoring
2017-06-15 18:58:56 -07:00
Bradley Austin Davis
995fe11c05
Migrate to single QML engine
2017-06-05 15:14:44 -07:00
Atlante45
ad16a935e9
Texture::create returns shared pointer
2017-04-25 15:56:23 -07:00
kunalgosar
19ab7526d3
apply profile to relevant entities
2017-04-04 11:54:21 -07:00
Bradley Austin Davis
efad7da508
Merge remote-tracking branch 'upstream/master' into HEAD
2017-03-03 08:59:24 -08:00
Stephen Birarda
8562a294fa
cleanup some extra spacing
2017-02-28 13:24:41 -08:00
Stephen Birarda
80af749b69
change max FPS for youtube on URL change
2017-02-27 11:09:17 -08:00
Stephen Birarda
d18936ea18
only force youtube web entities to 30 FPS
2017-02-27 09:44:34 -08:00
Stephen Birarda
2ceb3d85bd
increase max renderable web entity FPS to 30
2017-02-27 09:33:49 -08:00
Bradley Austin Davis
7fb7aa87eb
Working on new texture management strategy
2017-02-17 07:53:16 -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
Seth Alves
c317ba8054
merge from upstream
2017-01-25 15:57:53 -08:00
Stephen Birarda
a8118e83ff
cleanup debug for safe web entity URLs
2017-01-23 13:54:43 -08:00
Seth Alves
c958314918
merge from upstream
2017-01-23 13:52:01 -08:00
Stephen Birarda
d7651e9838
move value sanitizing to WebEntityItem
2017-01-23 11:45:21 -08:00
Stephen Birarda
99e0c8c0e7
use fromUserInput in web entity URL set to avoid crashable URLs
2017-01-23 11:37:54 -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
Anthony J. Thibault
3c2f9acd39
Hooked up EventBridge to TabletScriptingInterface.
2017-01-03 15:43:21 -08:00
Anthony J. Thibault
00980366d6
Merge branch 'master' into tablet-ui
2017-01-03 09:45:23 -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
ec38c4e319
Merge remote-tracking branch 'upstream/tablet-ui' into tablet-ui
2016-12-20 13:43:06 -08:00
Anthony J. Thibault
84db58dbc6
Make tablet.qml work on Web3DOverlay
2016-12-20 12:16:11 -08:00
David Rowe
e85bc50333
Tidying
2016-12-20 07:38:25 -08:00
Brad Hefta-Gaub
c65471e880
Merge branch 'master' of https://github.com/highfidelity/hifi into removeLogSpam
...
Conflicts:
libraries/script-engine/src/FileScriptingInterface.cpp
2016-12-19 22:27:24 -08:00
Brad Hefta-Gaub
dbbed462b4
cleanup naked qDebug() calls
2016-12-19 22:24:25 -08:00
Anthony J. Thibault
a791ddcc22
Tablet can switch to a web url.
...
Help button has been updated to switch to the help.html. It doesn't look good because
the content was authored expecting landscape window, not portrait.
The API is by no means final. But it exposes two methods to JS.
* Tablet.gotoHomeScreen() - Used to forcefully go back to the home tablet "springboard", eventually this will
hooked up to the tablet button.
* Tablet.gotoWebScreen(url) - Causes the tablet to switch from the home "springboard" and load a web url.
tabletTest.js and help.js have been updated to use this functionality.
2016-12-19 17:52:19 -08:00
Anthony J. Thibault
856791c11d
Made TabletRoot.qml the main tablet qml file.
...
This file uses a Loader node to load, Tablet.qml.
2016-12-19 15:15:16 -08:00
Anthony J. Thibault
5d1ccfbccc
Tablet#removeButton now works properly
2016-12-15 15:49:37 -08:00
Anthony J. Thibault
d2c4417b24
Hook up Help button to the new Tablet interface
2016-12-14 17:05:47 -08:00
Anthony J. Thibault
d4f9d21ce8
Pass tablet QQuickItem to TabletScriptingInterface
...
Also, moved TabletScriptingInterface to script-engine library for easy access, baby.
2016-12-14 14:04:48 -08:00
Seth Alves
819e3dc41d
remove some unneeded html special-casing
2016-12-09 10:18:30 -08:00
Seth Alves
6c99b5e9ca
code review
2016-12-09 06:50:10 -08:00
Seth Alves
369f61e172
bring over some previous tablet-ui work
2016-12-08 16:54:39 -08:00
Anthony J. Thibault
319bb9ce78
Prototype of Tablet.qml hacked to appear on ALL web entities.
2016-12-08 15:31:00 -08:00
David Rowe
71de106594
Tidying
2016-12-04 15:14:47 +13:00
Anthony J. Thibault
066ddad25a
Reduced MAX_CONCURRENT_WEB_VIEWS from 100 to 20.
2016-11-16 09:39:55 -08:00
