233 commits

Author	SHA1	Message	Date
Seth Alves	bb8c83d49a	Merge branch 'master' of github.com:highfidelity/hifi into multi-hull-collisions	2015-03-23 18:26:11 -07:00
Seth Alves	c8ad82917e	clean up some debugging spew. take dimensions into account when scaling points used for collision hull creation	2015-03-23 16:54:36 -07:00
Seth Alves	f31ac8b968	compound covex hull collisions work	2015-03-23 15:10:28 -07:00
Seth Alves	bfc5cf99d6	more code for compound hull collisions	2015-03-21 16:11:47 -07:00
Seth Alves	86d09a1607	more compound shape stuff	2015-03-21 08:55:49 -07:00
Seth Alves	769194f046	first stab at compound hull collisions	2015-03-20 13:41:14 -07:00
Andrew Meadows	ab9d8eb345	reorder arguments to StepDownConvexResultCallback ctor	2015-03-20 08:42:35 -07:00
Andrew Meadows	90a8844738	merge upstream/master into andrew/bispinor ... Conflicts: libraries/physics/src/PhysicsEngine.cpp	2015-03-19 16:18:52 -07:00
Andrew Meadows	3cd2ce82d4	tuning character so it can walk up ledges	2015-03-19 15:31:34 -07:00
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
Andrew Meadows	8eec83c144	comments and formatting	2015-03-17 22:28:38 -07:00
Seth Alves	2dd75fef2c	remove some unneeded Q_OBJECT macros, diff minimization	2015-03-17 19:12:26 -07:00
Andrew Meadows	180d147806	merge upstream/master into andrew/isentropic	2015-03-17 15:59:09 -07:00
Seth Alves	222c3f01eb	minor cleanups, diff minimization	2015-03-17 14:24:46 -07:00
Andrew Meadows	9ea13fac37	cleanup formatting	2015-03-17 09:01:36 -07:00
Andrew Meadows	b4263cd2eb	allow objs to collide agains char controller ... but char controller only responds to penetration when enabled	2015-03-16 17:10:49 -07:00
Seth Alves	b76103edb0	clean up debugging spew	2015-03-16 16:44:29 -07:00
Andrew Meadows	78b614f855	move avatar details into CharacterController	2015-03-16 16:24:32 -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