343aeeeb36
Merge remote-tracking branch 'LGPL/master'
...
# Conflicts:
# doc/contributions.txt
# indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
2024-05-16 02:11:51 +02:00
5f1a19af72
Merge remote-tracking branch 'LL/marchcat/x-ws-merge'
...
# Conflicts:
# autobuild.xml
# indra/linux_crash_logger/llcrashloggerlinux.cpp
# indra/newview/llappviewerlinux_api.h
# indra/newview/llappviewerlinux_api_dbus.cpp
# indra/newview/llappviewerlinux_api_dbus.h
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llcallbacklist.cpp
# indra/newview/llimpanel.h
2024-05-01 12:30:57 +02:00
1b68f71348
#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed
2024-04-29 07:56:09 +03:00
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
b2462355a3
#677 WIP -- add mirror clipping to more shaders
2024-02-01 13:19:20 -06:00
a666e640c8
Merge branch 'DRTVWR-596' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llwindow/llwindowwin32.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/skins/default/xui/en/notifications.xml
2023-12-08 00:10:01 +01:00
964f9e74d5
SL-20611 followup -- remove now unused glsl files. Fix transparent water.
2023-11-17 10:10:58 -06:00
1d8360e8bb
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/app_settings/shaders/class1/objects/previewV.glsl
# indra/newview/featuretable.txt
# indra/newview/featuretable_mac.txt
# indra/newview/llmodelpreview.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewershadermgr.cpp
2023-07-04 14:18:58 +02:00
8d17467f7f
SL-19884 Fix for garbled rigged meshes in model import preview window.
2023-06-27 18:49:36 -05:00
9d4eb9362e
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewershadermgr.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/menu_viewer.xml
2023-05-19 11:27:04 +02:00
c827d32ebe
SL-19655 Decruft legacy GLSL shaders and now unused build queues.
2023-05-17 18:09:36 -05:00
9ffb2514db
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/cmake/00-Common.cmake
# indra/newview/app_settings/settings.xml
# indra/newview/installers/windows/installer_template.nsi
# indra/newview/llviewermenu.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/menu_viewer.xml
2023-04-17 10:01:32 +02:00
bb79718c8f
SL-19538 Followup -- scrub all possible sources of NaNs, make dynamic exposure controls not persist, limit exposure range, and do a debug gl pass.
2023-04-06 13:21:25 -05:00
8385b6a7dd
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/pipeline.cpp
# indra/newview/pipeline.h
2023-02-10 11:30:38 +01:00
a2647e953a
SL-18229 Fix for PBR materials on HUDs misbehaving. Incidental decruft.
2023-02-07 18:25:22 -06:00
ca5c9c9215
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/app_settings/shaders/class1/deferred/multiSpotLightF.glsl
# indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
# indra/newview/app_settings/shaders/class1/deferred/spotLightF.glsl
# indra/newview/lldrawpoolbump.cpp
# indra/newview/lldrawpoolground.cpp
# indra/newview/lldrawpoolterrain.cpp
# indra/newview/lldrawpooltree.cpp
# indra/newview/llviewershadermgr.cpp
2023-02-04 15:17:29 +01:00
1c2410b8af
SL-19148 Decruft followthrough -- decruft shader tree and some remaining forward rendering code.
2023-02-03 19:45:31 -06:00
830cb6b665
SL-19148 Decruft some forward shaders and drawpools. Fix HUDs being in wrong color space.
2023-02-03 17:18:39 -06:00
13a509fe05
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# .gitignore
# autobuild.xml
# indra/llwindow/llwindow.cpp
# indra/llwindow/llwindow.h
# indra/llwindow/llwindowwin32.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/llfloaterpreference.cpp
# indra/newview/llpanelface.h
# indra/newview/llviewerregion.h
# indra/newview/llviewerwindow.cpp
2022-11-30 22:51:52 +01:00
02c71b0ac2
Merge branch 'master' v 6.6.1 into DRTVWR-528
2022-05-26 11:18:44 -06:00
6f8175acd7
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2022-05-19 21:27:53 +02:00
c7ddba7eb4
SL-17417 Fix for incorrect reflection orientation on some moving child prims.
2022-05-16 16:02:38 -05:00
410704b5c6
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2022-05-03 11:37:50 +02:00
436544a51a
SL-17086 Fix for bad lighting in upload preview render.
2022-04-26 14:43:55 -05:00
a775b9fc7f
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2022-04-19 15:49:47 +02:00
43069379a2
SL-16993: Add new shaders for physics hull
2022-03-18 19:58:38 -07:00
d881fa40d3
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2021-11-20 22:35:31 +01:00
28f9fb06a9
SL-16289 Rigged mesh rendering overhaul
2021-11-20 18:49:19 +00:00
b979ddef7d
FIRE-30979 Fix Ambient Lighting in Mesh preview
...
and a couple of typo fixes
2021-05-28 03:58:37 +01:00
e745da0c0b
DRTVWR-528, delete all unreferenced shader files, improve dev QoL
2021-03-18 18:05:30 -06:00
f4f7b9d35b
More stabbing at the mesh uploader and upstream sync
2020-10-27 23:10:44 +01:00
ffaa950312
Various fixes and repairs to mesh uploader
...
* re-establish proper shading of degenerate triangles in phsyics
* restore configurable settings
* fix shader lighting and re-align default base colour to not be overexposed.
2020-10-27 21:36:40 +00:00
4fc76ed738
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-09-29 13:20:36 +02:00
663a6dc2c3
Merged master(DRTVWR-497) into DRTVWR-482
2020-09-28 21:21:20 +03:00
462234bd8c
Merge branch 'DRTVWR-497' of https://bitbucket.org/lindenlab/viewer
2020-06-25 00:05:35 +02:00
e7883022b2
SL-9632 Fix HUD objects to not use environment lighting
2020-06-19 15:52:19 -07:00
f854e95116
SL-9632: Fix most HUD objects incorrectly being effected by the environment lighting
2020-06-19 15:52:08 -07:00
73cbce5b02
Merge branch 'DRTVWR-482' of https://bitbucket.org/lindenlab/viewer
2020-04-23 18:40:28 +02:00
d38fd1e7c3
SL-13081 Model is unnaturally grey
2020-04-21 18:55:29 +03:00
a4b1c0330a
Merge branch 'master' into DRTVWR-482
...
# Conflicts:
# indra/newview/app_settings/shaders/class1/objects/previewV.glsl
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloatermodelpreview.cpp
2020-04-21 13:12:05 +03:00
12c68bac09
Merge branch 'DRTVWR-440' of https://bitbucket.org/lindenlab/viewer
2020-04-08 08:13:48 +02:00
9e8e623197
SL-10449, add missing linkage variable, fix OSX & Intel deferred shaders comp
2020-04-07 14:23:24 -07:00
ccea567c08
Merge viewer-eep
2019-06-19 20:20:14 +02:00
a7856d4fc5
SL-11374
...
Use color channel for trees instead of shenanigans to get proper diffuse colors to shaders.
Remove fudge factors on density modifier in class1 sky.
2019-06-06 14:34:14 -07:00
3d9bd0fb82
SL-10969, SL-11073
...
Modify forward projector lighting to use falloff like the deferred lights.
Make tex cache not evaluate evictions for size during validation passes.
2019-05-28 14:36:00 -07:00
e6970af7a1
Merge Firestorm LGPL
2019-05-09 19:52:27 +02:00
08f138ab66
Merge viewer-eep
2019-05-02 16:55:26 +02:00
f133be068a
Lighting WIP
...
Consistency across class2/3/ALM lighting.
2019-04-26 16:02:21 -07:00
59a12684a0
Merge Firestorm LGPL
2019-01-26 00:05:24 +01:00
76369c2463
SL-10288 comments cleanup
2019-01-03 14:30:01 +02:00
Ansariel