Age | Commit message (Collapse) | Author |
|
change in #4406
|
|
|
|
|
|
|
|
secondlife/viewer#1883: Local-only PBR terrain paintmap with developer tools
|
|
paintmap bake and compare it to the heightmap
|
|
|
|
secondlife/viewer#1885: Terrain texture repeats: Remove feature flag dependency on simulator feature in favor of cap
|
|
|
|
|
|
KHR_texture_transform on prims
|
|
|
|
|
|
keywords_lsl_default.xml
|
|
|
|
|
|
|
|
# Conflicts:
# doc/contributions.txt
# indra/newview/llfloaterimagepreview.cpp
|
|
Add more details to Behavior overview.
|
|
|
|
|
|
|
|
# Conflicts:
# indra/llimage/llimageworker.cpp
# indra/llimage/llimageworker.h
# indra/newview/llcontrolavatar.cpp
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/lloutfitslist.h
# indra/newview/lltexturefetch.cpp
|
|
# Conflicts:
# autobuild.xml
# indra/llcommon/llsys.cpp
|
|
|
|
|
|
|
|
# Conflicts:
# indra/llui/lltransutil.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llfloaterenvironmentadjust.cpp
# indra/newview/llpaneleditwater.cpp
# indra/newview/llpanelface.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
|
|
# Conflicts:
# .github/workflows/build.yaml
|
|
|
|
|
|
|
|
|
|
|
|
validation
|
|
secondlife/viewer#76: Change wording of terrain blending documentation when using materials
|
|
labels should match the current context
|
|
* #975 Add RenderHDRISplitScreen debug setting
* Create hdri_local_preview.md
|
|
* Create RenderMaxTextureResolution.md
* #983 Add RenderMaxTextureResolution setting. Incidental crash fix.
|
|
test plan
|
|
|
|
PBR Terrain UI second pass
|
|
|
|
# Conflicts:
# indra/llcommon/llstring.cpp
# indra/llcommon/llstring.h
|
|
release/materials_featurette
|
|
|
|
# Conflicts:
# indra/newview/llinventorygallery.cpp
|
|
|
|
|
|
|