Seth Alves 918cfa8b4e Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json		2015-03-11 14:36:25 -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 persist-entities-as-json	2015-03-11 14:36:25 -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	trying to put the atmospheric effect in a shader header and use it on the directional lighting pass	2015-03-10 00:47:27 -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	merge from upstream	2015-03-10 15:43:40 -07:00
physics	Merge pull request #4411 from AndrewMeadows/thermonuclear	2015-03-10 16:43:17 -07:00
render-utils	removing the atmosphere effect from the directional lighting	2015-03-10 10:24:16 -07:00
script-engine	Merge pull request #4366 from ZappoMan/removeMetavoxels	2015-03-03 15:50:53 -08:00
shared	saving and loading largely works. still some rough edges	2015-03-10 11:31:48 -07:00