Sam Gateau 8fba8062c3 Merge branch 'master' of https://github.com/highfidelity/hifi into punk		2018-12-19 20:01:48 -08:00
..
animation	took out the unnecessary hfm.jointindex code	2018-12-16 17:29:16 -08:00
audio
audio-client
auto-updater
avatars
avatars-renderer	fixed mac build conflict, unused variable	2018-12-17 16:21:22 -08:00
baking
controllers
display-plugins
embedded-webserver
entities	Merge pull request #14523 from SamGondelman/NOverlays2	2018-12-19 11:33:24 -08:00
entities-renderer	Merge branch 'master' of github.com:highfidelity/hifi into punk	2018-12-19 09:31:41 -08:00
fbx	removed white space and stray semi colon	2018-12-17 15:05:51 -08:00
gl
gpu
gpu-gl
gpu-gl-common
gpu-gles
graphics
graphics-scripting
hfm	removed humanIK joint name code from fbx serializer	2018-12-17 10:56:53 -08:00
image
input-plugins
ktx
midi
model-baker	Remove dependency on VaryingSet1	2018-12-14 10:40:28 -08:00
model-networking	Add model preparation step to ModelCache using new library model-baker	2018-12-11 11:15:54 -08:00
networking	Merge pull request #14523 from SamGondelman/NOverlays2	2018-12-19 11:33:24 -08:00
octree
physics
plugins
pointers
procedural
qml
recording
render
render-utils	Compiling	2018-12-19 20:01:14 -08:00
script-engine
shaders
shared	Merge pull request #14564 from sabrina-shanman/hfm_prep	2018-12-17 15:17:19 -08:00
task	fixing warnings from the build	2018-12-18 16:25:24 -08:00
test-utils
trackers
ui
ui-plugins
workload