106b1a6e6a
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
2022-11-02 14:58:45 -05:00
3e7e146be6
SL-18520 Fix for mac build.
2022-11-02 14:58:24 -05:00
89e9cdd482
SL-18531 Disable texture controls when editing face with material
2022-11-02 21:54:30 +02:00
d042ad67ed
SL-18448 Make material editor's scroll smarter
2022-11-02 19:47:47 +02:00
32cc9a71d0
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
2022-11-02 12:17:28 -05:00
c3f94ab9a1
SL-18520 Use GLTF material.extras to pass flags for enabling overriding alpha mode and double sided to default
2022-11-02 12:14:56 -05:00
734e3fcb21
SL-18522 Use naming consistent with GLTF standard
2022-11-02 01:08:43 +02:00
757dc513db
SL-18448 Fix metallic and normal controls being swapped
2022-11-01 23:58:02 +02:00
245cfb30f6
Merge remote-tracking branch 'origin/master' into DRTVWR-559
2022-11-01 14:19:57 -07:00
15b5dedb2d
Increment viewer version to 6.6.8
...
following promotion of DRTVWR-575
2022-11-01 17:16:13 -04:00
613f3738b2
D559 MacOS build fix
2022-11-01 23:05:03 +02:00
d228a12f45
SL-18448 Fixed exit condition
2022-11-01 22:23:45 +02:00
8c5c07d307
SL-18448 Modified Material Editor to match overrides better
2022-11-01 22:20:38 +02:00
0ea5b38b8d
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
2022-11-01 15:17:42 -05:00
a4ad75e93c
SL-18520 WIP - Use off-by-epsilon and special UUID identifier hacks to allow overriding to default values.
2022-11-01 15:17:22 -05:00
a0e7dd45d9
Fix mac build for DRTVWR-559. PROFILE_ZONE_SCOPED macro cant take an argument
2022-11-01 10:15:37 -07:00
e6fb0a9397
SL-18391 Removed direct dependency of local materials onto tinygltf
2022-11-01 18:51:47 +02:00
9f21fba6d9
SL-18513 Put profile markers around GLTF code.
2022-11-01 08:31:01 -05:00
8faa5a3305
SL-18448 Fix for mac build.
2022-10-31 17:39:56 -05:00
52b64bcfd7
Fix SL-18511 TOS and MFA login failure handlers must cooperate to answer both reasons at the same time
2022-10-31 14:17:05 -07:00
e73c5e4ee3
SL-18448 Do not show editor when saving material inworld, only a name prompt
2022-10-31 23:16:37 +02:00
75e743be2f
SL-18442 Port of Caladbolg's fix for emissive overrides not taking. Remove unused function.
2022-10-31 15:58:20 -05:00
94afae5b15
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
2022-10-31 15:20:02 -05:00
29e344bbd0
SL-18483 Work around for crash on AMD when using glGenerateMipmap on cubemap array.
2022-10-31 15:19:28 -05:00
4cb5439e42
SL-18446 Don't cause excessive udpates
2022-10-31 21:24:41 +02:00
b1f529082b
SL-18446 Fix emissive tint
2022-10-31 20:42:47 +02:00
094a8876d6
SL-18446 Material override arrival filtering
2022-10-31 20:12:53 +02:00
35d4124b5e
SL-18446 Material override arrival for selected objects should update material editor
2022-10-29 03:16:16 +03:00
b6a35e36d7
SL-18448 Material Editor and Tools floater adjustments
...
1. Enable glow
2. Added buttons to texture->pbr
2022-10-29 02:52:56 +03:00
105f50478c
SL-18498 WIP -- Better handling of updates from server (don't null out overrides on updates from server unless material ID has changed)
2022-10-28 18:49:51 -05:00
ee227feed3
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
2022-10-28 17:07:57 -05:00
3b08abf70b
SL-18493 Fix for viewer not sending material ID updates to simulator.
2022-10-28 17:07:32 -05:00
c61224bef2
SL-17699 Hide pipette for material picker
...
At the moment there is no specification how it should work, it can't work like it does for textures due to material overrides.
Also removed some dead code
2022-10-29 00:27:47 +03:00
6d0fcc0e61
SL-17699 Blank material Id for material picker
2022-10-28 20:08:53 +03:00
e72d0161bb
SL-18493 Fix for assert when setting override before material has arrived
2022-10-28 11:50:32 -05:00
2752ab3b62
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
2022-10-28 11:20:06 -05:00
8155361355
SL-18453 WIP -- Use GLTF draw pool to render shadows. Still need a GLTF specific shadow shader to multiply alpha.
2022-10-28 11:19:43 -05:00
467c9f627c
SL-18441 Fix logging to be more informative and logcontrol compatible.
2022-10-28 18:45:36 +03:00
29062fd907
SL-18441 "Override" UI cleanup
2022-10-27 23:35:46 +03:00
e70cf8edfe
SL-18446 Live editing material should not override objects without pbr
...
Objects without pbr have no base to override
2022-10-27 23:35:46 +03:00
5364da4d8e
SL-18411: GLTF material transform serialization, plus fix improper indexing not matching GLTF spec
2022-10-27 13:19:19 -07:00
414efe56bd
SL-18008 Edit PBR in menu should not be enabled if selection has no pbr materials
2022-10-27 21:35:46 +03:00
6860df0b98
SL-17699 Enable 'none' button it amterial picker
2022-10-27 20:47:05 +03:00
0451d51f4d
SL-18459 WIP -- fix for assert in setGLTFMaterial
2022-10-27 11:27:21 -05:00
eb4581edf2
SL-18454 Fix for HUDs with alpha mask using wrong shader.
2022-10-27 10:34:54 -05:00
0e02f25604
SL-18472 Fix for assert when increasing number of texture entries on existing primitive with overrides applied.
2022-10-26 23:51:13 -05:00
babdb7c209
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
2022-10-26 23:03:10 -05:00
a6da630207
SL-18469 Fix for material edits only applying to one face.
2022-10-26 23:02:49 -05:00
0c0b66388f
SL-18465 Crash opening Material Editor
2022-10-27 01:46:31 +03:00
65eec2ca8f
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
2022-10-26 17:22:50 -05:00
Dave Parks