Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-18 06:01:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
55878 commits 25 branches 0 tags 1.1 GiB
Commit graph

134 commits

Author SHA1 Message Date
Brad Davis
8782fe1d93 Merge branch 'master' into smarter_textures 
Conflicts:
	libraries/model-networking/src/model-networking/TextureCache.cpp
 2017-03-06 15:29:41 -08:00
Vladyslav Stelmakhovskyi
6d9e7de6dc Implemented AssetBrowser in Tablet view 2017-03-06 21:45:55 +01:00
David Rowe
09ecb12510 Merge branch 'tablet-ui-edit-js' into 21197 
# Conflicts:
#	interface/src/ui/overlays/Web3DOverlay.cpp
 2017-03-07 08:59:40 +13:00
Seth Alves
08e2e421e4 Merge branch '21199' of github.com:ctrlaltdavid/hifi into tablet-ui-edit-js 2017-03-06 11:08:27 -08:00
Seth Alves
93246b24b0 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-03-06 08:54:49 -08:00
Dante Ruiz
d5948079c7 Merge branch 'master' of github.com:highfidelity/hifi into menuFix 2017-03-06 16:29:37 +00:00
David Rowe
0333122b23 Make Save and Cancel buttons close preferences dialog 2017-03-04 15:27:31 +13:00
David Rowe
b31cf23c8d Fix tablet QML fonts path 
This is the path for running scripts from build/install directory rather
than from source directory.
 2017-03-03 17:45:23 +13:00
David Rowe
3285816fca Fix up audio stats displayed in tablet 2017-03-03 16:45:35 +13:00
Anthony J. Thibault
465a9e2008 Responsiveness improvement to tablet 
PointerEvents sent from handControllerGrab.js to the Qml window are now direct connections, instead of queued.
This should reduce latency of laser and finger pressed onto the tablet.
 2017-03-01 14:31:04 -08:00
samcake
6938948501 Merge branch 'master' of https://github.com/highfidelity/hifi into texmex 2017-02-22 12:00:11 -08: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
Bradley Austin Davis
7fb7aa87eb Working on new texture management strategy 2017-02-17 07:53:16 -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
Brad Davis
9523660027 Fix offscreen QML texture leak, improve texture sharing for same size surfaces 2016-10-20 11:55:25 -07:00
Brad Hefta-Gaub
bf732127ca Merge pull request #8856 from jherico/geometry_ids 
Remove the use of implicit ids in geometry cache
 2016-10-20 08:14:49 -07:00
Brad Davis
2705ee7030 Remove the use of implicit ids in geometry cache 2016-10-19 11:18:25 -07:00
Brad Davis
61e5e2861e Rate limit QML web surfaces 2016-10-18 19:29:11 -07:00
Brad Davis
8c5028158f Fix crash on destroying web entities and overlays 2016-10-03 18:02:21 -07:00
Brad Davis
ca3572f991 Support external GL textures with proper fencing 2016-10-03 17:09:10 -07:00
Anthony J. Thibault
e82f6a90af Improved web entity rendering 
* fading now works properly
* web browsers are now fully opaque.
 2016-08-25 11:04:23 -07:00
Anthony J. Thibault
7de8cc6422 Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-16 16:49:57 -07:00
Anthony J. Thibault
75b88b0794 WebEntities now support custom hifi url handling 
WebEntities now use qml/controls/WebView.qml instead of qml/WebEntity.qml.
marketplace urls and hifi urls should work properly in web entities.
 2016-08-03 10:20:15 -07:00
Seth Alves
70becfaff1 avoid some unneeded SpatiallyNestable transform-locks 2016-08-01 08:20:24 -07:00
Seth Alves
e4e86c245e 3d overlays can be children of entities or avatars 2016-07-31 14:11:56 -07:00
Anthony Thibault
ea310bcc43 Web Entities now render correctly as well 2016-07-28 14:11:19 -07:00
Anthony J. Thibault
fb84f058d6 Fix alpha cut-outs and incorrect gamma on Web3DOverlays 2016-07-25 15:56:05 -07:00
Brad Davis
b7926b8582 Don't render wire geometry with lighting effects 2016-06-30 16:11:05 -07:00
Brad Davis
2f89253dc1 Make Overlays usable from QML 2016-03-04 11:35:54 -08:00
Zach Pomerantz
a7bafed61b Change ShapeKey::CULL to NO_CULL_FACE 2016-02-08 13:44:42 -08:00
Zach Pomerantz
53bd595b77 Update all appropriate overlays to use plumber 2016-02-03 19:18:56 -08:00
Atlante45
11dc3cd261 Move primitive rendering out of DeferredLightingEffect 2016-01-13 11:47:43 -08:00
Brad Davis
5cbb2562cd Move GL utilities out to their own library 2015-10-27 15:53:42 -07:00
Brad Hefta-Gaub
430cbcca7e first cut at adding surface normals to ray intersection 2015-09-27 21:57:50 -07:00
Brad Hefta-Gaub
7536fed09a more warning fixes 2015-09-22 17:22:09 -07:00
Brad Davis
c8069ba73c Working on magballs polish 2015-09-03 20:09:54 -07:00
Brad Davis
b6ef2e314f Adding 'web3d' overlay type 2015-09-02 18:25:49 -07:00