Andrey Lihatskiy
|
f4c7c8aff5
|
Post-merge build fixes
|
2020-04-26 21:15:54 +03:00 |
|
Andrey Lihatskiy
|
231dea378b
|
Merge branch 'master' into DRTVWR-486
|
2020-04-26 19:40:09 +03:00 |
|
Nat Goodspeed
|
d7f1c88c35
|
Increment viewer version to 6.4.1
following promotion of DRTVWR-440
|
2020-04-20 14:09:16 -04:00 |
|
Dave Houlton
|
693791f4ff
|
Merged in euclid-13019 (pull request #70)
SL-13019, fix broken varying linkage on MacOS
Approved-by: Michael Pohoreski
|
2020-04-14 19:00:25 +00:00 |
|
Dave Houlton
|
ff27f6c8f7
|
SL-13019, fix broken varying linkage on MacOS
|
2020-04-14 12:56:40 -06:00 |
|
Andrey Kleshchev
|
ee88ebf9e9
|
SL-13029 Fixed load order
|
2020-04-13 17:16:10 +03:00 |
|
Andrey Kleshchev
|
483c459e2e
|
SL-13029 Environment update was not applying properly
|
2020-04-12 12:02:38 +03:00 |
|
Dave Houlton
|
8b3071dd1f
|
Merged in euclid-12975 (pull request #65)
SL-12975, unfix alpha and undo non-fix magic number of refracted portion of water Fresnel
|
2020-04-10 00:40:07 +00:00 |
|
Dave Houlton
|
3c6b666ccd
|
SL-12975, unfix alpha and undo non-fix magic number of refracted portion of water Fresnel
|
2020-04-09 18:30:33 -06:00 |
|
Michael Pohoreski
|
538a6d737d
|
Merged in SL-10449 (pull request #63)
SL-10449
Approved-by: Dave Houlton <euclid@lindenlab.com>
|
2020-04-07 23:30:48 +00:00 |
|
Ptolemy
|
af7563968c
|
SL-10449: Put first shader error on new line for readability
|
2020-04-07 16:22:25 -07:00 |
|
Ptolemy
|
e4f72db20d
|
SL-10449: Add dumping of shader to log file
|
2020-04-07 16:21:39 -07:00 |
|
Dave Houlton
|
9e8e623197
|
SL-10449, add missing linkage variable, fix OSX & Intel deferred shaders comp
|
2020-04-07 14:23:24 -07:00 |
|
Ptolemy
|
0b717e2d1a
|
SL-10449 Cleanup dumping shader without LOG spam on every line when it fails to compile/link
|
2020-04-07 14:22:24 -07:00 |
|
Ptolemy
|
4051f5754a
|
SL-10449 Fix off-by-one line numbers when dumping shader that failed to compile/link
|
2020-04-07 14:07:45 -07:00 |
|
Ptolemy
|
1016b9de18
|
SL-10449 Fix ALM on OSX
|
2020-04-07 14:02:48 -07:00 |
|
Dave Houlton
|
81c4c76d6d
|
Merged in euclid-11368 (pull request #58)
SL-11368, fix missing water uniforms for low shader settings
Approved-by: Michael Pohoreski
|
2020-04-03 18:06:51 +00:00 |
|
Dave Houlton
|
0524a1a86f
|
SL-11368, fix missing water uniforms for low shader settings
|
2020-04-03 11:52:18 -06:00 |
|
Michael Pohoreski
|
eb4ceb533d
|
Merged in SL-12852 (pull request #57)
SL-12852 Cleanup for readability
Approved-by: Dave Houlton <euclid@lindenlab.com>
|
2020-04-03 16:11:22 +00:00 |
|
Ptolemy
|
a3f0913b4b
|
SL-12852 Cleanup for readability
|
2020-04-03 08:10:36 -07:00 |
|
Rye Mutt
|
6058c49bb4
|
Merged in eep-fix-falloff-edit (pull request #54)
Fix light falloff being corrupted when editing value via build floater spinner
Approved-by: Dave Houlton
|
2020-04-01 00:25:07 +00:00 |
|
Rye Mutt
|
c77e4e7a57
|
Merged in eep-fix-light-color (pull request #53)
Fix editing light color corrupting intensity and color values
Approved-by: Dave Houlton
|
2020-04-01 00:23:57 +00:00 |
|
Michael Pohoreski
|
2cd264f4a8
|
Merged in SL-12888 (pull request #55)
SL-12888 Fix space alpha megaprim not using z-test
Approved-by: Dave Houlton <euclid@lindenlab.com>
|
2020-03-31 16:53:58 +00:00 |
|
Rye Mutt
|
516ca23659
|
Update falloff fix with changes requested in review.
|
2020-03-30 23:27:04 -04:00 |
|
Ptolemy
|
8c46605c32
|
SL-12888 Fix space alpha megaprim not using z-test
|
2020-03-30 16:11:54 -07:00 |
|
Rye Mutt
|
3dc71d1ce9
|
Fix light falloff being corrupted when editing value via build floater spinner
|
2020-03-30 12:53:11 -04:00 |
|
Rye Mutt
|
8e436fc396
|
Fix editing light color corrupting intensity and color values
|
2020-03-30 10:39:10 -04:00 |
|
Dave Parks
|
c28852bd9a
|
Merged in davep/DRTVWR-440 (pull request #52)
SL-12902 Better fix for light color values in color swatch not matching light color values inworld.
|
2020-03-27 22:33:57 +00:00 |
|
Runitai Linden
|
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 |
|
Dave Houlton
|
f61474fe5b
|
DRTVWR-440, quick fix, add return value - needed for Mac build
|
2020-03-27 11:24:22 -06:00 |
|
Andrey Kleshchev
|
6620211bff
|
SL-12911 Add Debug setting EnvironmentPersistAcrossLogin
|
2020-03-27 00:24:08 +02:00 |
|
Andrey Kleshchev
|
a7849c6ec4
|
Removed obsolete and misleading variable
|
2020-03-27 00:24:07 +02:00 |
|
Dave Parks
|
964597af05
|
Merged in davep/DRTVWR-440 (pull request #48)
SL-12902 Fix for doing the technically correct but compatibility wrong thing WRT light color values.
|
2020-03-26 22:00:54 +00:00 |
|
Runitai Linden
|
d756e18573
|
SL-12902 Fix for doing the technically correct but compatibility wrong thing WRT light color values.
|
2020-03-26 16:48:33 -05:00 |
|
Dave Houlton
|
a248018d6d
|
Merged in euclid_gDebugGL_inf_loop (pull request #46)
Fix infinite loop debug message when debugGL flag is enabled.
Approved-by: Michael Pohoreski
|
2020-03-26 16:25:53 +00:00 |
|
Dave Houlton
|
126b91f8ee
|
DRTVWR-440, make enabling GLdebug flag slightly less infinite-loopy
|
2020-03-26 10:24:25 -06:00 |
|
Dave Parks
|
c7a2c9564e
|
Merged in davep/DRTVWR-440 (pull request #47)
Fix for class2/softenLightF.glsl not matching class1/softenLightF.glsl
|
2020-03-25 20:30:33 +00:00 |
|
Runitai Linden
|
9e0cf3edaa
|
Fix for class2/softenLightF.glsl not matching class1/softenLightF.glsl
|
2020-03-25 15:29:11 -05:00 |
|
Dave Parks
|
5e7271cc6b
|
Merged in davep/DRTVWR-440 (pull request #45)
Davep/DRTVWR-440
|
2020-03-24 18:46:08 +00:00 |
|
Runitai Linden
|
20e5ad48ec
|
Merge cleanup
|
2020-03-24 13:44:40 -05:00 |
|
Runitai Linden
|
cbe8344279
|
Merge branch 'DRTVWR-440' of bitbucket.org:lindenlab/viewer into davep/DRTVWR-440
|
2020-03-24 11:58:31 -05:00 |
|
Runitai Linden
|
3d22273726
|
Fix for bad fullbright shiny shininess values and inconsistency between materialF and fullbrightShinyF
|
2020-03-24 11:22:01 -05:00 |
|
Runitai Linden
|
3e472948db
|
WIP - Make EEP match production.
|
2020-03-20 16:50:37 -05:00 |
|
Michael Pohoreski
|
1370c6d0c0
|
Merged in SL-11589 (pull request #44)
SL-11589
Approved-by: Dave Houlton <euclid@lindenlab.com>
|
2020-03-19 17:16:43 +00:00 |
|
Michael Pohoreski
|
34fe06290a
|
Merged in SL-12574_tweak_brightness (pull request #43)
SL-12574 tweak brightness
Approved-by: Dave Houlton <euclid@lindenlab.com>
|
2020-03-19 17:14:31 +00:00 |
|
Ptolemy
|
cbc3c51daf
|
SL-11589 Remove redundant setting vary_texcoord0, cleanup grouping
|
2020-03-19 01:09:12 -07:00 |
|
Ptolemy
|
4bffb6e793
|
SL-11589 Fix clouds drooping below horizon
|
2020-03-19 00:57:18 -07:00 |
|
Ptolemy
|
e466ab255d
|
SL-12574 Cleanup unused final_atten
|
2020-03-18 23:37:47 -07:00 |
|
Ptolemy
|
03e0549d57
|
SL-12574 Fix environmentMap being too dark on EEP
|
2020-03-18 23:37:47 -07:00 |
|
Ptolemy
|
bb99e50b26
|
SL-12574 Add note about duplicated procedurally generated sky texture
|
2020-03-18 23:37:47 -07:00 |