summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2013-06-07Merge vwr-dev-matGraham Madarasz
2013-06-07NORSPEC-233 WIP clean up regressions in enable/tentative logic from reworkGraham Madarasz
2013-06-07NORSPEC-233 WIP make gcc like it and do some clean-upGraham Madarasz
2013-06-07NORSPEC-233 WIP for individual material param edits across hetero object ↵Graham Madarasz
selections
2013-06-05Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-06-05NORSPEC-237 nix resetting the keyboard focus to cripple the repeats per ↵Graham Madarasz
meter control
2013-06-05NORSPEC-232 Fix for broken alpha masking with basic shaders disabled.Dave Parks
2013-06-05Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-06-05NORSPEC-238, NORSPEC-225 Fix for specular map alpha channel being improperly ↵Dave Parks
used and glossiness bludgeoning environment intensity. Reviewed/written by Graham.
2013-06-05NORSPEC-238 NORSPEC-225 fix issues with env mask term being ignored and or ↵Graham Madarasz
damped by glossiness
2013-06-05NORSPEC-238 spec map env mask term in alpha chan ignoredGraham Madarasz
2013-06-05NORSPEC-236 Fix for rigged attachments with materials not rendering under ↵Dave Parks
water when advanced lighting is enabled.
2013-06-04fix modified virtual function names in platform-specific modulesOz Linden
2013-06-04merge changes for build number fixOz Linden
2013-06-04Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-06-03NORSPEC-229 Fix for linux build.Dave Parks
2013-06-03NORSPEC-195 Fix for incorrect alpha blending with deferred rendering enabled.Dave Parks
2013-06-03merge changes for 3.6.0-materials-beta1Oz Linden
2013-06-03Fix and organize code for managing marker files that detect last_exec_event ↵Oz Linden
and last_exec_duration
2013-06-03MATBUG-136 Fix for glow being too bright on rigged attachments.Dave Parks
2013-06-03MATBUG-151 Fix for black textures on Intel HD when glow is present.Dave Parks
2013-06-03NORSPEC-227 fix settings XML merge derpGraham Madarasz
2013-06-03Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-06-03NORSPEC-229 Fix for bad binormals on mirrored surfaces (use tangent ↵Dave Parks
calculator instead of binormal calculator, convert binormal centric code to tangent centric)
2013-05-31Revert NORSPEC-214 fix causing knock-on in spec exp controlsGraham Madarasz
2013-05-31Fix for uninitialized texture gamma on fullbright alpha objects.Dave Parks
2013-05-31NORSPEC-223 Fix for wrong textures displaying on fullbright+shiny faces with ↵Dave Parks
advanced lighting enabled.
2013-05-31Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-05-30NORSPEC-214 fix dropdown handling of 'Use Texture' item across objectsGraham Madarasz
2013-05-30NORSPEC-158 fix issues with loading of bumpmaps on clean installGraham Madarasz
2013-05-30NORSPEC-216 Fix for some HUD objects not rendering with advanced ↵Dave Parks
lighting/materials enabled.
2013-05-30BUG-2707 add some logging to help narrow down what part of login instance ↵Graham Madarasz
handling is going awry
2013-05-30Fix for some objects not rendering underwater with advanced lighting enabledDave Parks
2013-05-30Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-05-29NORSPEC-96 diff/norm/spec tex scale ratio rodeo, yoGraham Madarasz
2013-05-29Fix for rigged attachments not having specular highlights with legacy shininess.Dave Parks
2013-05-29Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-05-29NORSPEC-198, NORSPEC-176, NORSPEC-106, NORSPEC-202 et al -- Material matrix ↵Dave Parks
testing based overhaul WIP Reviewed by Graham
2013-05-29Merge latest viewer-releasesimon
2013-05-29increment version to 3.5.4Oz Linden
2013-05-28NORSPEC-211 less intrusive version of this fixGraham Madarasz
2013-05-28NORSPEC-211 better handling of diff alpha modeGraham Madarasz
2013-05-28NORSPEC-182 do not add 'Use Texture' menu items in XML to avoid accidental ↵Graham Madarasz
appearance in menu 1st time
2013-05-25Merge viewer-dev-matGraham Madarasz
2013-05-24NORSPEC-189 throw caution to the wind and avoid using getVolume() check ↵Graham Madarasz
which has deleterious effects on materials rendering
2013-05-24NORSPEC-96 NORSPEC-189 another attempt at planar stretch across all 3 ↵Graham Madarasz
channels and make the materials CB use a UUID instead of this pointer for safety
2013-05-24norspec-107: remove the need for a friend declaration in local texturesOz Linden
2013-05-24MATBUG-8: fix local texture support for normal and specular mapsSerpentu
2013-05-24merge changes for maint-2724Oz Linden
2013-05-24NORSPEC-210 fix issues with the map used to store TE-specific registrations ↵Graham Madarasz
which was only invoking the CB for the last TE on log-in by replacing std::map with boost::unordered_map