Commit Graph

239 Commits (d5877bc365292358eb4c9b8d14d1c8a1237ca5bd)

Author SHA1 Message Date
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 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 Linden 167fc26273 NORSPEC-291 WIP drop the no deferred underwater logic only 2013-07-09 06:38:12 -07:00
Dave Parks 6c061ae4fd Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-06-19 11:31:44 -05:00
Dave Parks ccd04cd66c Occlusion culling overhaul. 2013-06-18 17:24:21 -05:00
Graham Madarasz 8c41ff72ac Fix ternary use found illegit in the eyes of GCC 2013-06-13 10:52:30 -07:00
Graham Madarasz ac018153cb MAINT-2632 speculative guards in display_startup based on prevalence of crashes ending there (no repro, unfortunately) 2013-06-13 07:57:22 -07:00
Dave Parks 2cfd002a3b NORSPEC-216 Fix for some HUD objects not rendering with advanced lighting/materials enabled. 2013-05-30 19:07:44 -05:00
Graham Madarasz fd447189c5 Merge 3.5.1 into Materials 2013-04-25 21:00:16 -07:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
Dave Parks 8025b8b2bc NORSPEC-49 Add shader profiler, add support for ARB_depth_clamp where available 2013-04-15 13:16:14 -05:00
Oz Linden 2fde4a9ae5 merge changes for 3.5.0-beta7 2013-04-01 14:24:01 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Dave Parks 6300f4f768 NORSPEC-61 Hook up material parameters to shaders. 2013-03-27 21:59:14 -05:00
prep@lindenlab.com f2948cb1eb Merge with viewer-chui 2013-03-20 17:53:51 -05:00
merov c294c7c474 CHUI-863 : Clean up dead code that's creating failures on gcc-4.6 builds on Linux 2013-03-16 16:09:50 -07:00
Don Kjer 9150757c81 More fixes for gcc-4.6 breakage 2013-03-13 21:01:50 +00:00
Nyx Linden 1586107e87 SH-3944 WIP CHUI merge fixing
re-introduced don's refactor of low-level openGL calls pulling out of llui
and putting them into llrender. Took the new code from their updated versions
from the CHUI merge, but put them in a place accessible to appearance utility.
2013-03-12 22:34:15 +00:00
Oz Linden 8bb3d0891d merge up to 3.4.5-release 2013-02-12 13:27:03 -05:00
Geenz 2ae4b6976b Added a new draw pool specifically for faces with materials applied to them. Removed materials rendering from the bump draw pool, and reverted it to its previous state. 2013-02-04 11:32:05 -05:00
Geenz eda11a25a4 Initial (largely complete) gamma correct rendering implementation. 2013-01-11 06:37:21 -05:00
MaksymS ProductEngine d1481a599f MAINT-1486 FIXED Crash on login (Unhandled exception) 2012-08-31 00:38:16 +03:00
Oz Linden 8df3619621 merge to viewer-developmento 2012-07-24 10:51:37 -04:00
Todd Stinson 4feef5af63 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2012-07-23 19:21:34 -07:00
simon@Simon-PC.lindenlab.com 173d0fa213 Pull in viewer-development because it's painful. Merge with runitai's help. 2012-07-11 16:15:23 -07:00
simon@Simon-PC.lindenlab.com b7555a3309 Merge back viewer-lion, which has viewer-development and down-stream fixes 2012-08-01 14:07:24 -07:00
Dave Parks 4a5ad35793 MAINT-570 Remove unused memory tracking system LLMemType 2012-07-20 11:42:15 -05:00
Todd Stinson 3f17205889 Some clean-up after checking the differences between the pathfinding branch and viewer-release. 2012-06-26 12:27:08 -07:00
Dave Parks 9e9d32de38 merge 2012-06-22 14:04:33 -05:00
Todd Stinson e4aa203881 PATH-702: Positioning the rebake navmesh button to align with the Stand/StopFlying buttons. Also, parenting the buttons to the toolbar UI elements. 2012-06-19 17:20:24 -07:00
prep c839e769e8 Instance checks before using llpathfindingmanager. 2012-06-19 15:34:24 -04:00
prep 6711e6584a path-722: handling the case where region entry or teleporting would cause the rebake button to be drawn ontop of splash screen. 2012-06-19 15:09:22 -04:00
callum 2eedd0c3c0 Merge with tip 2012-06-15 13:00:49 -07:00
Dave Parks b93a23aa82 MAINT-1147 Fix for frame stall on region crossing. 2012-06-13 18:05:56 -05:00
Todd Stinson fbf01e9c2a EXP-1942,EXP-1945: Pulling down the teleport screen in the scenario of waiting for a maturity preference change that is still being posted to the server. 2012-05-29 18:02:38 -07:00
Dave Parks abaf0155b4 MAINT-616 Faster issuance of occlusion queries. 2012-05-25 10:51:38 -05:00
Dave Parks b7cfd8c7f0 MAINT-616 Factor out calls to glGenFoo where possible, add setting to control synchronizing strategy WRT occlusion queries, add experimental transform feedback driven LoD update 2012-05-21 23:33:25 -05:00
Todd Stinson 2f4ad07633 Cleaning up miscellaneous differences between the pathfinding repository and the latest viewer-development. 2012-03-20 17:38:58 -07:00
prep fab57eea61 pull and merge from viewer-development 2012-03-13 15:48:24 -04:00
prep e5a2e668be Removed unneeded code 2012-03-07 10:44:32 -05:00
prep 34a0a98f9d Partial fix for Path-387. Path-287 Viewer perfomance tweaks. 2012-03-07 10:34:49 -05:00
prep 5f2ed985ab Path-267: Support for rendering of new shape types an ui hookup. 2012-02-27 13:42:14 -05:00
prep 37febbcb7a WIP: navmesh rendering on ultra. Atmospheric shaders still need to be disabled, but navmesh renders on all settings 2012-02-24 16:10:18 -05:00
prep b64773bf2d Fix for nacmesh viewing on low gfx setting and llpathinglib update. 2012-02-24 14:34:53 -05:00
Dave Parks d953cce386 MAINT-775 Cleanup of some weird corner cases on animated child prims. 2012-04-19 17:29:32 -05:00
Todd Stinson e5d59b3c2a Moving the bulk of the display settings into the viewer. 2012-02-14 16:41:53 -08:00
prep ca79e6bb04 merge 2012-02-13 10:11:22 -05:00
prep 6d6c38f216 Path-197. Navmeshes are converted into vbos. 2012-02-13 10:10:57 -05:00
Todd Stinson 11259b37ee PATH-284: Moving files around in preparation for the new pathfinding console design. 2012-02-10 17:34:14 -08:00
Todd Stinson 125bdb31b0 Renaming the pathfinding console to be pathfinding setup. 2012-02-01 17:55:49 -08:00