Sam Gateau b5eb4a7f5b Since glProgramUniform is not supported on MAc we need a workaround...		2015-03-18 16:12:47 -07:00
..
animation	remove use of include_dependency_includes and use cmake	2015-02-18 14:12:05 -08:00
audio	fix stereo to stereo resampling	2015-03-10 15:50:30 -07:00
audio-client	Wrong byte array size in audio client	2015-03-17 16:40:26 +01:00
avatars	Account for stereo audio in recorder	2015-03-17 16:40:26 +01:00
embedded-webserver	remove use of include_dependency_includes and use cmake	2015-02-18 14:12:05 -08:00
entities	Merge pull request #4465 from sethalves/avatars-can-collide	2015-03-18 12:52:52 -07:00
entities-renderer	bump shape stuff from ModelEntityItem down to RenderableModelEntityItem	2015-03-17 18:55:13 -07:00
environment	test the possibility that zlib is no longer required	2015-02-19 15:29:28 -08:00
fbx	fix attempt to avoid normalizing a zero length vector, other adjustments to respond to code review	2015-03-16 10:03:55 -07:00
gpu	Since glProgramUniform is not supported on MAc we need a workaround...	2015-03-18 16:12:47 -07:00
model	set the defines for GPU profile correctly AGAIN	2015-03-17 16:51:59 -07:00
networking	merge from upstream	2015-03-17 14:16:00 -07:00
octree	minor cleanups, diff minimization	2015-03-17 14:24:46 -07:00
physics	quiet physics log spam	2015-03-18 13:22:29 -07:00
render-utils	Merge branch 'master' of https://github.com/highfidelity/hifi into temp1	2015-03-18 15:59:50 -07:00
script-engine	Merge pull request #4366 from ZappoMan/removeMetavoxels	2015-03-03 15:50:53 -08:00
shared	Merge pull request #4465 from sethalves/avatars-can-collide	2015-03-18 12:52:52 -07:00