255 commits

Author	SHA1	Message	Date
Seth Alves	fd69a54f10	Merge branch 'master' of github.com:highfidelity/hifi into multi-hull-collisions	2015-03-27 15:55:20 -07:00
Andrew Meadows	bee8c0e237	"hover" if the "jump" key is held down long enough	2015-03-27 13:56:03 -07:00
Andrew Meadows	be5fdbf217	enable avatar collisions by default ... also remove old gravity features	2015-03-27 13:36:20 -07:00
Andrew Meadows	821ac605f5	smoother motion on steps ... faster motion when "flying" cleanup of MyAvatar::updatePosition()	2015-03-26 19:48:52 -07:00
Andrew Meadows	8a951e0dd3	minor cleanup	2015-03-26 15:16:57 -07:00
Andrew Meadows	0ef4022e94	tweak gravity and step heights of controller	2015-03-26 15:14:46 -07:00
Seth Alves	212f564131	Merge branch 'master' of github.com:highfidelity/hifi into multi-hull-collisions	2015-03-26 13:08:44 -07:00
Andrew Meadows	429a258df0	enable hover when far above floor	2015-03-25 14:38:27 -07:00
Andrew Meadows	2440c47648	remove extra whitespace	2015-03-25 11:06:19 -07:00
Andrew Meadows	2128f21308	only set ADD bit with UPDATE_SHAPE when enabled	2015-03-25 11:02:48 -07:00
Andrew Meadows	674b2c97a2	added comments to zlib license	2015-03-25 08:53:33 -07:00
Seth Alves	719dae61a9	when a compound shape is deleted, delete the children, as well	2015-03-25 06:51:00 -07:00
Andrew Meadows	430158c109	updateShapeIfNecessary() is a more correct name	2015-03-24 23:35:09 -07:00
Andrew Meadows	d497620976	avatar can jump with E key when walking	2015-03-24 23:05:46 -07:00
Andrew Meadows	44eca08fa4	PhysicsEngine doesn't need AvatarData ... MyAvatar now owns its CharacterController fix for bug of phantom collision obj when avatar's physics are disabled	2015-03-24 17:38:35 -07:00
Seth Alves	2f47f7c7ba	diff minimization	2015-03-24 16:51:42 -07:00
Seth Alves	8d2c942509	diff minimization	2015-03-24 16:38:11 -07:00
Seth Alves	1eeb2e89f8	remove some debug spam	2015-03-24 16:23:51 -07:00
Seth Alves	6e3be26013	attempting to figure out why physics motion object doesn't get updated when collision model url changes	2015-03-24 15:28:21 -07:00
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
Andrew Meadows	49f5de2b94	make character's "up" axis depend on orientation	2015-03-20 16:39:38 -07:00
Seth Alves	769194f046	first stab at compound hull collisions	2015-03-20 13:41:14 -07:00
Andrew Meadows	0164de80fe	apply coding standard to CharacterController	2015-03-20 13:19:24 -07:00
Andrew Meadows	6454149536	formatting and comments	2015-03-20 12:45:29 -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