David Kelly 4d4d9421d3 Merge pull request #10983 from davidkelly/dk/marketplaceIDHack ... Get marketplaceID into imported entities		2017-07-18 15:25:49 -07:00
..
animation	Merge pull request #10881 from hyperlogic/feature/smooth-ik-chains	2017-07-14 16:59:30 -07:00
audio
audio-client	Ensure input and output device containers are protected by mutex	2017-07-18 08:58:17 -07:00
auto-updater
avatars	make sure to lock data	2017-07-17 22:11:05 +01:00
avatars-renderer	try again on putting result of Avatar::getJointNames in index order	2017-07-12 20:36:37 -07:00
controllers
display-plugins
embedded-webserver
entities	Merge branch 'master' of github.com:highfidelity/hifi into bug/delete-avatar-entity	2017-07-18 16:51:41 +01:00
entities-renderer	Make hover overlays work for hand controller lasers	2017-07-17 13:16:53 -07:00
fbx
gl
gpu
gpu-gl
image
input-plugins
ktx
model
model-networking
networking	Merge pull request #10947 from Atlante45/fix/ignore-ac-crash	2017-07-18 09:59:30 -07:00
octree	cr feedback	2017-07-18 11:12:06 -07:00
physics
plugins
procedural
recording
render	fix linux compilation maybe	2017-07-13 09:30:04 +02:00
render-utils	don't do SoftAttachmentModel::updateClusterMatrices if geometry isn't ready	2017-07-13 13:18:21 -07:00
script-engine
shared	Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-scaler	2017-07-13 21:25:39 +01:00
trackers
ui	Merge pull request #10954 from jherico/qml_crashes_again	2017-07-17 10:21:23 -07:00
ui-plugins