Sam Gateau 48fca4c11d introducing PBR shading		2015-02-08 23:22:14 -08:00
..
animation	Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11	2015-01-13 20:38:52 -08:00
audio	merge from master	2015-02-04 11:30:22 -08:00
avatars	Name threads	2015-01-31 00:50:12 -08:00
embedded-webserver	rename cmake macro to represent actual purpose	2014-12-18 16:51:20 -08:00
entities	Merge pull request #4241 from birarda/master	2015-02-06 11:49:29 -08:00
entities-renderer	repairs to warnings shown in Xcode	2015-02-06 10:12:04 -08:00
environment	more voxel-ectomy cleaning up some remaining references to voxels	2015-01-06 09:27:48 -08:00
fbx	Merge branch 'temp0' of https://github.com/samcake/hifi into temp1	2015-02-06 16:30:47 -08:00
gpu	Merge branch 'temp0' of https://github.com/samcake/hifi into temp1	2015-02-06 16:30:47 -08:00
metavoxels	Settings update	2015-02-03 12:27:30 -08:00
model	connecting the globalLight info to the DeferredLightingEffect	2015-02-05 17:30:57 -08:00
networking	rather than a list of allowed editors, a list of allowed lockers/unlockers	2015-02-06 09:14:40 -08:00
octree	Inline setFieldOfView	2015-02-03 18:51:26 -08:00
physics	fix physics crash on disconnect from domainserver	2015-02-05 09:13:32 -08:00
render-utils	introducing PBR shading	2015-02-08 23:22:14 -08:00
script-engine	Initialize _entityScriptingInterface in ScriptEngine	2015-02-06 11:31:19 -08:00
shared	Merge branch 'temp0' of https://github.com/samcake/hifi into temp1	2015-02-06 16:30:47 -08:00