Age | Commit message (Collapse) | Author | |
---|---|---|---|
2013-05-29 | NORSPEC-198, NORSPEC-176, NORSPEC-106, NORSPEC-202 et al -- Material matrix ↵ | Dave Parks | |
testing based overhaul WIP Reviewed by Graham | |||
2013-04-25 | Merge 3.5.1 into Materials | Graham Madarasz | |
2013-03-29 | Update Mac and Windows breakpad builds to latest | Graham Madarasz | |
2013-03-28 | NORSPEC-62 Fix for fullbright checkbox not working with materials | Dave Parks | |
2013-03-27 | NORSPEC-61 Hook up material parameters to shaders. | Dave Parks | |
2013-02-04 | Added a new draw pool specifically for faces with materials applied to them. ↵ | Geenz | |
Removed materials rendering from the bump draw pool, and reverted it to its previous state. | |||
2012-07-24 | merge to viewer-developmento | Oz Linden | |
2012-06-13 | MAINT-1147 Fix for frame stall on region crossing. | Dave Parks | |
2012-05-09 | Added support to disable a draw pool. When the movable option checkbox is ↵ | prep | |
selected we will now also cull the terrain draw pool. | |||
2012-02-10 | SH-2963 Fix for highlight transparent not highlighting 100% transparent objects. | Dave Parks | |
2011-11-21 | SH-2708 Fix for broken shadows on alpha objects | Dave Parks | |
2011-05-29 | SH-1682 Work in progress on using texture indexes to improve batch size ↵ | Dave Parks | |
(wow, super fast so far) | |||
2011-02-09 | SH-874 Fix for bad performance on cards without GL_ARB_depth_clamp in cases ↵ | Dave Parks | |
where water and terrain should be occluded. | |||
2010-12-01 | Automated merge up from viewer-development | Loren Shih | |
2010-10-27 | Automated merge up from viewer-development | Loren Shih | |
2010-10-27 | merge from viewer-development. | Tofu Buzzard | |
2010-10-10 | VWR-21967 There's lots of ::renderForSelect() code that we don't need any more. | Tofu Linden | |
VWR-22088 Remove underlying ::renderForSelect() code (render-pipeline) | |||
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-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-31 | merge | Dave Parks | |
2010-05-12 | Fix for fullbright bump not working in deferred render. | Dave Parks | |
Fix for shadow artifacts around split frusta. Tweak for shadow aliasing with projectors. Fix for crash on exit in mesh thread. (transplanted from 6dcf09cd3e524016c8130a0c8af3d9fc95f2d411) | |||
2010-05-12 | Fix for fullbright bump not working in deferred render. | Dave Parks | |
Fix for shadow artifacts around split frusta. Tweak for shadow aliasing with projectors. Fix for crash on exit in mesh thread. | |||
2010-05-01 | Rigged attachment integration WIP. | Dave Parks | |
2009-09-22 | Merging render-pipeline-6-qa-2 into viewer-2 | David Parks | |
Self reviewed. | |||
2009-07-10 | merge QAR-1579: texture-cleanup-1. | Xiaohong Bao | |
2009-05-04 | QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3 | Adam Moss | |
svn merge -r118927:118939 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476 this is a composite of... svn merge -r115088:118182 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23 conflicts resolved: C doc/contributions.txt C indra/llaudio/audioengine.cpp C indra/newview/CMakeLists.txt C indra/newview/llfloaterlandholdings.cpp C indra/newview/llpaneldirbrowser.cpp C indra/newview/llpanelgrouplandmoney.cpp C indra/newview/llpreviewscript.cpp C indra/newview/llviewermenu.cpp C indra/newview/skins/default/xui/en-us/notifications.xml and... svn merge -r116937:118673 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 minor-to-trivial conflicts resolved: C indra/llcommon/llversionserver.h C indra/newsim/llrezdata.cpp C indra/newsim/llstate.cpp C indra/upgrade/schema_version/sequence/3/index_log_paypal.sql | |||
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-04-28 | merge release-QAR-499 Viewer 1.20 RC 3 | Steven Bennetts | |
merge release-QAR-508 Viewer 1.20 RC 4 merge Branch_1-20-Viewer -r 85278 : 85828 -> release | |||
2008-02-27 | Merge of windlight into release (QAR-286). This includes all changes in | Brad Kittenbrink | |
windlight14 which have passed QA (up through r79932). svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620 | |||
2007-10-04 | Result of svn merge -r71162:71205 ↵ | Aaron Brashears | |
svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. | |||
2007-03-21 | svn merge -r 59178:59364 ↵ | Josh Bell | |
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release | |||
2007-03-07 | SKIPPED 58849. merge -r 58856:58859 maintenance -> release | Steven Bennetts | |
2007-03-02 | merge release@58699 beta-1-14-0@58707 -> release | Steven Bennetts | |
2007-01-04 | svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@56429 ↵ | Josh Bell | |
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance@56431 This turned up the following "lost" changes: llapp.cpp (from maintenance r55371) - SIGPIPE fix, possibly llfontgl.cpp (from maintenance r50207) - whitespace only inventorybridge.cpp (property - non-executable) skins/xui/*/* (from maintenance r55380) - XML processing instruction went AWOL | |||
2007-01-02 | Print done when done. | James Cook | |