89720cdb59
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
2023-11-20 13:05:41 +01:00
843866d193
Drtvwr 596 11/8/2023 ( #501 )
...
* SL-20570 Fix for lossy (and square) normal maps when importing GLTF materials.
* SL-20582 Fix for overriding to alpha mode blend not working. Incidental decruft of dead code (thanks, Rye!)
2023-11-13 13:12:48 -06:00
2053458181
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llinventorybridge.cpp
# indra/newview/pipeline.h
# indra/newview/skins/default/xui/en/menu_inventory.xml
2023-10-18 14:55:45 +02:00
07a830a4ce
SL-20062: Fix near clip on reflection probes being clamped to at or below 10
2023-10-12 13:02:23 -07:00
9ffb2514db
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/cmake/00-Common.cmake
# indra/newview/app_settings/settings.xml
# indra/newview/installers/windows/installer_template.nsi
# indra/newview/llviewermenu.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/menu_viewer.xml
2023-04-17 10:01:32 +02:00
698966f8e7
SL-19538 Remove hacky ambiance scale and take the mittens off probe a… ( #151 )
...
* SL-19538 Remove hacky ambiance scale and take the mittens off probe ambiance values. Fix for sky brightening being done in sRGB space.
2023-04-04 10:29:12 -07:00
cea42d25d1
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
2022-08-10 16:19:57 +02:00
d048795fce
SL-17870 Nudge PBR material textures so they start downloading. (and add missing validation code for reflection probes network data).
2022-08-05 16:58:22 -05:00
45fd8ee26b
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
2022-06-30 17:49:59 +02:00
6f6df8ed71
SL-17685 Drag and drop material support
2022-06-29 21:42:44 -05:00
fd6b5ea8c3
SL-17685 Drag and drop material support WIP
2022-06-29 17:59:09 -05:00
8e4abf8ea3
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
2022-06-10 13:52:52 +02:00
03d85bfb33
SL-17573 Add "dynamic" checkbox, also followup on SL-17551 and do "Select Invisible Objects" checkbox instead of "Select Reflection Probes"
2022-06-09 19:43:21 -05:00
a185fae28d
SL-17285 Build fix take two.
2022-06-03 11:36:37 -05:00
220afbcda0
SL-17285 Add proper reflection probe support to LLVOVolume, LLPrimitive, and LLPanelVolume
2022-06-02 18:42:38 -05:00
3765c775cb
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
2022-05-21 15:04:54 +02:00
c9fbd9e2e8
SL-17116 work on implementing MaterialID in ExtraParams of ObjectUpdate and related messages
2022-04-27 14:48:25 -07:00
15bbf6510c
Merge branch 'DRTVWR-521-maint' of https://bitbucket.org/lindenlab/viewer
2020-12-09 13:14:39 +01:00
da3bd5a796
SL-13599 Resolve gcc v10 'no trivial copy-assigment' warnings
2020-11-23 14:03:27 +02:00
f7bd33161b
Merge branch 'DRTVWR-521-maint' of https://bitbucket.org/lindenlab/viewer
2020-11-12 11:05:22 +01:00
79ec8a8be4
SL-13599 Fixed missing zero
2020-11-09 13:56:06 +02:00
22b2d0d4e0
Merge branch 'DRTVWR-521-maint' of https://bitbucket.org/lindenlab/viewer
2020-11-04 15:33:34 +01:00
6786b9118c
SL-13599 Variable should correspond to type
2020-10-28 20:34:12 +02:00
10775e3079
SL-13599 Don't spam into logs when te has no material ids
2020-10-28 19:05:14 +02:00
89fb672503
SL-13599 Missing bounds checks in deserializer code
...
Pulled in and updated Rider's changes
2020-10-19 21:46:56 +03:00
846d78345c
Merge branch 'DRTVWR-440' of https://bitbucket.org/lindenlab/viewer
2020-04-01 15:00:34 +02:00
e468d80186
SL-12902 Better fix for light color values in color swatch not matching light color values inworld.
2020-03-27 17:32:01 -05:00
cd895d6e58
Merged in lindenlab/viewer-bear
2019-09-05 21:55:56 +03:00
642d28245f
Merge Firestorm LGPL
2019-08-31 14:30:14 +02:00
529569cdd9
Merge viewer-neko
2019-08-04 12:09:33 +02:00
87be5f7997
SL-4150 Rename htonmemcpy
2019-07-24 16:58:24 +03:00
504a138cb1
Merge
2019-05-10 12:22:29 -06:00
892d224446
Merge Firestorm LGPL
2019-01-31 21:10:17 +01:00
f9ec853f4a
Merge viewer-neko
2019-01-03 19:07:09 +01:00
0acab8ba2d
SL-10283 Allow changing "Repeats per meter" on face 6 of hollowed cube
2018-12-24 15:57:04 +02:00
1dbc638d38
SL-10283 Allow changing "Repeats per meter" on face 6 of hollowed cube
2018-12-24 15:57:04 +02:00
014480a79b
Merge
2018-11-28 15:16:01 -08:00
f04189ed9f
Merge Firestorm LGPL
2018-11-17 01:03:38 +01:00
f848271c28
fix line endings
2018-06-19 23:04:29 +05:30
cb4ba0b15e
fix line endings
2018-06-19 23:04:29 +05:30
4aa45cb8e1
Merge viewer-baking-updates
2018-06-16 13:22:49 +02:00
7abb0c99be
[DRTVWR-476] - add universal head,upper,lower tattoos
2018-06-13 01:09:27 +05:30
2a2046fd07
merge
2018-06-05 22:44:04 +01:00
6e1cbd04b4
Merge
2018-06-05 23:21:30 +05:30
2de275724b
Merge Firestorm LGPL
2018-06-01 22:29:06 +02:00
acfe7e625e
Merge Firestorm LGPL
2018-06-01 22:10:21 +02:00
1b485c97e6
Merge viewer-baking-updates
2018-05-31 12:21:16 +02:00
f277aed218
[DRTVWR-455] - add new bake testure and tattoo slots
2018-05-24 01:17:07 -07:00
f9d432a570
Merge Firestorm LGPL
2018-05-08 19:29:46 +02:00
a2879b80a6
Merge Firestorm LGPL
2018-05-08 17:13:44 +02:00
Ansariel