12 commits

Author	SHA1	Message	Date
Zach Pomerantz	0ea70f234f	Add bg gpu timer display	2016-03-14 17:53:48 -07:00
samcake	89920370db	A bunch of typo fixes after review	2016-03-01 10:53:08 -08:00
samcake	96fb9c4466	cleaning up macos warnings, separating Metallic maps from the default, gamma corrected gray textures	2016-02-25 14:13:35 -08:00
samcake	a0d7ce145e	Adding support for emissive and occlusion maps, on to pr land	2016-02-24 17:30:29 -08:00
samcake	9b2a90b430	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2016-02-19 19:50:02 -08:00
samcake	39a7852979	MOving forward with PBR rendering, cleaning up the lighting shaders and the packi/unpack deferredBuffer shaders	2016-02-19 18:43:07 -08:00
samcake	903824809c	trying to have better support for the materials	2016-02-18 18:33:32 -08:00
Zach Pomerantz	2dd1cf2f15	Update Render.fromJSON to Render.load	2016-02-18 18:21:26 -08:00
Zach Pomerantz	981d4d37ca	Update render/debug.js ... - Add a toggle for the entire UI - Set items sliders minimums to -1 - Fix off-by-one with debug buffer radios	2016-02-18 17:45:55 -08:00
Zach Pomerantz	3bace3cdbb	Rework the qml for brevity	2016-02-11 08:48:01 -08:00
Zach Pomerantz	9c5881345a	Disable the AO gpuTimer pending cpp fix	2016-02-11 08:48:00 -08:00
Zach Pomerantz	dbc59ccc2b	Revamp render engine debug JS script	2016-02-11 08:47:59 -08:00