609 commits

Author	SHA1	Message	Date
HifiExperiments	3dfd63d46b	merge with master	2019-11-26 20:42:44 -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
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
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
sabrina-shanman	a166b41216	Fix build warnings/errors	2019-09-13 15:39:29 -07:00
HifiExperiments	97b9179144	merge with master	2019-09-05 00:46:56 -07:00
HifiExperiments	7b29f0f718	reduce locking necessary for render updates	2019-07-31 11:21:29 -07:00
SamGondelman	60600779c9	merge with master	2019-07-12 11:01:17 -07:00
Andrew Meadows	9a6b42ec28	move getCollisionShapeURL() back to base class	2019-07-09 15:51:56 -07:00
Andrew Meadows	520c62f6f6	wait for objects added to physics before stop SafeLanding	2019-07-09 15:51:56 -07:00
SamGondelman	fa416adaf6	adding unlit property to text, fixing transparency, normals, other cleanup	2019-07-02 10:28:36 -07:00
Sam Gondelman	e4847cc4ae	Merge branch 'master' into proceduralMesh	2019-06-24 10:16:45 -07:00
Seth Alves	e7b852ca38	don't try to create collision shape before compound shape resource is finished loading	2019-06-17 13:18:03 -07:00
Sam Gondelman	16a56dc1ec	Merge branch 'master' into proceduralMesh	2019-06-04 09:56:25 -07:00
Andrew Meadows	bfe809f3f7	local entities should not be in physics	2019-05-29 20:19:12 -07:00
Sam Gondelman	3d05a954bc	Merge branch 'master' into proceduralMesh	2019-05-23 09:35:14 -07:00
Andrew Meadows	045b0f7cf8	check for unloaded model	2019-05-21 07:49:21 -07:00
SamGondelman	de90c5088c	(✿◠‿◠)	2019-05-16 19:33:07 -07:00
Sabrina Shanman	fbe947c8ac	Merge pull request #15558 from AndrewMeadows/fix-crash-bugz178 ... BUGZ-178: avoid crash for RenderableModelEntityItem with invalid model	2019-05-14 13:07:40 -07:00
Andrew Meadows	5a257eb137	avoid crash for RenderableModelEntityItem with invalid model	2019-05-14 09:48:06 -07:00
Sam Gondelman	4c4589271c	Merge pull request #15469 from SamGondelman/switch ... Case 22379: Run-time switch for deferred/forward rendering	2019-05-13 11:14:26 -07:00
SamGondelman	eb8c722080	fix runtime switch	2019-05-13 09:58:55 -07:00
Andrew Meadows	7dfa8a26a3	cleanup EntityItem::shouldBePhysical() and derivations	2019-05-06 17:35:57 -07:00
SamGondelman	0bcd8b81e1	trying and failing to fix models	2019-05-01 12:01:49 -07:00
SamGondelman	27338c3639	fix cauterization of entities that are children of MyAvatar's head	2019-04-08 19:48:11 -07:00
Sam Gondelman	414a39bd8a	Merge branch 'master' into particleShapes	2019-04-01 22:20:13 -07:00
Sabrina Shanman	2fd2d2cc5d	Merge pull request #15154 from SamGondelman/parentCollider ... Case 8064: Child of animated model brings collider with it	2019-03-21 11:26:50 -07:00
SamGondelman	ea50133146	working on adding particle shape types	2019-03-18 12:05:17 -07:00
SamGondelman	97b01bad70	tellPhysics to children when animating model	2019-03-11 12:23:26 -07:00
danteruiz	4371723145	fix soft entity popping	2019-03-11 11:27:12 -07:00
SamGondelman	380df059ff	fix shapes app	2019-03-06 18:18:39 -08:00
SamGondelman	c8ffb130a3	only update sub items on change	2019-02-19 17:38:47 -08:00
SamGondelman	06ac2b291b	attachments and wearables cull with avatar parent	2019-02-17 17:52:10 -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
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	618146e885	fix animation url change	2019-01-18 15:36:10 -08:00
SamGondelman	292071febb	fix model groupCulled	2019-01-08 14:34:19 -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
SamGondelman	b609cfaa2b	renderLayer	2019-01-07 15:43:35 -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