219 commits

Author	SHA1	Message	Date
Seth Alves	480eae7317	Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide	2015-03-19 09:14:26 -07:00
Brad Davis	91906d619f	Removing unmatched QReadWriteLock::unlock() call	2015-03-18 22:32:06 -07:00
Andrew Meadows	c032b29633	proper shape management for ConvexHull shapes	2015-03-18 16:29:57 -07:00
Seth Alves	e2a104c38a	unjack AvatarData locks	2015-03-18 14:11:02 -07:00
Seth Alves	dd97b54e52	quiet physics log spam	2015-03-18 13:22:29 -07:00
Seth Alves	1cab14064d	remove unneeded code, quiet some debug spew	2015-03-18 13:10:53 -07:00
Seth Alves	2dd75fef2c	remove some unneeded Q_OBJECT macros, diff minimization	2015-03-17 19:12:26 -07:00
Seth Alves	222c3f01eb	minor cleanups, diff minimization	2015-03-17 14:24:46 -07:00
Seth Alves	b76103edb0	clean up debugging spew	2015-03-16 16:44:29 -07:00
Seth Alves	08cb13640c	debugging spew	2015-03-16 11:22:42 -07:00
Seth Alves	59e4efa651	debugging prints around a deadlock	2015-03-15 07:10:43 -07:00
Seth Alves	250567e315	formatting, diff minimization	2015-03-14 12:09:23 -07:00
Seth Alves	b815c365eb	formatting	2015-03-13 18:57:27 -07:00
Seth Alves	f7f75cabf4	formatting	2015-03-13 18:49:48 -07:00
Seth Alves	87cc710efc	more merge madness, calculate 2nd PhysicsEngine hash with qChecksum if url is set	2015-03-13 18:43:24 -07:00
Seth Alves	a5cdc3c68b	still recovering from troubled merge	2015-03-13 18:27:52 -07:00
Seth Alves	c24ea023f6	still recovering from troubled merge	2015-03-13 18:26:09 -07:00
Seth Alves	af2c00b235	still recovering from troubled merge	2015-03-13 18:21:59 -07:00
Seth Alves	8481a65fbb	still recovering from troubled merge	2015-03-13 18:21:30 -07:00
Seth Alves	2345e5a4f9	oops	2015-03-13 18:19:49 -07:00
Seth Alves	7230257b9e	oops	2015-03-13 18:08:58 -07:00
Seth Alves	50798398ff	merge from upstream	2015-03-13 18:04:55 -07:00
Philip Rosedale	6a4dbd35b5	Merge pull request #4449 from AndrewMeadows/thermonuclear ... ShapeManager can release shape by pointer	2015-03-13 17:34:32 -07:00
Andrew Meadows	e4c6d49c4d	ShapeManager can release shape by pointer	2015-03-13 16:36:18 -07:00
Seth Alves	2368e6e5b7	collision with a hull sort of works. there is a new memory corruption problem	2015-03-13 15:41:57 -07:00
Andrew Meadows	99e2d799c5	correct math for capsule halfHeight	2015-03-13 09:40:32 -07:00
Seth Alves	89b58e2681	trying to get loaded callback for model hooked up to PhysicsEngine	2015-03-13 09:11:15 -07:00
Andrew Meadows	be252147e2	merge upstream/master into andrew/isentropic	2015-03-12 16:38:59 -07:00
Seth Alves	a945421d9d	still trying to make PhysicsEngine::addEntityInternal be async	2015-03-12 16:38:55 -07:00
Andrew Meadows	a1a12465da	able to update avatar controller in PhysicsEngine	2015-03-12 16:36:41 -07:00
Seth Alves	4b1fc4fa10	merge from upstream	2015-03-12 15:59:37 -07:00
Seth Alves	2cf0e1ab25	break PhysicsEngine::addEntityInternal in half, making the 2nd part asynch. This is to allow a ModelEntityItem time to download its collision hull before the 2nd part runs	2015-03-12 15:58:09 -07:00
Stephen Birarda	471e55c8ce	fix some lingering warnings	2015-03-12 12:36:39 -07:00
Seth Alves	bf1cb951a3	move PhysicsEntity so that ModelEntityItem can initiate a model download	2015-03-11 18:34:27 -07:00
Seth Alves	df29d5365a	Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide	2015-03-11 15:18:55 -07:00
Andrew Meadows	feafa0a60b	remove old Ragdoll and avatar interactions	2015-03-11 14:29:03 -07:00
Seth Alves	3a3e723f4e	trying to figureo out where to download hull models	2015-03-11 14:26:30 -07:00
Seth Alves	20a22ff42c	Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide	2015-03-11 07:17:19 -07:00
Seth Alves	1c73f50dbc	started to hook up geometry downloader to ShapeInfo	2015-03-11 07:17:13 -07:00
Brad Hefta-Gaub	77eae204cf	Merge pull request #4411 from AndrewMeadows/thermonuclear ... fix for crash when deleting physical entity that departs the domain	2015-03-10 16:43:17 -07:00
Seth Alves	844085b514	started on hull collisions	2015-03-10 15:30:08 -07:00
Virendra Singh	a0e7125e11	code revamp and correction in parallel axis theorem	2015-03-11 03:11:17 +05:30
Andrew Meadows	3d531e8304	add f at end of float literal	2015-03-10 14:24:49 -07:00
Virendra Singh	ce4226d6b9	Merge branch 'master' of git://github.com/highfidelity/hifi into 20304	2015-03-10 22:36:18 +05:30
Andrew Meadows	fd76eda383	slightly better hardcoded size for avatar capsule ... we'll be measuring avatar dimensions more correctly soon	2015-03-09 17:59:45 -07:00
Andrew Meadows	3c05d685d7	avoid assert for zero-length character velocity	2015-03-09 17:37:34 -07:00
Seth Alves	ab8784f1b4	add comment about character capsule being hard-coded	2015-03-09 13:51:08 -07:00
Seth Alves	99300a5bc8	merge from master	2015-03-09 13:39:51 -07:00
Seth Alves	b2cfed8bca	removed unused blob of code	2015-03-08 09:04:00 -07:00
Andrew Meadows	f5352333f0	entities use radians per second for angular velocity	2015-03-06 16:42:06 -08:00