Ansariel
|
e33d2fad5f
|
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-gltf-development
# Conflicts:
# indra/newview/llimview.h
# indra/newview/llpanelpeople.h
# indra/newview/llpanelvoicedevicesettings.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
# indra/newview/llvoicechannel.cpp
# indra/newview/llvoicechannel.h
# indra/newview/llvoiceclient.cpp
# indra/newview/llvoiceclient.h
# indra/newview/llvoicevivox.cpp
# indra/newview/llvoicevivox.h
|
2024-06-21 19:10:44 +02:00 |
|
Ansariel
|
050d2fefab
|
Merge branch 'project/gltf_development' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/gltf/primitive.cpp
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloaterregioninfo.h
# indra/newview/lltexturectrl.cpp
# indra/newview/lltinygltfhelper.cpp
# indra/newview/llvlcomposition.cpp
# indra/newview/llvlcomposition.h
# indra/newview/llvovolume.cpp
|
2024-06-13 03:21:12 +02:00 |
|
Ansariel
|
c29a661b22
|
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-600
# Conflicts:
# indra/llimage/llimage.cpp
# indra/llprimitive/llgltfmaterial.h
# indra/llrender/llglslshader.cpp
# indra/newview/app_settings/shaders/class1/deferred/pbrterrainF.glsl
# indra/newview/app_settings/shaders/class1/deferred/terrainF.glsl
# indra/newview/app_settings/shaders/class2/deferred/pbralphaF.glsl
# indra/newview/gltf/accessor.cpp
# indra/newview/gltf/accessor.h
# indra/newview/gltf/animation.h
# indra/newview/gltf/asset.cpp
# indra/newview/gltf/primitive.cpp
# indra/newview/gltf/primitive.h
# indra/newview/gltfscenemanager.h
# indra/newview/llenvironment.cpp
# indra/newview/llfetchedgltfmaterial.cpp
# indra/newview/llfloaterregioninfo.h
# indra/newview/llimprocessing.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltinygltfhelper.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llvlcomposition.cpp
# indra/newview/llvlcomposition.h
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
|
2024-06-13 01:54:18 +02:00 |
|
Brad Linden
|
ae74ca8069
|
Add whitespace change to .git-blame-ignore-revs for pr #1723
|
2024-06-12 14:39:32 -07:00 |
|
Brad Linden
|
071e464155
|
Merge pull request #1723 from secondlife/brad/maint-a-merge-to-gltf-dev
maint a merge to gltf dev
|
2024-06-12 14:33:01 -07:00 |
|
Brad Linden
|
8444cd9562
|
Fix whitespace pre-commit hook failures
|
2024-06-12 13:51:21 -07:00 |
|
Brad Linden
|
8729c0d2c4
|
Fixup more signed/unsigned warnings after merge.
|
2024-06-12 12:53:45 -07:00 |
|
Brad Linden
|
d12c897bfc
|
Merge remote-tracking branch 'origin/project/gltf_development' into brad/maint-a-merge-to-gltf-dev
# Conflicts:
# indra/newview/gltf/primitive.cpp
|
2024-06-12 10:31:27 -07:00 |
|
cosmic-linden
|
f0de2ba634
|
Merge pull request #1724 from secondlife/v-1475
secondlife/viewer#1475: PBR Terrain texture transform UI: Second pass
|
2024-06-12 09:25:28 -07:00 |
|
Ansariel
|
8565041c2d
|
Merge branch 'release/webrtc-voice' of https://github.com/secondlife/viewer
# Conflicts:
# autobuild.xml
|
2024-06-12 11:38:14 +02:00 |
|
Ansariel
|
da75fdd7be
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
# autobuild.xml
|
2024-06-12 11:37:17 +02:00 |
|
Roxanne Skelly
|
0f3c3563b0
|
Merge pull request #1726 from secondlife/roxie/webrtc-voice
Merge from main.
|
2024-06-11 23:18:54 -07:00 |
|
Roxie Linden
|
ed34782283
|
Merge branch 'main' of github.com:secondlife/viewer into roxie/webrtc-voice
|
2024-06-11 18:43:34 -07:00 |
|
Cosmic Linden
|
d2145142d9
|
secondlife/viewer#1475: PBR Terrain texture transform UI: Second pass
|
2024-06-11 18:09:47 -07:00 |
|
Brad Linden
|
9775d7ea10
|
Merge remote-tracking branch 'origin/release/maint-a' into project/gltf_development
|
2024-06-11 17:42:17 -07:00 |
|
Brad Linden
|
a7b0f93911
|
Fixed signed/unsigned warnings after they got enabled in the maint-A merge
|
2024-06-11 15:39:48 -07:00 |
|
Dave Parks
|
f40fbdf4ad
|
#1718 Add GLTF support for multiple texcoords (#1720)
* Fix for GLTF MeshPrimitiveModes test
|
2024-06-11 17:10:13 -05:00 |
|
Dave Parks
|
429c92ad75
|
#1687 Add support for KHR_texture_transform (#1717)
|
2024-06-11 13:27:54 -05:00 |
|
Ansariel
|
d99fbffb6d
|
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llimage/llimage.cpp
# indra/llmath/llvolume.cpp
# indra/newview/gltf/asset.cpp
# indra/newview/lldynamictexture.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llvovolume.cpp
|
2024-06-11 20:25:22 +02:00 |
|
Ansariel
|
18903f6cac
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
# indra/llappearance/llavatarappearance.h
# indra/llimage/llimage.cpp
# indra/llmath/llvolume.cpp
# indra/llmath/llvolume.h
# indra/llprimitive/llgltfmaterial.h
# indra/llrender/llshadermgr.cpp
# indra/newview/lldynamictexture.cpp
# indra/newview/llenvironment.cpp
# indra/newview/llfetchedgltfmaterial.cpp
# indra/newview/llfloaterimagepreview.cpp
# indra/newview/llfloaterimagepreview.h
# indra/newview/llfloaterpreference.cpp
# indra/newview/llfloaterregioninfo.cpp
# indra/newview/llfloaterregioninfo.h
# indra/newview/llmaniprotate.cpp
# indra/newview/llmaniptranslate.cpp
# indra/newview/llpanelvolume.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llselectmgr.h
# indra/newview/llsurface.cpp
# indra/newview/llsurface.h
# indra/newview/llsurfacepatch.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/lltinygltfhelper.cpp
# indra/newview/llviewerregion.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llviewerwindow.h
# indra/newview/llvlcomposition.cpp
# indra/newview/llvlcomposition.h
# indra/newview/llvocache.cpp
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
|
2024-06-11 19:04:21 +02:00 |
|
cosmic-linden
|
961b6b0c7e
|
Merge pull request #1690 from secondlife/v-1475
secondlife/viewer#1475: Update PBR Terrain test plans
|
2024-06-11 09:45:54 -07:00 |
|
Ansariel
|
0870539264
|
Fix some apparent previous merge error
|
2024-06-11 18:22:32 +02:00 |
|
Ansariel
|
2050429e98
|
Fix possible null pointer access crash
|
2024-06-11 17:49:58 +02:00 |
|
Andrey Lihatskiy
|
ef9f4b38e9
|
Merge branch 'main' into DRTVWR-600-maint-A
|
2024-06-11 17:51:35 +03:00 |
|
Andrey Lihatskiy
|
f25440c8f0
|
Windows build fix following #1695
|
2024-06-11 17:48:47 +03:00 |
|
Andrey Lihatskiy
|
3d4bc98f6b
|
Trim remaining trailing whitespaces after #1695
|
2024-06-11 17:38:48 +03:00 |
|
Ansariel
|
fe0ffaee54
|
Fix overlooked BOOL
|
2024-06-11 16:18:39 +02:00 |
|
nat-goodspeed
|
f5e2708a0f
|
Merge pull request #1685 from secondlife/brad/materials_featurette_build_workaround
Attempted workaround for actions/runner-images#10004 build failures.
|
2024-06-11 09:59:42 -04:00 |
|
Ansariel
|
6fba1530bb
|
Remove orphaned shader permutation
|
2024-06-11 15:50:03 +02:00 |
|
Ansariel
|
0e037b525a
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
# indra/llcommon/llprofiler.h
# indra/llmath/llvolume.cpp
# indra/llrender/llshadermgr.cpp
# indra/newview/gltf/buffer_util.h
# indra/newview/lldrawpoolterrain.cpp
# indra/newview/llfloaterimagepreview.h
# indra/newview/llfloaterregioninfo.cpp
# indra/newview/llfloaterregioninfo.h
# indra/newview/llmaniprotate.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llselectmgr.h
# indra/newview/llsurface.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerobject.h
# indra/newview/llviewerregion.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexture.h
# indra/newview/llviewerwindow.cpp
# indra/newview/llviewerwindow.h
# indra/newview/llvlcomposition.cpp
# indra/newview/llvocache.cpp
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
|
2024-06-11 15:47:42 +02:00 |
|
Ansariel
|
1ebf62e102
|
Clean up line endings that got mangled up during last merge
|
2024-06-11 15:40:09 +02:00 |
|
Ansariel
|
1bbe697db7
|
Merge branch 'project/gltf_development' of https://github.com/secondlife/viewer
# Conflicts:
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/llappearance/llavatarappearance.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/newview/llpanelface.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvocache.cpp
|
2024-06-11 14:38:20 +02:00 |
|
Beq
|
7740cfc26e
|
Starlight skins: add mirror probe settings - ScentualLust
|
2024-06-11 13:07:13 +01:00 |
|
Ansariel
|
d9789bfaf2
|
Merge branch 'main' of https://github.com/secondlife/viewer into DRTVWR-600-maint-A
# Conflicts:
# indra/llappearance/llavatarappearance.h
# indra/llimage/llimage.cpp
# indra/llmath/llvolume.cpp
# indra/llmath/llvolume.h
# indra/llprimitive/llgltfmaterial.h
# indra/llrender/llrendertarget.cpp
# indra/llrender/llshadermgr.cpp
# indra/newview/lldynamictexture.cpp
# indra/newview/llenvironment.cpp
# indra/newview/llfetchedgltfmaterial.cpp
# indra/newview/llfloaterimagepreview.cpp
# indra/newview/llfloaterimagepreview.h
# indra/newview/llfloaterregioninfo.cpp
# indra/newview/llfloaterregioninfo.h
# indra/newview/llmaniprotate.cpp
# indra/newview/llmaniptranslate.cpp
# indra/newview/llpanelvolume.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llselectmgr.h
# indra/newview/llsurface.cpp
# indra/newview/llsurface.h
# indra/newview/llsurfacepatch.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/lltinygltfhelper.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llviewerwindow.h
# indra/newview/llvlcomposition.cpp
# indra/newview/llvlcomposition.h
# indra/newview/llvocache.cpp
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
|
2024-06-11 13:38:43 +02:00 |
|
Zi Ree
|
4c5d757d3c
|
Vintage: add mirror probe settings
|
2024-06-11 12:43:45 +02:00 |
|
Ansariel
|
2fed7b2b25
|
Fix what most likely looks like a merge bug
|
2024-06-11 12:20:05 +02:00 |
|
Ansariel
|
4971139212
|
Only register with to LLAvatarPropertiesProcessor once a request is actually made
|
2024-06-11 10:03:24 +02:00 |
|
Nat Goodspeed
|
4b35328e49
|
Merge branch 'main' into brad/materials_featurette_build_workaround
|
2024-06-10 21:54:59 -04:00 |
|
Ansariel
|
f7c7abd180
|
Fix build
|
2024-06-11 03:34:38 +02:00 |
|
Ansariel
|
c809ca9dff
|
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
|
2024-06-11 02:56:51 +02:00 |
|
Zi Ree
|
5d5b1650d0
|
Linux: Make it compile
|
2024-06-11 02:55:32 +02:00 |
|
Cosmic Linden
|
00c4d2ed4e
|
secondlife/viewer#1475: Update PBR Terrain test plans
|
2024-06-10 17:03:27 -07:00 |
|
Brad Linden
|
7c42711ca3
|
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into project/gltf_development
|
2024-06-10 16:22:12 -07:00 |
|
Brad Linden
|
e0e6e7fd74
|
Merge remote-tracking branch 'origin/main' into project/gltf_development
|
2024-06-10 16:15:05 -07:00 |
|
Brad Linden
|
2e41f5a35e
|
Try to get sign-and-package-windows job a runner to run on
|
2024-06-10 16:11:29 -07:00 |
|
Ansariel
|
9f6b8484df
|
Re-enable compiler warnings C4127, C4512 & C4706
Disable particular CRT and WinSock API warnings for functions Microsoft considers unsafe/deprecated
|
2024-06-11 01:56:08 +03:00 |
|
Dave Parks
|
4522f33d2b
|
#1677 Add GLTF extensions serialization and support for KHR_materials_unlit (#1686)
|
2024-06-10 16:57:31 -05:00 |
|
Ansariel
|
492dcabe96
|
Merge branch 'main' of https://github.com/secondlife/viewer
|
2024-06-10 23:46:37 +02:00 |
|
Ansariel
|
6f866e682d
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
|
2024-06-10 23:46:12 +02:00 |
|
Nat Goodspeed
|
a73773bc1a
|
Increment viewer version to 7.1.9
following promotion of secondlife/viewer #648: Release/materials featurette
|
2024-06-10 17:24:23 -04:00 |