summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
AgeCommit message (Collapse)Author
2021-02-01Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
2020-11-11Revert "SL-13565, clean up now-orphaned throttling variable and handling code"Andrey Kleshchev
This reverts commit 6c1a15d936763dc14f368e10bd53c6e351bf0136.
2020-10-14Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
2020-10-14Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
2020-09-28Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
# Conflicts: # indra/newview/llfloaterbuycurrency.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llinventorypanel.h # indra/newview/skins/default/xui/en/floater_buy_currency.xml
2020-09-28Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llgroupmgr.cpp
2020-09-28Merged master(DRTVWR-497) into DRTVWR-482Andrey Kleshchev
2020-09-22Merge branch 'master' v6.4.9 into DRTVWR-497Dave Houlton
2020-09-22Merged master (DRTVWR-503) into DRTVWR-482Andrey Kleshchev
2020-09-16DRTVWR-4976 Misc shader cleanup.Dave Houlton
Removed some potential div-by-0 NaNs and a mangled clamp.
2020-09-16SL-13768 clang-format class2 deferred skyF.glsl (whitespace)Dave Houlton
2020-09-16SL-13768 de-obfuscate the ALM version of skyF.glslDave Houlton
2020-09-15SL-13768 remove moon glow from ALM deferred path as wellDave Houlton
2020-09-11SL-13465 Restore Pre-EEP haze effecting moonPtolemy
2020-09-11SL-13465 Remove hack offset of moon when AS is ON to match when AS is OFF.Ptolemy
2020-09-09Revert "SL-12475 add Inventory Favorites tab"Andrey Lihatskiy
This reverts commit 92499ce1b43fd60ce7aad71d12f9eef0cef04f7f. # Conflicts: # indra/newview/llinventorybridge.cpp # indra/newview/llinventorypanel.cpp # indra/newview/llinventorypanel.h
2020-09-09SL-12475 add Inventory Favorites tabmaxim_productengine
# Conflicts: # indra/newview/llinventorybridge.cpp # indra/newview/llinventorypanel.cpp
2020-09-02SL-12978 & SL-13743. Remove abrupt changes in sun intensity calc, preserve ↵Dave Houlton
original fall-off. Had to find a balance in the sunlight intensity calculation that behaves correctly for both these issues.
2020-09-02SL-12978 clang-format shader file (whitespace)Dave Houlton
2020-09-02SL-12978 de-obfuscate, banish the tempsDave Houlton
2020-09-02SL-12978 refactor sunlight intensity calculationDave Houlton
2020-08-28SL-13768 clang-format shader files (whitespace)Dave Houlton
2020-08-28SL-13768 de-obfuscate cloud/sky vertex shadersDave Houlton
2020-08-28SL-13768 remove moon glow from sky and cloudsDave Houlton
2020-08-21SL-13743 revert part of SL-12978 change that broke low-angle sunlightDave Houlton
2020-08-20SL-13565, clean up now-orphaned throttling variable and handling codeDave Houlton
2020-08-18Merge branch 'master' 6.4.8 into DRTVWR-497Dave Houlton
2020-08-18Merge branch 'master' into DRTVWR-482Andrey Lihatskiy
2020-08-18Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llimprocessing.cpp # indra/newview/llviewerjoystick.cpp # indra/newview/llviewermenufile.cpp
2020-08-16SL-13465 Fix local scalar mix masking global mix() function.Ptolemy
2020-08-16SL-13465 Partially restore atmospheric effects for the moon.Ptolemy
2020-08-11Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
# Conflicts: # indra/cmake/DirectX.cmake # indra/newview/llviewerparcelmedia.cpp # indra/newview/viewer_manifest.py
2020-08-11SL-13626 Renamed PoolSizeAssetStorage to PoolSizeVAssetStorageAndrey Kleshchev
to reflect previous commit and use correct pool size
2020-07-21SL-13416 eliminate sun/moon specular on shadowed surfacesDave Houlton
2020-07-15SL-5894 #4 Organize device storage between sessionsAndrey Kleshchev
2020-07-14SL-13163 revert 2 more instances of 'new EEP' specular calculationDave Houlton
2020-07-14SL-13163 - Fix (revert) EEP specular contribution calculation for deferredDave Houlton
2020-07-02SL-13539 Fix a white artifact over the water at certain anglesPtolemy
2020-07-01SL-12978 Add note about similar code in C++ and GLSLPtolemy
2020-07-01SL-12978: CleanupPtolemy
2020-07-01SL-12978: Fix off-axis water dimmingPtolemy
2020-06-29SL-9632 Cleanup: Add note about potential missing inverse pow() texture_gammaPtolemy
2020-06-29SL-9632 Fix Haze effecting HUD objectsPtolemy
2020-06-29SL-9632 Add note about shiny HUD objects that will be fullbright for both ↵Ptolemy
ALM ON and OFF
2020-06-29SL-9632 Add note that shiny HUD objects will be fullbrightPtolemy
2020-06-29Merge branch 'DRTVWR-497' of bitbucket.org:lindenlab/viewer into DRTVWR-497Ptolemy
2020-06-29DRTVWR-497: Cleanup: Document algorithm name for normal packing/unpacking.Ptolemy
2020-06-24Merge branch 'master' into DRTVWR-482Andrey Lihatskiy
2020-06-24Merge branch 'master' into DRTVWR-497Andrey Lihatskiy
2020-06-24Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
# Conflicts: # indra/llcommon/llkeybind.cpp # indra/llcommon/llkeybind.h
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-02 16:49:44 +0000