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
..
animation	put back ssize_t definition	2014-05-20 11:56:06 -07:00
audio	remove warnings about signed/unsigned comparison	2014-06-17 11:59:37 -07:00
avatars	cleanup of avatar collisions, prep for more ragdoll collisions	2014-06-06 10:51:22 -07:00
embedded-webserver	handle serving of scripts at temp unique UUIDs	2014-05-23 12:33:39 -07:00
fbx	Simplification. If the normal is zero, then the cross product will also be	2014-06-09 11:03:50 -07:00
metavoxels	Fix for setID.	2014-06-13 12:12:17 -07:00
models	fix some bugs in models	2014-06-10 13:37:53 -07:00
networking	The balance display didn't get over ~21.1 because the parsed json object int32 is maximal 2147483647, fixed this by parsing it from json to double.	2014-06-17 19:49:35 +02:00
octree	merge upstream/master into andrew/ragdoll	2014-06-17 17:03:16 -07:00
particles	cleanup of avatar collisions, prep for more ragdoll collisions	2014-06-06 10:51:22 -07:00
script-engine	Fix invalid remote scripts being loaded	2014-06-17 13:09:48 -07:00
shared	merge upstream/master into andrew/ragdoll	2014-06-17 17:03:16 -07:00
voxels	add ray picking to the model scripting interface	2014-05-23 17:09:37 -07:00