16 commits

Author	SHA1	Message	Date
Andrew Meadows	ec0b4a956a	move collision group consts to shared lib	2015-06-03 14:13:51 -07:00
Andrew Meadows	7b6cc59d30	basic support for collision groups	2015-06-03 11:40:48 -07:00
Andrew Meadows	0431e8da36	put avatar body in right spot, and give it mass	2015-05-22 11:08:56 -07:00
Andrew Meadows	5537c9e042	merge upstream/master into andrew/bispinor ... Conflicts: libraries/physics/src/DynamicCharacterController.cpp	2015-04-28 15:18:02 -07:00
Andrew Meadows	72deb2e49b	merge upstream/master into andrew/thermonuclear ... Conflicts: libraries/entities/src/EntityItem.h libraries/physics/src/EntityMotionState.cpp	2015-04-27 12:54:21 -07:00
Andrew Meadows	7a222dff1d	move one-liner isEnabled() to header	2015-04-27 09:54:58 -07:00
Atlante45	ba507cef98	Fix a few warnings	2015-04-25 11:01:02 +02:00
Andrew Meadows	c4395e75bb	cleanup and comments	2015-04-24 13:26:26 -07:00
Andrew Meadows	80d3f35b2e	Controller disabled when not in physics engine	2015-04-24 09:57:22 -07:00
Andrew Meadows	4bef5b7b73	Merge pull request #4638 from Triplelexx/myavatar-targetvelocity ... Myavatar targetvelocity	2015-04-15 14:22:02 -07:00
Triplelexx	d2b643d389	Add targetVelocity into MyAvatar simulation ... MyAvatar sets a target velocity to achieve, this is parsed in the preSimulation controller step.	2015-04-13 23:57:08 +01:00
Andrew Meadows	86f89a1d6f	fix bug where fly speed is limited to walk speed	2015-04-13 13:23:15 -07:00
Andrew Meadows	d9146b1033	jump to hover works again	2015-04-07 16:23:06 -07:00
Andrew Meadows	b5f0c57dd1	jumping and hovering works with dynamic controller	2015-04-07 15:07:46 -07:00
Andrew Meadows	23951620bb	cleanup DynamicCharacterController	2015-04-06 16:19:14 -07:00
Andrew Meadows	435ce106eb	Add DynamicCharacterController prototype	2015-04-06 16:03:13 -07:00