8 commits

Author	SHA1	Message	Date
Andrew Meadows	9b7e50858a	merge upstream/master into andrew/inertia ... Conflicts: libraries/avatars/CMakeLists.txt libraries/entities/CMakeLists.txt	2014-12-29 09:15:49 -08:00
Andrew Meadows	25b00977be	fix cmake config for bullet after c++-11 changes	2014-12-18 17:34:39 -08:00
Stephen Birarda	114e3bb2ff	rename cmake macro to represent actual purpose	2014-12-18 16:51:20 -08:00
Andrew Meadows	1df6c32a4e	moving Shape* back into shared lib ... removing dependency of entities lib on physics lib physics lib now depends on entities lib	2014-12-01 16:03:14 -08:00
Andrew Meadows	d26540b029	ShapeManager now under unit test	2014-10-31 17:13:17 -07:00
Andrew Meadows	29fd359385	fix typo in libraries/physics/CMakeLists.txt	2014-10-29 14:39:23 -07:00
Andrew Meadows	c9450bba02	Adding Bullet as non-required dependency	2014-10-28 17:32:34 -07:00
Andrew Meadows	4c3cdf5b7a	move stuff out of shared and into physics library	2014-10-28 13:51:45 -07:00