Seth Alves 20a22ff42c Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide		2015-03-11 07:17:19 -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	fix stereo to stereo resampling	2015-03-10 15:50:30 -07:00
avatars	merge from master	2015-03-09 13:39:51 -07:00
embedded-webserver	remove use of include_dependency_includes and use cmake	2015-02-18 14:12:05 -08:00
entities	Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide	2015-03-11 07:17:19 -07:00
entities-renderer	namechanges: setFooInMeters() --> setFoo()	2015-03-09 09:56:15 -07:00
environment	test the possibility that zlib is no longer required	2015-02-19 15:29:28 -08:00
fbx	add comment about character capsule being hard-coded	2015-03-09 13:51:08 -07:00
gpu	Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide	2015-03-11 07:17:19 -07:00
model	adding the atmosphere in the directional lighting pass, debug	2015-03-10 09:37:13 -07:00
networking	make sure UserActivityLogger::close() waits for the pending log message to complete	2015-03-10 14:23:23 -07:00
octree	CR feedback	2015-03-10 15:27:44 -07:00
physics	Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide	2015-03-11 07:17:19 -07:00
render-utils	Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide	2015-03-11 07:17:19 -07:00
script-engine	Merge pull request #4366 from ZappoMan/removeMetavoxels	2015-03-03 15:50:53 -08:00
shared	started to hook up geometry downloader to ShapeInfo	2015-03-11 07:17:13 -07:00