Brad Hefta-Gaub ac49feda22 Merge branch 'master' of https://github.com/highfidelity/hifi into removeDisableEntityNACKS ... Conflicts: libraries/entities/src/EntityEditPacketSender.h		2016-05-21 09:23:45 -07:00
..
avatar	Updated default idle and turn animations.	2016-05-09 18:43:30 -07:00
config	Remove antialiasing from menus, default to on	2016-02-23 16:24:44 -08:00
controllers	Doing a pass over the input plugins and controller code	2016-05-20 14:50:23 -07:00
fonts	Updated the HiFi glyphs font file	2016-04-13 16:48:13 +12:00
html	Remove obsolete reference to text chat within "about" text.	2016-01-22 10:45:04 -08:00
icons	show with debug icons when someone else is the simulation owner	2016-05-05 18:33:01 -07:00
images	Add "home" button to address bar	2016-04-27 10:28:05 +12:00
info	repair usage of INI file for QSettings	2014-02-19 14:09:18 -08:00
mention-sounds	fixed mention sounds dir for deployment	2014-05-12 20:55:24 +02:00
meshes	replace the default avatar with the being of light	2016-04-22 13:48:30 -07:00
qml	remove more dead code	2016-05-20 13:43:08 -07:00
shaders	Remove the last of the glow level	2016-05-14 14:49:31 -07: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