Commit Graph

28528 Commits (5efee00a835a30f09637b2459134d458a9efa6cd)

Author SHA1 Message Date
Graham Linden 5efee00a83 NORSPEC-291 WIP added underwater deferred program and more reflection pass work 2013-07-12 13:01:31 -07:00
Graham Linden b588865f3f NORSPEC-291 WIP first attempt at materials in reflection/waterdis maps 2013-07-12 08:04:40 -07:00
Graham Linden a8c9d81a37 NORSPEC-291 WIP fix materials underwater with shadows on 2013-07-12 06:45:49 -07:00
Graham Madarasz (Graham) d07ba61a85 NORSPEC-291 really fix missing avatar 2013-07-11 16:42:14 -07:00
Graham Madarasz (Graham) e9cdd0bfe8 NORSPEC-291 WIP fix avatar disappearing 2013-07-11 16:39:39 -07:00
Graham Madarasz (Graham) fbf3d8b781 NORSPEC-291 WIP materials underwater with haze, reflection broken, water dist broken 2013-07-11 16:21:23 -07:00
Graham Linden d7856f0999 Merge 2013-07-10 09:56:22 -07:00
Graham Linden 326e20b0e5 NORSPEC-291 WIP materials underwater w and wo alpha, water fog color broken, no refl, no water dis 2013-07-10 09:47:46 -07:00
Graham Madarasz (Graham) cb013b54c2 Remove failed renderDeferredLightingToRenderTarget experiment 2013-07-09 09:40:14 -07:00
Graham Linden 167fc26273 NORSPEC-291 WIP drop the no deferred underwater logic only 2013-07-09 06:38:12 -07:00
Dave Parks b8e6789965 Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-07-03 17:18:27 -05:00
Dave Parks 4ad86739c1 NORSPEC-286 Make raycast code pay attention to diffuse alpha mode. 2013-07-03 15:10:54 -05:00
Graham Linden e6f980cfac Merge vwr-dev-mat 2013-07-03 11:51:45 -07:00
Graham Linden 6963c69c85 NORSPEC-297 fix deferred fog using wrong ref point 2013-07-03 11:42:52 -07:00
Dave Parks 8dedaadacd Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-07-03 13:00:55 -05:00
Dave Parks cf3b7bbe4b NORSPEC-298 Fix for inconsistent alpha lighting when diffuse color is not white. 2013-07-03 12:59:29 -05:00
Graham Linden d2855f9eec NORSPEC-293 better fix incorporating srgb_to_linear curve and applying texture gamma corrections to spot inputs 2013-07-03 10:56:10 -07:00
Graham Linden 37c9fcb3da Merge vwr-dev-mat 2013-07-03 10:43:37 -07:00
Graham Linden ed3b518499 NORSPEC-295 make a deferred path version of fullbright alpha mask shader so we can included gamma ops 2013-07-03 10:42:03 -07:00
Dave Parks c4d6c4213f Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-07-03 11:53:48 -05:00
Graham Linden ce6bb95384 NORSPEC-293 nix gamma correction in fullbrightF causing this visual disparity 2013-07-02 16:50:35 -07:00
Dave Parks 930de04f51 NORSPEC-287 Make alpha sRGB correction curves match OpenGL spec. 2013-07-02 18:02:28 -05:00
Graham Linden 4f2c259794 Merge vwr-dev-mat 2013-07-02 13:47:41 -07:00
Graham Linden c262ef58fa NORSPEC-292 remove unnecessary call to setIsLight 2013-07-02 13:16:23 -07:00
Graham Linden f1c04467f7 NORSPEC-292 fix issues with managing LLNetworkData::PARAMS_LIGHT_IMAGE when demoting spotlights by removing their tex 2013-07-02 13:12:08 -07:00
Graham Linden 418c8a72c8 NORSPEC-296 make add_media button always available as long as the face is editable 2013-07-02 07:39:55 -07:00
Graham Linden dd31d9941f NORSPEC-296 make add_media button always available as long as the face is editable 2013-07-02 07:39:55 -07:00
Oz Linden cdedd9356a merge changes for latest project integration repo 2013-07-01 10:12:33 -04:00
Oz Linden 743b6ca617 merge changes for 3.6.1-release 2013-06-27 18:17:16 -04:00
Oz Linden 6060e5e46a increment viewer version to 3.6.2 2013-06-27 18:10:18 -04:00
Dave Parks 21b78d7368 Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-06-26 19:18:19 -05:00
Dave Parks 06b024f60e MATBUG-194 Fix for crazy colors on projector shadows with NVIDIA OpenGL 3.3 implementations 2013-06-26 19:16:49 -05:00
Graham Madarasz (Graham) a1a64c3527 Merge vwr-dev-mat 2013-06-26 13:45:57 -07:00
Graham Madarasz (Graham) 3ce387a04d Remove patch file 2013-06-26 13:44:57 -07:00
Oz Linden b2db719faf Added tag 3.6.1-release for changeset 75cf8e855ae1 2013-06-26 16:35:53 -04:00
Dave Parks 2b5205c743 Merge cleanup. 2013-06-26 15:33:07 -05:00
Dave Parks bb66e722d3 Automated merge with https://bitbucket.org/davep/viewer-release-iqa-1366 2013-06-26 11:55:03 -05:00
Dave Parks b717a28194 Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-06-26 11:53:47 -05:00
Dave Parks 5595888dd2 NORSPEC-290 Allow shader compiler to unroll loop in multiPointLightF 2013-06-26 11:52:10 -05:00
Oz Linden 1c6783fdb5 NORSPEC-29: use the MaxMaterialsPerTransaction simulator feature if available 2013-06-26 09:43:01 -04:00
Graham Linden 00ea6f3b2b Merge vwr-dev-mat 2013-06-25 16:26:47 -07:00
Graham Linden de4892b337 NORSPEC-288 remove unassertable asserts from restoring code to condition normals for this fix 2013-06-25 16:25:22 -07:00
Dave Parks 280a9d9827 MATBUG-78 Fix for alpha lighting falloff not matching opaque lighting falloff (again). 2013-06-25 18:02:08 -05:00
Oz Linden 7ede4c4b6e merge changes for NORSPEC-280 2013-06-25 16:43:55 -04:00
Oz Linden b23143418b merge changes for NORSPEC-280 2013-06-25 16:25:32 -04:00
Graham Linden 705a0ab677 NORSPEC-288 WIP fixes the issue with normal gen, but may be a bigger perf hit than we want 2013-06-25 11:16:27 -07:00
Graham Linden 5378900822 NORSPEC-250 add setting to force higher LUT precision and made LUT cleanup match creation 2013-06-25 10:21:59 -07:00
Graham Linden 269519e267 Merge vwr-dev-mat 2013-06-25 09:36:58 -07:00
Graham Linden 363ef9d73d Merge 2013-06-24 19:30:52 -07:00
Graham Linden c07f47dee8 NORSPEC-259 nerfed copyContentsToFramebuffer handling of non-FBO sources 2013-06-24 19:28:02 -07:00