6 commits

Author	SHA1	Message	Date
Brad Hefta-Gaub	dfba05ae5f	CR feedback	2016-01-11 11:07:07 -08:00
Brad Hefta-Gaub	e2a3903def	add support for advanced/developer plugins and change diplay modes to match spec	2016-01-08 16:58:25 -08:00
samcake	a50b14dfae	Merging with upstream graphics	2015-12-14 18:18:39 -08:00
Howard Stearns	83078b9d8c	Merge branch 'master' of https://github.com/highfidelity/hifi into correct-target-frame-rate	2015-12-10 08:44:08 -08:00
Bradley Austin Davis	fd5fb3096f	Disabling OpenVR plugin	2015-12-09 17:31:53 -08:00
Brad Davis	978d39b7f4	Moving OpenVR to external plugin and updating to latest version	2015-12-09 16:20:24 -08:00