summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2013-06-11Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-06-10NORSPEC-222 fix issues with removing the use texture item selecting weave ↵Graham Madarasz
when the TE was BUMPY_TEXTURE, but no normal map was applied
2013-06-10NORSPEC-257 fix alpha mode display incorrect default when alpha is present ↵Graham Madarasz
in tex
2013-06-10NORSPEC-251 fix issues with not binning objects changed from having a ↵Graham Madarasz
material to using legacy bumps causing incorrect rendering
2013-06-10NORSPEC-252 fix reverting normal maps to noneGraham Madarasz
2013-06-10NORSPEC-247 Fix for rigged attachments with alpha masking on occluding alpha ↵Dave Parks
object when 100% transparent.
2013-06-10Line endings.Dave Parks
2013-06-10MAINT-2414 fix for texture cache crasherGraham Madarasz
2013-06-10Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-06-10NORSPEC-248 fix broken repeats handling in media modeGraham Madarasz
2013-06-10Merge vwr-dev-matGraham Madarasz
2013-06-10NORSPEC-87 fix diffuse repeats display as wellGraham Madarasz
2013-06-10NORSPEC-87 fix regression from NSPEC 233 fix typo which is breaking norm ↵Graham Madarasz
repeats display
2013-06-10NORSPEC-87 fix regression from 233 fix that made spec repeats info show in ↵Graham Madarasz
norm tab
2013-06-09NORSPEC-246 fix shader compile errors from missing returnGraham Madarasz
2013-06-09NORSPEC-246 fix issues with normal encoding on precision-deprived hardware ↵Graham Madarasz
and remove haxors
2013-06-09NORSPEC-246 WIP fix callsite missed when swapping in macro implGraham Madarasz
2013-06-09NORSPEC-246 WIP Fix macro bug that slipped past due to MSVC promiscuityGraham Madarasz
2013-06-09NORSPEC-246 WIP fix handling of encoded normals with single FP only cardsGraham Madarasz
2013-06-08NORSPEC-233 fix regressions in default spec parametersGraham Madarasz
2013-06-08NORSPEC-226 NORSPEC-222 fix menu content bugs and alpha mask stomp when ↵Graham Madarasz
editing multiple objects
2013-06-08NORSPEC-233 fix default value and material apply logic errorsGraham Madarasz
2013-06-07NORSPEC-230 Fix for incorrect gamma under water.Dave Parks
2013-06-07NORSPEC-233 WIP fix completely bogus substitution of offsets for scales and ↵Graham Madarasz
make scale accessors get with the program
2013-06-07NORSPEC-233 WIP cleanup and fix crasher in templated material get driver funcGraham Madarasz
2013-06-07Fix busted WIP check-inGraham Madarasz
2013-06-07Merge MAINT-2740 crash fixGraham Madarasz
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-06merge changes for 3.5.3-releaseOz Linden
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