Dante Ruiz da29157a3c fixed merge conflict'		2017-06-17 00:40:50 +01:00
..
animation	Refactor	2017-06-14 10:45:30 +12:00
audio
audio-client	Merge branch 'master' of github.com:highfidelity/hifi into audio/parity	2017-06-15 15:04:06 -04:00
auto-updater
avatars	typos in comments/help-strings	2017-06-14 11:56:47 -07:00
avatars-renderer
controllers
display-plugins
embedded-webserver
entities
entities-renderer	fix teleport vs stuck-in-floor work	2017-06-12 17:01:13 -07:00
fbx	simplify fileOnUrl to always look right beside FBX	2017-06-09 15:52:21 -07:00
gl	up to reverb (needs cherry-picking)	2017-06-12 18:00:52 -04:00
gpu
gpu-gl	Fix bug in clearFramebuffer with Stencil Buffer	2017-06-12 22:59:42 -07:00
image
input-plugins
ktx
model
model-networking
networking	CR	2017-06-14 11:42:25 -07:00
octree	Create one packet per node	2017-06-14 11:42:25 -07:00
physics
plugins	making final changes	2017-06-12 22:01:41 +01:00
procedural
recording
render
render-utils	Remove one more instance of FramebufferCache	2017-06-13 15:26:07 -07:00
script-engine	Merge branch 'master' of github.com:highfidelity/hifi into audio/parity	2017-06-13 17:41:52 -04:00
shared	Fix SharedNodePointer leak	2017-06-14 11:42:25 -07:00
trackers
ui	Simplify eventBridge mechanism exposing functionality to web pages	2017-06-12 14:46:37 -07:00
ui-plugins