Wayne Chen c85b840db0 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2		2018-11-14 14:47:56 -08:00
..
avatar	Tweak transit animation	2018-11-05 19:14:40 -07:00
config	feedback changes	2018-11-08 09:58:53 -08:00
controllers	Merge pull request #14040 from hyperlogic/feature/acceleration-limit-filter	2018-10-25 08:51:59 -07:00
fonts	updating qml, adding new glyphs font	2018-10-23 16:22:42 -07:00
html	Merge pull request #14028 from ElderOrb/FB12459	2018-11-13 09:41:04 -08:00
icons	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-11-14 14:47:56 -08:00
images	updating qml, adding new glyphs font	2018-10-23 16:22:42 -07:00
mention-sounds
meshes	Merge pull request #14159 from alexiamandeville/WoodyUpdate	2018-11-12 12:12:49 -08:00
qml	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-11-14 14:47:56 -08:00
QtWebEngine/UIDelegates	update imports for utilities / all other qml files found	2018-11-06 14:21:14 +05:30
serverless	new location drop - unparent overlays	2018-09-26 15:12:48 -07:00
shaders	Alternate shader	2018-05-04 16:40:05 -07:00
snapshot/img	new local reference to image model	2018-02-02 10:27:44 -08:00
sounds	3D Keyboard	2018-11-08 09:58:53 -08:00
styles	Some improvements to the log window	2018-02-08 11:26:02 -08:00
visage