Bradley Austin Davis c92588685b Merge pull request #11533 from SamGondelman/modelMaster ... Fix model loading for real this time		2017-10-08 10:23:13 -07:00
..
animation	fix local t pose	2017-10-03 12:51:37 -07:00
audio	Minor cleanup	2017-10-05 09:49:38 -07:00
audio-client
auto-updater
avatars	Merge pull request #11326 from cain-kilgore/21537	2017-10-06 08:51:42 -07:00
avatars-renderer
baking	Add removal of temporary files in FBXBaker	2017-10-05 09:08:42 -07:00
controllers
display-plugins	cleanup debug stats, use more correct names	2017-10-02 13:08:17 -07:00
embedded-webserver
entities	Revert "fix importing of avatar entities"	2017-10-07 16:54:05 -07:00
entities-renderer	Merge pull request #11533 from SamGondelman/modelMaster	2017-10-08 10:23:13 -07:00
fbx
gl
gpu
gpu-gl
gpu-gles
image
input-plugins
ktx
midi
model
model-networking	Merge pull request #11466 from SamGondelman/mirrorCrash	2017-09-27 16:17:04 -07:00
networking	Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-properties	2017-09-29 16:46:43 -07:00
octree	clarify some comments	2017-09-29 11:34:35 -07:00
physics
plugins
procedural
recording
render	Merging with master	2017-10-04 10:55:38 -07:00
render-utils	Merge pull request #11533 from SamGondelman/modelMaster	2017-10-08 10:23:13 -07:00
script-engine	Merge pull request #11494 from humbletim/add-console-output-basenames	2017-10-06 17:58:19 -07:00
shared	Revert "fix importing of avatar entities"	2017-10-07 16:54:05 -07:00
trackers
ui	Merge pull request #11495 from zfox23/pop_interfaceChanges2	2017-10-03 11:56:00 -07:00
ui-plugins