2636 commits

Author	SHA1	Message	Date
SamGondelman	bed2732d34	start moving materials to rendering only	2019-02-14 12:59:16 -08:00
SamGondelman	4202685a4b	Merge remote-tracking branch 'upstream/master' into fst	2019-02-11 16:07:36 -08:00
John Conklin II	78f0a3feaa	Merge pull request #14739 from SamGondelman/animations ... Case 20398: Fix animation URL change	2019-02-08 14:40:24 -08:00
John Conklin II	851b968501	Merge pull request #14737 from SamGondelman/zone ... Case 19291: Fix zone bugs	2019-02-08 14:07:26 -08:00
Jeff Clinton	54109deab9	Merge pull request #14825 from SamGondelman/fall ... Case 20829: Always fall when flying is not allowed	2019-02-07 14:39:46 -08:00
John Conklin II	dda310c0b9	Merge pull request #14835 from SamGondelman/textures ... Case 20944: Fix Model textures property	2019-02-07 14:19:01 -08:00
SamGondelman	3ee448a89a	fix scattering and working on resource cache bug	2019-02-05 17:32:15 -08:00
SamGondelman	ee1552661c	fix textures	2019-01-31 12:04:46 -08:00
SamGondelman	2d0c1184e4	only domain zone entities control flying and ghosting	2019-01-30 18:27:17 -08:00
Clement	283dabc622	Fix reload mechanic for entity server scripts	2019-01-30 17:29:28 -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	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	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	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	618146e885	fix animation url change	2019-01-18 15:36:10 -08:00
SamGondelman	d17e04967a	fix zone bugs	2019-01-18 13:49:16 -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
Sam Gondelman	5a6f9eb9e3	Merge branch 'master' into NOverlays8	2019-01-03 15:11:48 -08:00
SamGondelman	a2fe8ef9e7	merge with master	2019-01-03 13:51:07 -08:00
SamGondelman	4cd1cd6606	merge with master	2019-01-03 12:56:41 -08:00
Seth Alves	78aff6e95c	grab js api; send grab information through trait system	2019-01-03 08:17:52 -08:00
SamGondelman	ea11497a67	Merge remote-tracking branch 'upstream/master' into NOverlays7	2019-01-02 18:09:19 -08:00