189 commits

Author	SHA1	Message	Date
Zach Pomerantz	0e9d696859	Cache renderable model orig texs as QVariantMap	2016-02-15 11:09:10 -08:00
Zach Pomerantz	0903e14b06	Revert model texs when unset	2016-02-12 15:57:24 -08:00
Seth Alves	6a646f1c24	put isMoving back and change all uses to isMovingRelativeToParent	2016-02-10 19:01:41 -08:00
Atlante45	7e8ea4dc77	Update primitive instance rendering calls	2016-02-01 18:50:01 +01:00
Andrew Meadows	d25f54485c	fix crash for emtpy modelUrl in ModelEntityItem	2016-01-22 22:01:30 -08:00
Seth Alves	edea0320e6	try again to make this thread safe	2016-01-19 15:44:22 -08:00
Seth Alves	a515d6debe	call into correct thread to getJointNames on entity	2016-01-19 15:16:58 -08:00
Seth Alves	f265656e74	expose getJointNames for entities to js	2016-01-19 12:55:17 -08:00
Seth Alves	4232e400cc	add getJointIndex call	2016-01-18 11:15:03 -08:00
David Rowe	a59cbd1aca	Merge branch 'master' into 20763	2016-01-14 17:25:44 +13:00
Atlante45	11dc3cd261	Move primitive rendering out of DeferredLightingEffect	2016-01-13 11:47:43 -08:00
David Rowe	25309e84b3	Fix interpreting textures properties	2016-01-07 17:30:28 +13:00
David Rowe	f64481c510	Warn user if cannot evaluate model's textures property	2016-01-07 16:47:48 +13:00
Seth Alves	942e77166e	merge from upstream	2016-01-05 11:11:19 -08:00
Seth Alves	ef8673610f	debugging	2016-01-04 14:58:13 -08:00
Seth Alves	6c8eb90ee0	debugging	2016-01-04 14:42:37 -08:00
Seth Alves	7f2e0cd103	expose a way to set translation and rotation of all model joints at once	2016-01-04 14:13:08 -08:00
Seth Alves	d35bbbb9f2	incorporate changes from #6732	2015-12-30 13:15:36 -08:00
Seth Alves	4e312dd8f8	undo temporary hack	2015-12-30 12:45:19 -08:00
Seth Alves	83f60d6e97	make entity properties for model-entity joint-states	2015-12-23 15:43:50 -08:00
Seth Alves	84bcfb7d71	hook up a way for scripts to set model-entity joint state	2015-12-22 17:43:01 -08:00
Seth Alves	1d9a81d5d4	Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting	2015-12-21 09:14:37 -08:00
Seth Alves	d71cecbc61	Merge pull request #6675 from AndrewMeadows/crash-fix ... fix crash when visiting new domain with gun in hand	2015-12-20 06:24:44 -08:00
Seth Alves	489d4099a7	add locationChanged to model entities	2015-12-16 15:21:20 -08:00
Andrew Meadows	c14433979b	fix crash mode when model late to get collision URL	2015-12-16 15:11:47 -08:00
Seth Alves	c74f8bca49	location getters also return a success boolean so that callers can know if the value they are receiving is bad due to lack of information about an object's parent	2015-12-14 09:13:36 -08:00
Seth Alves	1492fd6090	merge from upstream	2015-12-12 12:37:57 -08:00
Seth Alves	8ec84bdde8	don't simulate model until it has geometry	2015-12-11 17:35:18 -08:00
Seth Alves	6c033d9603	call locationChanged when receiving changing avatar joints over the network. RenderableModelEntityItem uses locationChanged to relay updates to _model	2015-12-11 11:35:42 -08:00
Seth Alves	3a35df191a	remove an off-brand change	2015-12-10 11:19:26 -08:00
Seth Alves	1467a9d2eb	handle initial simulation of _model	2015-12-10 11:17:40 -08:00
Seth Alves	2dd40beed5	formatting	2015-12-10 10:42:25 -08:00
Seth Alves	d09f70239c	make entity-tree a global. change how network-requests to load model geometry are triggered	2015-12-10 09:03:53 -08:00
Seth Alves	47df744552	Merge branch 'update-model-during-simulate' of github.com:sethalves/hifi into no-physics-until-ready	2015-12-09 12:40:18 -08:00
Seth Alves	4d60c7bbc0	update model location with SpatiallyNestable's locationChanged call	2015-12-09 10:42:32 -08:00
Seth Alves	f99812a903	adjust method names to fit convention	2015-12-07 14:31:08 -08:00
Seth Alves	96e9580473	change some more parameters back to being pass-by-reference, where it's safe	2015-12-07 05:30:19 -08:00
Seth Alves	a948ae5f19	children of avatar joints might be right, now	2015-12-06 10:48:00 -08:00
Seth Alves	cf39cac7fc	attempt to make SpatiallyNestable data access thread-safe	2015-11-29 12:50:33 -08:00
Seth Alves	4ab2bfa854	clean up, minimize diff	2015-11-26 08:35:28 -08:00
Seth Alves	c96a09976e	Merge branch 'master' of github.com:highfidelity/hifi into update-model-during-simulate	2015-11-26 08:32:17 -08:00
Seth Alves	ca75802b9c	unmangle merge	2015-11-26 06:43:28 -08:00
Stephen Birarda	5a7b0dd1ad	put the parsed model URL in ModelEntityItem	2015-11-24 11:46:51 -06:00
Stephen Birarda	0d6b919448	cleanup printing of updated model URL	2015-11-24 11:22:30 -06:00
Stephen Birarda	0e19e50047	cleaner handling for QString/QUrl conversion/comparison	2015-11-24 11:17:46 -06:00
Seth Alves	09f14bc9a5	guard against nullptr deferenece	2015-11-23 16:51:17 -08:00
Seth Alves	5cd047da15	move some more code over	2015-11-23 16:49:36 -08:00
Seth Alves	cfcff42004	missed a line	2015-11-23 16:41:16 -08:00
Seth Alves	283ad7ffd9	try, try again	2015-11-23 16:39:19 -08:00
Seth Alves	89e5b11f9e	do this from update rather than simulate	2015-11-23 16:17:22 -08:00