852 commits

Author	SHA1	Message	Date
Dale Glass	65a87b9603	Fix for _meshStates.empty() assertion ... See the comment in the code for a detailed discussion of the issue. This is a workaround, but it should be a safe one.	2021-11-22 01:13:39 +01:00
Dale Glass	24b2cdfcd2	Fix QString::SplitBehavior deprecation, replace with Qt::	2021-08-06 20:16:10 +02:00
David Rowe	4d11d1d515	Convert all "/**jsdoc" occurrences to "/*@jsdoc"	2021-05-12 10:54:45 +12:00
Julian Groß	937e0a55db	Merge remote-tracking branch 'refs/remotes/HifiExperiments/fixBillboard'	2021-02-20 12:12:59 +01:00
HifiExperiments	852edec9e7	entities with billboardMode != none use local rotation so parent rotation doesn't affect them	2021-02-18 22:15:12 -08:00
HifiExperiments	56fa4698da	potential fix for offset soft attachments	2021-02-11 20:07:46 -08:00
HifiExperiments	ae26416c59	Merge branch 'master' into billboard	2021-02-09 22:57:10 -08:00
HifiExperiments	7030798d41	cleanup	2021-01-17 22:47:26 -08:00
HifiExperiments	92ea14a059	proper render bounds for models (need to pass RenderArgs to getBound everywhere)	2021-01-17 22:08:06 -08:00
HifiExperiments	1f71a23082	optimize picking	2021-01-17 13:09:09 -08:00
HifiExperiments	2a27fc4de2	billboarding for model entities	2021-01-13 22:31:21 -08:00
HifiExperiments	030524c3ee	CR and actually send property over wire	2021-01-03 21:03:43 -08:00
HifiExperiments	20e0c24163	cleanup + create	2021-01-02 00:04:24 -08:00
HifiExperiments	002271a4cc	finishing touches	2021-01-01 21:52:16 -08:00
HifiExperiments	1475cae504	wip	2020-12-23 21:29:59 -08:00
HifiExperiments	f33c7de67a	Merge remote-tracking branch 'upstream/master' into pivot	2020-12-18 17:33:24 -08:00
HifiExperiments	7069e48073	working on pivot	2020-12-16 21:01:56 -08:00
HifiExperiments	9a5b956968	Apply suggestions from code review ... Co-authored-by: David Rowe <david@ctrlaltstudio.com>	2020-11-27 15:11:18 -08:00
HifiExperiments	ccd5ef80b3	remove isActive, fix contains, maybe fix green box issue	2020-11-09 19:14:30 -08:00
HifiExperiments	c8532a1ac5	another unused variable	2020-11-04 22:21:24 -08:00
HifiExperiments	c664991f6f	models seem to be working!	2020-10-20 15:06:21 -07:00
HifiExperiments	5a8c1a0374	starting improve entity updates pt 2	2020-10-12 18:50:46 -07:00
HifiExperiments	e78ece7fc5	CR	2020-08-17 14:16:41 -07:00
HifiExperiments	87fd039f99	fix merge issue	2020-08-04 08:54:44 -07:00
HifiExperiments	0d62798860	Merge remote-tracking branch 'upstream/master' into parenting	2020-08-04 08:52:13 -07:00
HifiExperiments	aa6eedf0fe	make sure render with zones works on models on restart/reload	2020-07-21 12:06:38 -07:00
HifiExperiments	56d359f2ba	Merge remote-tracking branch 'upstream/master' into parenting	2020-06-14 17:30:26 -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	405d557725	Merge branch 'master' into blendshapes	2020-05-07 13:38:59 -07:00
HifiExperiments	ebc9dae78d	Merge branch 'master' into parenting	2020-05-07 13:35:32 -07:00
HifiExperiments	8017e30ab9	Merge branch 'master' into blendshapes	2020-05-07 13:27:22 -07:00
HifiExperiments	91e177f68b	add spaces after fors	2020-05-07 13:23:22 -07:00
HifiExperiments	3bf690571c	Merge branch 'master' into zoneOcclusion	2020-05-07 13:13:20 -07:00
HifiExperiments	eb26d9b4e3	working on parenting fixes	2020-04-06 13:41:01 -07:00
HifiExperiments	bc319cb340	zone occlusion	2020-01-11 22:29:07 -08:00
HifiExperiments	ef8f085b47	support blendshapes on model entities	2020-01-05 02:37:44 -08:00
Brad Hefta-Gaub	fb70569fc2	Merge pull request #16548 from HifiExperiments/visible ... Case 17368: Fix wearables not disappearing with avatar	2019-12-13 13:20:15 -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	e0a29d9367	material entities support cullFaceMode and support gltf doubleSided	2019-12-12 23:01:57 -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
HifiExperiments	69714a89ca	material entities support cullFaceMode and support gltf doubleSided	2019-11-26 14:48:48 -08:00
sabrina-shanman	79d470c70e	Call updateGeometry before Model::createRenderItemSet to ensure well-defined state	2019-11-21 16:12:49 -08:00
sabrina-shanman	516debdcb2	Fix code style / remove cruft	2019-11-13 12:50:13 -08:00
sabrina-shanman	b7da5d0d72	Update Model::calculateTriangleSets to use hfm::Shapes	2019-11-08 13:56:49 -08:00
sabrina-shanman	7b14c00540	Merge branch 'master' into instancing	2019-11-05 10:22:24 -08:00
HifiExperiments	bae2ba7bae	merge with master	2019-11-02 01:08:56 -07:00
Sabrina Shanman	05ac16536e	Merge pull request #16436 from highfidelity/master ... Merge master into instancing	2019-10-31 17:39:15 -07:00
Anthony J. Thibault	92f1b59cc8	Full legacy API and FST support	2019-10-18 16:30:32 -07:00