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

..

avatar

Huge renderer update (WIP). Still plenty to do, especially pertaining to UI.

2011-12-09 14:02:29 -06:00

deferred

Merge remote-tracking branch 'upstream/master'

2013-11-03 12:17:50 -05:00

lighting

Huge renderer update (WIP). Still plenty to do, especially pertaining to UI.

2011-12-09 14:02:29 -06:00

windlight

Catching up with Lindies part 3

2012-03-26 15:01:53 +02:00