howard-stearns 60cb7acb50 Merge branch 'master' of https://github.com/highfidelity/hifi into sessionDisplayNames		2016-12-19 15:28:07 -08:00
..
animation	tracing polish	2016-12-16 14:02:27 -08:00
audio	Merge pull request #9197 from davidkelly/dk/injectorVolume	2016-12-16 15:11:33 -08:00
audio-client	Merge pull request #9197 from davidkelly/dk/injectorVolume	2016-12-16 15:11:33 -08:00
auto-updater	Switch to JSON for application settings	2016-10-12 10:20:19 -07:00
avatars	Initialize AvatarMixerClientData with the proper node id (should not be	2016-12-19 15:22:42 -08:00
controllers	only consider standard poses written if the pose was valid	2016-12-12 09:23:01 -08:00
display-plugins	tracing polish	2016-12-16 14:02:27 -08:00
embedded-webserver
entities	Cleanup dead code	2016-12-16 09:21:41 -08:00
entities-renderer	tracing polish	2016-12-16 14:02:27 -08:00
fbx	tracing polish	2016-12-16 14:02:27 -08:00
gl	tracing polish	2016-12-16 14:02:27 -08:00
gpu	tracing polish	2016-12-16 14:02:27 -08:00
gpu-gl	tracing polish	2016-12-16 14:02:27 -08:00
input-plugins
model	tracing polish	2016-12-16 14:02:27 -08:00
model-networking	tracing polish	2016-12-16 14:02:27 -08:00
networking	Merge branch 'master' of https://github.com/highfidelity/hifi into sessionDisplayNames	2016-12-19 15:28:07 -08:00
octree	tracing polish	2016-12-16 14:02:27 -08:00
physics	Revert "Merge pull request #8691 from highfidelity/out-of-body-experience"	2016-12-05 15:18:03 -08:00
plugins	Extend HMD scripting interface to check subdevices	2016-12-16 15:05:17 -08:00
procedural	remove lerp in deference to mix, adjust naming conventions, namespace shader helper functions	2016-11-30 16:37:04 -08:00
recording
render	tracing polish	2016-12-16 14:02:27 -08:00
render-utils	Merge pull request #9225 from jherico/chrome_tracing	2016-12-16 17:53:55 -08:00
script-engine	Comments and clarity	2016-12-19 10:20:08 -08:00
shared	Fix stat tracker missing in agents	2016-12-16 17:34:00 -08:00
ui
ui-plugins	Working on reprojection	2016-08-12 22:28:22 -07:00