2869 commits

Author	SHA1	Message	Date
Brad Hefta-Gaub	1609e59c42	Merge pull request #16546 from HifiExperiments/cullFace ... Material Entities can specify face culling method, support GLTF doubleSided property	2019-12-13 13:16:01 -08:00
Brad Hefta-Gaub	f8a9789f86	Merge pull request #16499 from HifiExperiments/proceduralMesh ... Procedural vertex shaders	2019-12-13 13:00:01 -08:00
HifiExperiments	2eb0ec18fc	fix non-procedural material entity crash	2019-12-11 00:42:59 -08:00
HifiExperiments	69714a89ca	material entities support cullFaceMode and support gltf doubleSided	2019-11-26 14:48:48 -08:00
Sabrina Shanman	518d6a530a	Merge pull request #16507 from highfidelity/master ... Merge master into instancing	2019-11-18 13:54:33 -08:00
HifiExperiments	b73a608094	procedural vertex shaders	2019-11-15 00:22:40 -08:00
Andrew Meadows	dbeea4038d	remove unused argument	2019-11-14 09:59:43 -08:00
Andrew Meadows	9d92546a8b	revert the revert of PR-16307	2019-11-14 09:59:43 -08:00
sabrina-shanman	516debdcb2	Fix code style / remove cruft	2019-11-13 12:50:13 -08:00
sabrina-shanman	a42e09aef8	Fix unused variables/implicit type conversions	2019-11-08 10:04:34 -08:00
sabrina-shanman	33bb0e2b19	Change RenderableModelEntityItem::computeShapeInfo to support new HFM format	2019-11-05 14:44:23 -08:00
sabrina-shanman	da5f80c139	Use std::vector types in ShapeInfo	2019-11-05 10:57:55 -08:00
Sam Gateau	7af0940846	getting coision to work	2019-11-05 10:57:54 -08:00
sabrina-shanman	7b14c00540	Merge branch 'master' into instancing	2019-11-05 10:22:24 -08:00
HifiExperiments	1e100a672e	merge with master and try to fix opacity mode stuff	2019-10-23 22:21:45 -07:00
Sam Gateau	695b9cdba6	Clening up left over comments and typos, simplify the code to update Matrices in the model classes and removed renderITemsIdMap because not needed, chasing the problem of the physics objects transform	2019-10-18 03:31:06 -07:00
Brad Hefta-Gaub	51669e1ac3	Revert "DEV-1811: apply deletion rules to linked entities"	2019-10-11 11:06:10 -07:00
Maia Hansen	07b916f0b7	Merge pull request #16307 from AndrewMeadows/colossal-cave ... DEV-1811: apply deletion rules to linked entities	2019-10-10 13:24:43 -07:00
Sam Gateau	abaf0262a7	Merge branch 'master' of https://github.com/highfidelity/hifi into instancing	2019-10-08 18:55:51 -07:00
RebeccaStankus	458d3bfb48	Renamed variable and made it private	2019-10-08 13:47:06 -07:00
RebeccaStankus	092424569d	Added flag to ensure mouse event signals are not connected twice	2019-10-08 12:01:47 -07:00
Sam Gateau	521ce3936b	I changed names! Renaming the Geometry to NetworkModel, the GeometryResource to ModelResource, i think there is no need for the 2, only one would be enough in my opinion...	2019-10-07 15:19:23 -07:00
Andrew Meadows	8ab70225d9	apply delete rules down linked hierarchy	2019-10-07 14:38:36 -07:00
Andrew Meadows	470a45c012	EntityItem::_owningAvatarID always AVATAR_SELF_ID for MyAvatar's entities	2019-10-07 14:38:36 -07:00
Sam Gateau	42bc91b389	Merge branch 'master' of github.com:highfidelity/hifi into instancing	2019-10-07 09:42:14 -07:00
Zach Fox	5f1c389d1c	DEV-611: Ensure that entities with the property set can be clicked in Desktop and VR modes	2019-10-03 09:45:23 -07:00
Sam Gateau	1d19671e88	Merge branch 'master' of github.com:highfidelity/hifi into instancing	2019-10-01 11:27:16 -07:00
Sam Gateau	9d999baab2	FIrst pass to clean up before pushing a pr:	2019-09-26 11:59:01 -07:00
Sam Gateau	dc40c530a3	INstrumenting the code more...	2019-09-25 17:53:59 -07:00
Sam Gateau	c0660329a3	Exposing the REsource Caches through a bit of ui, adding MaterialCache to the family	2019-09-17 18:06:08 -07:00
Sam Gateau	3d199ff444	Merge branch 'master' of https://github.com/highfidelity/hifi into yellow	2019-09-16 21:34:56 -07:00
Sam Gateau	18226e64f8	Add a read lock where we think it s needed and banging my head on the problem	2019-09-16 18:06:43 -07:00
sabrina-shanman	76b1f551b1	Merge branch 'master' into instancing	2019-09-16 10:17:59 -07:00
sabrina-shanman	a166b41216	Fix build warnings/errors	2019-09-13 15:39:29 -07:00
Shannon Romano	79d845d127	Merge pull request #16190 from danteruiz/fix-html ... BUGZ-1398: HMD Tablet Apps blocked by Web access error	2019-09-13 12:35:29 -07:00
danteruiz	8491a37923	fixing WebEntities html	2019-09-13 09:57:51 -07:00
milad	e56d0066a3	Merge branch 'master' of github.com:highfidelity/hifi into BUGZ-1452/entity-link-property-right-button-disable	2019-09-11 17:08:39 -07:00
milad	12b980d99d	about to test if this new right click disable is working	2019-09-11 17:08:35 -07:00
Shannon Romano	65d0bb1342	Merge pull request #15906 from kasenvr/kpi-v1-modkit-rc ... Kasen Plugin Infrastructure v½ Codename "Modkit Mini"	2019-09-11 13:04:01 -07:00
Seth Alves	404b42c41e	remove unneeded call to tellNeighborsToRecopyEdges	2019-09-05 08:04:09 -07:00
humbletim	271fac4bca	Merge remote-tracking branch 'upstream/master' into kasenvr-kpi-v1-modkit-rc-merge	2019-09-05 09:46:21 -04:00
HifiExperiments	97b9179144	merge with master	2019-09-05 00:46:56 -07:00
Seth Alves	d86944baf4	rework polyvox state-machine	2019-09-04 20:14:11 -07:00
Andrew Meadows	8957cc5b2b	render opaque PolyLines with opaque pipepline	2019-08-22 08:13:11 -07:00
Andrew Meadows	81eaf157a6	tighter bounding box when rendering PolyLines	2019-08-22 08:13:11 -07:00
Simon Walton	85da916a3b	Merge pull request #16061 from SimonWalton-HiFi/entities-scriptengine-takedown ... BUGZ-984: Wait for client entity-scripts to unload when shutting down	2019-08-16 10:12:38 -07:00
Brad Hefta-Gaub	b0b406adda	Merge pull request #16015 from HifiExperiments/renderUpdate ... BUGZ-902: Drastically reduce locking and branching necessary for render updates	2019-08-15 09:35:17 -07:00
Simon Walton	9aacd136b8	Add blocking to script unload for client entity-scripts	2019-08-14 13:51:40 -07:00
Sam Gateau	4a93b23d83	Address the procedural to populate all reflection versions with user uniforms bindings and make EnigneInspector works correctly	2019-08-13 18:47:57 -07:00
Sam Gateau	9139edc8b1	Maybe fixed the problem, cannot render the gl41 version properly	2019-08-12 00:44:14 -07:00