201 commits

Author	SHA1	Message	Date
SamGondelman	7c8d080050	Merge remote-tracking branch 'upstream/master' into scriptvec3	2018-07-31 14:04:23 -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
SamGondelman	2ca217eb4a	merge with master	2018-07-30 17:43:15 -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
SamGondelman	9929529f30	vec3 conversion	2018-07-11 14:18:22 -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
Seth Alves	897b96d092	Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3	2017-12-22 07:36:26 -08:00
SamGondelman	7a7b1f7089	fix web entity crash	2017-12-20 13:58:58 -08:00
Olivier Prat	bd666406f4	Removed glColor reset hack in MeshPartPayload and replaced it by a reset of the color attribute to white in the execution of the setInputFormat command of the various GLBackends	2017-12-19 14:17:17 +01:00
Zach Fox	b2bafed2bb	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-07 11:21:24 -08:00
Seth Alves	b590cd5b89	avatar-entities which are children of an avatar will scale with the avatar	2017-12-02 09:31:43 -08:00
samcake	84ff40c717	Merging with master	2017-11-21 14:12:47 -08:00
SamGondelman	8730a26d20	use mouse events for offscreenui because touch events aren't working with the eventFilter, cleanup, documentation	2017-11-15 14:12:16 -08:00
SamGondelman	2c0272f304	(mostly?) fix touch events	2017-11-13 12:58:31 -08:00
Brad Davis	d162e1cff6	Whitelist functionality for tablet apps	2017-11-04 15:14:06 -07:00
SamGondelman	55ac585cd9	Merge remote-tracking branch 'upstream/master' into ui	2017-11-03 17:32:13 -07:00
SamGondelman	ce58b6c401	trying to fix HUD events, abstracting touch event logic (wip), seth's comments	2017-11-03 17:15:30 -07:00
SamGondelman	dd4275430b	fix hover events, working on HUD events	2017-11-02 17:48:37 -07:00
SamGondelman	76eb4c656e	fix multi-touch and keyboard on web entities	2017-10-30 16:41:59 -07:00
ZappoMan	a7a0f03ede	rename SpatiallyNestable::getPosition() to SpatiallyNestable::getWorldPosition()	2017-10-27 18:39:17 -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