livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
70,029 Commits
2 Branches
0 Tags
297 MiB
Commit Graph

169 Commits (f3fa991d2ccfb5ff969edbd77b9c6b2d5010fb45)

Author SHA1 Message Date
Ansariel 1bdfb7df70 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-11-01 15:16:40 +01:00
Beq 452f8fd9a0 clean up log tab output for mesh optimiser logs 2022-10-31 20:37:51 +00:00
Ansariel 8b0d341aca Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-10-21 12:34:53 +02:00
Ansariel 2b65ae8215 Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer 2022-10-15 17:33:22 +02:00
Andrey Kleshchev e8af383b2d SL-18351 Better meshoptimizer fallback handling 2022-10-11 23:04:42 +03: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
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
Ansariel b6007f059b Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-08-02 14:35: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
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
Ansariel 34064a7c28 Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer 2022-05-19 21:22:11 +02:00
Howard Stearns 87e7b732ba SL-98-a - fix jumping ground plane 2022-05-16 11:39:04 -07:00
Ansariel a3f0779309 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-05-05 11:21:37 +02:00
Ansariel a4d60d06ec Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-05-05 10:43:31 +02:00
Ansariel 6e83be2167 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-04-29 14:27:09 +02:00
Beq ecb13170f5 [FIRE-31602] Add physics warning when model dimensions are too thin 2022-04-28 17:57:36 +01:00
Ansariel f9f11a7782 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-04-19 18:40:01 +02:00
Ansariel a775b9fc7f Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2022-04-19 15:49:47 +02:00
Ansariel b8b0c8ec3b Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-04-19 15:42:14 +02:00
Ansariel ac2ee57edb Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/cmake/FMODSTUDIO.cmake
#	indra/llaudio/llaudioengine_fmodstudio.cpp
#	indra/llaudio/llstreamingaudio_fmodstudio.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llfloatersearch.cpp
#	indra/newview/llgroupactions.cpp
#	indra/newview/lllocationinputctrl.h
#	indra/newview/llnavigationbar.cpp
#	indra/newview/llnavigationbar.h
#	indra/newview/viewer_manifest.py
#	indra/viewer_components/login/lllogin.cpp
 2022-04-19 15:27:35 +02:00
Ansariel 2daf0cb2fd Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llfloatersearch.cpp
#	indra/newview/llgroupactions.cpp
#	indra/newview/llvovolume.cpp
 2022-04-19 14:24:09 +02:00
Ansariel 07040f7eb0 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-04-19 00:15:01 +02:00
Andrey Kleshchev ce4c694b66 Merge branch master (D540) into DRTVWR-546 
# Conflicts:
#	indra/llcommon/llsdutil.cpp
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/lldrawpoolalpha.cpp
#	indra/newview/lldrawpoolwater.cpp
 2022-04-18 23:42:39 +03:00
Andrey Lihatskiy 026ad511ea Merge branch 'master' into DRTVWR-544-maint 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llfloatersearch.cpp
#	indra/newview/llgroupactions.cpp
#	indra/newview/llvovolume.cpp
 2022-04-18 20:43:49 +03:00
Andrey Lihatskiy 16494f4400 Merge branch 'master' into DRTVWR-548-maint-N 2022-04-18 20:38:56 +03:00
Andrey Kleshchev 84e22d410e SL-17121 Fix error threshold value 2022-04-01 22:32:57 +03:00
Andrey Kleshchev 14e792766e SL-17121 Adjust uploader for possible 0 input. 2022-04-01 01:39:35 +03:00
Andrey Kleshchev 7f0e62ea9e SL-17121 Revert "SL-15940 Remove ability to set zero triangle limit" 
This reverts commit b45c0e3ed9.
 2022-04-01 00:53:52 +03:00