9f2be1de74
Merge branch 'release/materials_featurette' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/lltexturectrl.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerregion.cpp
# indra/newview/skins/default/xui/en/floater_tools.xml
2024-02-12 12:54:03 +01:00
e1d9ce6970
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-601
2024-02-11 19:47:44 +01:00
86230977c4
Merge branch 'release/gltf-maint2' of https://github.com/secondlife/viewer
...
# Conflicts:
# README.md
2024-02-11 19:46:50 +01:00
bc6a69ac66
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-02-11 18:37:21 +01:00
0a0aeba208
Fixing the 'lighting' typo
2024-02-11 17:34:22 +01:00
54e5292ba4
FIRE-33687 Italian Translation Update, by Spartaco Zemenis
...
(PBR interface and more)
2024-02-10 17:35:54 +01:00
2d52bd4554
Tiny fix for attribute name
2024-02-10 15:38:30 +01:00
1552ee3a5d
Merge pull request #784 from secondlife/v-773
...
Fix RenderTerrainPBREnabled requiring restart and respect simulator feature PBRTerrainEnabled
2024-02-09 12:48:31 -08:00
2cbf4a15df
secondlife/viewer#773 : Fix RenderTerrainPBREnabled requiring restart and respect simulator feature PBRTerrainEnabled
2024-02-09 12:42:26 -08:00
4e5344ba76
https://github.com/secondlife/jira-archive-internal/issues/70847 Fix for more inaccurate than usual alpha sorting ( #781 )
2024-02-09 13:10:26 -06:00
1f5c7eb8d3
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-02-09 19:25:40 +01:00
963e2072d2
FIRE-33680 French translation update, by Laurent Bechir
2024-02-09 19:25:20 +01:00
d7642b11fb
Merge pull request #778 from secondlife/release/gltf-maint2
...
Release/gltf maint2
2024-02-09 11:48:31 -06:00
846337483c
Merge branch 'release/materials_featurette' into release/gltf-maint2
2024-02-09 09:47:19 -08:00
d6048bfcb2
Put PBR material swatch behind feature flag ( #775 )
...
* secondlife/viewer#771 : Put PBR material swatch behind feature flag
* secondlife/viewer#771 : Make viewer respect PBRMaterialSwatchEnabled from SimulatorFeatures
2024-02-09 09:16:01 -06:00
e24f631110
Merge pull request #770 from secondlife/vi-67
...
secondlife/viewer-issues#67 : Add test plan + fix Windows build
2024-02-08 15:00:32 -08:00
ae46dc068e
secondlife/viewer-issues#67 : Fix Windows release build warning
2024-02-08 14:41:49 -08:00
0ca75120be
secondlife/viewer-issues#67 : Add test plan
2024-02-08 14:41:49 -08:00
598dfb1f34
Pre-empt LL and add build instructions replacing the mostly outdated build readme files
2024-02-08 23:11:59 +01:00
1a353aafb7
Merge pull request #768 from secondlife/vi-67
...
Improve PBR terrain loading robustness
2024-02-08 13:46:15 -08:00
ba9bae0570
Merge pull request #715 from secondlife/materials_featurette/mirrors
...
Mirrors pre-release
2024-02-08 15:34:01 -06:00
9c6e351e05
secondlife/viewer-issues#67 : Improve PBR terrain loading robustness
2024-02-08 13:24:16 -08:00
c3d4f571aa
Update softenLightF.glsl
2024-02-08 13:22:10 -08:00
a7310ae741
#671 Nudge RenderMirrors and clear shader cache as needed based on SimulatorFeatures
2024-02-08 15:07:54 -06:00
602be267ed
Merge branch 'release/materials_featurette' into materials_featurette/mirrors
2024-02-08 14:54:57 -06:00
c721152c44
Fix for crash in LLHeroProbeManager
2024-02-08 14:54:01 -06:00
97d2b21621
#671 Setup the viewer to respect the MirrorsEnabled simulator feature.
2024-02-08 11:39:35 -08:00
192e77344f
Make the UI conditional.
2024-02-08 10:40:56 -08:00
6248b77457
Update FMOD Studio 2.02.20 for Linux and MacOS
2024-02-08 16:21:41 +00:00
00b6060600
FIRE-33622 Italian Translation Update, by Spartaco Zemenis
2024-02-08 00:17:08 +01:00
8b85f0fbef
Update README.md and get rid of some extra spacing
2024-02-07 22:15:03 +01:00
f75616f7a2
Update README.md and use URL shortener for self compiler group since Github's markdown parser won't render it is link otherwise
2024-02-07 22:11:34 +01:00
23d44cb665
Merge remote-tracking branch 'origin/main' into release/gltf-maint2
2024-02-07 13:09:35 -08:00
4f6e3acece
Merge pull request #755 from sldevel/pbr-hdr-auto-adjust-fix
...
Confusion between light diffuse and light color in HDR auto-adjust mode
2024-02-07 14:58:44 -06:00
43b4159c8c
Merge pull request #756 from secondlife/main
...
merge main to materials_featurette
2024-02-07 14:54:11 -06:00
619bcf78f4
Merge pull request #754 from secondlife/v-711
...
secondlife/viewer#711 : Add test plan
2024-02-07 12:47:18 -08:00
1940188e75
Confusion between light diffuse and light color in HDR auto-adjust mode
...
While the SUNLIGHT_COLOR uniform is initialized with getSunlightColor() when not
auto-adjusting for HDR, it is overwritten with getSunDiffuse()*auto_adjust_factor
when auto-adjusting, causing very bad lighting discrepancies in the latter mode
(especially when not at midday or midnight).
Let's use getSunlightColor() everywhere, shall we ?...
2024-02-07 21:40:17 +01:00
c74adabdb5
secondlife/viewer#711 : Add test plan
2024-02-07 12:33:00 -08:00
37b1ea4685
Merge pull request #752 from secondlife/v-711
...
Terrain graphics feature gating
2024-02-07 10:27:13 -08:00
cae3e086ce
secondlife/viewer#711 : Bump featuretable
2024-02-07 10:17:55 -08:00
c790fe58e6
secondlife/viewer#711 : Reduce PBR terrain textures at low graphics settings
2024-02-07 10:17:55 -08:00
139c10dbeb
secondlife/viewer#711 : Add more options to drop textures from terrain, not yet used
2024-02-07 10:17:54 -08:00
78f7423bcd
secondlife/viewer#711 : More thoroughly clamp terrain PBR detail
2024-02-07 10:17:54 -08:00
e6e24556a7
Merge branch 'materials_featurette/mirrors' of https://github.com/secondlife/viewer into materials_featurette/mirrors
2024-02-07 11:20:36 -06:00
78cc23f89c
Merge branch 'release/materials_featurette' into materials_featurette/mirrors
2024-02-07 11:20:06 -06:00
e38a646018
Merge pull request #751 from secondlife/davep/655
...
#665 Make viewer respect MaxTextureResolution from SimulatorFeatures
2024-02-07 09:15:05 -08:00
7b83294216
Merge pull request #748 from secondlife/geenz/mirror-masking
...
Add mirrors prototype UI + data model
2024-02-07 11:13:45 -06:00
f0570e4edb
Merge pull request #750 from secondlife/vi-67
...
secondlife/viewer#67 : (debug) Add temporary setting to force-load PBR terrain
2024-02-07 09:12:15 -08:00
c583c666d2
secondlife/viewer#67 : (debug) Add temporary setting to force-load PBR terrain
2024-02-07 09:11:26 -08:00
4ce6b5114d
Update FMOD Studio to 2.02.20 for Windows
2024-02-07 18:10:16 +01:00
Ansariel