Olivier Prat 9e9c0aff65 Merge branch 'master' of git://github.com/highfidelity/hifi into fadeshape		2017-07-17 09:59:59 +02:00
..
avatar	Eliminated to wiggle while pucks are enabled.	2017-06-26 14:09:10 -07:00
config	Introducing the renderview task	2017-06-06 18:00:41 -07:00
controllers	Merge branch 'master' of github.com:highfidelity/hifi into vive-in-desktop	2017-07-01 00:48:49 +01:00
fonts	added new glyph	2017-07-06 00:45:59 +01:00
html	Simplify eventBridge mechanism exposing functionality to web pages	2017-06-12 14:46:37 -07:00
icons	Merge pull request #10886 from 1P-Cusack/21420	2017-07-14 10:06:45 -07:00
images	Merge branch 'master' of git://github.com/highfidelity/hifi into fade	2017-07-14 17:28:35 +02:00
mention-sounds
meshes	put back defaultAvatar_full.fst mode to 644	2017-06-09 13:55:57 -07:00
qml	Merge pull request #10965 from CainFoool/avatar-scaler	2017-07-14 10:30:33 -07:00
QtWebEngine/UIDelegates	remove old ../../qml/menus import	2017-03-25 18:37:36 -04:00
shaders
snapshot/img	Add placeholder image when previous snapshot can't be loaded	2017-05-31 10:27:17 -07:00
sounds	add sample sound	2017-06-19 14:41:01 -07:00
styles	Revert "Actually merge from master"	2017-03-24 17:56:48 -07:00
visage