Commit Graph

188 Commits (680194deaf7a35caaa629abc16e886d71baff636)

Author SHA1 Message Date
callum_linden bdce32a02b Update to build on Xcode 6.0: collection of removal of unused variables [-Wunused-variable] 2014-10-18 11:56:23 -07:00
simon 250db74bf9 Pull and merge viewer-release as version 3.7.8 2014-05-07 10:56:41 -07:00
Dave Parks e606b7918d MAINT-3211 Fix for texture animations not working properly on rigged attachments when worn from inventory. 2014-03-24 14:04:40 -05:00
Richard Linden 5866bb7ef0 merge with release 2014-02-12 10:32:02 -08:00
Oz Linden 9bb2bc6099 fix odd editor artifact 2014-01-30 14:18:58 -05:00
Oz Linden 7b1e1e4e35 FITMESH-6: correct bounds checking 2014-01-29 18:25:03 -05:00
Dave Parks 476e317c8b FITMESH-6, FITMESH-20 Fix for some objects disappearing when hardware skinning enabled and ALM disabled. 2014-01-23 17:55:03 -06:00
Xiaohong Bao 0c60e32808 Merge 2013-10-21 16:57:38 -06:00
Richard Linden 697d2e720b renamed TimeBlock to BlockTimerStatHandle 2013-10-15 20:24:42 -07:00
Dave Parks 929311869b MAINT-2968 Transplant cleanup. 2013-10-11 17:10:26 -05:00
Dave Parks ff8b002c3b Quite down log spam from loading shaders.
Up bone cap to 64 for rigged meshes.
2013-10-10 13:56:06 -05:00
Richard Linden 80dfbbaacd merge from viewer-release 2013-10-08 11:59:24 -07:00
Richard Linden 59628d6f85 Automated merge with http://bitbucket.org/lindenlab/viewer-release 2013-10-01 14:28:39 -07:00
Graham Linden 2a03e8f9fb MAINT-3172 fix rendering regressions from release mergedown 2013-09-20 16:44:39 -07:00
Graham Linden 95e34d86b9 The unbearable lightness of being norspec 2013-09-18 18:24:16 -07:00
Richard Linden cbe397ad13 changed fast timer over to using macro
another attempt to move mem stat into base class
2013-09-05 14:04:13 -07:00
Graham Linden 8675ed0491 Fix merge regressions from missed changes to LoD updates 2013-08-19 16:04:28 -07:00
Xiaohong Bao d8c02bf062 Merge 2013-08-19 16:09:28 -06:00
Graham Linden 3f186aab77 Merge in viewer-release 2013-08-19 12:10:40 -07:00
Graham Linden 51dfcb9c67 NORSPEC-342 WIP MATBUG-347 make impostor rendering not contribute to depth for mostly-transparent buffer pixels, aka hair in ALM only 2013-08-12 15:55:25 -07:00
Richard Linden e340009fc5 second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Graham Madarasz (Graham Linden) 83fa549b56 NORSPEC-322 NORSPEC-342 WIP fix black deferred impostors, lighting bugs remain 2013-08-06 18:02:26 -07:00
Graham Linden 5b400d50e1 NORSPEC-322 NORSPEC-342 fix issues with black impostors and missing alpha attachments on impostors 2013-08-06 14:16:46 -07:00
Graham Linden 6d21cd2ae1 NORSPEC-324 set gamma value for avatar alpha shader too for gamma correct eyelashes 2013-07-25 11:09:45 -07:00
Graham Linden e21ab706b9 NORSPEC-324 when using display_gamma, actually set display_gamma 2013-07-24 15:43:38 -07:00
Graham Linden 749eef31fa NORSPEC-265 WIP imposters work in non-deferred and ALM but are forward-only render 2013-07-15 17:38:38 -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 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
Dave Parks 79029149a4 Automated merge with file:///F:%5Cviewer-bear 2013-06-21 12:51:29 -05:00
Richard Linden a2a6bf20d7 merge with release 2013-06-20 16:46:23 -07:00
Dave Parks 9ea2d90a0d Automated merge with http://bitbucket.org/lindenlab/viewer-release 2013-06-20 12:10:26 -05:00
Richard Linden 0a96b47663 merge with viewer-release 2013-06-05 19:05:43 -07:00
Dave Parks da294b79c0 NORSPEC-236 Fix for rigged attachments with materials not rendering under water when advanced lighting is enabled. 2013-06-05 11:10:32 -05:00
Dave Parks bc57b8050c MATBUG-136 Fix for glow being too bright on rigged attachments. 2013-06-03 15:45:59 -05:00
Dave Parks ee4c2e837b Fix for rigged attachments not having specular highlights with legacy shininess. 2013-05-29 20:46:29 -05:00
Dave Parks 743d1a777e NORSPEC-198, NORSPEC-176, NORSPEC-106, NORSPEC-202 et al -- Material matrix testing based overhaul WIP
Reviewed by Graham
2013-05-29 18:48:09 -05:00
Dave Parks 933d4c40f4 NORSPEC-198, NORSPEC-176, NORSPEC-106 WIP Fix for various fullbright/shiny descrepencies. 2013-05-23 12:47:52 -05:00
Dave Parks 369dadf823 NORSPEC-173 Fix for mac build 2013-05-13 13:34:14 -05:00
Dave Parks edd6349952 Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-05-13 10:57:05 -05:00
Dave Parks efe8d75fe3 NORSPEC-173 Shrink size of matrix palette for backwards compatibility. 2013-05-10 16:08:48 -05:00
simon ee2fce8790 Merge downstream code and viewer-beta 2013-05-09 14:10:45 -07:00
simon c7f7c4bc4d Merge viewer-beta 2013-05-09 13:14:49 -07:00
Richard Linden 6b81b8629e Spring cleaning: removed unused .cpp and.h files, and cleaned up header dependencies 2013-05-05 17:45:35 -07:00
Graham Madarasz 3e8101834b NORSPEC-99 add break statement to fix legacy bump vert program from being stomped with inappropriate material prog sans skinning 2013-05-02 10:20:55 -07:00
graham linden 33d2225666 Merged lindenlab/viewer-development-materials into default 2013-05-02 09:12:20 -07:00
Graham Madarasz de582bfe86 NORSPEC-99 add break statement to fix legacy bump vert program from being stomped with inappropriate material prog sans skinning 2013-05-02 10:20:55 -07:00
Dave Parks 90c2be46bf NORSPEC-145 Fix for improper rendering of glow pass for rigged meshes. 2013-05-01 20:01:37 -05:00
Graham Madarasz fd447189c5 Merge 3.5.1 into Materials 2013-04-25 21:00:16 -07:00