Andrzej Kapolka 7de108f493 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels		2014-09-25 11:22:19 -07:00
..
animation	remove TARGET_NAME from cmake macros where it is not required	2014-08-08 13:17:54 -07:00
audio	coding standard + missing frame-offsets in audiobuffer	2014-09-22 11:21:18 -07:00
avatars	Merge pull request #3479 from PhilipRosedale/master	2014-09-25 09:32:37 -07:00
embedded-webserver	remove TARGET_NAME from cmake macros where it is not required	2014-08-08 13:17:54 -07:00
entities	only do collisions on entities moving toward each other	2014-09-24 18:22:28 -07:00
fbx	Read the emissive color property and use it to effect glow.	2014-09-19 16:49:51 -07:00
metavoxels	CSG edit improvements.	2014-09-22 17:56:18 -07:00
networking	hook My Locations to data-web dialog	2014-09-18 09:35:33 -07:00
octree	first cut at getting entities to collide	2014-09-24 15:28:04 -07:00
particles	first cut at getting entities to collide	2014-09-24 15:28:04 -07:00
script-engine	move JoystickManager to JoystickScriptingInterface, add Joystick class for SDL Joystick	2014-09-23 17:09:46 -07:00
shared	remove virtual for ListShape::findRayIntersection()	2014-09-23 10:04:36 -07:00
voxels	collions with voxels and avatars	2014-09-24 17:37:56 -07:00