Seth Alves 64c23b8e8b Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol		2015-04-20 16:56:24 -07:00
..
animation	remove use of include_dependency_includes and use cmake	2015-02-18 14:12:05 -08:00
audio	Add generated audio methods to audio interface	2015-04-15 15:49:11 +02:00
audio-client	less loud generated noise	2015-04-15 16:22:52 +02:00
avatars	Merge pull request #4638 from Triplelexx/myavatar-targetvelocity	2015-04-15 14:22:02 -07:00
embedded-webserver	try again without macro	2015-04-07 09:59:04 -07:00
entities	cleanups, diff minimization	2015-04-20 16:52:29 -07:00
entities-renderer	use computed shape type	2015-04-16 12:13:41 -07:00
environment	test the possibility that zlib is no longer required	2015-02-19 15:29:28 -08:00
fbx	migrate the various list to sort the rendering from explicit names to a more generic key based map	2015-04-16 14:37:39 -07:00
gpu	fixing syntax issues	2015-04-15 10:16:04 -07:00
model	Update the cookies.js to be able to edit and test direction and color, validate that the SunDirection and color and on/off is working	2015-04-17 19:00:40 -07:00
networking	Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol	2015-04-20 08:49:33 -07:00
octree	if a uuid is null, don't send a uuid of all zeros	2015-04-17 09:55:49 -07:00
physics	cleanups, diff minimization	2015-04-20 16:51:28 -07:00
render-utils	bring back the glPushPop in transform legacy mode	2015-04-20 15:56:44 -07:00
script-engine	Update the cookies.js to be able to edit and test direction and color, validate that the SunDirection and color and on/off is working	2015-04-17 19:00:40 -07:00
shared	remove SHAPE_TYPE_CONVEX_HULL from libs and tests	2015-04-14 14:54:43 -07:00