summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2013-05-07Merge vwr-dev-matGraham Madarasz
2013-05-07NORSPEC-165 tweak panel_tools_texture layout to uncrop the planar align checkboxGraham Madarasz
2013-05-07NORSPEC-51 Fix (additional) Added missing imagecallum_linden
2013-05-06Merge with lindenlab/viewer-development-materialscallum_linden
2013-05-06Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-05-06NORSPEC-118 fix regression of 118 from extra conditions added for 151Graham Madarasz
2013-05-06NORSPEC-118 fix regression of 118 from extra conditions added for 151Graham Madarasz
2013-05-06NORSPEC-162 Fix for objects with materials set ignoring "tranparency %" value.Dave Parks
2013-05-06NORSPEC-94 fix this without setting in getState causing round-trip wierdness ↵Graham Madarasz
with spec color picker
2013-05-06NORSPEC-94 fix this without setting in getState causing round-trip wierdness ↵Graham Madarasz
with spec color picker
2013-05-06MATBUG-78 Fix for alpha lighting falloff not matching for sunlight when ↵Dave Parks
shadows are enabled.
2013-05-06NORSPEC-126 Make objects with normal maps applied obey legacy shiny settingsGraham Madarasz
2013-05-06NORSPEC-126 Make objects with normal maps applied obey legacy shiny settingsGraham Madarasz
2013-05-04Remove unnecessary assert as ternary protects against null ptr derefGraham Madarasz
2013-05-04Remove unnecessary assert as ternary protects against null ptr derefGraham Madarasz
2013-05-03NORSPEC-160 fix trashing of spec map from sunshine integration snafuGraham Madarasz (Graham)
2013-05-03NORSPEC-160 fix trashing of spec map from sunshine integration snafuGraham Madarasz (Graham)
2013-05-03NORSPEC-151 make disabling bumpyshiny disable adv lighting model as wellGraham Madarasz (Graham)
2013-05-03NORSPEC-151 make disabling bumpyshiny disable adv lighting model as wellGraham Madarasz (Graham)
2013-05-03Merge with headcallum_linden
2013-05-03Merge with vwr-dev-matGraham Madarasz (Graham)
2013-05-02Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-05-02NORSPEC-157 make texture repeats/offsets controls display in media modeGraham Madarasz
2013-05-02NORSPEC-157 make texture repeats/offsets controls display in media modeGraham Madarasz
2013-05-02NORSPEC-149 Fix for objects set to alpha blend sometimes getting tossed into ↵Dave Parks
alpha mask pool.
2013-05-02NORSPEC-99 add break statement to fix legacy bump vert program from being ↵Graham Madarasz
stomped with inappropriate material prog sans skinning
2013-05-02Merged lindenlab/viewer-development-materials into defaultgraham linden
2013-05-01NORSPEC-119 redux : fix getState to find the material ID of individually ↵Graham Madarasz
selected faces correctly
2013-05-02NORSPEC-99 add break statement to fix legacy bump vert program from being ↵Graham Madarasz
stomped with inappropriate material prog sans skinning
2013-05-01NORSPEC-119 redux : fix getState to find the material ID of individually ↵Graham Madarasz
selected faces correctly
2013-05-01NORSPEC-145 Fix for improper rendering of glow pass for rigged meshes.Dave Parks
2013-05-01Merge vwr-dev-matGraham Madarasz
2013-05-01More informative light func tex binding messageGraham Madarasz
2013-05-01Fix for sky being too bright with advanced lighting enabledDave Parks
2013-05-01Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-05-01Fix up specular highlights and gamma correction for projectors.Dave Parks
2013-05-01Add some diag for debugging light func tex bindingGraham Madarasz
2013-05-01NORSPEC-51 Fix for Incorrect Texture icon used in build tool when normal or ↵callum_linden
specular map is not set to 'Use Texture'
2013-05-01NORSPEC-144 make code to nerf use of FBOs on old windows drivers not affect ↵Graham Madarasz (Graham)
Mac too
2013-05-01NORSPEC-144 make code to nerf use of FBOs on old windows drivers not affect ↵Graham Madarasz (Graham)
Mac too
2013-05-01Restore mismerged sunshine changeGraham Madarasz
2013-05-01Merge vwr-dev-matGraham Madarasz
2013-04-30Merge vwr-dev-mat againGraham Madarasz
2013-04-30Fix gcc ternary type inference fail to unbreak Mac and Linux buildsGraham Madarasz
2013-04-30Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-30Fix vwr-dev-mat merge bugs in llpanelface (missing Oz fix) and XMLGraham Madarasz
2013-04-30MATBUG-78 Fix for alpha lighting distance attenuation not matching opaque ↵Dave Parks
distance attenuation
2013-04-29NORSPEC-153 Workaround for AMD driver bug that doesn't like '\' on #define'sDave Parks
2013-04-29Merged with https://bitbucket.org/lindenlab/viewer-development-materialsGeenz
2013-04-29Fix any missing color space conversions where appropriate, tweak the sun's ↵Geenz
intensity to match pre-gamma correction results, and also mask spotlight specular by the projected texture.