| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2010-10-27 | Automated merge up from viewer-development | Loren Shih | |
| 2010-10-21 | SH-175 Better handling of failure to load rigged attachment shaders. | Dave Parks | |
| 2010-10-13 | correct licenses (fix problem with license change merge) | Oz Linden | |
| 2010-09-30 | Port of SNOW-643 : Water flicker at high altitude. This doesn't fix the low ↵ | Merov Linden | |
| altitude flicker though (STORM-306) | |||
| 2010-09-27 | STORM-1126 WIP Windlight Estate Settings port from 1.23: first pass at ↵ | Nyx (Neal Orman) | |
| merging in windlight estate settings to viewer-dev codebase. not built, not tested. Probably needs a bunch of fixes to be able to be integrated. (resubmitted by Vadim ProductEngine) | |||
| 2010-08-24 | Backed out changeset c3d41f18ce2b | Tofu Linden | |
| back-out the back-out for this branch. yay. | |||
| 2010-08-24 | Backed out changeset a62bf7c0af21 | Tofu Linden | |
| Backing out this merge that I pushed (prematurely) to the wrong place. | |||
| 2010-08-24 | merge heads. whew. | Tofu Linden | |
| 2010-08-13 | Change license from GPL to LGPL (version 2.1) | Oz Linden | |
| 2010-08-13 | Better support for curious mixtures fullbright/shiny/water with rigged ↵ | Dave Parks | |
| attachments, deferred rendering, and not. | |||
| 2010-08-13 | Make rigged attachments respect under water rendering. | Dave Parks | |
| Reviewed by Nyx. | |||
| 2010-08-12 | Vertex buffer cleanup, adding water shader to simple rigged attachments. | Dave Parks | |
| Reviewed by Nyx. | |||
| 2010-05-04 | EXT-7168 | Tofu Linden | |
| Fix the tying of the deferred prefs UI to the featuretable. | |||
| 2010-05-04 | EXT-7168 | Tofu Linden | |
| Fix the tying of the deferred prefs UI to the featuretable. (transplanted from 3196941d73f122f5dbe42aa0ffdc28a2470ea089) | |||
| 2010-05-04 | Deferred pipeline integration of rigged attachments and cleanup. | Dave Parks | |
| 2010-05-01 | Fullbright shiny skinned. | Dave Parks | |
| 2010-05-01 | Fullbrigt skinned and fix for silly crash from not removing face references. | Dave Parks | |
| 2010-05-01 | Rigged attachment integration WIP. | Dave Parks | |
| 2010-04-22 | Deferred shading for rigged attachments. | Dave Parks | |
| 2010-04-06 | Rigged attachments (almost works). | Dave Parks | |
| 2010-03-20 | Tweak detail settings and make graphics preferences widget enabling respect ↵ | Dave Parks | |
| requirements. | |||
| 2010-03-19 | Make gcc happy | Dave Parks | |
| 2010-03-19 | RenderDeferredSSAO works as an independent setting -- decoupled shadows from ↵ | Dave Parks | |
| SSAO. | |||
| 2010-03-19 | Replace RenderDeferredShadow/RenderDeferredSunShadow with RenderShadowDetail | Dave Parks | |
| 2010-03-20 | Tweak detail settings and make graphics preferences widget enabling respect ↵ | Dave Parks | |
| requirements. | |||
| 2010-03-19 | Make gcc happy | Dave Parks | |
| 2010-03-19 | RenderDeferredSSAO works as an independent setting -- decoupled shadows from ↵ | Dave Parks | |
| SSAO. | |||
| 2010-03-19 | Replace RenderDeferredShadow/RenderDeferredSunShadow with RenderShadowDetail | Dave Parks | |
| 2010-01-27 | CID-348 | Tofu Linden | |
| Checker: UNINIT_CTOR Function: LLViewerShaderMgr::LLViewerShaderMgr() File: /indra/newview/llviewershadermgr.cpp | |||
| 2009-09-22 | Merging render-pipeline-6-qa-2 into viewer-2 | David Parks | |
| Self reviewed. | |||
| 2009-02-18 | Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 ↵ | Brad Kittenbrink | |
| (maint-render-9) and QAR-1236 (dll-msvcrt-2) svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833 | |||
| 2009-01-08 | Result of svn merge -r107256:107258 ↵ | Aaron Brashears | |
| svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 | |||
| 2008-11-07 | QAR-992 Merging revisions 101012-101170,101686-101687 of ↵ | Mark Palange | |
| svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release | |||
| 2008-08-12 | QAR-767 Combined maint-render-7 and maint-viewer-9 merge | Steven Bennetts | |
| merge release@93398 viewer-merge-1@94007 -> release dataserver-is-deprecated | |||
| 2008-06-30 | Merging in file-move-merge ( QAR-649 ) | Eric Tulla | |
| Result of "svn merge -r 90669:90786 $tulla/file-move-merge ." Be careful of future merges involving changes to any of these moved files as SVN usually does the wrong thing: newview/llglslshader.* -> llrender/llglslshader.*, llrender/llshadermgr.*, newview/llviewershadermgr.* (gets split into 3 separate files) newview/llpostprocess.* -> llrender/llpostprocess.* newview/llrendersphere.* -> llrender/llrendersphere.* newview/llcubemap.* -> llrender/llcubemap.* llwindow/llgl.* -> llrender/llgl.* llwindow/llglstates.h -> llrender/llglstates.h llwindow/llgltypes.h -> llrender/llgltypes.h llwindow/llglheaders.h -> llrender/llglheaders.h | |||
 |
index : viewer.git | |
| Megapahit's fork of the Second Life viewer. | Erik Kundiman |
| summaryrefslogtreecommitdiff |