Dante Ruiz 3894c7c2ff Merge branch 'master' of github.com:highfidelity/hifi into config-pucks		2017-05-04 16:54:00 +01:00
..
avatar	Now supports sensorConfig with hips and chest sensors	2017-04-14 17:00:46 -07:00
config
controllers	limbs tracking pucks	2017-05-03 20:08:42 +01:00
fonts	add new glyphs with check, reference in entityList	2017-04-20 14:21:13 -07:00
html	Fix keyboard not raising for Facebook username field	2017-04-30 11:40:28 +12:00
icons	Merge pull request #10258 from howard-stearns/watch-for-announcements	2017-04-27 14:00:39 -07:00
images	Tiny forward/backward icon updates	2017-04-14 13:19:33 -07:00
mention-sounds
meshes	Change default avatar to ball and stick avatar	2017-04-04 09:39:06 -07:00
qml	Merge pull request #10369 from druiz17/url-fix	2017-05-03 16:58:06 -07:00
QtWebEngine/UIDelegates	remove old ../../qml/menus import	2017-03-25 18:37:36 -04:00
shaders	hacking	2016-10-18 21:33:37 -07:00
sounds	Implemented snap sound using sound injector	2017-04-20 17:43:16 +02:00
styles	Revert "Actually merge from master"	2017-03-24 17:56:48 -07:00
visage