Age | Commit message (Collapse) | Author |
|
# Conflicts:
# indra/llmath/llquaternion.h
# indra/newview/lldrawpoolwater.cpp
# indra/newview/lljoystickbutton.cpp
# indra/newview/llvosky.cpp
# indra/newview/skins/default/textures/textures.xml
|
|
|
|
|
|
|
|
water Fresnel
|
|
|
|
|
|
|
|
|
|
|
|
davep/DRTVWR-440
|
|
materialF and fullbrightShinyF
|
|
|
|
SL-11589
Approved-by: Dave Houlton <euclid@lindenlab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
SL-12005 Fix for projectors getting brighter when switching to single light shader.
|
|
shader.
|
|
|
|
|
|
|
|
|
|
SL-12233 Fix for disagreement between fullbright implementations with ALM on and off.
|
|
and off.
|
|
|
|
|
|
component
|
|
|
|
transparent objects from last commit.
|
|
for lack of angular attenuation on ambient lighting on triangles facing away from sun.
|
|
|
|
deferred. Don't make terrain fullbright under water.
|
|
This keeps ambient from getting overblown and better matches environment lighting with ALM on/off.
|
|
|
|
|
|
|
|
davep/BUG-228263
|
|
|
|
inconsistencies between softenLightF.glsl, materialF.glsl, and alphaF.glsl
|
|
|
|
This reverts commits 9d9b890 and 5f846e4.
|
|
|
|
|
|
|
|
Adds the 'additive' component of calcAtmosphericVars into the sunlit color to reduce
darkening of sun lighting component, and adds a further magic number gainto boost
final result to rough parity with windlight.
Removes all light calculations on fullbright objects, just passing through the unlit
diffuse color.
|