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

831 Commits (4c2d4e32addd95dedf01acf254db9b41b0813fdb)

Author SHA1 Message Date
Andrey Kleshchev 563c35e1b4 Issue#894 Crash at load3 in cacheOptimize 2024-02-27 17:14:03 +02:00
Cosmic Linden 07a830a4ce SL-20062: Fix near clip on reflection probes being clamped to at or below 10 2023-10-12 13:02:23 -07:00
Cosmic Linden a280bacfea SL-20157: Fix scale of avatar mesh parts when mikktspace tangent generation fails 2023-09-12 10:50:26 -07:00
Cosmic Linden 59a626c2a2 SL-19992: Fix assert in LLVolumeLODGroup::refLOD when LLMeshRepository::notifyMeshUnavailable is called on the highest LOD 2023-07-11 16:28:36 -07:00
Andrey Kleshchev ca84e0e0c0 SL-5161 Avatars should stay hidden longer if they are waiting for meshes or skin data 2023-06-23 13:01:19 +03:00
Brad Linden 2f44377b3e Merge remote-tracking branch 'origin/main' into DRTVWR-559 2023-05-17 11:17:48 -07:00
RunitaiLinden 1cadfd44fe DRTVWR-559 WIP - optimize ARC calculation et al. 2023-05-03 17:30:02 -05:00
RunitaiLinden 6c5b907670 SL-19358 Fix for explody meshes. 2023-04-13 19:41:11 -05:00
Brad Linden a548c16989 Merge remote-tracking branch 'origin/main' into DRTVWR-559 2023-03-29 14:54:06 -07:00
Andrey Lihatskiy 5217e6bfb7 Merge branch 'main' into DRTVWR-577-maint-S 
# Conflicts:
#	indra/cmake/CMakeLists.txt
#	indra/newview/skins/default/xui/es/floater_tools.xml
 2023-03-30 00:25:16 +03:00
Dave Parks 5882215a6d SL-19321 Optimization pass -- Remove another shadow split from probe render, incidental decruft. 2023-03-24 14:33:41 -05:00
Andrey Lihatskiy dca3c83cd9 Merge branch 'DRTVWR-568' into DRTVWR-573-maint-R 
# Conflicts:
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/cmake/FindOpenJPEG.cmake
#	indra/cmake/OpenJPEG.cmake
#	indra/integration_tests/llui_libtest/CMakeLists.txt
#	indra/newview/CMakeLists.txt
 2023-03-20 01:23:16 +02:00
Rye Mutt 3377b19de4
Fix double copy of tangents array (#107) 2023-03-06 09:15:38 -06:00
Andrey Kleshchev 6c54c9f8a9 Merge branch 'main' into DRTVWR-577-maint-S 
# Conflicts:
#	indra/llcommon/llsdserialize.cpp
#	indra/llcommon/llsdserialize.h
#	indra/newview/llfilepicker.h
#	indra/newview/llfilepicker_mac.h
#	indra/newview/llfilepicker_mac.mm
 2023-02-09 22:33:52 +02:00
Brad Linden 5fabfa50d7 Merge remote-tracking branch 'origin/main' into DRTVWR-559 2023-02-02 12:11:40 -08:00
Brad Linden eb526fec0a Merge remote-tracking branch 'origin/main' into DRTVWR-559 2022-12-12 17:59:34 -08:00
Callum Prentice f7838ca17c Merge branch 'main' into DRTVWR-568 2022-12-12 11:13:10 -08:00
Andrey Lihatskiy f836194516 Merge branch 'main' into DRTVWR-570-maint-Q 
# Conflicts:
#	doc/contributions.txt
#	indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
#	indra/newview/llfloater360capture.cpp
 2022-12-12 20:53:11 +02:00
Nat Goodspeed 12f66fda13 DRTVWR-565: Merge branch 'origin/contribute' into DRTVWR-565 2022-12-12 13:27:57 -05:00
Nat Goodspeed 5a74f7648a DRTVWR-575: A few more tweaks addressing size_t wider than 32 bits. 2022-11-03 15:18:32 -04:00
Callum Linden 80585d56fd Merge master into DRTVWR-568 (and fix conflicts) 2022-10-24 17:48:16 -07: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
Andrey Lihatskiy e0ace0c722 Merge branch 'master' into DRTVWR-570-maint-Q 
# Conflicts:
# indra/newview/llnetmap.cpp
# indra/newview/llnetmap.h
 2022-10-20 22:34:11 +03:00
Andrey Lihatskiy 97b676b60f Merge branch 'master' into DRTVWR-565-maint-P 2022-10-20 21:43:54 +03:00
Dave Parks f6762c3de5 SL-18105 Add to/from json capability to LLGLTFMaterial 2022-10-14 17:35:48 -05:00
Dave Parks 598c953d54 SL-18190 Fix for assert on 360 snapshot and ? fix for mac build ? 2022-10-12 18:49:18 -05:00
Brad Kittenbrink f2867c71db Better fix for DRTVWR-559 mac build breakage 2022-09-29 13:58:05 -07:00
Brad Kittenbrink 5c83ac76b5 fix for mac build breakage DRTVWR-559 2022-09-29 13:24:38 -07:00
Dave Parks 2e499bcc40 SL-18190 Prune srgb_to_linear from atmosphericsFuncs.glsl 2022-09-28 19:14:00 -05:00
Rye Mutt 1b31ab5c52 Introduce a U8* based interface to unzip_llsd and unpackVolumeFaces 2022-09-27 17:59:21 -04:00
Dave Parks 75de4d3276 SL-18156 Cleanup of MikktSpace integration, apply MikktSpace tangents to all meshes. 2022-09-23 12:53:24 -05:00
Dave Parks 09f3d6eaee Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559 2022-09-16 16:25:38 -05: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
Nicky Dasmijn 0710d95f4b Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into DRTVWR-568_cmake 2022-09-16 23:15:49 +02: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
Callum Linden f08f20db5f Merge branch 'master' into DRTVWR-568 2022-09-15 17:00:34 -07: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
Andrey Lihatskiy 329268c5f7 Merge branch 'master' into DRTVWR-548-maint-N 
# Conflicts:
#	indra/newview/llmodelpreview.h
 2022-09-15 20:44:04 +03:00
Andrey Lihatskiy b5861e58cb Merge branch 'master' into DRTVWR-565-maint-P 2022-09-15 20:43:02 +03: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
Dave Parks d7c77e5c64 SL-18095 WIP -- Use meshoptimizer to re-weld and cache optimize after generating tangents 2022-09-12 11:48:16 -05:00
Dave Parks c822da9fe6 SL-18095 WIP -- Allow mikktspace generator to add more vertices (skip re-welding step for now). 2022-09-09 20:56:22 -05:00
Dave Parks 8ad7240a3b SL-18095 WIP -- Add Mikktspace tangent generation for PBR materials and switch to per-pixel binormal generation. Still bugged with some test content. 2022-09-08 10:06:53 -05:00
Nat Goodspeed 65612700f3 DRTVWR-558: Eliminate many spurious set-not-used variables. 
With Xcode 13.4, these unused variables break Release builds.
 2022-08-24 14:00:16 -04:00
Andrey Kleshchev 09400b74ad SL-17902 Crash at LLAlignedArray, out of bounds 2022-08-04 22:14:08 +03:00
Brad Kittenbrink 38208441db Merge remote-tracking branch 'origin/master' into DRTVWR-559 2022-08-04 10:59:26 -07: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
Andrey Lihatskiy dfc1175546 Merge branch 'master' into DRTVWR-565-maint-P 2022-08-04 00:12:26 +03:00
Cosmic Linden cdff716908 SL-17801: Don't let external code delete the raw pointer to the picking octree 2022-07-26 10:40:19 -07:00