summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Expand)Author
2013-05-10Put back normal map and spec map initializers/destruction, delete FMOD refs (...Graham Madarasz
2013-05-10Remove some unreachable codeDave Parks
2013-05-10merge changes for latest project changesOz Linden
2013-05-09NORSPEC-164 fix TE copy ctor and operator= to include material pointer in add...Graham Madarasz
2013-05-09NORSPEC-168 separate UI handlers for spec and normal textures to avoid cross-...Graham Madarasz
2013-05-09NORSPEC-170 make adv lighting checkbox reflect whether deferred shaders loade...Graham Madarasz
2013-05-09remove duplications and other errors introduced during the mergeOz Linden
2013-05-08Rollback NORSPEC-156 change which fails to compile due to implicit castGraham Madarasz
2013-05-08NORSPEC-156 back to the fix that actually worksGraham Madarasz
2013-05-08merge changes for 3.5.1-releaseOz Linden
2013-05-07Automated merge with https://bitbucket.org/lindenlab/viewer-development-mater...Dave Parks
2013-05-07NORSPEC-147 make repeats per meter disabled when in planar mode and make UI r...Graham Madarasz
2013-05-08NORSPEC-156 move gamma correction to vert shaderGraham Madarasz
2013-05-08NORSPEC-156 modify fullbrightF colorspace conversion to eliminate delta with ...Graham Madarasz
2013-05-07Fix for bad light map generation/sampling.Dave Parks
2013-05-07NORSPEC-119 another attempt at individual faces edits without side-effectsGraham 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 https://bitbucket.org/lindenlab/viewer-development-mater...Dave Parks
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
2013-05-06MATBUG-78 Fix for alpha lighting falloff not matching for sunlight when shado...Dave Parks
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-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-03Merge with headcallum_linden
2013-05-02Automated merge with https://bitbucket.org/lindenlab/viewer-development-mater...Dave Parks
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
2013-05-01NORSPEC-119 redux : fix getState to find the material ID of individually sele...Graham Madarasz
2013-05-02NORSPEC-99 add break statement to fix legacy bump vert program from being sto...Graham Madarasz
2013-05-01NORSPEC-145 Fix for improper rendering of glow pass for rigged meshes.Dave Parks
2013-05-01Fix for sky being too bright with advanced lighting enabledDave Parks
2013-05-01Automated merge with https://bitbucket.org/lindenlab/viewer-development-mater...Dave Parks
2013-05-01Fix up specular highlights and gamma correction for projectors.Dave Parks
2013-05-01NORSPEC-51 Fix for Incorrect Texture icon used in build tool when normal or s...callum_linden
2013-05-01NORSPEC-144 make code to nerf use of FBOs on old windows drivers not affect M...Graham Madarasz (Graham)
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-30MATBUG-78 Fix for alpha lighting distance attenuation not matching opaque dis...Dave Parks
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 in...Geenz
2013-04-26Automated merge with https://bitbucket.org/lindenlab/viewer-development-mater...Dave Parks
2013-04-25Bump resolution on lightFunc to avoid banding.Dave Parks
2013-04-25NORSPEC-104 Fix for texture animation sometimes not overriding specular and n...Dave Parks
2013-04-25NORSPEC-106 Fix for emissive mask overriding environment mask.Dave Parks