Ansariel
|
18903f6cac
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
# indra/llappearance/llavatarappearance.h
# indra/llimage/llimage.cpp
# indra/llmath/llvolume.cpp
# indra/llmath/llvolume.h
# indra/llprimitive/llgltfmaterial.h
# indra/llrender/llshadermgr.cpp
# indra/newview/lldynamictexture.cpp
# indra/newview/llenvironment.cpp
# indra/newview/llfetchedgltfmaterial.cpp
# indra/newview/llfloaterimagepreview.cpp
# indra/newview/llfloaterimagepreview.h
# indra/newview/llfloaterpreference.cpp
# indra/newview/llfloaterregioninfo.cpp
# indra/newview/llfloaterregioninfo.h
# indra/newview/llmaniprotate.cpp
# indra/newview/llmaniptranslate.cpp
# indra/newview/llpanelvolume.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llselectmgr.h
# indra/newview/llsurface.cpp
# indra/newview/llsurface.h
# indra/newview/llsurfacepatch.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/lltinygltfhelper.cpp
# indra/newview/llviewerregion.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llviewerwindow.h
# indra/newview/llvlcomposition.cpp
# indra/newview/llvlcomposition.h
# indra/newview/llvocache.cpp
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
|
2024-06-11 19:04:21 +02:00 |
|
Ansariel
|
a17fd2352a
|
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llcharacter/llkeyframemotion.cpp
# indra/llcharacter/llmotioncontroller.cpp
# indra/llcrashlogger/llcrashlogger.cpp
# indra/llimage/llimagetga.cpp
# indra/llmessage/llregionflags.h
# indra/llprimitive/lldaeloader.cpp
# indra/llprimitive/llmodel.cpp
# indra/llrender/llrendertarget.cpp
# indra/llui/llconsole.cpp
# indra/llui/llkeywords.cpp
# indra/llui/llscrolllistctrl.cpp
# indra/llui/lltextbase.cpp
# indra/llui/lltexteditor.cpp
# indra/llui/llurlentry.cpp
# indra/newview/llappearancemgr.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterworldmap.cpp
# indra/newview/llgiveinventory.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llpanelpeople.cpp
# indra/newview/llpanelpermissions.cpp
# indra/newview/llpanelteleporthistory.cpp
# indra/newview/llvocache.cpp
|
2024-06-09 16:11:24 +02:00 |
|
Ansariel
|
b42f9d836b
|
Re-enable a lot of compiler warnings for MSVC and address the C4267 "possible loss of precision" warnings
|
2024-06-01 15:49:26 +02:00 |
|
Ansariel
|
0ecfbc3de9
|
Merge remote-tracking branch 'LGPL/master'
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/cmake/GoogleMock.cmake
# indra/llappearance/llwearable.cpp
# indra/llcharacter/llmultigesture.cpp
# indra/llcharacter/llmultigesture.h
# indra/llimage/llimage.cpp
# indra/llimage/llimagepng.cpp
# indra/llimage/llimageworker.cpp
# indra/llmessage/tests/llmockhttpclient.h
# indra/llrender/llfontfreetype.cpp
# indra/llui/llcombobox.cpp
# indra/llui/llfolderview.cpp
# indra/llui/llfolderviewmodel.h
# indra/llui/lllineeditor.cpp
# indra/llui/lllineeditor.h
# indra/llui/lltextbase.cpp
# indra/llui/lltextbase.h
# indra/llui/lltexteditor.cpp
# indra/llui/lltextvalidate.cpp
# indra/llui/lltextvalidate.h
# indra/llui/lluictrl.h
# indra/llui/llview.cpp
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappearancemgr.cpp
# indra/newview/llappearancemgr.h
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llbreadcrumbview.cpp
# indra/newview/llbreadcrumbview.h
# indra/newview/llbreastmotion.cpp
# indra/newview/llbreastmotion.h
# indra/newview/llconversationmodel.h
# indra/newview/lldensityctrl.cpp
# indra/newview/lldensityctrl.h
# indra/newview/llface.inl
# indra/newview/llfloatereditsky.cpp
# indra/newview/llfloatereditwater.cpp
# indra/newview/llfloateremojipicker.h
# indra/newview/llfloaterimsessiontab.cpp
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/llfloaterprofiletexture.h
# indra/newview/llgesturemgr.cpp
# indra/newview/llgesturemgr.h
# indra/newview/llgroupactions.cpp
# indra/newview/llimpanel.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryclipboard.cpp
# indra/newview/llinventoryclipboard.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventoryfunctions.h
# indra/newview/llinventorygallery.cpp
# indra/newview/lllistbrowser.cpp
# indra/newview/lllistbrowser.h
# indra/newview/llpaneleditwearable.cpp
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpreviewgesture.cpp
# indra/newview/llsavedsettingsglue.cpp
# indra/newview/llsavedsettingsglue.h
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llurllineeditorctrl.cpp
# indra/newview/llvectorperfoptions.cpp
# indra/newview/llvectorperfoptions.h
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llviewertexlayer.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/macmain.h
|
2024-05-16 14:10:55 +02:00 |
|
Ansariel
|
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 |
|
Ansariel
|
f0e4dcdaf6
|
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llcommon/llthread.h
# indra/llmessage/llcachename.cpp
# indra/llui/lllineeditor.cpp
# indra/llwindow/llwindowmacosx.cpp
# indra/llwindow/llwindowwin32.cpp
# indra/newview/llchatitemscontainerctrl.cpp
# indra/newview/llfloaterimnearbychathandler.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llimprocessing.cpp
# indra/newview/llimview.cpp
# indra/newview/llnotificationhandlerutil.cpp
# indra/newview/llpaneleditwearable.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltextureview.cpp
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexture.h
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoavatar.cpp
|
2024-05-08 05:10:22 +02:00 |
|
Alexander Gavriliuk
|
f9473e8afc
|
secondlife/viewer#1333 BOOL to bool conversion leftovers: ternaries
|
2024-05-07 10:18:51 +02:00 |
|
Ansariel
|
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 |
|
Andrey Lihatskiy
|
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 |
|
Ansariel
|
eb98cb3864
|
Merge branch 'release/materials_featurette' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/lltexturectrl.cpp
|
2024-02-22 20:17:20 +01:00 |
|
Cosmic Linden
|
fc7abe8cb9
|
secondlife/viewer-issues#72: More correct interpretation of swapFBORefs
|
2024-02-21 16:06:11 -08:00 |
|
Cosmic Linden
|
589910f445
|
secondlife/viewer-issues#72: Fix material preview affecting exposure on main screen
|
2024-02-21 12:53:10 -08:00 |
|
Ansariel
|
11e9d2cdb6
|
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/featuretable.txt
# indra/newview/featuretable_mac.txt
# indra/newview/llappviewer.cpp
# indra/newview/lldrawpool.cpp
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolbump.cpp
# indra/newview/lldrawpoolmaterials.cpp
# indra/newview/llfeaturemanager.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llfloaterpreferencesgraphicsadvanced.cpp
# indra/newview/llglsandbox.cpp
# indra/newview/llperfstats.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/floater_adjust_environment.xml
# indra/newview/skins/default/xui/en/menu_viewer.xml
# indra/newview/skins/default/xui/en/notifications.xml
# indra/newview/skins/default/xui/en/panel_performance_preferences.xml
# indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
# indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
|
2023-04-29 23:32:04 +02:00 |
|
RunitaiLinden
|
a3b1d0beb6
|
SL-19197 Fix for crash in LLRenderTarget::release
|
2023-04-27 16:05:07 -05:00 |
|
Ansariel
|
45fdf20c3d
|
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
# Conflicts:
# autobuild.xml
# indra/newview/app_settings/settings.xml
# indra/newview/llviewercontrol.cpp
# indra/newview/pipeline.cpp
|
2023-04-21 18:32:34 +02:00 |
|
Ansariel
|
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 |
|
Jonathan "Geenz" Goodman
|
f4274ba64e
|
Move mipmap generation into LLRenderTarget.
DRTVWR-583
|
2023-04-14 03:08:28 -07:00 |
|
RunitaiLinden
|
5bf60f5d9e
|
SL-19538 Followup -- fix for dynamic exposure having large gaps in it… (#157)
* SL-19538 Followup -- fix for dynamic exposure having large gaps in its luminance sampling.
* SL-19538 Followup -- review feedback changes.
|
2023-04-05 16:48:34 -05:00 |
|
Ansariel
|
6cbca4da71
|
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llcommon/llprofiler.h
# indra/llcommon/lluuid.cpp
# indra/llprimitive/llmodel.cpp
# indra/llrender/llrendertarget.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/app_settings/shaders/class1/deferred/multiPointLightF.glsl
# indra/newview/app_settings/shaders/class1/deferred/pointLightF.glsl
# indra/newview/llviewerwindow.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/da/floater_about.xml
# indra/newview/skins/default/xui/de/floater_about.xml
# indra/newview/skins/default/xui/en/floater_about.xml
# indra/newview/skins/default/xui/es/floater_about.xml
# indra/newview/skins/default/xui/fr/floater_about.xml
# indra/newview/skins/default/xui/it/floater_about.xml
# indra/newview/skins/default/xui/pt/floater_about.xml
# indra/newview/skins/default/xui/ru/floater_about.xml
# indra/newview/skins/default/xui/tr/floater_about.xml
# indra/newview/skins/default/xui/zh/floater_about.xml
|
2023-02-01 11:40:17 +01:00 |
|
RunitaiLinden
|
3ef31cb9b2
|
SL-19203 et al -- Integrate SSR with reflection probes, tweak probe blending. (#63)
* SL-19203 WIP -- Integrate SSR with reflection probes. Decruft LLRenderTarget.
* SL-19203 WIP -- Re-integrate SSR. Incidental decruft.
* SL-19203 WIP -- SSR frame delta correction (still broken for Z)
* SL-19203 WIP -- SSR frame delta Z fix
* SL-19203 WIP -- Make SSR toggleable again and disable SSR in cube snapshots.
* SL-19203 WIP -- Soften sphere probe transitions and fix reflections on void water (make fallback probe a simple terrain+water+sky probe). Remove parallax correction for automatic probes to reduce artifacts.
* SL-19203 Tune probe blending.
* SL-19203 Cleanup.
|
2023-01-27 17:24:22 -06:00 |
|
Ansariel
|
75180c8746
|
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llrender/llglslshader.cpp
# indra/llrender/llrender.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llrender/llvertexbuffer.h
# indra/newview/lldrawpool.cpp
# indra/newview/lldrawpoolbump.cpp
# indra/newview/lldrawpoolmaterials.cpp
# indra/newview/llfilepicker.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/pipeline.cpp
# indra/newview/pipeline.h
|
2023-01-12 12:08:46 +01:00 |
|
Dave Parks
|
a2d17d3c1e
|
SL-18869 Optimizations -- Decruftify LLRenderTarget, use a shader to copy color/depth instead of glCopyTexSubImage or glBlitFrameBuffer
|
2023-01-09 18:12:54 -06:00 |
|
Ansariel
|
0ae0cd0c88
|
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llrender/llrendertarget.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llviewercontrol.cpp
|
2022-10-24 20:01:04 +02:00 |
|
Ansariel
|
a1090f5f5d
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llrender/llrendertarget.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/quickprefs.cpp
|
2022-10-24 19:54:30 +02:00 |
|
Ansariel
|
5763aa32cc
|
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
# indra/newview/llreflectionmapmanager.cpp
# indra/newview/llsettingsvo.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/pipeline.cpp
|
2022-10-12 16:25:18 +02:00 |
|
Dave Parks
|
9448db5d4a
|
SL-18190 Water shader WIP. Better parallax correction for sphere probes. Reduce probe memory footprint. Remove framebuffer copies and move to deprecate stencil buffer usage.
|
2022-10-06 18:40:01 -05:00 |
|
Dave Parks
|
30bcc7d6d5
|
SL-18190 WIP - Add refraction to water without splitting scene between above and below water
|
2022-10-05 08:11:33 -05:00 |
|
Ansariel
|
87501c03ae
|
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
# indra/llrender/llrender2dutils.cpp
# indra/newview/llreflectionmapmanager.cpp
# indra/newview/llviewershadermgr.cpp
# indra/newview/llviewershadermgr.h
|
2022-09-20 11:37:09 +02:00 |
|
Dave Parks
|
a5233ed774
|
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
|
2022-09-19 17:27:41 -05:00 |
|
Dave Parks
|
04d3a29a69
|
SL-18190 Faster better stronger radiance/irradiance maps
|
2022-09-19 17:27:33 -05:00 |
|
Howard (Aech Linden) Stearns
|
718073717c
|
SL-18128, SL-18128 - No glerror on Mac!
|
2022-09-19 12:16:49 -07:00 |
|
Ansariel
|
9756e0e89e
|
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llrender/llimagegl.cpp
# indra/llrender/llrender.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/lldynamictexture.cpp
# indra/newview/llface.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerwindow.cpp
|
2022-09-17 12:02:14 +02:00 |
|
Dave Parks
|
8dc59e5ef3
|
SL-18128 Clear out much OpenGL cruft and switch to core profile on AMD
|
2022-09-16 16:25:26 -05:00 |
|
Ansariel
|
1f176fdc18
|
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
# indra/llmath/llvolume.cpp
# indra/llrender/llglslshader.cpp
# indra/llrender/llpostprocess.cpp
# indra/llrender/llrender.cpp
# indra/newview/llpanelface.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/llvieweroctree.cpp
# indra/newview/llviewershadermgr.cpp
# indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
|
2022-09-13 20:11:44 +02:00 |
|
Howard Stearns
|
2082443220
|
SL-17967 - Git rid of ARB that is in core
|
2022-09-01 10:58:27 -07:00 |
|
Ansariel
|
6259666be0
|
Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
# indra/llmath/lloctree.h
# indra/llmath/llvolume.cpp
# indra/llrender/llgl.cpp
# indra/newview/installers/windows/installer_template.nsi
# indra/newview/installers/windows/lang_da.nsi
# indra/newview/installers/windows/lang_de.nsi
# indra/newview/installers/windows/lang_en-us.nsi
# indra/newview/installers/windows/lang_es.nsi
# indra/newview/installers/windows/lang_fr.nsi
# indra/newview/installers/windows/lang_it.nsi
# indra/newview/installers/windows/lang_ja.nsi
# indra/newview/installers/windows/lang_pl.nsi
# indra/newview/installers/windows/lang_pt-br.nsi
# indra/newview/installers/windows/lang_ru.nsi
# indra/newview/installers/windows/lang_tr.nsi
# indra/newview/installers/windows/lang_zh.nsi
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llvovolume.cpp
|
2022-06-22 21:11:47 +02:00 |
|
Andrey Kleshchev
|
ed36165f29
|
SL-17584 Frame buffer object is now nessesary to run viewer
|
2022-06-15 18:03:11 +03:00 |
|
Ansariel
|
8e4abf8ea3
|
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
|
2022-06-10 13:52:52 +02:00 |
|
Dave Parks
|
509476f95e
|
SL-17574 Add probe detail combo box to advanced graphics preferences. Fix spot light shadows not working in probes.
|
2022-06-10 01:13:41 -05:00 |
|
Ansariel
|
3765c775cb
|
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
|
2022-05-21 15:04:54 +02:00 |
|
Dave Parks
|
6eaf8521ab
|
SL-17287 Instrument and optimize cubemap render. Fix for cubemap snapshots doing a full resolution render instead of a 512x512 render.
|
2022-05-20 19:05:28 -05:00 |
|
Dave Parks
|
6c6d9a10f8
|
SL-17287 Update Tracy to 0.8.1. Clean up GPU instrumentation.
|
2022-05-20 13:31:18 -05:00 |
|
Dave Parks
|
93260cfeff
|
SL-17283 LLReflectionMapManager prototype. Remove snapshot code related overhead from reflection map renders. Add parallax correction and support for multiple reflection maps.
|
2022-05-04 16:07:50 +00:00 |
|
Ansariel
|
63c8280325
|
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
|
2022-03-08 16:20:47 +01:00 |
|
Dave Parks
|
9dc8fee0f5
|
SL-16928 Fix for broken bumpmaps on Intel GPUs
|
2022-03-04 17:05:05 -06:00 |
|
Beq
|
0911cae538
|
Initial merge of DRTVWR-541 into FS
Fixup a few niggly mistakes from the LL work
Add a couple of missing macros
replace all FS tracy macros with the corresponding LL ones.
|
2021-10-09 20:18:14 +01:00 |
|
Ptolemy
|
a35544c701
|
SL-16027: Add Tracy OpenGL support
|
2021-09-21 16:10:52 -07:00 |
|
Ansariel
|
3d37c73654
|
Merge branch 'DRTVWR-497' of https://bitbucket.org/lindenlab/viewer
|
2020-06-17 12:10:58 +02:00 |
|
Dave Houlton
|
84d3065596
|
SL-13281, add missing srgb->linear conversion for specular
|
2020-06-11 23:33:14 +03:00 |
|
Ansariel
|
c7eddc5fd9
|
Remove Nicky's Intel fix in favor of upcoming changes from LL
|
2019-07-20 14:08:54 +02:00 |