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
af8f8bb040
Mats.
2013-11-02 01:20:05 -05:00
Andros Baphomet
f6861cd5ba
Fix shader compilation/out-of-spec issues
2013-10-05 17:33:34 -04:00
Siana Gearz
3f0f955a76
Catching up with Lindies part 2
2012-03-25 10:47:20 +02:00
Shyotl
ffb285c6ff
Huge renderer update (WIP). Still plenty to do, especially pertaining to UI.
...
-Nametag bubble visbility is oddly inconsistent. May vanish with future planned UI merges...
-VBOs are PAINFULLY slow on ATI hardware. This repos self-compiled davep/shining-fixes branch, so I'll leave the ball in LL's court for now regarding that.
2011-12-09 14:02:29 -06:00
