summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Expand)Author
2013-05-23Automated merge with https://bitbucket.org/lindenlab/viewer-development-mater...Dave Parks
2013-05-23NORSPEC-198, NORSPEC-176, NORSPEC-106 WIP Fix for various fullbright/shiny de...Dave Parks
2013-05-23NORSPEC-198, NORSPEC-176, NORSPEC-106 WIP Fix for various fullbright/shiny de...Dave Parks
2013-05-23NORSPEC-193 NORSPEC-161 make legacy shiny a batch breaker when materials are ...Graham Madarasz
2013-05-22NORSPEC-204 make tex controls act like diffuse map when in media modeGraham Madarasz
2013-05-22NORSPEC-186 clamp norm/spec map rotations to 0-360 until we can fix the serve...Graham Madarasz (Graham)
2013-05-22MergeGraham Madarasz (Graham)
2013-05-22NORSPEC-205 more dueling spec controlsGraham Madarasz (Graham)
2013-05-22merge latest project repoOz Linden
2013-05-22merge changes for 3.5.3-releaseOz Linden
2013-05-22NORSPEC-203 fix handling of objs with materials due to alpha mode in non-defe...Graham Madarasz
2013-05-22merge changes for chui-967Oz Linden
2013-05-22CHUI-967: fix display of % escapes in chatGilbert Gonzales
2013-05-21NORSPEC-96 tweak fix to follow clone/modify/re-apply pattern from build tool ...Graham Madarasz
2013-05-21NORSPEC-96 slight refrain, make Stretch Textures apply to norm/spec maps in p...Graham Madarasz
2013-05-21MergeGraham Madarasz
2013-05-21merge changes for maint-2628Oz Linden
2013-05-21NORSPEC-200 fix regression from 188 fix caused by not having enough bits to s...Graham Madarasz
2013-05-21merge changes for chop-947Oz Linden
2013-05-21BUG-2432: Crashfix. Don't call map::erase when the iterator is not valid.Oz Linden
2013-05-21merge changes for chop-948Oz Linden
2013-05-21NORSPEC-196: fix frame stalls caused by FmodEx loggingcallum_linden
2013-05-21revise test for hg to detect and ignore incorrect results from cygwin hgOz Linden
2013-05-21CHOP-947: create summary.json (really python) metadata file for TeamCity resultsOz Linden
2013-05-21Automated merge with https://bitbucket.org/lindenlab/viewer-development-mater...Dave Parks
2013-05-21CHOP-948: correctly persist the UpdaterWillingToTest preferenceOz Linden
2013-05-20NORSPEC-191 make alpha masked rigged faces appear with deferred rendering on ...Graham Madarasz
2013-05-20MergeGraham Madarasz
2013-05-20MergeGraham Madarasz
2013-05-20NORSPEC-188 avoid removing 'Use Texture' item when cancelling from picker bac...Graham Madarasz
2013-05-20Mergecallum_linden
2013-05-20Quieten down writing to fmod.log - only write errors - speculate this is rela...callum_linden
2013-05-20NORSPEC-197 Fix for fullbright alpha masked objects not renderingDave Parks
2013-05-20NORSPEC-168 fix UI update to not re-add the 'Use Texture' item when selecting...Graham Madarasz
2013-05-17increment version to 3.5.3 to be higher than the releaseOz Linden
2013-05-17merge changes for lastest integrationsOz Linden
2013-05-17Merge vwr-dev-matGraham Madarasz (Graham)
2013-05-17NORSPEC-189 restore old mat param update registrationGraham Madarasz (Graham)
2013-05-17merge changes for latest integration repoOz Linden
2013-05-17increment version to 3.6.0Oz Linden
2013-05-17Automated merge with https://bitbucket.org/lindenlab/viewer-development-mater...Dave Parks
2013-05-17NORSPEC-187 Add directionality to ambient lighting.Dave Parks
2013-05-17Extra fix for Dave's shader OS X related shader changecallum_linden
2013-05-17Backout OpenGL 2.1 compatibility attemptDave Parks
2013-05-17NORSPEC-187 Directional ambient work in progress.Dave Parks
2013-05-17Merge with headcallum_linden
2013-05-16Fix for compilation error in shadows disabled and don't load transform feedba...Dave Parks
2013-05-16MergeGraham Madarasz
2013-05-16Merge beta fixesGraham Madarasz
2013-05-16NORSPEC-190 Fix for local lights not being gamma corrected on alpha objects.Dave Parks