SamGondelman 86cc938a47 Merge remote-tracking branch 'upstream/master' into sharks		2017-08-16 09:54:12 -07:00
..
animation	code review feedback	2017-08-15 11:19:41 -07:00
audio
audio-client	fix typo	2017-08-09 20:11:52 -07:00
auto-updater
avatars	Merge pull request #11083 from Menithal/experimental-face-expressions	2017-08-14 14:19:08 -07:00
avatars-renderer	Merge pull request #11021 from Zvork/fade2	2017-08-10 13:48:30 -07:00
controllers
display-plugins
embedded-webserver
entities	rename qvector findRayIntersection to avoid script conflicts	2017-08-15 18:03:52 -07:00
entities-renderer	Merge pull request #11021 from Zvork/fade2	2017-08-10 13:48:30 -07:00
fbx	improve 14-dop generation for avatar joint collision	2017-08-10 15:52:51 -07:00
gl
gpu	merge from master	2017-08-10 15:43:23 -07:00
gpu-gl	Merge pull request #11021 from Zvork/fade2	2017-08-10 13:48:30 -07:00
image
input-plugins
ktx
midi
model
model-networking
networking
octree
physics
plugins	Merge branch 'master' of https://github.com/highfidelity/hifi into sharks	2017-08-07 13:29:00 -07:00
procedural
recording
render	Merge pull request #11021 from Zvork/fade2	2017-08-10 13:48:30 -07:00
render-utils	Merge remote-tracking branch 'upstream/master' into sharks	2017-08-16 09:54:12 -07:00
script-engine
shared	Merge remote-tracking branch 'upstream/master' into sharks	2017-08-16 09:54:12 -07:00
trackers
ui
ui-plugins