David Rowe 42b606c09d Merge branch 'master' into 20855		2016-03-22 18:51:07 +13:00
..
config	Remove antialiasing from menus, default to on	2016-02-23 16:24:44 -08:00
controllers	Correcting vive button naming	2016-03-08 15:12:54 -08:00
fonts	Update the HiFi-Glyphs font file	2016-03-16 10:29:22 +13:00
html	Remove obsolete reference to text chat within "about" text.	2016-01-22 10:45:04 -08:00
icons	show actions in status icons	2015-11-11 16:35:04 -08:00
images	merging	2015-08-21 16:34:13 -07:00
info
mention-sounds
meshes	MyAvatar: added standing and run landing animations	2016-02-05 17:53:50 -08:00
qml	Merge branch 'master' into 20855	2016-03-22 18:51:07 +13:00
shaders	Fix for misaligned color/material textures when resolution is greater than the	2015-01-20 13:07:35 -08:00
sounds	Signal Audio.disconnected, and use new hello/goodbye sounds in resources.	2015-06-11 20:33:30 -07:00
styles	Remove custom styling	2014-08-23 00:16:25 +02:00
visage	css and cfg filetypes are text in .gitattributes	2015-10-20 13:58:44 -07:00