Dante Ruiz a194c8bc03 Merge branch 'master' of github.com:highfidelity/hifi into fix-qml-tablet-apps		2018-02-15 15:46:16 -08:00
..
avatar
config
controllers	added control button for controller API	2018-02-13 09:41:00 -08:00
fonts	added image icon	2018-02-02 10:27:44 -08:00
html	Fix web entities accessing the webcam	2017-12-12 16:00:17 -07:00
icons	Merge pull request #12272 from elisa-lj11/2d-images	2018-02-13 11:44:02 -08:00
images	Merge remote-tracking branch 'upstream/master' into android	2018-01-19 14:35:20 -08:00
mention-sounds
meshes	new local reference to image model	2018-02-02 10:27:44 -08:00
qml	Merge branch 'master' of github.com:highfidelity/hifi into fix-qml-tablet-apps	2018-02-15 15:46:16 -08:00
QtWebEngine/UIDelegates
shaders	move hud rendering to render thread, still need to separate out hud overlays	2017-09-29 09:49:08 -07:00
snapshot/img	new local reference to image model	2018-02-02 10:27:44 -08:00
sounds	Tighter version of sample sound	2017-10-26 11:48:40 -07:00
styles	Some improvements to the log window	2018-02-08 11:26:02 -08:00
visage