2661 commits

Author	SHA1	Message	Date
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
Shannon Romano	bb9a764855	Merge pull request #14517 from luiscuenca/getEntityJointParent ... Add method to check entities joint hierarchy	2018-12-11 01:06:38 +00:00
SamGondelman	6aac596698	updated entityscriptinginterface API and related functions	2018-12-07 15:25:21 -08:00
Sam Gateau	b24a2d33bf	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-12-06 19:51:05 -08:00
Sam Gondelman	d21d764131	Merge branch 'master' into NOverlays4	2018-12-06 12:48:05 -08:00
Sam Gondelman	2291c7e5fb	Merge branch 'master' into NOverlays3	2018-12-06 12:37:18 -08:00
Sam Gondelman	b690faeb12	Merge branch 'master' into NOverlays	2018-12-06 11:29:06 -08:00
Sam Gondelman	c38a6966a9	Merge branch 'master' into NOverlays4	2018-12-06 11:25:43 -08:00
Sam Gondelman	d30dd4c26c	Merge branch 'master' into NOverlays3	2018-12-06 11:23:50 -08:00
Adam Smith	08d6e35d4d	Merge pull request #14372 from SamGondelman/decals ... Case 19798: 3D projected Material Entities and materialRepeat option	2018-12-06 11:13:46 -08:00
sam gateau	a267c3115a	drafting more factorisation of render tasks	2018-12-05 17:47:33 -08:00
SamGondelman	9923e76968	cleanup	2018-12-05 17:18:26 -08:00
Sam Gondelman	df6fbefc31	Merge branch 'master' into v3	2018-12-05 16:51:33 -08:00
Adam Smith	653974ca30	Merge pull request #14293 from SamGondelman/branching ... Case 19473: Reduce branching in our shaders	2018-12-05 16:42:42 -08:00
SamGondelman	305cb6d323	grid entities	2018-12-03 18:04:34 -08:00
SamGondelman	98f9dc0ca4	remove grid entity files	2018-12-03 12:07:26 -08:00
SamGondelman	3ce6f7f3d6	real image entities	2018-12-03 11:50:59 -08:00
luiscuenca	ad42f6a590	Add method to check entities joint hierarchy	2018-12-01 12:32:29 -07:00
SamGondelman	2acb6b6857	v3 procedurals and shader fixes	2018-11-28 17:58:27 -08:00
Seth Alves	098440c273	fix a bug that broke Entities.setVoxel(). Fix polyvox textures	2018-11-27 10:43:33 -08:00
SamGondelman	e282d51883	CR	2018-11-26 01:15:07 -05:00
sabrina-shanman	be511378cd	Merge branch 'master' into hfm_serializer	2018-11-20 13:42:24 -08:00
Sam Gondelman	968ffe7ec3	Merge branch 'master' into branching	2018-11-16 10:25:02 -08:00
Sam Gondelman	a206d9e25a	Merge branch 'master' into branching	2018-11-14 17:08:08 -08:00
Clement	7192aed131	Rework audio data memory ownership model	2018-11-14 14:45:18 -08:00
SamGondelman	079d1dcbd6	convert clientOnly to entityHost and add local entities	2018-11-14 11:25:37 -08:00
sabrina-shanman	e08bc7296f	Merge branch 'master' into hfm_serializer	2018-11-13 15:41:49 -08:00
Sam Gondelman	13f650d514	Merge pull request #14093 from SamGondelman/police ... Case 19409, Case 19468: Fading fixes and shader cleanup	2018-11-13 15:00:23 -08:00
sabrina-shanman	83cc90ace0	Re-name GLTFReader to GLTFSerializer and do the same for other model readers	2018-11-12 16:12:20 -08:00
sabrina-shanman	753557736e	Merge branch 'master' into hfm_library	2018-11-12 15:03:30 -08:00
Brad Hefta-Gaub	22dd958582	Merge pull request #14297 from jherico/feature/vcpkg ... Case 19807: Switch to vcpkg for many dependencies on all non-mobile platforms	2018-11-12 09:52:02 -08:00
SamGondelman	1d1510e18e	Merge remote-tracking branch 'upstream/master' into police	2018-11-09 13:32:41 -08: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
SamGondelman	b3abd97707	projected materials and repeat property	2018-11-09 10:47:07 -08:00
Brad Davis	8c4237b520	Fix warnings	2018-11-08 12:27:56 -08:00
Zach Fox	58dd690c0a	Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech	2018-11-06 10:29:05 -08:00
sabrina-shanman	2801f324b7	Switch references to HFM to the HFM lib and remove HFM classes in FBX	2018-11-05 12:47:34 -08:00
sabrina-shanman	cbca77b12f	Rename HFMGeometry to HFMModel and adjust related variables	2018-11-01 17:17:48 -07:00
Zach Fox	b43ad15fa7	Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech	2018-11-01 11:32:38 -07:00
sabrina-shanman	becee7f010	Re-name FBXGeometry to HFMGeometry and do the same for related classes	2018-10-30 17:28:42 -07:00
SamGondelman	dc9405775f	more branching removal	2018-10-29 16:42:46 -07:00
Bradley Austin Davis	95d160a170	Working on mac GL issues	2018-10-26 11:23:29 -07:00