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

131 Commits (b7d3cab3f28b6bf550f2bd9a4c0160b4a0a7b29e)

Author SHA1 Message Date
Ansariel b7d3cab3f2 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-08-02 12:51:12 +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 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
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
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 a3f0779309 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-05-05 11:21:37 +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 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 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
Ansariel 81ec1bfb81 Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer 2022-03-31 12:13:57 +02:00
Beq b93ebdbe45 [BUG-231970] Fix for mesh uploader preview not refreshing 2022-03-28 01:30:18 +01:00
Ptolemy bcd37186f1 SL-16993: Fix Model Upload Physics Analyze rendering physics hull as black mesh 2022-03-18 19:54:27 -07:00
Mnikolenko Productengine 0b56a3da94 SL-16980 FIXED Uploading model preview disappeared after changing the Triangle limit 2022-03-09 23:53:20 +02:00
Ansariel 63c8280325 Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2022-03-08 16:20:47 +01:00
Andrey Kleshchev c012e872a2 SL-3787 Fallback in case meshopt precise simplification methd fails entirely 2022-03-07 17:03:23 +02:00
Howard Stearns 340213b302 SL-9748 - Only supply a default physics shape if it is named default_physics_shape 2022-03-03 18:56:52 -08:00
Howard Stearns 239a29ab5c SL-9748 - more cases 2022-03-02 17:39:12 -08:00
Ansariel cc95d520b4 Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	autobuild.xml
#	indra/newview/lldrawpoolavatar.cpp
#	indra/newview/llfloatermodelpreview.cpp
#	indra/newview/llspatialpartition.h
#	indra/newview/llvovolume.cpp
 2022-03-02 10:31:44 +01:00
Ansariel ef88337eef Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	autobuild.xml
#	doc/contributions.txt
#	indra/llcommon/tests/llprocess_test.cpp
#	indra/newview/lldrawpoolavatar.cpp
#	indra/newview/llfloatermodelpreview.cpp
#	indra/newview/llmodelpreview.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/viewer_manifest.py
 2022-03-02 10:12:19 +01:00
Andrey Kleshchev 97a103255e Merge branch 'master' (DRTVWR-557) into DRTVWR-546 
# Conflicts:
#	autobuild.xml
#	doc/contributions.txt
#	indra/cmake/GLOD.cmake
#	indra/llcommon/tests/llprocess_test.cpp
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/lldrawpoolavatar.cpp
#	indra/newview/llfloatermodelpreview.cpp
#	indra/newview/llmodelpreview.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/viewer_manifest.py
 2022-03-01 13:41:42 +02:00
Ansariel 25f974d77d Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-03-01 10:00:36 +01:00
Howard Stearns 130d0c0704 Merge branch 'master' of bitbucket.org:lindenlab/viewer into SL-9749 2022-02-28 15:54:23 -08:00
Howard Stearns 932b7de530 SL-9748 - Handle submesh case of resuseable physics model. 2022-02-28 15:47:56 -08:00
Andrey Lihatskiy 73eec89131 Merge branch 'master' into DRTVWR-540-maint 
# Conflicts:
#	autobuild.xml
#	indra/llcommon/llsys.cpp
#	indra/newview/app_settings/key_bindings.xml
#	indra/newview/llfloatereditextdaycycle.cpp
 2022-02-28 21:54:21 +02:00
Howard Stearns 9210ec8a82 SL-9748 - Apply explicitly given physics shape only if the usual rules do not. 2022-02-25 18:32:55 -08:00
Andrey Kleshchev 92c302d6fb SL-15940 Verify triangle limit 
to not trigger an assert inside meshoptimizer
 2022-02-25 18:56:54 +02:00
Andrey Kleshchev c141ecdcc2 SL-3787 Fixed sloppy mode returning invalid model 
In automatic mode for simple models gradualy increase sloppy decimator until something valid is found.
 2022-02-25 13:51:19 +02:00
Andrey Kleshchev 21baea0907 SL-3787 Fixed mesh uploader LoD generation returning worse results than higher lod 2022-02-24 14:42:04 +02:00
Ansariel d06070241a Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	autobuild.xml
#	indra/cmake/00-Common.cmake
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappviewer.cpp
#	indra/newview/lldrawpoolavatar.cpp
#	indra/newview/llvovolume.cpp
 2021-12-16 10:09:12 +01:00
Ansariel 47e2173239 Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/llrender/llgl.cpp
#	indra/llwindow/llwindowwin32.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/featuretable.txt
#	indra/newview/featuretable_mac.txt
#	indra/newview/lldrawpoolalpha.cpp
#	indra/newview/lldynamictexture.cpp
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/pipeline.cpp
#	indra/newview/pipeline.h
 2021-12-16 08:42:54 +01:00
Andrey Kleshchev 2d0d7c71e6 SL-16485 Crash at memcpyNonAliased16 2021-12-15 14:40:44 +02:00
Andrey Kleshchev 0a9ade4687 SL-16479 'sloppy' precision in automated mode. 2021-12-09 21:17:57 +02:00
Andrey Kleshchev 9e38e5a187 SL-16471 Removed unneeded MeshOpt generation method 2021-12-09 00:33:57 +02:00
Ansariel ffa26108ee This refresh is most likely unnecessary now GLOD is gone 2021-12-03 18:27:01 +01:00
Ansariel 381f8936f0 Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/llrender/llrender.h
#	indra/newview/lldrawpoolalpha.cpp
#	indra/newview/lldrawpoolbump.cpp
#	indra/newview/lldrawpooltree.cpp
#	indra/newview/llmodelpreview.cpp
#	indra/newview/llviewertexture.cpp
 2021-12-03 18:23:05 +01:00
Andrey Kleshchev 2ed229473d SL-14403 Remove unused shader binds 
remains from glod
 2021-12-02 17:35:03 +02:00
Andrey Kleshchev 1cd1d3fbe2 SL-16420 Upload's physics LODs are broken in preview #2 2021-12-02 02:28:29 +02:00