Brad Davis 1ecca9fd29 Merge branch 'master' into zzmp-audio/peak-values		2017-08-06 17:21:00 -07:00
..
animation
audio
audio-client	Merge branch 'master' into zzmp-audio/peak-values	2017-08-06 17:21:00 -07:00
auto-updater
avatars
avatars-renderer	Fix for crash when attempting to teleport while avatar was loading	2017-08-01 18:40:43 -07:00
controllers	Added Vive pucks as an input channel	2017-08-02 13:08:43 -07:00
display-plugins
embedded-webserver
entities	Merge pull request #11016 from highfidelity/context-overlays	2017-08-03 16:28:14 -07:00
entities-renderer	Updates from Threaded Rendering project	2017-08-04 15:22:14 -07:00
fbx
gl
gpu
gpu-gl
image
input-plugins
ktx
midi	Update Midi.cpp	2017-07-27 16:17:23 -07:00
model
model-networking
networking	Merge branch 'context-overlays' of https://github.com/highfidelity/hifi into contextOverlays_renderMOde	2017-07-26 14:11:28 -07:00
octree
physics	Merge pull request #11048 from 1P-Cusack/21389	2017-08-03 09:04:31 -07:00
plugins	Updates from Threaded Rendering project	2017-08-04 15:22:14 -07:00
procedural
recording
render	Updates from Threaded Rendering project	2017-08-04 15:22:14 -07:00
render-utils
script-engine	Merge branch 'master' into midi	2017-07-26 13:59:07 -07:00
shared	PR comments	2017-08-04 15:27:33 -07:00
trackers
ui	Make connection to tablet shown signal more consistent, eliminates missed signals	2017-08-03 20:58:44 +02:00
ui-plugins