samcake 9b2a90b430 Merge branch 'master' of https://github.com/highfidelity/hifi into orange		2016-02-19 19:50:02 -08:00
..
ConfigSlider.qml	Rework the qml for brevity	2016-02-11 08:48:01 -08:00
debug.js	Update Render.fromJSON to Render.load	2016-02-18 18:21:26 -08:00
debugFramebuffer.js	trying to have better support for the materials	2016-02-18 18:33:32 -08:00
framebuffer.qml	MOving forward with PBR rendering, cleaning up the lighting shaders and the packi/unpack deferredBuffer shaders	2016-02-19 18:43:07 -08:00
main.qml	Update render/debug.js	2016-02-18 17:45:55 -08:00