23 commits

Author	SHA1	Message	Date
Andrew Meadows	1d64262067	whoops, committed wrong file. Rolling back.	2014-05-05 08:46:35 -07:00
Andrew Meadows	6cc8d53a6d	fix sphere-cube collisions at edges	2014-05-04 22:14:05 -07:00
Andrew Meadows	c8e56a97cc	fix sphere-cube collisions, with tests	2014-05-02 21:47:27 -07:00
Andrew Meadows	fe42f66cc9	change x.f to be x.0f as per the coding standard	2014-04-23 13:27:43 -07:00
Andrew Meadows	7cb6856415	Adding some collision tests for sphere-vs-AACube	2014-04-22 10:44:41 -07:00
Andrew Meadows	22d2f84cff	merge upstream/master into andrew/scripting	2014-04-09 15:38:56 -07:00
Andrew Meadows	635f832dfe	rename shapeShape() to be collideShapes() ... Also add collideShapesCoarse()	2014-04-09 13:04:17 -07:00
Stephen Birarda	ae4b8348a2	fix header include guards via regex	2014-04-09 12:03:17 -07:00
Stephen Birarda	c9b58c0ee9	fix headers in h files in tests, fix Andrew's dates	2014-04-09 09:49:47 -07:00
Stephen Birarda	cb402e3eb3	run apache header script on tests	2014-04-09 09:46:43 -07:00
Andrew Meadows	c383b69b61	merge upstream/master into enforce-standard ... Conflicts: interface/src/avatar/Hand.cpp	2014-03-27 10:53:54 -07:00
Andrew Meadows	4c64c11144	making some type casts abide by coding standard	2014-03-26 16:58:47 -07:00
Andrew Meadows	06fbd49ffa	Adding StreamUtils for common debug output	2014-03-25 15:29:22 -07:00
Andrew Meadows	ab84526a1b	removing compile warnings	2014-03-14 16:12:32 -07:00
Andrew Meadows	aa8c2fc8cb	use radians instead of degrees (almost) everywhere	2014-03-11 17:26:58 -07:00
ZappoMan	1ceb05bf09	click harder	2014-03-08 18:22:30 -08:00
Andrew Meadows	ea0bc52e12	removing unused variables	2014-03-04 09:56:06 -08:00
Andrew Meadows	da0276ac7e	ShapeCollider takes CollisionList argument ... Also, adding first pass at ListShape	2014-02-26 12:10:16 -08:00
Andrew Meadows	f0e1a6ccd3	more capsuleCapsule tests	2014-02-25 11:38:08 -08:00
Andrew Meadows	9a70a50bdb	capsuleCapsule() collision with preliminary tests	2014-02-25 10:59:12 -08:00
Andrew Meadows	8a3640f016	Adding CapsuleSphere collisions with tests.	2014-02-24 11:38:27 -08:00
Andrew Meadows	0e28e0947c	Adding ShapeColliderTests.*	2014-02-22 13:20:47 -08:00
Andrew Meadows	072369abfe	Adding physics test framework	2014-02-21 16:27:44 -08:00