167 commits

Author	SHA1	Message	Date
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	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	8ec84bdde8	don't simulate model until it has geometry	2015-12-11 17:35:18 -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
Seth Alves	7b70562a1b	update RenderableModelEntityItem::_model during simulate rather than during render	2015-11-23 15:51:43 -08:00
Stephen Birarda	6339c2c48f	fix for unnecessary model URL updating	2015-11-23 17:25:31 -06:00
Seth Alves	ba30e01664	include global position in avatar-mixer protocol so server knows where avatars are in world-space	2015-11-23 14:12:49 -08:00
Seth Alves	a08bad8cbd	for models, relay getJointRotation and getJointTranslation to the model	2015-11-23 13:46:32 -08:00
Seth Alves	4646c0c103	unmangle merge	2015-11-21 10:49:31 -08:00
Seth Alves	f013f95e9b	merge from upstream	2015-11-21 08:43:00 -08:00
Seth Alves	f07d5d9d3f	show network and physics status on boxes and spheres	2015-11-11 11:32:12 -08:00
Seth Alves	4cf84a4e5b	use makeEntityItemStatusGetters from more entity types	2015-11-10 17:14:09 -08:00
Seth Alves	7b4dd9a908	Merge branch 'rework-visual-physics-debug' of github.com:sethalves/hifi into rework-visual-physics-debug	2015-11-10 17:06:16 -08:00
Seth Alves	39b92d2b52	terse log when ownership changes	2015-11-10 17:06:12 -08:00
Seth Alves	66387c4530	use icons to show network and physics status	2015-11-10 17:02:57 -08:00
Seth Alves	d535109caf	attempt to fix render-collision hull feature	2015-11-10 09:49:31 -08:00
Seth Alves	bc516c0b86	use render-item status getters to display physics debugging information	2015-11-06 11:32:56 -08:00
Seth Alves	61269c3ce8	fix up entity constructors so that setProperties isn't called during the constructor	2015-10-23 13:52:50 -07:00
Seth Alves	113321184d	if model RegistrationPoint doesn't match entityItem's, update it	2015-10-19 12:21:26 -07:00
Seth Alves	742e48b0c8	try another way of fixing held object snagging at slow velocity	2015-10-19 09:48:34 -07:00
Seth Alves	1f3b92577d	update _model's location anytime it doesn't match the entity's location	2015-10-17 20:08:25 -07:00
Atlante45	a84fdecec9	Fix export bug	2015-10-15 18:43:32 -07:00
Atlante45	ae83dfe041	Move auto-resize to update	2015-10-09 12:23:19 -07:00
Atlante45	75f0a6442f	ModelEntities spawned with no dimension autoresize	2015-10-09 12:23:19 -07:00
Brad Hefta-Gaub	57cc7adbfe	standardize somethingChanged - CR feedback	2015-10-07 12:27:12 -07:00
Brad Hefta-Gaub	016bf4011d	cleanup	2015-10-06 16:07:36 -07:00