Stephen Birarda 52ec949aac Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel		2014-10-03 11:26:23 -07:00
..
animation	remove TARGET_NAME from cmake macros where it is not required	2014-08-08 13:17:54 -07:00
audio	Update audio injector volume every frame	2014-09-30 11:19:45 -07:00
avatars	Missed some qints	2014-09-30 21:20:37 -07:00
embedded-webserver	allow calls to HTTPManager to skip the subHandler and ask for direct processing	2014-10-02 10:38:46 -07:00
entities	removed some old debug	2014-10-02 17:55:55 -07:00
fbx	Read the emissive color property and use it to effect glow.	2014-09-19 16:49:51 -07:00
metavoxels	Remove the "box edit" in favor of using the spanner edit.	2014-10-02 13:01:39 -07:00
networking	Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel	2014-10-03 11:26:23 -07:00
octree	make sure to scale default octree shape collision to meters	2014-09-25 14:54:06 -07:00
particles	first cut at getting entities to collide	2014-09-24 15:28:04 -07:00
script-engine	added new methods to Vec3 and Quat	2014-10-02 17:55:32 -07:00
shared	remove definition for an unused method	2014-09-29 15:27:45 -07:00
voxels	collions with voxels and avatars	2014-09-24 17:37:56 -07:00