Seth Alves 861497e907 Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1		2018-02-02 08:56:18 -08:00
..
animation	Merge pull request #12317 from hyperlogic/feature/remove-ik-hips-offset	2018-02-01 15:30:08 -08:00
audio
audio-client
auto-updater
avatars
avatars-renderer
baking
controllers
display-plugins
embedded-webserver
entities	Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1	2018-02-01 12:04:56 -08:00
entities-renderer	merge from upstream	2018-01-31 10:43:41 -08:00
fbx	FBX node IDs aren't alphanumerically ordered per logical structure	2018-02-01 13:43:14 +13:00
gl	Trying to fix AMD crash in QML rendering	2018-01-31 08:36:52 -08:00
gpu
gpu-gl
gpu-gles
graphics
image
input-plugins
ktx
midi
model-networking
networking	Bump avatar mixer packet version	2018-02-02 10:02:20 +13:00
octree
physics
plugins
pointers
procedural
recording
render	formatting	2018-01-31 12:24:23 -08:00
render-utils	Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1	2018-02-02 08:56:18 -08:00
script-engine	Merge pull request #12216 from thoys/feat/js-script-console-auto-complete	2018-01-31 10:39:51 -08:00
shared
trackers
ui	Merge pull request #12311 from ElderOrb/FB11511	2018-02-01 12:11:30 -08:00
ui-plugins