2702 commits

Author	SHA1	Message	Date
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
SamGondelman	f7a487a020	move materialcache et al to material-networking library	2019-02-08 10:28:07 -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	25ca52d892	Merge remote-tracking branch 'upstream/master' into NOverlaysFinal	2019-02-07 09:48:13 -08:00
SamGondelman	3ee448a89a	fix scattering and working on resource cache bug	2019-02-05 17:32:15 -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
SamGondelman	0955512a80	add billboard mode to web entities and fix picking/culling	2019-01-31 15:45:10 -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
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	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
SamGondelman	a9d798070a	wip	2019-01-02 18:08:59 -08:00
SamGondelman	1a62b59a8f	Merge remote-tracking branch 'upstream/master' into matFallthrough	2019-01-02 10:11:46 -08:00
SamGondelman	32bec57cfe	Merge remote-tracking branch 'upstream/master' into NOverlays6	2019-01-02 09:53:29 -08:00
Jeff Clinton	bb27acf934	Merge pull request #14530 from SamGondelman/NOverlays4 ... Case 20134: Grid Entities	2019-01-02 09:12:34 -08:00
Jeff Clinton	032178673a	Merge pull request #14634 from SamGondelman/NOverlays5 ... Case 20200: Update EntityScriptingInterface to not find local entities (#2)	2019-01-02 09:00:56 -08:00
Adam Smith	52980559b8	Merge pull request #14491 from SamGondelman/v3 ... Case 20080: v3 + v4 procedurals and misc shader fixes	2018-12-28 15:17:50 -08:00
Brad Hefta-Gaub	440f517b88	Merge pull request #14602 from samcake/punk ... Case 20303 : Cleaning up the render view tasks and jobs for better 2ndary camera	2018-12-27 15:43:17 -08:00
howard-stearns	af65e59ba3	Recognize data: URLs in Web entities.	2018-12-27 14:34:59 -05:00
SamGondelman	b5a2642b6a	updated entityscriptinginterface API and related functions ... (cherry picked from commit 6aac596698)	2018-12-22 00:55:10 -05:00
Sam Gondelman	097d2d9503	Revert "Case 20200: Update EntityScriptingInterface to not find local entities"	2018-12-20 16:53:33 -08:00
SamGondelman	9fc7813e24	Merge remote-tracking branch 'upstream/master' into v3	2018-12-20 16:05:06 -08:00
SamGondelman	9155853889	working on material fallthrough	2018-12-20 16:03:58 -08:00
SamGondelman	bb030660bd	Merge remote-tracking branch 'upstream/master' into NOverlays4	2018-12-20 13:26:23 -08:00
sam gateau	26c9d7a94e	Merge branch 'master' of github.com:highfidelity/hifi into punk	2018-12-20 13:22:19 -08:00
Shannon Romano	21ec4e0c53	Merge pull request #14524 from SamGondelman/NOverlays3 ... Case 20132, Case 16928: First class Image Entities	2018-12-20 21:20:49 +00:00
sam gateau	49df69e609	Merge branch 'master' of github.com:highfidelity/hifi into punk	2018-12-20 13:17:02 -08:00
Shannon Romano	b6d1607acd	Merge pull request #14547 from SamGondelman/NOverlays5 ... Case 20200: Update EntityScriptingInterface to not find local entities	2018-12-20 19:10:22 +00:00
SamGondelman	05e0fb464e	new improved polylines	2018-12-19 15:01:49 -08:00
Sam Gondelman	e890fc6980	Merge branch 'master' into NOverlays3	2018-12-19 11:37:10 -08:00
sam gateau	9c436bc28c	Merge branch 'master' of github.com:highfidelity/hifi into punk	2018-12-19 09:31:41 -08:00
Jeff Clinton	16c7619aa7	Merge pull request #14608 from SamGondelman/zone ... Case 19080: Fix zone with invalid script not loading	2018-12-19 08:49:33 -08:00
sam gateau	b8d96d98b8	fixing warnings from the build	2018-12-18 16:25:24 -08:00
sam gateau	265b1591d6	Merge branch 'master' of github.com:highfidelity/hifi into punk	2018-12-18 14:43:12 -08:00
sam gateau	2f18555ee0	removing comments and dead code, rewiring the debug	2018-12-18 14:42:45 -08:00
SamGondelman	7231116e43	fix zone with invalid script not loading	2018-12-18 13:04:56 -08:00
Jeff Clinton	889f110357	Merge pull request #13925 from sethalves/fix-polyvox-texture-and-single-setter ... fix a bug that broke Entities.setVoxel(). Fix polyvox textures	2018-12-18 12:15:07 -08:00
Sam Gateau	318bf20ede	Shadow is working correctly in both pipelines	2018-12-17 00:27:07 -08:00
SamGondelman	6094a2f0a0	add back line entities, undo polyline changes temporarily	2018-12-14 15:41:11 -08:00
SamGondelman	5dd00bed1d	new improved polylines	2018-12-14 14:15:56 -08:00
SamGondelman	770da220d7	cleanup entity properties more and start polyline work, remove lines	2018-12-12 16:47:35 -08:00
SamGondelman	b261665072	working on lines	2018-12-12 09:39:01 -08:00
SamGondelman	250baa9c72	add missing properties to text entities	2018-12-11 15:42:24 -08:00
SamGondelman	fd8245e258	Merge remote-tracking branch 'upstream/master' into NOverlays6	2018-12-11 10:46:39 -08:00
Sam Gateau	d5b127d258	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-12-10 21:35:41 -08:00