2641 commits

Author	SHA1	Message	Date
SamGondelman	25ca52d892	Merge remote-tracking branch 'upstream/master' into NOverlaysFinal	2019-02-07 09:48:13 -08:00
SamGondelman	31cf623252	fix keyboard focus	2019-02-04 12:44:04 -08:00
SamGondelman	391cca787f	fix keyboard textures and text display	2019-02-01 15:33:53 -08:00
SamGondelman	b80d2a9b06	Merge remote-tracking branch 'upstream/master' into NOverlaysFinal	2019-02-01 13:33:04 -08:00
SamGondelman	50bfe84aa7	fix keyboard intersection, laser alpha	2019-02-01 12:11:00 -08:00
Clement	283dabc622	Fix reload mechanic for entity server scripts	2019-01-30 17:29:28 -08:00
SamGondelman	834e44dd3a	make polyline's with faceCamera not depend on normal	2019-01-30 11:02:24 -08:00
Jeff Clinton	3b84580e88	Merge pull request #14794 from SamGondelman/colors ... Case 20888: Fix color space	2019-01-30 09:09:07 -08:00
SamGondelman	56096708d3	one more try	2019-01-29 15:26:49 -08:00
SamGondelman	e41f5617e9	fix color space	2019-01-29 14:52:57 -08:00
SamGondelman	7fa676a846	don't render text parts if alpha == 0	2019-01-29 08:25:17 -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	0d1e4bed66	merge with master	2019-01-28 18:13:05 -08:00
SamGondelman	13cb70a6a5	Merge remote-tracking branch 'upstream/master' into NOverlays12	2019-01-28 11:37:15 -08:00
Sam Gondelman	4d83c7f6df	fix line rendering mode	2019-01-27 00:02:06 -08:00
SamGondelman	8f0bd2449b	pointerevents are working!	2019-01-26 21:53:46 -08:00
SamGondelman	abd7d6bddf	some stuff is working!	2019-01-26 01:39:13 -08:00
SamGondelman	a10f52c66d	merge with master	2019-01-25 14:16:07 -08:00
Jeff Clinton	d92d256cfc	Merge pull request #14656 from SamGondelman/matFallthrough ... Case 20241: Material entity fallthrough	2019-01-25 14:01:27 -08:00
SamGondelman	ca8d64bc05	removing overlays wip	2019-01-24 14:59:45 -08:00
SamGondelman	0bfcde67ea	remove overlays from application.cpp	2019-01-24 14:11:24 -08:00
SamGondelman	5d19666f60	merge with master	2019-01-23 17:58:56 -08:00
SamGondelman	9a734b2011	merge with master	2019-01-23 17:48:24 -08:00
SamGondelman	ac513df103	ring gizmo entities	2019-01-23 17:46:04 -08:00
SamGondelman	8d2e81a13b	Merge remote-tracking branch 'upstream/master' into matFallthrough	2019-01-17 10:27:43 -08:00
SamGondelman	62b853816a	deprecate the new property so that people hopefully don't use it	2019-01-16 19:35:15 -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	1d2270e9c7	web entity fixes	2019-01-15 16:51:36 -08:00
SamGondelman	9803043512	web entity fixes	2019-01-15 09:51:55 -08:00
Dante Ruiz	4ab7308669	addressing code review requests	2019-01-14 14:04:01 -08:00
Dante Ruiz	e7d3844620	making pre review requests	2019-01-14 11:14:57 -08:00
SamGondelman	6fd34bf1f0	setup qml surface contexts	2019-01-14 09:26:57 -08:00
Dante Ruiz	8252481ce7	Delete domain entities only	2019-01-11 16:00:10 -08:00
SamGondelman	4b67a79561	more web entity wip	2019-01-11 09:57:42 -08:00
SamGondelman	292071febb	fix model groupCulled	2019-01-08 14:34:19 -08:00
SamGondelman	5dd59dd9e9	correct lighting of layered shapes	2019-01-08 14:02:57 -08:00
SamGondelman	10068cc42c	merge with master	2019-01-08 12:14:32 -08:00
SamGondelman	1b5c1d0677	working on primitiveMode and groupCulled	2019-01-08 10:02:03 -08:00
John Conklin II	ed4f2d9c10	Merge pull request #14439 from AndrewMeadows/shaped-zones ... Case 15518: shaped zones	2019-01-08 09:06:45 -08:00
SamGondelman	3341d75eda	merge with master	2019-01-07 15:49:16 -08:00
SamGondelman	b609cfaa2b	renderLayer	2019-01-07 15:43:35 -08:00
Adam Smith	7e75ed5daa	Merge pull request #14586 from SamGondelman/NOverlays8 ... Case 20322, Case 12279, Case 15803: Improve PolyLines to support glow and faceCamera	2019-01-07 14:53:27 -08:00
SamGondelman	ff3545beab	working with texture transform fallthrough	2019-01-07 13:28:00 -08:00
SamGondelman	5cded6938b	possible fix for texture path	2019-01-07 11:55:34 -08:00
Shannon Romano	3faf12b141	Merge pull request #14637 from howard-stearns/data-url-for-web-entity ... data url for web entity	2019-01-04 14:21:55 -08:00
Andrew Meadows	13a3982b5a	fix ZoneEntityItem::contains() for model shapes	2019-01-04 12:38:32 -08:00
Andrew Meadows	1fabaf0db4	rename getCollisionGeometryResource to fetchCollisionGeometryResource	2019-01-04 12:37:23 -08:00
Andrew Meadows	0072684d98	remove cruft and fix error in transform to mesh frame	2019-01-04 12:37:23 -08:00