Seth Alves 84b93826d0 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js		2017-02-22 09:30:16 -08:00
..
avatar
config
controllers	Made jumping easier on the Vive	2017-02-07 19:46:16 -08:00
fonts	Another checkpoint	2017-01-16 10:44:54 -08:00
html	start on moving edit.js to tablet	2017-02-09 14:03:01 -08:00
icons	Finger paint button icon files	2017-02-18 14:21:54 +13:00
images
mention-sounds
meshes	include tablet fbx with interface distribution rather than get it from s3	2017-01-26 10:20:46 -08:00
qml	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-22 09:30:16 -08:00
QtWebEngine/UIDelegates	hide context menu on item click	2017-01-28 14:37:49 -05:00
shaders
sounds	put name of button-click file back	2017-01-23 13:55:11 -08:00
styles	Button styling	2017-02-14 16:13:40 -08:00
visage