Commit graph

5 commits

Author SHA1 Message Date
Andrew Meadows
b9d4545aef merge upstream/master into andrew/ragdoll
Conflicts:
	libraries/shared/src/Shape.h
	libraries/shared/src/ShapeCollider.h
2014-06-17 17:03:16 -07:00
Andrew Meadows
f18864bd72 Moved findRayIntersection() to the Shape classes 2014-06-17 12:36:36 -07:00
Andrew Meadows
e75340f8ce Add PlaneShape::getNormal() method. 2014-06-17 10:48:29 -07:00
Andrew Meadows
3fd4ee02ff Shape uses "center" instead of "position" 2014-06-16 08:55:08 -07:00
Andrzej Kapolka
873541dd7b Trying out basic pushback for other avatars. 2014-04-10 11:56:17 -07:00