625 commits

Author	SHA1	Message	Date
HifiExperiments	ae7a46fbca	more updates	2020-10-12 22:31:39 -07:00
HifiExperiments	5a8c1a0374	starting improve entity updates pt 2	2020-10-12 18:50:46 -07:00
HifiExperiments	ae944fd985	merge with master	2020-09-01 09:34:54 -07:00
HifiExperiments	aa6eedf0fe	make sure render with zones works on models on restart/reload	2020-07-21 12:06:38 -07:00
Kasen IO	21fd10d154	Revert commit 359248829c using -m 1 to temporarily fix issue 383.	2020-06-03 16:08:18 -04:00
HifiExperiments	8f9c180243	Merge remote-tracking branch 'origin/parenting' into modelShader	2020-05-07 13:43:20 -07:00
HifiExperiments	405d557725	Merge branch 'master' into blendshapes	2020-05-07 13:38:59 -07:00
HifiExperiments	8017e30ab9	Merge branch 'master' into blendshapes	2020-05-07 13:27:22 -07:00
HifiExperiments	3bf690571c	Merge branch 'master' into zoneOcclusion	2020-05-07 13:13:20 -07:00
HifiExperiments	b6cb1fcfe7	fix procedural applying to other things	2020-04-22 16:36:51 -07:00
HifiExperiments	bc319cb340	zone occlusion	2020-01-11 22:29:07 -08:00
HifiExperiments	b40a468b4c	fix EOF	2020-01-06 18:31:35 -08:00
HifiExperiments	ef8f085b47	support blendshapes on model entities	2020-01-05 02:37:44 -08:00
HifiExperiments	6156495345	stupid, shadows still broken	2019-12-12 23:04:47 -05:00
SamGondelman	1736252f0d	trying and failing to fix models	2019-12-12 23:04:47 -05:00
HifiExperiments	413bf10f79	stupid, shadows still broken	2019-11-26 22:28:06 -08:00
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