Ansariel
|
b4fde14f09
|
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llrender/llimagegl.cpp
# indra/llrender/llrender.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llrender/llvertexbuffer.h
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/lldrawpool.cpp
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpoolbump.cpp
# indra/newview/lldrawpooltree.cpp
# indra/newview/llface.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llspatialpartition.h
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
|
2023-01-19 23:04:50 +01:00 |
|
RunitaiLinden
|
7bd9d21e19
|
Optimizations, decruft, and intel compatibility pass (#53)
SL-18869, SL-18772 Overhaul VBO management, restore occlusion culling, intel compatibility pass, etc
|
2023-01-19 09:13:45 -06:00 |
|
Ansariel
|
b48f34b24c
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2022-11-01 14:04:55 +01:00 |
|
Beq
|
452f8fd9a0
|
clean up log tab output for mesh optimiser logs
|
2022-10-31 20:37:51 +00: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 |
|
Andrey Kleshchev
|
24fb2f8336
|
Merge branch 'master' (DRTVWR-548) into DRTVWR-559
# 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/llfloaterpreference.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
|
2022-10-21 18:19:27 +03:00 |
|
Ansariel
|
c3eb62664b
|
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/app_settings/shaders/class1/deferred/fullbrightShinyV.glsl
# indra/newview/featuretable.txt
# indra/newview/featuretable_mac.txt
# indra/newview/llpanelface.cpp
# indra/newview/llreflectionmapmanager.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
|
2022-09-26 15:21:07 +02:00 |
|
Dave Parks
|
75de4d3276
|
SL-18156 Cleanup of MikktSpace integration, apply MikktSpace tangents to all meshes.
|
2022-09-23 12:53:24 -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
|
54e6c554c5
|
Fix for crash when loading dae
|
2022-09-17 13:53:37 -05:00 |
|
Andrey Kleshchev
|
7649114588
|
Merge branch master (DRTVWR-571) into DRTVWR-559
# Conflicts:
# indra/newview/llpanelface.cpp
# indra/newview/llpanelface.h
|
2022-09-16 21:07:39 +03:00 |
|
Ansariel
|
5a78473123
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
# indra/newview/app_settings/settings.xml
# indra/newview/llpanelface.cpp
# indra/newview/llpanelface.h
# indra/newview/skins/default/xui/en/menu_viewer.xml
|
2022-09-16 11:23:28 +02:00 |
|
Ansariel
|
5178e59b59
|
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
|
2022-09-16 09:37:16 +02:00 |
|
Dave Parks
|
82ab5f9765
|
SL-18156 WIP -- Add NormalizedScale/NormalizedTranslation to mesh assets to recover mesh's original coordinate frame when generating tangents post download.
|
2022-09-15 17:23:34 -05:00 |
|
Ansariel
|
656dd12dfc
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
# indra/newview/llmodelpreview.h
|
2022-09-15 20:35:44 +02:00 |
|
Andrey Lihatskiy
|
329268c5f7
|
Merge branch 'master' into DRTVWR-548-maint-N
# Conflicts:
# indra/newview/llmodelpreview.h
|
2022-09-15 20:44:04 +03: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 |
|
Dave Parks
|
e49d602bd9
|
SL-18095 Add tangents to mesh assets so we can calculate mikktspace tangents in the mesh's original coordinate frame.
|
2022-09-12 19:48:33 -05:00 |
|
Brad Kittenbrink
|
38208441db
|
Merge remote-tracking branch 'origin/master' into DRTVWR-559
|
2022-08-04 10:59:26 -07:00 |
|
Ansariel
|
480c549ee0
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2022-08-04 15:25:54 +02:00 |
|
Ansariel
|
49b6f9b312
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2022-08-04 14:52:20 +02:00 |
|
Ansariel
|
6d09c9ff89
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2022-08-04 12:37:05 +02:00 |
|
Andrey Lihatskiy
|
59ab8e78f4
|
Merge branch 'master' into DRTVWR-544-maint
# Conflicts:
# indra/newview/llpanelface.cpp
# indra/newview/llpanelface.h
# indra/newview/llpanelobject.cpp
|
2022-08-04 00:17:55 +03:00 |
|
Andrey Lihatskiy
|
ea26ee5e92
|
Merge branch 'master' into DRTVWR-548-maint-N
# Conflicts:
# indra/newview/llfloaterworldmap.cpp
# indra/newview/llvovolume.cpp
|
2022-08-04 00:15:36 +03:00 |
|
Ansariel
|
b6007f059b
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2022-08-02 14:35:55 +02:00 |
|
Ansariel
|
ede1eb93ab
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2022-08-02 13:55:55 +02:00 |
|
Ansariel
|
b7d3cab3f2
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2022-08-02 12:51:12 +02:00 |
|
Ansariel
|
d7953c1e94
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2022-08-02 12:03:54 +02:00 |
|
Ansariel
|
ff45c6b438
|
Probably meant this...
|
2022-08-01 12:17:10 +02:00 |
|
Beq
|
00875f93d0
|
Restore GLOD alongside MeshOpt
|
2022-07-31 22:11:35 +01:00 |
|
Ansariel
|
61119c137b
|
Merge branch 'DRTVWR-561-maint-O' of https://bitbucket.org/lindenlab/viewer
|
2022-07-16 14:25:37 +02:00 |
|
Andrey Kleshchev
|
2cf9f046a6
|
SL-17545 lodQueryCallback should quit as soon as it is done
|
2022-07-07 20:50:56 +03:00 |
|
Andrey Kleshchev
|
3dcdc4c85a
|
SL-17545 fix double-scheduling of calculations
|
2022-07-06 15:57:58 +03:00 |
|
Andrey Kleshchev
|
429274c468
|
SL-17545 Recalculate lods when replacing high lod with something incompatible
|
2022-07-04 21:40:31 +03:00 |
|
Ansariel
|
d5501d459b
|
Merge branch 'DRTVWR-561-maint-O' of https://bitbucket.org/lindenlab/viewer
|
2022-07-01 11:36:10 +02:00 |
|
Ansariel
|
fc11575657
|
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
|
2022-06-29 20:28:29 +02: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 |
|
Maxim Nikolenko
|
076a895062
|
SL-17635 remove unused variables
|
2022-06-21 17:55:29 +03:00 |
|
Ansariel
|
a829354551
|
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546
|
2022-06-15 09:30:07 +02:00 |
|
Andrey Kleshchev
|
b1cbf369cf
|
SL-17475 Use a shadow indices buffer before simplification
|
2022-06-14 21:41:27 +03:00 |
|
Andrey Kleshchev
|
45bcefd981
|
SL-17475 fix remap causing an assert
|
2022-06-14 16:40:56 +03:00 |
|
Andrey Kleshchev
|
b08340f183
|
SL-17475 Remap models before simplification
|
2022-06-11 10:23:46 +03:00 |
|
Ansariel
|
8e4abf8ea3
|
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
|
2022-06-10 13:52:52 +02:00 |
|
Dave Houlton
|
8c0163bcb4
|
SL-17214 initial loader class skeleton
|
2022-06-08 13:33:59 -06:00 |
|
Beq
|
a064407647
|
Add feedback from MeshOptimiser into the log tab
|
2022-06-07 16:37:48 +01:00 |
|
Beq
|
16b63a990e
|
Allow user to configure LOD suffixes to suit their workflow.
|
2022-06-05 22:26:52 +01:00 |
|
Andrey Lihatskiy
|
9b0569840f
|
Merge branch 'master' into DRTVWR-544-maint
# Conflicts:
# indra/llprimitive/llmodel.cpp
# indra/llprimitive/llmodel.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
|
2022-05-31 01:58:09 +03:00 |
|
Ansariel
|
7d7aff4377
|
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546
# Conflicts:
# indra/llprimitive/llmodel.cpp
# indra/llprimitive/llmodel.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/llinventorymodel.h
|
2022-05-28 23:00:17 +02:00 |
|
Ansariel
|
5cdd8cdb6e
|
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546
|
2022-05-26 11:43:21 +02:00 |
|
Andrey Lihatskiy
|
91606c7b60
|
Merge branch 'master' into DRTVWR-548-maint-N
|
2022-05-26 03:07:05 +03:00 |