5 Commits

Author	SHA1	Message	Date
Siana Gearz	749d0eec28	Merge https://github.com/abaph/SingularityViewer ... Brings in support for MESA accelerators.	2013-11-17 16:38:06 +01:00
Andros Baphomet	fe0a761ce6	Merge remote-tracking branch 'upstream/master' ... Conflicts: indra/newview/app_settings/shaders/class1/deferred/alphaNonIndexedNoColorF.glsl indra/newview/app_settings/shaders/class1/deferred/fullbrightShinyF.glsl indra/newview/app_settings/shaders/class1/deferred/fxaaF.glsl indra/newview/app_settings/shaders/class1/deferred/giF.glsl indra/newview/app_settings/shaders/class1/deferred/multiSpotLightF.glsl indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl indra/newview/app_settings/shaders/class1/deferred/spotLightF.glsl indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl indra/newview/app_settings/shaders/class2/deferred/alphaNonIndexedF.glsl indra/newview/app_settings/shaders/class2/deferred/alphaNonIndexedNoColorF.glsl indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl	2013-11-03 12:17:50 -05:00
Shyotl	827bbc9b89	Fix up a few glowies.	2013-11-02 19:15:28 -05:00
Shyotl	e5d71560e8	Fix fullbright stuff in deferred. Have to re-assess old glow occlusion bugfixes.	2013-11-02 02:38:23 -05:00
Shyotl	af8f8bb040	Mats.	2013-11-02 01:20:05 -05:00