Sam Gateau 4619ba1f5b Merge branch 'master' of https://github.com/highfidelity/hifi into temp0		2015-03-03 10:56:04 -08:00
..
animation	remove use of include_dependency_includes and use cmake	2015-02-18 14:12:05 -08:00
audio	remove use of include_dependency_includes and use cmake	2015-02-18 14:12:05 -08:00
audio-client	Merge pull request #4300 from birarda/dependencies	2015-02-25 13:22:49 -08:00
avatars	Merge pull request #4300 from birarda/dependencies	2015-02-25 13:22:49 -08:00
embedded-webserver	remove use of include_dependency_includes and use cmake	2015-02-18 14:12:05 -08:00
entities	Update lightEntityItem old version handling to be more clear	2015-03-02 09:25:18 -08:00
entities-renderer	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2015-03-03 10:56:04 -08:00
environment	test the possibility that zlib is no longer required	2015-02-19 15:29:28 -08:00
fbx	test the possibility that zlib is no longer required	2015-02-19 15:29:28 -08:00
gpu	Merge with upstream master	2015-02-27 13:19:50 -08:00
metavoxels	add support for transparency in RAW heightmaps	2015-02-27 15:57:46 -08:00
model	Merge with upstream master	2015-02-27 13:19:50 -08:00
networking	Merge pull request #4356 from sethalves/domain-server-http-port-in-shmem	2015-03-03 10:05:24 -08:00
octree	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2015-02-26 14:19:23 -08:00
physics	Merge pull request #4341 from AndrewMeadows/bispinor	2015-02-26 09:21:49 -08:00
render-utils	Fixed the 2 remianing issues before PR, the shadow program needed to have the binding assigned and the Head of the avatar isn't getting it's BBox evaluated	2015-02-27 17:11:16 -08:00
script-engine	REfining the naming and introducing an orientation offset	2015-02-26 17:26:41 -08:00
shared	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2015-03-03 10:56:04 -08:00