c1faabe951
Merge
2018-11-02 09:17:41 -07:00
51772e6083
SL-9886: Viewer send and receive new day_name(s) information in the environment protocol for viewer specified names on individual tracks.
2018-11-02 09:17:19 -07:00
c3ac4650ad
SL-9870 EEP Water texture doesn't apply to observer
2018-11-02 17:23:30 +02:00
c361ae8cec
Merged in graham_linden/viewer-eep-fixes (pull request #179 )
...
SL-9994
2018-11-01 21:27:43 +00:00
4f267a5723
SL-9994
...
Make shaders use consistent naming and parameter order for transport and atmospheric helpers.
Share transport and gamma correction code where possible.
Add lots of asserts and other validation for when things don't go as planned.
Engage dumpShaderSource to get more source output with shader compilation fail.
2018-11-01 20:28:47 +01:00
e6b5ed3fef
Merged in graham_linden/viewer-eep-fixes (pull request #178 )
...
Default
2018-11-01 18:12:19 +00:00
a67cf385d7
Back out unintended shader changes from SL-10000 fix.
2018-11-01 19:04:11 +01:00
fb335cc243
SL-10000 fix storing of ambient value when converting legacy settings
2018-11-01 18:26:24 +01:00
2c5d17aa6b
Merged in andreykproductengine/maint-eep2 (pull request #176 )
...
SL-9793 EEP Clouds vanish and reappear abruptly if one of textures is not set
Approved-by: Graham Madarasz <graham@lindenlab.com>
2018-11-01 16:59:30 +00:00
64db1f4820
SL-9793 EEP Clouds vanish and reappear abruptly if one of textures is not set
2018-11-01 18:17:43 +02:00
6505a80b4a
SL-9905 FIXED [EEP] Teleporting from EEP Region with parcel environment does not clear on non-eep region.
2018-11-01 17:45:58 +02:00
5e0e09ec89
Yet another OSX compile issue.
2018-10-30 14:32:00 -07:00
51ee902502
Merged in graham_linden/viewer-eep-fixes (pull request #173 )
...
Fix OSX issue with ctor not recognizing version with defaulted arg.
2018-10-30 20:28:19 +00:00
d292ec7ee0
Better OSX clean up.
2018-10-30 21:25:52 +01:00
17df1215b0
Fix OSX issue with ctor not recognizing version with defaulted arg.
2018-10-30 21:12:22 +01:00
7b6cd0859c
Merged in andreykproductengine/maint-eep (pull request #170 )
...
SL-1476 EEP Better shader transitions
Approved-by: Maxim Nikolenko <maximnproductengine@lindenlab.com>
2018-10-30 17:55:42 +00:00
9a8e124fde
SL-9976 change moon blend/brightness handling in shaders and cleanup extraneous GL state management.
2018-10-30 18:17:47 +01:00
2f97660ab7
Merge
2018-10-30 15:56:41 +01:00
56355cf354
SL-9966
...
Port over transport, gamma, atmospherics shader stub updates for per-fragment atmospherics.
Fix bindings of current/next noise map when current and next are the same (select only one and force blend factor to 0).
2018-10-30 15:56:08 +01:00
769be699a9
SL-9766 Move up blend_factor init so we can override if we're short of blendable noise maps.
2018-10-30 00:46:28 +01:00
f334453af1
Merge
2018-10-30 00:23:22 +01:00
38a6f3b0df
SL-9966 fix cloud noise map bindings when current and next are identical.
2018-10-30 00:22:00 +01:00
0645181f94
Merge
2018-10-30 00:17:14 +01:00
86419eb11b
SL-1476 EEP Better shader transitions
2018-10-30 01:14:21 +02:00
2ee1f40411
Merged in andreykproductengine/maint-eep (pull request #169 )
...
SL-1476 EEP Better shader resets and transitions
Approved-by: Graham Madarasz <graham@lindenlab.com>
2018-10-29 23:05:16 +00:00
536799d07e
SL-9977
...
SL-9973
2018-10-29 23:02:20 +01:00
48e751d397
SL-9977 viewer side ambient param fix.
2018-10-29 20:12:33 +01:00
659d14504f
SL-1476 EEP Better shader resets and transitions
2018-10-29 18:18:20 +02:00
e9faa3cce8
SL-9960 [EEP] Allow drag and drop inventory setting to the "Settings from Inventory" field
2018-10-25 18:16:34 +03:00
8740368b0b
SL-9922 FIXED [EEP] The Day environment settings are changed when open the Water setting in ‘Fixed Environment’ editor
2018-10-23 17:52:00 +03:00
2cee3e6ef4
Merged in graham_linden/viewer-eep-graham (pull request #165 )
...
SL-9806
2018-10-22 18:53:20 +00:00
dba9521cf6
SL-9806
...
Get dome rendering to not assert the depth test state behind deferred render's back.
Make clouds write and test depth to give stars something to depth test against.
Add z-bias in star vert shader to force some depth testing of stars against clouds.
2018-10-22 19:23:10 +01:00
d2428d53b5
SL-9911 FIXED [EEP] Day Settings are modifiable in About Land floater for parcel that uses Region Settings
2018-10-22 15:36:22 +03:00
91615351b5
SL-9931
...
Remove (unused) fan buffer and fix parameterization of the strip vert buffer(s)
to not include a sharp discontinuity at the horizon.
2018-10-20 00:32:01 +01:00
e0557054c2
Merged in graham_linden/viewer-eep-graham (pull request #162 )
...
SL-9928
2018-10-19 22:28:26 +00:00
c06bd45df9
SL-9928
...
De-hackify WL additive to get better match between ALM and non-ALM rendering
without bringing back SL-1491 lens flare bug.
2018-10-19 22:58:01 +01:00
135720248c
Merged in graham_linden/viewer-eep-graham (pull request #161 )
...
SL-9929
2018-10-19 17:05:44 +00:00
75858d9f3f
SL-9929
...
Replace WL atmospherics sun color calcs, fix water specular sunlight contribution to use them,
and do not add moon contribution during daytime.
2018-10-19 17:45:40 +01:00
0343c59d4e
Merged in graham_linden/viewer-eep-graham (pull request #160 )
...
Port sim-side changes to back-conversion of new settings to legacy.
2018-10-19 16:01:48 +00:00
0532c644a3
Merge
2018-10-19 16:58:52 +01:00
8b7b22d236
Merged in maxim_productengine/viewer-eep2 (pull request #159 )
...
SL-9918 FIXED [EEP] Cloud image set to None displays the same clouds as Default
2018-10-19 15:57:20 +00:00
722a00cb0b
SL-9918 FIXED [EEP] Cloud image set to None displays the same clouds as Default
2018-10-19 17:21:19 +03:00
ab9a66d5fe
SL-9919 [EEP] Change width for "Large Wave Speed" text field
2018-10-19 14:38:12 +03:00
539780f3dc
SL-9923 FIXED [EEP] The sliders on the ‘Atmosphere & Lighting’ tab are offset from each other
2018-10-19 13:33:33 +03:00
38e9230817
SL-9921 [EEP] Rename the tooltip for trash icon to 'Remove selected item'
2018-10-19 13:06:15 +03:00
41a038bf02
FIX INTL-307 Translate Viewer Set53 into 9 languages (viewer-eep)
2018-10-18 13:22:40 -07:00
3447621a15
Port sim-side changes to back-conversion of new settings to legacy.
...
Fix validating of density multiplier to clamp >= 0.0001f.
Port fix to setter for ambient color in sky settings.
2018-10-18 21:18:40 +01:00
44cdf00bff
SL-1476 EEP parcel transition inconsistencies
2018-10-17 21:17:00 +03:00
26806a7770
Merge
2018-10-17 12:17:18 -07:00
6cdcc7fe2e
SL-9889: New reconverted default assets
2018-10-17 12:16:24 -07:00
Rider Linden