Commit Graph

43489 Commits (01e5caade3d85eb618c1d7f16eb2e3972d1f65f9)

Author SHA1 Message Date
Ptolemy 01e5caade3 SL-14113 Fix moon haze 2021-04-12 16:58:18 -07:00
Euclid Linden caabb384bd Merged in DV528-merge-6.4.18 (pull request #512)
DRTVWR-528 merge up to 6.4.18
2021-04-01 21:45:41 +00:00
Dave Houlton 98580cd85c Merge branch 'master' into DV528-merge-6.4.18 2021-04-01 15:17:13 -06:00
Nat Goodspeed 167e45e309 Increment viewer version to 6.4.18
following promotion of DRTVWR-514
2021-04-01 13:37:32 -04:00
Dave Houlton ebadc409de SL-14895, restore previous post-deferred alpha behavior 2021-03-29 16:00:19 -06:00
Andrey Kleshchev 9fc1b51ae8 SL-14993 Crash accessing mInvBindMatrix 2021-03-23 01:08:38 +02:00
Dave Houlton e745da0c0b DRTVWR-528, delete all unreferenced shader files, improve dev QoL 2021-03-18 18:05:30 -06:00
Euclid Linden 896dc82f6b Merged in euclid-14895 (pull request #496)
SL-14895, point light atten should move inversely light radius

Approved-by: Michael Pohoreski
2021-03-18 18:08:16 +00:00
Dave Houlton 6e2c805dd3 SL-14895, point light atten should move inversely light radius 2021-03-17 14:18:18 -06:00
Euclid Linden 0104e5c13d Merged in euclid (pull request #495)
Cherry-pick a couple quality-of-life commits from LMR#5
2021-03-17 20:17:12 +00:00
Dave Houlton e70473f794 DRTVWR-525 housekeeping: delete unused shader file 2021-03-17 12:01:38 -06:00
Dave Houlton ed7bff58c4 DRTVWR-525, improve dev's quality-of-life 2021-03-17 12:01:11 -06:00
Dave Houlton f6ddd91dd6 Merge branch 'master' v6.4.17 into DRTVWR-528 2021-03-10 09:59:41 -07:00
Andrey Lihatskiy 9a36df5763 Merge branch 'master' into DRTVWR-514-keymappings 2021-03-09 21:59:14 +02:00
Nat Goodspeed 88d837c16e Increment viewer version to 6.4.17
following promotion of DRTVWR-532
2021-03-09 14:49:29 -05:00
Brad Payne (Vir Linden) bfd4abbf92 Increment viewer version to 6.4.16 following revert of DRTVWR-519 2021-03-08 13:58:35 +00:00
Brad Payne (Vir Linden) c83e740ef9 Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519"
This reverts commit e61f485a04, reversing
changes made to 00c47d079f.
2021-03-08 13:56:16 +00:00
Euclid Linden a0b9fd6eb0 Merged in DV528-merge-6.4.15 (pull request #484)
DRTVWR-528 merge up to 6.4.15
2021-03-02 22:41:49 +00:00
Dave Houlton 10241c5596 Merge branch 'master' v6.4.15 into DRTVWR-528 2021-03-02 15:11:15 -07:00
Andrey Lihatskiy f271ba3277 Merge branch 'master' into DRTVWR-514-keymappings 2021-03-02 21:41:13 +02:00
Nat Goodspeed 2b385841f3 Increment viewer version to 6.4.15
following promotion of DRTVWR-519
2021-03-02 14:28:57 -05:00
Dave Houlton 2cad61d76b Merged in DV528-merge-6.4.14 (pull request #476)
DRTVWR-528 merge up to v 6.4.14
2021-02-17 22:17:45 +00:00
Dave Houlton 57e0d91d16 Merge branch 'master' v 6.4.14 into DV528-merge-6.4.14 2021-02-17 15:10:32 -07:00
Andrey Lihatskiy 003f396d2f Merge branch 'master' into DRTVWR-514-keymappings 2021-02-17 21:22:22 +02:00
unknown e61f485a04 Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519 2021-02-17 09:51:18 -08:00
Nat Goodspeed 00c47d079f Increment viewer version to 6.4.14
following promotion of DRTVWR-517
2021-02-17 11:00:52 -05:00
Callum Prentice d26567915c Merge with Master after Viewer release 2021-02-03 09:31:32 -08:00
Dave Houlton de711c2138 Merged in DV528-rebase-6.4.13 (pull request #461)
DRTVWR-528 rebase to 6.4.13
2021-02-02 16:11:44 +00:00
Dave Houlton 7af677ab44 Merged in DV525-merge-6.4.13 (pull request #459)
DRTVWR-525, merge up to 6.4.13
2021-02-02 06:16:53 +00:00
Dave Houlton 033d16747c DRTVWR-525 fix build error resulting from 6.4.13 merge 2021-02-01 16:25:56 -07:00
Dave Houlton f07b332ef0 Merge branch 'master' into DV525-merge-6.4.13 2021-02-01 15:59:08 -07:00
Michael Pohoreski baa8147314 Merged in SL-14706 (pull request #457)
SL-14706 Merge Sovereign Engineer's fix for stars not centered around camera: Stars render around center of sim instead of center of camera.

Approved-by: Dave Houlton
2021-02-01 22:29:43 +00:00
Michael Pohoreski 8b38ed6dc3 Merged in SL-14732 (pull request #456)
SL-14732 Undefined behavior in class2 windlight cloud fragment shader

Approved-by: Dave Houlton
2021-02-01 22:29:00 +00:00
Michael Pohoreski cccb489cca Merged in SL-14731 (pull request #455)
SL-14731: Fix sun gamma -- merge Sovereign Engineer's patch: Fix sun gamma space for accurate color reproduction of sun textures

Approved-by: Dave Houlton
2021-02-01 22:26:24 +00:00
Andrey Kleshchev 44b6459dfa Merge branch 'master' into DRTVWR-514-keymappings
# Conflicts:
#	indra/llui/llscrolllistctrl.cpp
2021-02-01 23:33:41 +02:00
Brad Payne (Vir Linden) 665598a5ba Merge remote-tracking branch 'origin/master' into DRTVWR-517 2021-02-01 20:20:33 +00:00
Nat Goodspeed 21565a1f3f Increment viewer version to 6.4.13
following promotion of DRTVWR-513
2021-02-01 14:51:28 -05:00
Ptolemy ab02a6dfd4 SL-14706 Merge Sovereign Engineer's fix for stars not centered around camera: Stars render around center of sim instead of center of camera. 2021-01-29 18:41:04 -08:00
Ptolemy cc6d132e90 SL-14732: Merge Sovereign Engineer's cloud patch: Fix writing outside outside of the bound fbo in forward render class2 cloud shader 2021-01-29 14:32:37 -08:00
Ptolemy d7b2016e39 SL-14731: Fix sun gamma -- merge Sovereign Engineer's patch: Fix sun gamma space for accurate color reproduction of sun textures 2021-01-29 13:06:55 -08:00
Dave Houlton 4ae7c00dc4 Merged in euclid-13490 (pull request #453)
SL-13490 replace imperfect object-sized normals/tangents with constant length
2021-01-29 19:12:04 +00:00
Dave Houlton 6f2cfaed0d Merged DRTVWR-525 into euclid-13490 2021-01-29 12:08:01 -07:00
Dave Houlton 10e95a60af SL-13490 replace imperfect object-relative normals with constant length 2021-01-29 12:05:29 -07:00
Dave Houlton 2a5abb4d6a Merged in euclid-13490 (pull request #450)
SL-13490 fix debug normals under non-uniform scale

Approved-by: Michael Pohoreski
2021-01-28 22:28:45 +00:00
Dave Houlton 6564fce81a SL-13490 fix debug normals under non-uniform scale 2021-01-27 14:35:06 -07:00
Andrey Kleshchev d3169aa696 SL-14423 Ctrl+Alt+Shift+A is assigned to 2 things
Remapped debugging avatar textures (requires godlike agent) to Ctrl+Shift+Alt+K
2021-01-27 19:18:22 +02:00
Andrey Kleshchev abdfc65f56 SL-14424 Remove shortcut that conflicts with camera controls 2021-01-27 18:47:54 +02:00
Andrey Kleshchev 958991ec4d SL-14651 Keybinding's panel combobox can cause confusion 2021-01-26 23:26:56 +02:00
Michael Pohoreski 25186d07ac Merged in SL-14705 (pull request #445)
SL-14705: Merge Sovereign Engineer's fix for name tags showing in front with AMD GPUs: Fix GL_INVALID_OPERATION when copying stencil to default window framebuffer on AMD graphics on windows

Approved-by: Dave Houlton
2021-01-26 00:00:13 +00:00
Ptolemy a1107d0e17 SL-14705 merge 2021-01-25 15:58:46 -08:00