Seth Alves db38503d57 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui		2017-01-26 13:48:59 -08:00
..
animation	add and remove some profile data points	2017-01-26 08:35:25 -08:00
audio	Merge branch 'master' of https://github.com/highfidelity/hifi into ess-pr	2017-01-25 13:06:49 -08:00
audio-client	Fix audio failures on systems that return incorrect/unsupported mixFormat	2017-01-14 10:26:13 -08:00
auto-updater
avatars	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-26 13:48:59 -08:00
controllers
display-plugins	Additional trace details for GPU timing, frame data updates	2017-01-18 16:19:32 -08:00
embedded-webserver
entities	merge from upstream	2017-01-25 15:57:53 -08:00
entities-renderer	merge from upstream	2017-01-25 15:57:53 -08:00
fbx	merge from upstream	2017-01-17 09:29:30 -08:00
gl	merge from upstream	2017-01-12 15:44:27 -08:00
gpu	Add profiling in COntext batch execution and shortcuts for trace names	2017-01-09 18:05:02 -08:00
gpu-gl	Attempt to account for sparse texture memory overhead	2017-01-25 10:59:49 -08:00
input-plugins
model
model-networking
networking	Merge branch 'master' of https://github.com/highfidelity/hifi into ess-pr	2017-01-25 13:06:49 -08:00
octree	use currentParameters instead of getJSONParameters()	2017-01-24 16:49:17 -08:00
physics	merge from upstream	2017-01-25 15:57:53 -08:00
plugins	Rename Steam.isRunning to Steam.running	2017-01-24 17:06:50 -08:00
procedural
recording
render	Removing macOS warning	2017-01-18 16:59:50 -08:00
render-utils	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-26 13:48:59 -08:00
script-engine	merge from upstream	2017-01-25 15:57:53 -08:00
shared	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-26 13:48:59 -08:00
ui	merge from upstream	2017-01-25 15:57:53 -08:00
ui-plugins