David Rowe 4dd7667fd7 Merge branch 'tablet-ui' into 21209 ... # Conflicts: # interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml # interface/src/ui/overlays/Web3DOverlay.cpp		2017-03-14 08:50:01 +13:00
..
avatar	Add sitting animations	2017-02-27 16:38:54 -08:00
config	Remove antialiasing from menus, default to on	2016-02-23 16:24:44 -08:00
controllers	Made jumping easier on the Vive	2017-02-07 19:46:16 -08:00
fonts	magical new glyphs	2017-03-01 13:57:03 -07:00
html	start on moving edit.js to tablet	2017-02-09 14:03:01 -08:00
icons	Merge pull request #7 from fayeli/edit-js-create-tab	2017-02-23 17:40:48 -08:00
images	switch to using glyph button	2017-02-27 12:44:23 -07:00
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 'tablet-ui' into 21209	2017-03-14 08:50:01 +13:00
QtWebEngine/UIDelegates	hide context menu on item click	2017-01-28 14:37:49 -05:00
shaders	hacking	2016-10-18 21:33:37 -07:00
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