Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-23 03:29:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
80673 commits 25 branches 0 tags 1.1 GiB
Commit graph

225 commits

Author SHA1 Message Date
HifiExperiments
7b29f0f718 reduce locking necessary for render updates 2019-07-31 11:21:29 -07:00
SamGondelman
8b9fcd43b1 merge with master 2019-07-03 17:58:23 -07:00
Andrew Meadows
87d7a0a72f recover the Good Parts from first attempt to fix bugz-512 2019-06-20 09:29:48 -07:00
Andrew Meadows
db3c7b9194 rollback fixes for bugz512 2019-06-13 13:57:18 -07:00
Andrew Meadows
b08bb93ff7 add comment about why WebEntityRenderer::onRemoveFromSceneTyped() 2019-06-13 10:53:55 -07:00
Andrew Meadows
eee52deefe destroy WebSurfaces on shutdown 2019-06-12 16:07:15 -07:00
SamGondelman
6111c8a108 initial work on combining shader variants 2019-06-03 19:36:01 -07:00
danteruiz
f715dbe243 fix tablet scaling 2019-02-28 13:32:12 -08:00
SamGondelman
f235d04601 trying to fix web crashes 2019-02-25 15:40:17 -08:00
SamGondelman
4fdf556d5d fix billboard mode in secondary camera 2019-02-21 10:29:21 -08:00
Shannon Romano
f267043953
Merge pull request #14838 from SamGondelman/billboardMode 
Case 20962: Billboard mode improvements
 2019-02-14 17:44:48 -08:00
SamGondelman
f53ccf7363 fix create, working on mini tablet 2019-02-11 14:54:53 -08:00
SamGondelman
0955512a80 add billboard mode to web entities and fix picking/culling 2019-01-31 15:45:10 -08:00
SamGondelman
a8dbe5e761 working on build errors 2019-01-28 21:10:24 -08:00
SamGondelman
6ad0b3412a showKeyboardFocusHighlight + fixes 2019-01-28 20:43:47 -08:00
SamGondelman
7b88efa42c trying to fix web surfaces?? 2019-01-28 18:29:09 -08:00
SamGondelman
abd7d6bddf some stuff is working! 2019-01-26 01:39:13 -08:00
SamGondelman
611998f799 add pulse group properties to shapes, particles, text, web, image, and grid 2019-01-16 13:34:10 -08:00
SamGondelman
9803043512 web entity fixes 2019-01-15 09:51:55 -08:00
SamGondelman
6fd34bf1f0 setup qml surface contexts 2019-01-14 09:26:57 -08:00
SamGondelman
4b67a79561 more web entity wip 2019-01-11 09:57:42 -08:00
howard-stearns
af65e59ba3 Recognize data: URLs in Web entities. 2018-12-27 14:34:59 -05:00
Jeff Clinton
b9c11aad7b
Merge pull request #14259 from SamGondelman/webLock 
Case 18986: Enable interaction with locked web entity
 2018-11-09 12:21:13 -08:00
Zach Fox
b43ad15fa7 Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-11-01 11:32:38 -07:00
Bradley Austin Davis
95d160a170 Working on mac GL issues 2018-10-26 11:23:29 -07:00
SamGondelman
2755cbcf4f enable interaction with locked web entity 2018-10-23 12:00:50 -07:00
Zach Fox
7de784ce27 First steps (definitely not working) 2018-10-10 12:32:55 -07:00
Seth Alves
4ff9252b47
Merge pull request #13718 from jherico/fix/fb15963 
Support rendering of 'about' URLs in web entities
 2018-07-31 09:44:31 -07:00
Brad Davis
c991053c93 Support rendering of 'about' URLs in web entities 2018-07-30 11:56:31 -07:00
Seth Alves
a6aaa71d02
Revert "Allow empty web entities to be rendered" 2018-07-30 11:54:52 -07:00
Seth Alves
32ec984f82
Merge pull request #13577 from dback2/invisibleWebEntities 
Allow empty web entities to be rendered
 2018-07-30 10:12:32 -07:00
David Back
c4236d7442 allow rendering empty web entity 2018-07-10 13:53:18 -07:00
Dante Ruiz
ae03dcb57a fix parent grab dropping and cullig flickering 2018-07-06 15:42:21 -07:00
Dante Ruiz
3d4f164a9f fixing web entity and whitespace cleanup 2018-06-19 16:53:36 -07:00
Brad Davis
8e42bb8c87 Restore the stop functionality for a browser view when it's being destroyed 2018-04-27 17:35:38 -07:00
Brad Davis
e892694bf5 Don't modify URL on web entity on QML shutdown, remove tablet related code from web entity 2018-04-27 08:13:35 -07:00
samcake
382161659e Merge branch 'master' of https://github.com/highfidelity/hifi into taa-zvork 2018-04-24 11:37:00 -07:00
Brad Davis
861200db27 Attempt to shutdown web surfaces more consistently 2018-04-23 14:32:38 -07:00
Seth Alves
ba43640950
Merge pull request #12785 from birarda/bug/xcode-warnings 
fix some xcode warnings for unnecessary captured this
 2018-04-20 10:30:27 -07:00
Olivier Prat
46a1ff4dd2 Set jitter to O on RenderableWebEntityItems 2018-04-20 12:02:17 +02:00
SamGondelman
d38dadaf58 possible fix for qml texture leak 2018-04-06 09:34:00 -07:00
Stephen Birarda
3a8c9de4fb fix some xcode warnings for unnecessary captured this 2018-04-04 10:38:32 -07:00
Cristian Luis Duarte
17fddd9e0e RenderableWebEntityItem root item check moved to hasWebSurface and buildWebSurface 2018-03-19 15:33:14 -03:00
Cristian Luis Duarte
ee6c65c1ac Android - Prevent crash when setting the url property to _webSurface. 2018-03-16 12:03:26 -03:00
Brad Davis
baa4dc3383 Don't leave trash web processes when changing web entity urls 2018-03-14 11:38:46 -07:00
Brad Davis
7d5502eb92 Migrating QML rendering off the main thread 2018-02-06 11:53:09 -08:00
Seth Alves
4bbce011a4
Merge pull request #11918 from sethalves/scale-wearables-with-avatar-3 
avatar-entities which are children of an avatar will scale with the avatar
 2017-12-29 09:12:17 -08:00
Brad Hefta-Gaub
3d02955c5d
Merge pull request #12029 from SamGondelman/webOverlay 
Fix >20 web entities crash
 2017-12-24 17:10:39 -08:00
Seth Alves
96197e66bb Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3 2017-12-22 15:13:02 -08:00
Sam Gateau
db4f9909c7
Merge pull request #12017 from Zvork/glcolor 
Removed glColor reset hack in MeshPartPayload
 2017-12-22 14:25:51 -08:00