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

110 Commits (f4a6a434fab9bbce34e5c11408323967c5b5e22e)

Author SHA1 Message Date
Brad Linden ae63ed51aa Merge remote-tracking branch 'origin/xcode-14.3' into DRTVWR-559 (#292) 2023-07-18 14:38:18 -07:00
RunitaiLinden 8d17467f7f SL-19884 Fix for garbled rigged meshes in model import preview window. 2023-06-27 18:49:36 -05:00
RunitaiLinden 7fb024cfc2 SL-19838 Put local lights back on fullbright objects. Fix assert in modelpreview. 2023-06-14 14:07:11 -05:00
Brad Linden df35005a9b Minor build fix for DRTVWR-559 2023-05-23 17:36:56 -07:00
Nat Goodspeed b61ea595b5 SL-18837: Clean up more set-but-unused variables for Xcode 14.3 2023-05-19 17:33:27 -04:00
RunitaiLinden ee0b330b2d DRTVWR-559 Decruft deprecated OpenGL flags. 2023-05-16 20:31:29 -05:00
Andrey Kleshchev 33e44b2059 SL-19353 Mesh importer throws an error when the file extension is upper case 2023-03-10 00:58:21 +02:00
Brad Linden 5fabfa50d7 Merge remote-tracking branch 'origin/main' into DRTVWR-559 2023-02-02 12:11:40 -08:00
Dave Parks 6f136d403b SL-19000 Fix various 3D UI components not respecting depth buffer. Incidental decruft. Do I get a prize for 1000th jira? 2023-02-01 17:09:34 -06: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
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 Kleshchev e8af383b2d SL-18351 Better meshoptimizer fallback handling 2022-10-11 23:04:42 +03: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 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
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
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
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 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
Maxim Nikolenko 076a895062 SL-17635 remove unused variables 2022-06-21 17:55:29 +03: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
Dave Houlton 8c0163bcb4 SL-17214 initial loader class skeleton 2022-06-08 13:33:59 -06: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
Andrey Lihatskiy 91606c7b60 Merge branch 'master' into DRTVWR-548-maint-N 2022-05-26 03:07:05 +03:00
Howard Stearns 87e7b732ba SL-98-a - fix jumping ground plane 2022-05-16 11:39:04 -07: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
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 c58c308d21 SL-17002 FIXED The "include joint positions" checkbox is displayed inactive 2022-03-15 16:13:24 +02:00
Mnikolenko Productengine 0b56a3da94 SL-16980 FIXED Uploading model preview disappeared after changing the Triangle limit 2022-03-09 23:53:20 +02:00
Mnikolenko Productengine 5e89e26554 SL-16980 FIXED Uploading model preview disappeared after changing the Triangle limit 2022-03-09 17:32:22 +02: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
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
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 1e0eafd50c Merge branch 'master' into DRTVWR-544-maint 
# Conflicts:
#	indra/llaudio/llstreamingaudio_fmodstudio.cpp
#	indra/newview/llviewerregion.cpp
 2022-02-28 21:56:25 +02:00